diff --git a/site/source/index.rst b/site/source/index.rst
index e6b2dcb..0eeca28 100644
--- a/site/source/index.rst
+++ b/site/source/index.rst
@@ -120,8 +120,8 @@
   support/index
   learn/index
   contribute/index
-  about/index
   developer-docs/index
+  about/index
 
 .. raw:: html
 
@@ -135,4 +135,4 @@
       </form>
       <div class="padding-top-1" id="subscription_msg" class="hidden"></div>
     </div>
-  </div>
\ No newline at end of file
+  </div>
diff --git a/site/source/user-manual/backups/cifs-setup/cifs-linux.rst b/site/source/user-manual/backups/cifs-setup/cifs-linux.rst
index eec7e4a..b7d28fb 100644
--- a/site/source/user-manual/backups/cifs-setup/cifs-linux.rst
+++ b/site/source/user-manual/backups/cifs-setup/cifs-linux.rst
@@ -1,4 +1,4 @@
-.. _cifs-lin:
+.. _cifs-linux:
 
 =====
 Linux
diff --git a/site/source/user-manual/backups/cifs-setup/cifs-windows.rst b/site/source/user-manual/backups/cifs-setup/cifs-windows.rst
index f6657f9..aeccc3b 100644
--- a/site/source/user-manual/backups/cifs-setup/cifs-windows.rst
+++ b/site/source/user-manual/backups/cifs-setup/cifs-windows.rst
@@ -1,4 +1,4 @@
-.. _cifs-win:
+.. _cifs-windows:
 
 =======
 Windows
diff --git a/site/source/user-manual/device-guides/dg-linux.rst b/site/source/user-manual/device-guides/dg-linux.rst
index be7cded..2903dd1 100644
--- a/site/source/user-manual/device-guides/dg-linux.rst
+++ b/site/source/user-manual/device-guides/dg-linux.rst
@@ -9,4 +9,4 @@ Linux
 * :ref:`Connecting over LAN <lan-linux>` - For a fast and secure connection while on your Embassy's local network
 * :ref:`Connecting over Tor <tor-linux>` - Run Tor natively (in the background) on your device.  This will allow you to use applications on your machine via the Tor Network so they can communicate with your Embassy.
 * :ref:`Tor Firefox Config <torff-linux>` - Configure Firefox to use the Tor Network so that you can reach ``.onion`` sites without needing to change browsers.
-* :ref:`SNF Setup <cifs-linux>` - Configure a Shared Network Folder on your laptop/desktop (or an external drive plugged into your laptop/desktop) in order to use it for Embassy backups.
\ No newline at end of file
+* :ref:`SNF Setup <cifs-linux>` - Configure a Shared Network Folder on your laptop/desktop (or an external drive plugged into your laptop/desktop) in order to use it for Embassy backups.
diff --git a/site/source/user-manual/initial-setup.rst b/site/source/user-manual/initial-setup.rst
index a315173..5016b3b 100644
--- a/site/source/user-manual/initial-setup.rst
+++ b/site/source/user-manual/initial-setup.rst
@@ -40,7 +40,7 @@ Connecting
 
     The product key is used to discover your Embassy's IP address on the Local Area Network using a hashing function and a protocol named :ref:`MDNS (or Zeroconf) <mdns>`.
 
-3. Next, select "Start Fresh" if this is your first time using an Embassy.  If you'd like to "Recover" from an existing Embassy, please follow the guide for :ref:`versions 0.2.x <recover-02x>` or :ref:`versions 0.3.x <recover-03x>`.
+3. Next, select "Start Fresh" if this is your first time using an Embassy.  If you'd like to "Recover" from an existing Embassy, please follow the guide for :ref:`versions 0.2.x <migrate-02>` or :ref:`versions 0.3.x <backup-restore>`.
 
 .. figure:: /_static/images/setup/setup1.png
     :width: 60%
diff --git a/site/source/user-manual/misc-guides/migrate-02.rst b/site/source/user-manual/misc-guides/migrate-02.rst
index 33d0ff0..a70de1c 100644
--- a/site/source/user-manual/misc-guides/migrate-02.rst
+++ b/site/source/user-manual/misc-guides/migrate-02.rst
@@ -10,7 +10,7 @@ Hardware Requirements
 ---------------------
 
 .. note::
-   If you purchased the `upgrade kit <https://store.start9.com/collections/embassy/products/upgrade-kit>`_ from Start9, you can skip to :ref:`Instructions <recover-02-instructions>`.
+   If you purchased the `upgrade kit <https://store.start9.com/collections/embassy/products/upgrade-kit>`_ from Start9, you can skip to :ref:`Instructions <migrate-02-instructions>`.
 
 #. `16GB microSD card <https://www.amazon.com/Sandisk-Ultra-Micro-UHS-I-Adapter/dp/B073K14CVB/>`_
 
@@ -44,7 +44,7 @@ Flashing
 ........
 
 .. note::
-   If you purchased the `upgrade kit <https://store.start9.com/collections/embassy/products/upgrade-kit>`_ from Start9, you can skip to :ref:`Migrate <recover-02-migrate>`.
+   If you purchased the `upgrade kit <https://store.start9.com/collections/embassy/products/upgrade-kit>`_ from Start9, you can skip to :ref:`Migrate <migrate-02-migrate>`.
 
 #. Once you have all these you will need to download an 0.3.0 image from https://images.start9.com. This is free for all existing users. Anyone who is running 0.2.x who compiled it themselves will need to either compile 0.3.0 themselves or purchase an 0.3.0 image.
 
@@ -72,7 +72,7 @@ Migrate
 Power Up
 ........
 
-#. The Embassy will power up and make a *bep* sound.  It will then initialize, a process of less than 5 minutes if you purchased an image, or about 10-20 minutes if you built from source. Once complete you will hear a *chime* sound.
+#. Embassy will power up and then initialize, a process of less than 5 minutes if you purchased an image, or about 10-20 minutes if you built from source. Once complete you will hear a _bep_ to indicate it is initialized and then a _chime_ sound to indicate it is online.
 
 #. On your computer, open up a browser and go to ``embassy.local``
 
@@ -88,7 +88,7 @@ Power Up
 
 #. You will now need to make a password for your Embassy. It needs to be a strong password. This password protects your Embassy. It can be the same one that you used prior to migration, or a different one.
 
-#. The Embassy will now recover all your data from your old Embassy and once finished, you will hear <this>.
+#. Embassy will now recover all your data from your old Embassy and once finished, you will hear <this>.
 
 #. Now you will be provided with both a Tor and LAN address with which you can access your Embassy. Please make a note of these.