diff --git a/Desktop App/.env b/Desktop App/.env
index 1ea3d4a..df28695 100644
--- a/Desktop App/.env	
+++ b/Desktop App/.env	
@@ -1,3 +1,3 @@
 UDP_PORT=41234
 TCP_PORT=41233
-IS_CLIENT=true
\ No newline at end of file
+IS_CLIENT=false
\ No newline at end of file
diff --git a/Desktop App/render/ceo/js/overview_departments.js b/Desktop App/render/ceo/js/overview_departments.js
index 0171749..a673915 100644
--- a/Desktop App/render/ceo/js/overview_departments.js	
+++ b/Desktop App/render/ceo/js/overview_departments.js	
@@ -87,6 +87,8 @@ async function fetchDepartments() {
         return;
     }
 
+    console.log(filteredDepartments)
+
     filteredDepartments.forEach(department => {
         const departmentDiv = document.createElement('div');
         departmentDiv.classList.add('department-card');
diff --git a/Desktop App/render/client/js/announcement.js b/Desktop App/render/client/js/announcement.js
index a087cf3..f2ad710 100644
--- a/Desktop App/render/client/js/announcement.js	
+++ b/Desktop App/render/client/js/announcement.js	
@@ -1,7 +1,7 @@
 // Load announcement content from the application info when the page loads
 async function loadAnnouncement() {
     try {
-        const announcementText = await window.electronAPI.readAnnouncement();
+        const announcementText = await window.uiAPI.readAnnouncement();
         const announcementContent = document.getElementById('announcement-content');
         if (announcementContent && announcementText) {
             announcementContent.innerHTML = formatTextForHtml(announcementText);
@@ -22,5 +22,5 @@ function formatTextForHtml(text) {
 
 // Close the window when the close button is clicked
 function closeWindow() {
-    window.electronAPI.closeAnnouncementWindow();
+    window.uiAPI.closeAnnouncementWindow();
 }
diff --git a/Desktop App/src/helpers/announcement_sender.ts b/Desktop App/src/helpers/announcement_sender.ts
index 3ff0404..d75c076 100644
--- a/Desktop App/src/helpers/announcement_sender.ts	
+++ b/Desktop App/src/helpers/announcement_sender.ts	
@@ -45,9 +45,11 @@ export class AnnouncementSender {
         type: 'showAlert',
         message: 'Announcement sent to all active users successfully.',
       })
+      process.send?.({ type: 'changeContent', page: 'announcement' })
     } catch (error: any) {
       console.error('Error in AnnouncementWorker:', error)
       process.send?.({ type: 'shotAlert', message: `A problem occurred: ${error.message}` })
+      process.send?.({ type: 'changeContent', page: 'announcement' })
     }
 
     console.log('AnnouncementWorker finished.')
diff --git a/Desktop App/src/main/main.ts b/Desktop App/src/main/main.ts
index fa7d08a..075245e 100644
--- a/Desktop App/src/main/main.ts	
+++ b/Desktop App/src/main/main.ts	
@@ -102,7 +102,7 @@ app.whenReady().then(async () => {
     },
   })
 
-  mainWindow.removeMenu()
+  //mainWindow.removeMenu()
 
   await ensureDirectoryExists(pathToClientsBackups)
 
diff --git a/Desktop App/src/network/operations_custom/user_to_user_operations.ts b/Desktop App/src/network/operations_custom/user_to_user_operations.ts
index d260f02..25dc2e0 100644
--- a/Desktop App/src/network/operations_custom/user_to_user_operations.ts	
+++ b/Desktop App/src/network/operations_custom/user_to_user_operations.ts	
@@ -52,7 +52,7 @@ export class UserToUserOperations implements OperationPlugin {
       await database.update((data: any) => {
         if (!parsedMessage.metaInfo) return data
 
-        data.app_config.announcement = parsedMessage.metaInfo.message
+        data.network.announcement = parsedMessage.metaInfo.message
         return data
       })
       return { operationCode: operationCodes.OK, metaInfo: { message: 'Announcement saved.' } }