diff --git a/frontend/projects/setup-wizard/src/app/pages/success/download-doc/download-doc.component.html b/frontend/projects/setup-wizard/src/app/pages/success/download-doc/download-doc.component.html
index 25fa87a2e..ef8c32a49 100644
--- a/frontend/projects/setup-wizard/src/app/pages/success/download-doc/download-doc.component.html
+++ b/frontend/projects/setup-wizard/src/app/pages/success/download-doc/download-doc.component.html
@@ -37,7 +37,7 @@
           <p>
             Download your server's Root CA and
             <a
-              href="https://docs.start9.com/0.3.5.x/user-manual/getting-started/connecting-lan"
+              href="https://docs.start9.com/0.3.5.x/user-manual/connecting-lan"
               target="_blank"
               rel="noreferrer"
               style="color: #6866cc; font-weight: bold; text-decoration: none"
@@ -104,7 +104,7 @@
           <span style="font-weight: bold">Note:</span>
           This address will only work from a Tor-enabled browser.
           <a
-            href="https://docs.start9.com/0.3.5.x/user-manual/getting-started/connecting-tor"
+            href="https://docs.start9.com/0.3.5.x/user-manual/connecting-tor"
             target="_blank"
             rel="noreferrer"
             style="color: #6866cc; font-weight: bold; text-decoration: none"
diff --git a/frontend/projects/setup-wizard/src/app/pages/success/success.page.ts b/frontend/projects/setup-wizard/src/app/pages/success/success.page.ts
index 53bc9afab..c1d175aaa 100644
--- a/frontend/projects/setup-wizard/src/app/pages/success/success.page.ts
+++ b/frontend/projects/setup-wizard/src/app/pages/success/success.page.ts
@@ -76,7 +76,7 @@ export class SuccessPage {
     try {
       const ret = await this.api.complete()
       if (!this.isKiosk) {
-        this.torAddress = ret['tor-address']
+        this.torAddress = ret['tor-address'].replace(/^https:/, 'http:')
         this.lanAddress = ret['lan-address'].replace(/^https:/, 'http:')
         this.cert = ret['root-ca']
 
diff --git a/frontend/projects/ui/src/app/components/backup-drives/backup-drives.component.html b/frontend/projects/ui/src/app/components/backup-drives/backup-drives.component.html
index 49f5a9744..141872084 100644
--- a/frontend/projects/ui/src/app/components/backup-drives/backup-drives.component.html
+++ b/frontend/projects/ui/src/app/components/backup-drives/backup-drives.component.html
@@ -33,7 +33,7 @@
               a folder on another computer that is connected to the same network
               as your Start9 server. View the
               <a
-                href="https://docs.start9.com/0.3.5.x/user-manual/backups/backup-create/#network-folder"
+                href="https://docs.start9.com/0.3.5.x/user-manual/backups/backup-create#network-folder"
                 target="_blank"
                 noreferrer
                 style="text-decoration: none"
@@ -109,7 +109,7 @@
               a physical drive that is plugged directly into your Start9 Server.
               View the
               <a
-                href="https://docs.start9.com/0.3.5.x/user-manual/backups/backup-create/#physical-drive"
+                href="https://docs.start9.com/0.3.5.x/user-manual/backups/backup-create#physical-drive"
                 target="_blank"
                 noreferrer
                 style="text-decoration: none"
diff --git a/frontend/projects/ui/src/app/pages/login/ca-wizard/ca-wizard.component.html b/frontend/projects/ui/src/app/pages/login/ca-wizard/ca-wizard.component.html
index af471d23e..a76cdab34 100644
--- a/frontend/projects/ui/src/app/pages/login/ca-wizard/ca-wizard.component.html
+++ b/frontend/projects/ui/src/app/pages/login/ca-wizard/ca-wizard.component.html
@@ -9,6 +9,13 @@
         device you use to connect to your server.
       </p>
       <ol>
+        <li>
+          <b>Bookmark this page</b>
+          - Save this page so you can access it later. You can also find the
+          address in the
+          <code>StartOS-info.html</code>
+          file downloaded at the end of initial setup.
+        </li>
         <li>
           <b>Download your server's Root CA</b>
           - Your server uses its Root CA to generate SSL/TLS certificates for
@@ -37,7 +44,7 @@
             size="small"
             shape="round"
             color="primary"
-            href="https://docs.start9.com/0.3.5.x/user-manual/getting-started/trust-ca/#trust-root-ca"
+            href="https://docs.start9.com/0.3.5.x/user-manual/trust-ca#establishing-trust"
             target="_blank"
             noreferrer
           >
@@ -47,9 +54,8 @@
         </li>
         <li>
           <b>Test</b>
-          - If refreshing the page does not work, you may need to quit the
-          browser and re-open.
-          <i>Tip: before quitting, bookmark this page or copy the URL.</i>
+          - Refresh the page. If refreshing the page does not work, you may need
+          to quit and re-open your browser, then revisit this page.
           <br />
           <ion-button
             strong
@@ -63,15 +69,11 @@
           </ion-button>
         </li>
       </ol>
-      <ion-button
-        style="--padding-start: 0"
-        fill="clear"
-        (click)="launchHttps()"
-        [disabled]="caTrusted"
-      >
+      <ion-button fill="clear" (click)="launchHttps()" [disabled]="caTrusted">
         Skip
         <ion-icon slot="end" name="open-outline"></ion-icon>
       </ion-button>
+      <span class="skip_detail">(not recommended)</span>
     </ion-card>
   </ng-container>
 
diff --git a/frontend/projects/ui/src/app/pages/login/ca-wizard/ca-wizard.component.scss b/frontend/projects/ui/src/app/pages/login/ca-wizard/ca-wizard.component.scss
index c87093699..48b198525 100644
--- a/frontend/projects/ui/src/app/pages/login/ca-wizard/ca-wizard.component.scss
+++ b/frontend/projects/ui/src/app/pages/login/ca-wizard/ca-wizard.component.scss
@@ -63,6 +63,13 @@ ol {
   font-size: 64px;
 }
 
+.skip_detail {
+  display: block;
+  font-size: 0.8rem;
+  margin-top: -13px;
+  padding-bottom: 0.5rem;
+}
+
 @media (max-width: 700px) {
   #trusted, #untrusted {
     max-width: 100%;
diff --git a/frontend/projects/ui/src/app/pages/login/login.page.html b/frontend/projects/ui/src/app/pages/login/login.page.html
index ef04eea67..99f6abbe8 100644
--- a/frontend/projects/ui/src/app/pages/login/login.page.html
+++ b/frontend/projects/ui/src/app/pages/login/login.page.html
@@ -14,7 +14,7 @@
           <p style="font-weight: 600">
             Tor is faster over https. Your Root CA must be trusted.
             <a
-              href="https://docs.start9.com/0.3.5.x/user-manual/getting-started/trust-ca/#trust-root-ca"
+              href="https://docs.start9.com/0.3.5.x/user-manual/trust-ca"
               target="_blank"
               noreferrer
               style="color: black"
diff --git a/frontend/projects/ui/src/app/pages/server-routes/lan/lan.page.html b/frontend/projects/ui/src/app/pages/server-routes/lan/lan.page.html
index 8b87c4f93..ed811d63d 100644
--- a/frontend/projects/ui/src/app/pages/server-routes/lan/lan.page.html
+++ b/frontend/projects/ui/src/app/pages/server-routes/lan/lan.page.html
@@ -15,7 +15,7 @@
         <h2>
           For a secure local connection and faster Tor experience,
           <a
-            href="https://docs.start9.com/0.3.5.x/user-manual/getting-started/connecting-lan"
+            href="https://docs.start9.com/0.3.5.x/user-manual/connecting-lan"
             target="_blank"
             rel="noreferrer"
           >