diff --git a/site/03-todo.md b/site/03-todo.md
index de79421..57bd937 100644
--- a/site/03-todo.md
+++ b/site/03-todo.md
@@ -21,10 +21,6 @@
     - Device-specific Setup Guides <label links with connectivity, performance, reliability, or tuning> - **ASK LUCY ABOUT "BADGES?"**
             - Change to topic or hero boxes
             - (after release) create badges
-- Walkthrough
-    - EmbassyOS Overview
-    - Updating EOS
-
 - Configuration
         - Basic Config
             - Name Your Embassy
@@ -63,10 +59,8 @@
     - Migrating to Embassy
         - From Umbrel
     - Advanced Configurations
-        - SSH Setup
         - SSH over Tor
         - Exec into a Service
-        - Change Marketplace
     - EmbassyOS
     - Service-specific Guides
         - Connecting External Services
diff --git a/site/source/support/user-manual/tuning/advanced-config/index.rst b/site/source/support/user-manual/tuning/advanced-config/index.rst
index b596621..799bedd 100644
--- a/site/source/support/user-manual/tuning/advanced-config/index.rst
+++ b/site/source/support/user-manual/tuning/advanced-config/index.rst
@@ -1,3 +1,5 @@
+.. _advanced-config:
+
 ======================
 Advanced Configuration
 ======================
@@ -8,4 +10,5 @@ Custom options for folks that "know what they're doing."
   :maxdepth: 2
 
   ssh-setup
-  alt-marketplace
\ No newline at end of file
+  ssh-tor
+  alt-marketplace
diff --git a/site/source/support/user-manual/tuning/advanced-config/ssh-tor.rst b/site/source/support/user-manual/tuning/advanced-config/ssh-tor.rst
new file mode 100644
index 0000000..4f8c008
--- /dev/null
+++ b/site/source/support/user-manual/tuning/advanced-config/ssh-tor.rst
@@ -0,0 +1,6 @@
+.. _ssh-tor:
+
+============
+SSH Over Tor
+============
+
diff --git a/site/source/support/user-manual/tuning/index.rst b/site/source/support/user-manual/tuning/index.rst
index e01504e..c9b4a7e 100644
--- a/site/source/support/user-manual/tuning/index.rst
+++ b/site/source/support/user-manual/tuning/index.rst
@@ -10,5 +10,5 @@ Here, you can customize your Embassy with advanced configuration, setup external
   diy
   migrating
   advanced-config/index
-  embassy-os
+  tune-embassy-os
   service-guides/index
diff --git a/site/source/support/user-manual/tuning/embassy-os.rst b/site/source/support/user-manual/tuning/tune-embassy-os.rst
similarity index 98%
rename from site/source/support/user-manual/tuning/embassy-os.rst
rename to site/source/support/user-manual/tuning/tune-embassy-os.rst
index 8554554..9ea31ee 100644
--- a/site/source/support/user-manual/tuning/embassy-os.rst
+++ b/site/source/support/user-manual/tuning/tune-embassy-os.rst
@@ -29,6 +29,8 @@ Here you can change the name of your Embassy!
   :width: 60%
   :alt: Rename Embassy
 
+.. _reorder:
+
 Reorder Service Page
 --------------------
 
diff --git a/site/source/support/user-manual/walkthrough/overview.rst b/site/source/support/user-manual/walkthrough/overview.rst
index 13f8956..3a4d911 100644
--- a/site/source/support/user-manual/walkthrough/overview.rst
+++ b/site/source/support/user-manual/walkthrough/overview.rst
@@ -9,7 +9,7 @@ Overview of EmbassyOS
 Services Tab
 ------------
 
-The Services Tab will show you all of your currently installed :ref:`Services<services>`, or in the case of a fresh install, no Services.
+The Services Tab will show you all of your currently installed :ref:`Services<services>`, or in the case of a fresh install, no Services.  You can reorder this layout to your liking with the ``Reorder`` button in the top right.  You can see a demo of this :ref:`here<reorder>`.
 
     .. figure:: /_static/images/walkthrough/servicestab.svg
         :width: 60%
@@ -29,12 +29,10 @@ The Embassy Tab is where you can perform :ref:`Backups<backups>`, get Insights i
     .. figure:: /_static/images/walkthrough/embassytab.svg
         :width: 60%
 
-.. _backups:
-
 Backups
 =======
 
-One of the most important actions you can do on your Embassy is to keep a regular backup of your data.  See the following page on :ref:`Backups<backup>`, and select your device for more details.
+One of the most important actions you can do on your Embassy is to keep a regular backup of your data.  See the following page on :ref:`Backups<backup>`, and select your device for more details.  In this section, you can create, and restore from, backups.
 
 Insights
 ========
@@ -46,6 +44,8 @@ Settings
 
 The Settings section lets you change preferences, and manage `Connectivity` and Active Sessions.  See the documentation on :ref:`Configuration<config>` for more details.
 
+.. _power:
+
 Power
 =====
 
diff --git a/site/source/support/user-manual/walkthrough/password.rst b/site/source/support/user-manual/walkthrough/password.rst
index 26f85e7..6a1fdf4 100644
--- a/site/source/support/user-manual/walkthrough/password.rst
+++ b/site/source/support/user-manual/walkthrough/password.rst
@@ -1,7 +1,7 @@
 .. _forgot-password:
 
 ===============
-Forgot Password - ***NEEDS UPDATING***
+Forgot Password
 ===============
 
 There is currently no way to reset you Embassy master password through a standard UI flow.
@@ -14,65 +14,75 @@ If you already have :ref:`SSH keys registered with your Embassy<ssh-setup>` **OR
 SSH
 ===
 
-  * Use the command line to gain SSH access to your Embassy::
+#. Use the command line to gain SSH access to your Embassy, replacing ``[network-id]`` with your Embassy's unique ID:
 
-      ssh pi@start9-[network-id].local
+    .. code-block:: bash
 
-  * Check if you have sqlite3 installed. If not, install it::
+        ssh pi@embassy-[network-id].local
 
-      which sqlite3
-      sudo apt install sqlite3
+#. Check if you have sqlite3 installed (with ``which``). If not, install it (with ``apt``):
 
-  * Access the sqlite3 terminal::
+    .. code-block:: bash
 
-      sudo sqlite3 /root/agent/start9_agent.sqlite3
+        which sqlite3
+        sudo apt install sqlite3
 
-  * Run::
+#. Access the sqlite3 terminal:
 
-      delete from account;
-      .quit
+    .. code-block:: bash
 
-  * Exit the SSH session::
+        sudo sqlite3 /root/agent/start9_agent.sqlite3
 
-      exit
+#. Run:
 
-  * You can now use the Start9 Setup App to reclaim your Embassy and set a new password.
+    .. code-block:: bash
 
-.. warning:: Running setup process will generate new certificate and Tor address for your Embassy.
+        delete from account;
+        .quit
+
+#. Exit the SSH session:
+
+    .. code-block:: bash
+
+        exit
+
+    .. warning:: Running setup process will generate new certificate and Tor address for your Embassy.
+
+#. You can now visit ``embassy.local`` to reclaim your Embassy and set a new password.
 
 Linux
 =====
 
-  * Shut down your Embassy, disconnect from power, and remove the microSD card.
-  * Insert the microSD card into your Linux computer and mount the drive::
+#. Shut down your Embassy, disconnect from power, and remove the microSD card.
+#. Insert the microSD card into your Linux computer and mount the drive::
 
       mount [drive] [mount folder]
 
-  * Check if you have sqlite3 installed. If not, install it::
+#. Check if you have sqlite3 installed. If not, install it::
 
       which sqlite3
       sudo apt install sqlite3
 
-  * Access the sqlite3 terminal::
+#. Access the sqlite3 terminal::
 
       sudo sqlite3 /root/agent/start9_agent.sqlite3
 
-  * Run::
+#. Run::
 
       delete from account;
       .quit
 
-  * Un-mount the microSD card::
+#. Un-mount the microSD card::
 
       umount [mount folder]
 
-  * Return the microSD card to your Embassy and power it on.
-  * You can now use the Start9 Setup App to reclaim your Embassy and set a new password.
+#. Return the microSD card to your Embassy and power it on.
 
-.. warning:: Running setup process will generate new certificate and Tor address for your Embassy.
+    .. warning:: Running setup process will generate new certificate and Tor address for your Embassy.
 
+#. You can now visit ``embassy.local`` to reclaim your Embassy and set a new password.
 
 No SSH/Linux
 ------------
 
-You must factory reset your device by re-installing EmbassyOS, resulting in permanent loss of data. Visit the `image downloader <https://images.start9labs.com/download>`_ to obtain a new EmbassyOS image, then follow the `installation instructions </getting-started/diy.html#installing-embassyos>`_.
+You must factory reset your device by re-installing EmbassyOS, resulting in permanent loss of data. Visit the `image downloader <https://images.start9labs.com/>`_ to obtain a new EmbassyOS image, then follow the :ref:`Initial Setup <initial-setup>` guide.