diff --git a/apk/controller/.idea/caches/deviceStreaming.xml b/apk/controller/.idea/caches/deviceStreaming.xml
index 23267a6..6a3e9f5 100644
--- a/apk/controller/.idea/caches/deviceStreaming.xml
+++ b/apk/controller/.idea/caches/deviceStreaming.xml
@@ -208,6 +208,18 @@
           <option name="screenX" value="1080" />
           <option name="screenY" value="2340" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="36" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="a15xtfn" />
+          <option name="id" value="a15xtfn" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy A15 5G" />
+          <option name="screenDensity" value="450" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="35" />
           <option name="brand" value="samsung" />
@@ -244,6 +256,18 @@
           <option name="screenX" value="1080" />
           <option name="screenY" value="2340" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="35" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="a16xeea" />
+          <option name="id" value="a16xeea" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="A16 5G" />
+          <option name="screenDensity" value="450" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="31" />
           <option name="brand" value="samsung" />
@@ -424,6 +448,18 @@
           <option name="screenX" value="1440" />
           <option name="screenY" value="3088" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="36" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="b5qsqw" />
+          <option name="id" value="b5qsqw" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy Z Flip 5" />
+          <option name="screenDensity" value="340" />
+          <option name="screenX" value="748" />
+          <option name="screenY" value="720" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="34" />
           <option name="brand" value="samsung" />
@@ -436,6 +472,18 @@
           <option name="screenX" value="1080" />
           <option name="screenY" value="2640" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="36" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="b6qsqw" />
+          <option name="id" value="b6qsqw" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy Z Flip 6" />
+          <option name="screenDensity" value="480" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2640" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="36" />
           <option name="brand" value="google" />
@@ -784,6 +832,18 @@
           <option name="screenX" value="720" />
           <option name="screenY" value="1600" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="motorola" />
+          <option name="codename" value="fogorow" />
+          <option name="id" value="fogorow" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Motorola" />
+          <option name="name" value="moto g24" />
+          <option name="screenDensity" value="280" />
+          <option name="screenX" value="720" />
+          <option name="screenY" value="1612" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="34" />
           <option name="brand" value="motorola" />
diff --git a/apk/controller/app/src/main/java/org/iiab/controller/Preferences.java b/apk/controller/app/src/main/java/org/iiab/controller/Preferences.java
index 7a7b73c..4c26273 100644
--- a/apk/controller/app/src/main/java/org/iiab/controller/Preferences.java
+++ b/apk/controller/app/src/main/java/org/iiab/controller/Preferences.java
@@ -195,7 +195,7 @@ public class Preferences
 	}
 
 	public boolean getMaintenanceMode() {
-		return prefs.getBoolean(MAINTENANCE_MODE, false);
+		return prefs.getBoolean(MAINTENANCE_MODE, true);
 	}
 
 	public void setMaintenanceMode(boolean enable) {
diff --git a/apk/controller/app/src/main/res/layout/main.xml b/apk/controller/app/src/main/res/layout/main.xml
index 7ec4774..c19e5ff 100644
--- a/apk/controller/app/src/main/res/layout/main.xml
+++ b/apk/controller/app/src/main/res/layout/main.xml
@@ -56,32 +56,6 @@
             android:layout_height="wrap_content"
             android:padding="16dp">
 
-            <!-- HR above Watchdog -->
-            <View android:layout_width="match_parent" android:layout_height="1dp" android:background="#444444" android:layout_marginBottom="16dp"/>
-
-            <!-- Watchdog Control Section -->
-            <Button
-                android:id="@+id/watchdog_control"
-                android:layout_width="match_parent"
-                android:layout_height="90dp"
-                android:text="@string/watchdog_enable"
-                android:textSize="20sp"
-                android:textStyle="bold"
-                android:textColor="#FFFFFF"
-                android:background="@drawable/rounded_button"
-                android:backgroundTint="#1976D2"
-                android:layout_marginBottom="8dp"
-                android:textAllCaps="false"/>
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/watchdog_description"
-                android:textSize="13sp"
-                android:gravity="center"
-                android:textColor="?android:attr/textColorSecondary"
-                android:layout_marginBottom="16dp"/>
-
             <!-- HR below Watchdog -->
             <View android:layout_width="match_parent" android:layout_height="1dp" android:background="#444444" android:layout_marginBottom="20dp"/>
 
@@ -186,7 +160,8 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="8dp"
                     android:layout_marginBottom="8dp"
-                    android:text="Maintenance Mode" />
+                    android:text="Maintenance Mode"
+                    android:checked="true" />
 
                 <TextView
                     android:id="@+id/maintenance_warning"
@@ -259,6 +234,32 @@
                 </LinearLayout>
             </LinearLayout>
 
+            <!-- HR above Watchdog -->
+            <View android:layout_width="match_parent" android:layout_height="1dp" android:background="#444444" android:layout_marginBottom="16dp"/>
+
+            <!-- Watchdog Control Section -->
+            <Button
+                android:id="@+id/watchdog_control"
+                android:layout_width="match_parent"
+                android:layout_height="90dp"
+                android:text="@string/watchdog_enable"
+                android:textSize="20sp"
+                android:textStyle="bold"
+                android:textColor="#FFFFFF"
+                android:background="@drawable/rounded_button"
+                android:backgroundTint="#1976D2"
+                android:layout_marginBottom="8dp"
+                android:textAllCaps="false"/>
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/watchdog_description"
+                android:textSize="13sp"
+                android:gravity="center"
+                android:textColor="?android:attr/textColorSecondary"
+                android:layout_marginBottom="16dp"/>
+
             <View android:layout_width="match_parent" android:layout_height="1dp" android:background="#444444" android:layout_marginVertical="20dp"/>
 
             <!-- Log Section (Collapsible) -->