diff --git a/docs/tools/templates/template.cshtml b/docs/tools/templates/template.cshtml
index b5a8e07b..1e376ec2 100644
--- a/docs/tools/templates/template.cshtml
+++ b/docs/tools/templates/template.cshtml
@@ -42,42 +42,51 @@
                 </div>
                 <div class="span3">
                     <ul class="nav nav-list" id="menu">
-                        @*<li><img src="img/logo.png" alt="Math.NET Logo" style="width: 200px; height: 200px; margin-left: auto; margin-right: auto; display: block; " /></li>*@
 
                         <li class="nav-header">Math.NET Numerics</li>
                         <li><a href="http://numerics.mathdotnet.com">Project Website</a></li>
                         <li><a href="https://github.com/mathnet/mathnet-numerics/blob/master/RELEASENOTES.md">Release Notes</a></li>
                         <li><a href="https://github.com/mathnet/mathnet-numerics/blob/master/CONTRIBUTING.md">Contributing</a></li>
                         <li><a href="http://mathnetnumerics.codeplex.com/license">MIT/X11 License</a></li>
+                        <li><a href="http://numerics.mathdotnet.com/api/">Class Reference</a></li>
 
-                        <li class="nav-header">User Guide</li>
+                        <li class="nav-header">Getting Started</li>
                         <li><a href="@Root/index.html">Getting started</a></li>
                         <li>Constants</li>
                         <li>Floating-Point Numbers</li>
                         <li>Arbitrary Precision Numbers</li>
                         <li>Complex Numbers</li>
+                        <li>Matrices and Vectors</li>
                         <li>Euclid & Number Theory</li>
                         <li>Combinatorics</li>
-                        <li><a href="@Root/Generate.html">Generating Data</a></li>
-                        <li><a href="@Root/RandomAndDistributions.html">Random Numbers</a></li>
-                        <li>Probability Distributions</li>
-                        <li><a href="@Root/Distance.html">Distance Metrics</a></li>
-                        <li><a href="@Root/DescriptiveStatistics.html">Descriptive Statistics</a></li>
+
+                        <li class="nav-header">Evaluation</li>
+                        <li><a href="@Root/Functions.html">Special Functions</a></li>
                         <li>Interpolation</li>
                         <li>Integration</li>
-                        <li>FFT & Integral Transforms</li>
-                        <li><a href="@Root/Functions.html">Special Functions</a></li>
+
+                        <li class="nav-header">Statistics/Probability</li>
+                        <li><a href="@Root/DescriptiveStatistics.html">Descriptive Statistics</a></li>
+                        <li>Probability Distributions</li>
+
+                        <li class="nav-header">Generation</li>
+                        <li><a href="@Root/Generate.html">Generating Data</a></li>
+                        <li><a href="@Root/RandomAndDistributions.html">Random Numbers</a></li>
+
+                        <li class="nav-header">Transformation</li>
+                        <li>Fourier Transform (FFT)</li>
+                        <li>Filtering & DSP</li>
                         <li>Window Functions</li>
-                        <li>Filtering</li>
-                        <li>Root Finding</li>
-                        <li>Matrices & Vectors</li>
+
+                        <li class="nav-header">Solving Equations</li>
+                        <li>Linear Equation Systems</li>
+                        <li>Nonlinear Root Finding</li>
+
+                        <li class="nav-header">Optimization</li>
                         <li>Linear Least Squares</li>
                         <li>Curve Fitting & Regression</li>
                         <li>Nonlinear Optimization</li>
-
-                        <li class="nav-header">Documentation</li>
-                        <li><a href="http://numerics.mathdotnet.com/api/">API Reference (docu)</a></li>
-                        <li>API Reference (new)</li>
+                        <li><a href="@Root/Distance.html">Distance Metrics</a></li>
 
                         <li class="nav-header">Working Together</li>
                         <li><a href="@Root/CSV.html">Delimited Text Files (CSV)</a></li>