diff --git a/source/index.rst b/source/index.rst
index 6d9f8dfc..1c31a1cd 100644
--- a/source/index.rst
+++ b/source/index.rst
@@ -31,12 +31,31 @@ The |Cyclus| project repository is located at http://github.com/cyclus/cyclus
 Quick Start
 -----------
 
-:doc:`Get started with Cyclus <user/install>`
+.. toctree::
+    :maxdepth: 1
+    user/install
+
+
+Learn More
+----------
+
+.. toctree::
+    :maxdepth: 1
+
+    basics/index
+    user/index
+    arche/index
+    kernel/index
+    python/index
+    cep/cep0
+    previous/index
+    cite/index
+
 
 News
 ----
 
-**June 1st, 2018:** :doc:`Cyclus Newsletter Spring 2018! <newsletters/may2018>`
+**June 1st, 2018:** :doc:` <newsletters/may2018>`
 
 **October 6th, 2017:** :doc:`Cyclus Newsletter Fall 2017! <newsletters/oct2017>`
 
@@ -48,25 +67,10 @@ News
 
 **July 21-24, 2015:** Joint workshop with CLASS_ project held in Madison, WI
 
-**June 10, 2015:** First Cyclus :doc:`user tutorial <user/tutorial/index>` and :doc:`developer tutorial <arche/tutorial/index>` are held at the 2015 ANS Annual Meeting in San Antonio, TX
+**June 10, 2015:** First Cyclus :doc:`user tutorial <user/tutorial/index>` and :doc:`developer tutorial <arche/tutorial_cpp/index>` are held at the 2015 ANS Annual Meeting in San Antonio, TX
 
 **June 7, 2015:** :doc:`Cyclus v1.3.1 is released <previous/v1.3>`
 
-Learn More
-----------
-
-.. toctree::
-    :maxdepth: 1
-
-    basics/index
-    user/index
-    arche/index
-    kernel/index
-    python/index
-    cep/cep0
-    previous/index
-    cite/index
-
 .. _try-it:
 
 Try It -- Out-of-Service