diff --git a/_includes/sidebar.html b/_includes/sidebar.html
index 3796cf9..b7411d6 100644
--- a/_includes/sidebar.html
+++ b/_includes/sidebar.html
@@ -13,8 +13,10 @@
     <nav class="sidebar-nav">
       <small>
         {% if page.name == "CppCoreGuidelines.md" %}
+
       <!-- Items have to be added manually until for now -->
-      <a class="sidebar-nav-item active" href="#main">Top</a>
+      <b><a class="sidebar-nav-item active" href="#main">Top</a></b>
+
       <a class="sidebar-nav-item active" href="#S-introduction">In: Introduction</a>
       <a class="sidebar-nav-item active" href="#S-philosophy">P: Philosophy</a>
       <a class="sidebar-nav-item active" href="#S-interfaces">I: Interfaces</a>
@@ -23,28 +25,29 @@
       <a class="sidebar-nav-item active" href="#S-enum">Enum: Enumerations</a>
       <a class="sidebar-nav-item active" href="#S-resource">R: Resource management</a>
       <a class="sidebar-nav-item active" href="#S-expr">ES: Expressions and statements</a>
+      <a class="sidebar-nav-item active" href="#S-performance">Per: Performance</a>
+      <a class="sidebar-nav-item active" href="#S-concurrency">CP: Concurrency</a>
       <a class="sidebar-nav-item active" href="#S-errors">E: Error handling</a>
       <a class="sidebar-nav-item active" href="#S-const">Con: Constants and immutability</a>
       <a class="sidebar-nav-item active" href="#S-templates">T: Templates and generic programming</a>
-      <a class="sidebar-nav-item active" href="#S-concurrency">CP: Concurrency</a>
-      <a class="sidebar-nav-item active" href="#S-stdlib">STL: The Standard library</a>
-      <a class="sidebar-nav-item active" href="#S-source">SF: Source files</a>
       <a class="sidebar-nav-item active" href="#S-cpl">CPL: C-style programming</a>
-      <a class="sidebar-nav-item active" href="#S-profile">PRO: Profiles</a>
-      <a class="sidebar-nav-item active" href="#S-gsl">GSL: Guideline support library</a>
-      <a class="sidebar-nav-item active" href="#S-faq">FAQ: Answers to frequently asked questions</a>
-
-      <a class="sidebar-nav-item active" href="#S-naming">NL: Naming and layout</a>
-      <a class="sidebar-nav-item active" href="#S-performance">PER: Performance</a>
+      <a class="sidebar-nav-item active" href="#S-source">SF: Source files</a>
+      <a class="sidebar-nav-item active" href="#S-stdlib">SL: The Standard library</a>
+      <br/>
+      <a class="sidebar-nav-item active" href="#S-A">A: Architectural Ideas</a>
       <a class="sidebar-nav-item active" href="#S-not">N: Non-Rules and myths</a>
       <a class="sidebar-nav-item active" href="#S-references">RF: References</a>
+      <a class="sidebar-nav-item active" href="#S-profile">Pro: Profiles</a>
+      <a class="sidebar-nav-item active" href="#S-gsl">GSL: Guideline support library</a>
+      <a class="sidebar-nav-item active" href="#S-naming">NL: Naming and layout</a>
+      <a class="sidebar-nav-item active" href="#S-faq">FAQ: Frequently asked questions</a>
       <a class="sidebar-nav-item active" href="#S-libraries">Appendix A: Libraries</a>
       <a class="sidebar-nav-item active" href="#S-modernizing">Appendix B: Modernizing code</a>
       <a class="sidebar-nav-item active" href="#S-discussion">Appendix C: Discussion</a>
+      <a class="sidebar-nav-item active" href="#S-tools">Appendix D: Tools support</a>
       <a class="sidebar-nav-item active" href="#S-glossary">Glossary</a>
       <a class="sidebar-nav-item active" href="#S-unclassified">To-do: Unclassified proto-rules</a>
       <button id="button">Highlighting</button>
-
         {% else %}
 
       <a class="sidebar-nav-item active" href="CppCoreGuidelines.html">C++ Core Guidelines</a>