diff --git a/src/app/components/GeneralPage.tsx b/src/app/components/GeneralPage.tsx
index 2203b09..6a8f87b 100644
--- a/src/app/components/GeneralPage.tsx
+++ b/src/app/components/GeneralPage.tsx
@@ -45,6 +45,17 @@ export default function GeneralPage({ config, setConfig }: GeneralPageProps) {
       <h2 className="text-sm text-neutral-500 flex items-center gap-2"><Settings className="w-4 h-4" /> General Settings</h2>
 
       <div className="bg-white border border-neutral-200 rounded-lg divide-y divide-neutral-200">
+
+        <div className="p-4">
+          <label className="text-sm text-neutral-500 block mb-2">Device Name</label>
+          <input
+            type="text"
+            value={general.devicename || ''}
+            onChange={(e) => updateSetting(['general', 'devicename'], e.target.value)}
+            className="w-full px-3 py-2 border border-neutral-300 rounded-lg"
+          />
+        </div>
+
         <div className="p-4">
           <label className="text-sm text-neutral-500 block mb-2">Appearance</label>
           <select
@@ -109,16 +120,6 @@ export default function GeneralPage({ config, setConfig }: GeneralPageProps) {
           />
         </div>
 
-        <div className="p-4">
-          <label className="text-sm text-neutral-500 block mb-2">Device Name</label>
-          <input
-            type="text"
-            value={general.devicename || ''}
-            onChange={(e) => updateSetting(['general', 'devicename'], e.target.value)}
-            className="w-full px-3 py-2 border border-neutral-300 rounded-lg"
-          />
-        </div>
-
         <div className="p-4 flex items-center justify-between">
           <label className="text-sm text-neutral-500">Rotation Sounds</label>
           <button
diff --git a/src/app/components/NetworkPage.tsx b/src/app/components/NetworkPage.tsx
index 16aa4ef..6f2acc9 100644
--- a/src/app/components/NetworkPage.tsx
+++ b/src/app/components/NetworkPage.tsx
@@ -217,15 +217,6 @@ export default function NetworkPage({ config, setConfig }: NetworkPageProps) {
       <h2 className="text-sm text-neutral-500 pt-4 flex items-center gap-2"><Bluetooth className="w-4 h-4" /> Bluetooth</h2>
 
       <div className="bg-white border border-neutral-200 rounded-lg divide-y divide-neutral-200">
-        <div className="p-4">
-          <label className="text-sm text-neutral-500 block mb-2">Device Name</label>
-          <input
-            type="text"
-            value={bluetooth.devicename || ''}
-            onChange={(e) => updateSetting(['bluetooth', 'devicename'], e.target.value)}
-            className="w-full px-3 py-2 border border-neutral-300 rounded-lg"
-          />
-        </div>
 
         <div className="p-4 flex items-center justify-between">
           <label className="text-sm text-neutral-500">Enabled</label>
@@ -242,6 +233,17 @@ export default function NetworkPage({ config, setConfig }: NetworkPageProps) {
             />
           </button>
         </div>
+        
+        <div className="p-4">
+          <label className="text-sm text-neutral-500 block mb-2">Device Name</label>
+          <input
+            type="text"
+            value={bluetooth.devicename || ''}
+            onChange={(e) => updateSetting(['bluetooth', 'devicename'], e.target.value)}
+            className="w-full px-3 py-2 border border-neutral-300 rounded-lg"
+          />
+        </div>
+
 
         <div className="p-4">
           <label className="text-sm text-neutral-500 block mb-2">Baud Rate</label>