diff --git a/gui/src/components/main_top_navbar.vue b/gui/src/components/main_top_navbar.vue
index 1501757e..07386bab 100644
--- a/gui/src/components/main_top_navbar.vue
+++ b/gui/src/components/main_top_navbar.vue
@@ -20,13 +20,15 @@ import { saveSettingsToFile } from "../js/settingsHandler";
 <template>
   <nav class="navbar bg-body-tertiary border-bottom">
     <div class="mx-auto">
-      <span class="badge bg-secondary me-4"
-        >Modem location | {{ settings.modem_host }}</span
-      >
-
-      <span class="badge bg-secondary me-4"
-        >Service | {{ state.modem_running_state }}</span
-      >
+      <span class="badge bg-secondary me-4">
+        Modem Connection {{ state.modem_connection }}
+      </span>
+      <span class="badge bg-secondary me-4">
+        Modem {{ state.modem_running_state }}
+      </span>
+      <span class="badge bg-secondary me-4">
+        RIG Control {{ state.rigctld_started }}
+      </span>
     </div>
-	 </nav>
+  </nav>
 </template>
diff --git a/gui/src/components/settings_modem.vue b/gui/src/components/settings_modem.vue
index 968ca0f5..2cc236ea 100644
--- a/gui/src/components/settings_modem.vue
+++ b/gui/src/components/settings_modem.vue
@@ -99,9 +99,10 @@ function saveSettings() {
     <label class="input-group-text w-50">Audio Input device</label>
     <select
           class="form-select form-select-sm"
-          id="audio_input_selectbox"
+          id="rx_audio"
           aria-label=".form-select-sm"
           @change="saveSettings"
+          v-model="settings.rx_audio"
           v-html="audio.getInputDevices()"
         >  
     </select>
@@ -112,9 +113,10 @@ function saveSettings() {
     <label class="input-group-text w-50">Audio Output device</label>
     <select
           class="form-select form-select-sm"
-          id="audio_output_selectbox"
+          id="tx_audio"
           aria-label=".form-select-sm"
           @change="saveSettings"
+          v-model="settings.tx_audio"
           v-html="audio.getOutputDevices()"
         >  
     </select>
diff --git a/gui/src/js/daemon.ts b/gui/src/js/daemon.ts
index f7703e6b..c2444ce3 100644
--- a/gui/src/js/daemon.ts
+++ b/gui/src/js/daemon.ts
@@ -37,6 +37,7 @@ function connectDAEMON() {
 
 daemon.on("connect", function () {
   console.log("daemon connection established");
+  state.modem_connection = "connected";
   daemonShowConnectStateError = 1;
 });
 
@@ -147,6 +148,16 @@ daemon.on("data", function (socketdata) {
       if (data["command"] == "test_hamlib") {
         //
       }
+
+      if (data["command_response"] == "stop_modem") {
+        switch (data["status"]) {
+          case "OK":
+            state.modem_running_state = "running";
+            break;
+          default:
+            state.modem_running_state = "stopped";
+        }
+      }
     }
 
     //finally delete message buffer
@@ -164,8 +175,8 @@ export function startModem() {
       {
         mycall: settings.mycall + "-" + settings.myssid,
         mygrid: settings.mygrid,
-        rx_audio: audioStore.startupInputDevice,
-        tx_audio: audioStore.startupOutputDevice,
+        rx_audio: settings.rx_audio,
+        tx_audio: settings.tx_audio,
         radiocontrol: settings.radiocontrol,
         devicename: settings.hamlib_deviceid,
         deviceport: settings.hamlib_deviceport,
diff --git a/gui/src/store/stateStore.js b/gui/src/store/stateStore.js
index a336c66b..02cd8c12 100644
--- a/gui/src/store/stateStore.js
+++ b/gui/src/store/stateStore.js
@@ -124,6 +124,7 @@ export const useStateStore = defineStore("stateStore", () => {
     arq_seconds_until_finish,
     arq_seconds_until_timeout,
     arq_seconds_until_timeout_percent,
+    modem_connection,
     modem_running_state,
     arq_session_state,
     is_codec2_traffic,