diff --git a/docs/_static/custom.css b/docs/_static/custom.css
new file mode 100644
index 0000000..72c470f
--- /dev/null
+++ b/docs/_static/custom.css
@@ -0,0 +1,3 @@
+div.sphinxsidebarwrapper h1.logo {
+  font-size: 2.3rem;
+}
diff --git a/docs/howto/admin/resource-estimation.rst b/docs/howto/admin/resource-estimation.rst
index d503196..440796d 100644
--- a/docs/howto/admin/resource-estimation.rst
+++ b/docs/howto/admin/resource-estimation.rst
@@ -1,4 +1,4 @@
-.. _howto/resource-estimation:
+.. _howto/admin/resource-estimation:
 
 ===================================
 Estimate Memory / CPU / Disk needed
@@ -40,7 +40,7 @@ Maximum memory allowed per user
 
 Depending on what kinda work your users are doing, they will use different amounts
 of memory. The easiest way to determine this is to run through a typical user
-workflow yourself, and measure how much memory is used. You can use :ref:`howto/nbresuse`
+workflow yourself, and measure how much memory is used. You can use :ref:`howto/admin/nbresuse`
 to determine how much memory your user is using.
 
 A good rule of thumb is to take the maximum amount of memory you used during
diff --git a/docs/howto/content/add-data.rst b/docs/howto/content/add-data.rst
index 6614ecc..9504395 100644
--- a/docs/howto/content/add-data.rst
+++ b/docs/howto/content/add-data.rst
@@ -6,14 +6,14 @@ Adding data to the JupyterHub
 
 This section covers how to add data to your JupyterHub either from the internet
 or from your own machine. To learn how to **share data** that is already
-on your JupyterHub, see :ref:`_howto/content/share-data`.
+on your JupyterHub, see :ref:`howto/content/share-data`.
 
 .. note::
 
    When you add data using the methods on this page, you will **only add it
    to your user directory**. This is not a place that is accessible to others.
    For information on sharing this data with users on the JupyterHub, see
-   :ref:`_howto/content/share-data`.
+   :ref:`howto/content/share-data`.
 
 Adding data from your local machine
 ===================================
@@ -37,7 +37,7 @@ interface. To do so, follow these steps:
    be on your JupyterHub, your home user's home directory.
 
 To learn how to **share** this data with new users on the JupyterHub,
-see :ref:`_howto/content/share-data`.
+see :ref:`howto/content/share-data`.
 
 Downloading data from the command line
 ======================================
@@ -90,6 +90,6 @@ time. You can download it from your browser `at this link <https://swcarpentry.g
 #. Confirm that your data was unzipped. It could be in a folder called ``data/``.
 
 To learn how to **share** this data with new users on the JupyterHub,
-see :ref:`_howto/content/share-data`.
+see :ref:`howto/content/share-data`.
 
 .. TODO: Downloading data with the "download" module in Python? https://github.com/choldgraf/download
diff --git a/docs/howto/content/share-data.rst b/docs/howto/content/share-data.rst
index 6c0493c..97af825 100644
--- a/docs/howto/content/share-data.rst
+++ b/docs/howto/content/share-data.rst
@@ -16,7 +16,7 @@ contained in the link's target repository is downloaded to the user's home
 directory. Note that a copy of the dataset will be made for each user.
 
 For information on creating and sharing ``nbgitpuller`` links, see
-:ref:`tutorials/nbgitpuller`.
+:ref:`howto/content/nbgitpuller`.
 
 Option 2: Create a read-only shared folder for data
 ===================================================
diff --git a/docs/howto/envt/user-environment.rst b/docs/howto/envt/user-environment.rst
index f112526..6cb5aa6 100644
--- a/docs/howto/envt/user-environment.rst
+++ b/docs/howto/envt/user-environment.rst
@@ -6,7 +6,7 @@ Install conda, pip or apt packages
 
 :abbr:`TLJH (The Littlest JupyterHub)` starts all users in the same `conda <https://conda.io/docs/>`_
 environment. Packages / libraries installed in this environment are available
-to all users on the JupyterHub. Users with :ref:`admin rights <howto/admin-users>` can install packages
+to all users on the JupyterHub. Users with :ref:`admin rights <howto/admin/admin-users>` can install packages
 easily.
 
 .. _howto/envt/user_environment_pip:
diff --git a/docs/install/digitalocean.rst b/docs/install/digitalocean.rst
index a4724d4..a1e7041 100644
--- a/docs/install/digitalocean.rst
+++ b/docs/install/digitalocean.rst
@@ -43,7 +43,7 @@ Let's create the server on which we can run JupyterHub.
    (4GB RAM, 2CPUs, 20 USD / month) is not a bad start. You can resize your server
    later if you need.
 
-   Check out our guide on How To :ref:`howto/resource-estimation` to help pick
+   Check out our guide on How To :ref:`howto/admin/resource-estimation` to help pick
    how much Memory, CPU & disk space your server needs.
 
 #. Scroll down to **Select additional options**, and select **User data**.
diff --git a/docs/install/google.rst b/docs/install/google.rst
index 15b3f36..817d33c 100644
--- a/docs/install/google.rst
+++ b/docs/install/google.rst
@@ -83,7 +83,7 @@ Let's create the server on which we can run JupyterHub.
    .. image:: ../images/providers/google/machine-type-advanced.png
       :alt: Select a customized VM size
 
-   Check out our guide on How To :ref:`howto/resource-estimation` to help pick
+   Check out our guide on How To :ref:`howto/admin/resource-estimation` to help pick
    how much Memory / CPU your server needs.
 
 #. Under **Boot Disk**, click the **Change** button. This lets us change the
@@ -109,7 +109,7 @@ Let's create the server on which we can run JupyterHub.
    to a hard drive. **SSD persistent disk** gives you a faster but more expensive
    disk, similar to an SSD.
 
-   Check out our guide on How To :ref:`howto/resource-estimation` to help pick
+   Check out our guide on How To :ref:`howto/admin/resource-estimation` to help pick
    how much Disk space your server needs.
 
 #. Click the **Select** button to dismiss the Boot disk popup and go back to the
diff --git a/docs/install/jetstream.rst b/docs/install/jetstream.rst
index cfadc6e..3073b54 100644
--- a/docs/install/jetstream.rst
+++ b/docs/install/jetstream.rst
@@ -54,7 +54,7 @@ Let's create the server on which we can run JupyterHub.
    #. Give your server a descriptive **Instance Name**.
    #. Select an appropriate **Instance Size**. We suggest m1.medium or larger.
 
-      Check out our guide on How To :ref:`howto/resource-estimation` to help pick
+      Check out our guide on How To :ref:`howto/admin/resource-estimation` to help pick
       how much Memory, CPU & disk space your server needs.
 
    #. If you have multiple allocations, make sure you are 'charging' this server
diff --git a/docs/topic/security.rst b/docs/topic/security.rst
index 6399c3c..e540f31 100644
--- a/docs/topic/security.rst
+++ b/docs/topic/security.rst
@@ -70,4 +70,4 @@ HTTPS
 =====
 
 Any internet-facing JupyterHub should use HTTPS to secure its traffic. For
-information on how to use HTTPS with your JupyterHub, see :ref:`_howto/admin/https`.
+information on how to use HTTPS with your JupyterHub, see :ref:`howto/admin/https`.