diff --git a/gui/src/components/main_modals.vue b/gui/src/components/main_modals.vue
index b6c956fa..2e44c3c5 100644
--- a/gui/src/components/main_modals.vue
+++ b/gui/src/components/main_modals.vue
@@ -8,7 +8,7 @@ setActivePinia(pinia);
 import { useChatStore } from "../store/chatStore.js";
 const chat = useChatStore(pinia);
 
-import { settingsStore as settings } from "../store/settingsStore.js";
+import { settingsStore as settings, onChange } from "../store/settingsStore.js";
 
 import { sendModemTestFrame } from "../js/api";
 
@@ -19,15 +19,6 @@ import {
 
 import main_startup_check from "./main_startup_check.vue";
 
-function set_tx_audio_level() {
-  saveSettingsToFile();
-  setTxAudioLevel(settings.tx_audio_level);
-}
-
-function set_rx_audio_level() {
-  saveSettingsToFile();
-  setRxAudioLevel(settings.rx_audio_level);
-}
 
 function deleteChat() {
   //console.log(chat.selectedCallsign)
@@ -1199,7 +1190,7 @@ const transmissionSpeedChartDataMessageInfo = computed(() => ({
           </div>
           <div class="input-group input-group-sm mb-1">
             <span class="input-group-text">RX Level</span>
-            <span class="input-group-text">{{ settings.rx_audio_level }}</span>
+            <span class="input-group-text">{{ settings.remote.AUDIO.rx_audio_level }}</span>
             <span class="input-group-text w-75">
               <input
                 type="range"
@@ -1208,13 +1199,13 @@ const transmissionSpeedChartDataMessageInfo = computed(() => ({
                 max="20"
                 step="1"
                 id="audioLevelRX"
-                @click="set_rx_audio_level()"
-                v-model="settings.rx_audio_level"
+                @change="onChange"
+                v-model="settings.remote.AUDIO.tx_audio_level"
             /></span>
           </div>
           <div class="input-group input-group-sm mb-1">
             <span class="input-group-text">TX Level</span>
-            <span class="input-group-text">{{ settings.tx_audio_level }}</span>
+            <span class="input-group-text">{{ settings.remote.AUDIO.tx_audio_level }}</span>
             <span class="input-group-text w-75">
               <input
                 type="range"
@@ -1223,8 +1214,8 @@ const transmissionSpeedChartDataMessageInfo = computed(() => ({
                 max="20"
                 step="1"
                 id="audioLevelTX"
-                @click="set_tx_audio_level()"
-                v-model="settings.tx_audio_level"
+                @change="onChange"
+                v-model="settings.remote.AUDIO.tx_audio_level"
             /></span>
           </div>
         </div>
diff --git a/gui/src/components/settings.vue b/gui/src/components/settings.vue
index fccc11d4..2584a156 100644
--- a/gui/src/components/settings.vue
+++ b/gui/src/components/settings.vue
@@ -3,7 +3,6 @@ import settings_station from "./settings_station.vue";
 import settings_gui from "./settings_gui.vue";
 import settings_chat from "./settings_chat.vue";
 import settings_rigcontrol from "./settings_rigcontrol.vue";
-import settings_hamlib from "./settings_hamlib.vue";
 import settings_modem from "./settings_modem.vue";
 import settings_web from "./settings_web.vue";
 import settings_exp from "./settings_exp.vue";
@@ -76,20 +75,7 @@ import settings_exp from "./settings_exp.vue";
                 Rig Control
               </button>
             </li>
-            <li class="nav-item" role="presentation">
-              <button
-                class="nav-link"
-                id="hamlib-tab"
-                data-bs-toggle="tab"
-                data-bs-target="#hamlib"
-                type="button"
-                role="tab"
-                aria-controls="profile"
-                aria-selected="false"
-              >
-                Hamlib
-              </button>
-            </li>
+
             <li class="nav-item" role="presentation">
               <button
                 class="nav-link"
@@ -180,15 +166,7 @@ import settings_exp from "./settings_exp.vue";
               <settings_rigcontrol />
             </div>
 
-            <div
-              class="tab-pane"
-              id="hamlib"
-              role="tabpanel"
-              aria-labelledby="hamlib-tab"
-              tabindex="0"
-            >
-              <settings_hamlib />
-            </div>
+
             <div
               class="tab-pane"
               id="modem"
diff --git a/gui/src/components/settings_rigcontrol.vue b/gui/src/components/settings_rigcontrol.vue
index 1af02c97..25b075bb 100644
--- a/gui/src/components/settings_rigcontrol.vue
+++ b/gui/src/components/settings_rigcontrol.vue
@@ -1,5 +1,9 @@
 <script setup lang="ts">
 import { settingsStore as settings, onChange } from "../store/settingsStore.js";
+import settings_hamlib from "./settings_hamlib.vue";
+import settings_tci from "./settings_tci.vue";
+
+
 </script>
 
 <template>
@@ -23,29 +27,18 @@ import { settingsStore as settings, onChange } from "../store/settingsStore.js";
 
   <hr class="m-2" />
 
-  <div class="input-group input-group-sm mb-1">
-    <span class="input-group-text" style="width: 180px">TCI IP Address</span>
-    <input
-      type="text"
-      class="form-control"
-      placeholder="TCI IP"
-      id="rigcontrol_tci_ip"
-      aria-label="Device IP"
-      @change="onChange"
-      v-model="settings.remote.TCI.tci_ip"
-    />
+  <nav>
+  <div class="nav nav-tabs" id="nav-tab" role="tablist">
+    <button class="nav-link active" id="nav-home-tab" data-bs-toggle="tab" data-bs-target="#nav-hamlib" type="button" role="tab" aria-controls="nav-home" aria-selected="true">Hamlib</button>
+    <button class="nav-link" id="nav-profile-tab" data-bs-toggle="tab" data-bs-target="#nav-tci" type="button" role="tab" aria-controls="nav-profile" aria-selected="false">TCI</button>
   </div>
+</nav>
+<div class="tab-content" id="nav-tabContent">
+  <div class="tab-pane fade show active" id="nav-hamlib" role="tabpanel" aria-labelledby="nav-hamlib-tab" tabindex="0"><settings_hamlib /></div>
+  <div class="tab-pane fade" id="nav-tci" role="tabpanel" aria-labelledby="nav-tci-tab" tabindex="0"><settings_tci /></div>
+</div>
+
+
+  <hr class="m-2" />
 
-  <div class="input-group input-group-sm mb-1">
-    <span class="input-group-text" style="width: 180px">TCI port</span>
-    <input
-      type="text"
-      class="form-control"
-      placeholder="TCI port"
-      id="rigcontrol_tci_port"
-      aria-label="Device Port"
-      @change="onChange"
-      v-model="settings.remote.TCI.tci_port"
-    />
-  </div>
 </template>
diff --git a/gui/src/components/settings_tci.vue b/gui/src/components/settings_tci.vue
new file mode 100644
index 00000000..03ae05ec
--- /dev/null
+++ b/gui/src/components/settings_tci.vue
@@ -0,0 +1,34 @@
+<script setup lang="ts">
+import { settingsStore as settings, onChange } from "../store/settingsStore.js";
+import { serialDeviceOptions } from "../js/deviceFormHelper";
+</script>
+
+<template>
+  <hr class="m-2" />
+
+  <div class="input-group input-group-sm mb-1">
+    <span class="input-group-text" style="width: 180px">TCI IP Address</span>
+    <input
+      type="text"
+      class="form-control"
+      placeholder="TCI IP"
+      id="rigcontrol_tci_ip"
+      aria-label="Device IP"
+      @change="onChange"
+      v-model="settings.remote.TCI.tci_ip"
+    />
+  </div>
+
+  <div class="input-group input-group-sm mb-1">
+    <span class="input-group-text" style="width: 180px">TCI port</span>
+    <input
+      type="text"
+      class="form-control"
+      placeholder="TCI port"
+      id="rigcontrol_tci_port"
+      aria-label="Device Port"
+      @change="onChange"
+      v-model="settings.remote.TCI.tci_port"
+    />
+  </div>
+</template>
diff --git a/modem/command_test.py b/modem/command_test.py
index 67c61450..4fbbb208 100644
--- a/modem/command_test.py
+++ b/modem/command_test.py
@@ -7,4 +7,4 @@ class TestCommand(TxCommand):
         return self.frame_factory.build_test()
 
     def get_tx_mode(self):
-        return codec2.FREEDV_MODE.datac13.value
+        return codec2.FREEDV_MODE.datac3
\ No newline at end of file