diff --git a/ui/src/app/pages/server-routes/lan/lan.page.html b/ui/src/app/pages/server-routes/lan/lan.page.html
index d615bb5ab..328decedf 100644
--- a/ui/src/app/pages/server-routes/lan/lan.page.html
+++ b/ui/src/app/pages/server-routes/lan/lan.page.html
@@ -1,6 +1,6 @@
 <ion-header>
   <ion-toolbar>
-    <ion-title>LAN Setup</ion-title>
+    <ion-title>LAN Settings</ion-title>
     <ion-buttons slot="start">
       <pwa-back-button></pwa-back-button>
     </ion-buttons>
@@ -10,20 +10,6 @@
 <ion-content class="ion-padding-top">
 
   <ion-item-group>
-    <ion-item>
-      <ion-label class="ion-text-wrap">
-        If you are having issues connecting to your Embassy or services over LAN, you can try refreshing the network by clicking the button below.
-      </ion-label>
-    </ion-item>
-    <ion-item>
-      <ion-button slot="start" fill="clear" (click)="refreshLAN()">
-        <ion-icon slot="start" name="refresh-outline"></ion-icon>
-        Refresh Network
-      </ion-button>
-    </ion-item>
-
-    <ion-item-divider>About</ion-item-divider>
-
     <ion-item lines="none">
       <ion-label class="ion-text-wrap">
         You can connect to your Embassy over your Local Area Network (LAN). This can be useful for achieving a faster experience, as well as a fallback in case the Tor network is experiencing issues.
@@ -39,7 +25,22 @@
       <ion-button slot="start" fill="clear" color="primary" (click)="viewInstructions()">View Instructions</ion-button>
     </ion-item>
 
+    <ion-item-divider></ion-item-divider>
+
+    <ion-item>
+      <ion-label class="ion-text-wrap">
+        If you are having issues connecting to your Embassy or services over LAN, you can try refreshing the network by clicking the button below.
+      </ion-label>
+    </ion-item>
+    <ion-item>
+      <ion-button slot="start" fill="clear" (click)="refreshLAN()">
+        <ion-icon slot="start" name="refresh-outline"></ion-icon>
+        Refresh Network
+      </ion-button>
+    </ion-item>
+
     <ng-container *ngIf="!lanDisabled">
+      <ion-item-divider class="borderless"></ion-item-divider>
       <ion-item-divider>Certificate and Address</ion-item-divider>
       <!-- Certificate -->
       <ion-item>
diff --git a/ui/src/app/pages/server-routes/server-show/server-show.page.html b/ui/src/app/pages/server-routes/server-show/server-show.page.html
index 4f5043db1..c7cbd0866 100644
--- a/ui/src/app/pages/server-routes/server-show/server-show.page.html
+++ b/ui/src/app/pages/server-routes/server-show/server-show.page.html
@@ -53,12 +53,12 @@
 
       <ion-item [routerLink]="['lan']">
         <ion-icon slot="start" name="home-outline" color="primary"></ion-icon>
-        <ion-label><ion-text color="primary">Connect over LAN</ion-text></ion-label>
+        <ion-label><ion-text color="primary">LAN Settings</ion-text></ion-label>
       </ion-item>
 
       <ion-item [routerLink]="['wifi']">
         <ion-icon slot="start" name="wifi" color="primary"></ion-icon>
-        <ion-label><ion-text color="primary">WiFi Setup</ion-text></ion-label>
+        <ion-label><ion-text color="primary">WiFi Settings</ion-text></ion-label>
       </ion-item>
 
       <ion-item-divider></ion-item-divider>
diff --git a/ui/src/app/pages/server-routes/wifi/wifi.page.html b/ui/src/app/pages/server-routes/wifi/wifi.page.html
index 483fc37bc..6c05c9555 100644
--- a/ui/src/app/pages/server-routes/wifi/wifi.page.html
+++ b/ui/src/app/pages/server-routes/wifi/wifi.page.html
@@ -3,7 +3,7 @@
     <ion-buttons slot="start">
       <pwa-back-button></pwa-back-button>
     </ion-buttons>
-    <ion-title>WiFi Setup</ion-title>
+    <ion-title>WiFi Settings</ion-title>
   </ion-toolbar>
 </ion-header>
 
diff --git a/ui/use-mocks.json b/ui/use-mocks.json
index b30f97d2c..2068a78fa 100644
--- a/ui/use-mocks.json
+++ b/ui/use-mocks.json
@@ -1,5 +1,5 @@
 {
-  "useMocks": false,
+  "useMocks": true,
   "mockOver": "tor",
-  "skipStartupAlerts": false
+  "skipStartupAlerts": true
 }