Use Twig pages function for navigation

See 681ad27158 for more info

index.twig

@@ -32,13 +32,10 @@
             </h1>
             <div id="nav" role="region" tabindex="-1">
                 <ul>
-                    {% for page in pages if page.title and not page.hidden %}
+                    {% for page in pages(depthOffset=-1) if page.title and not page.hidden %}
-                        {% set pageDepth = page.id|split('/')|length %}
+                        <li{% if page.id == current_page.id %} class="active"{% endif %}>
-                        {% if (pageDepth == 2) and (page.id ends with "/index") or (pageDepth == 1) %}
+                            <a href="{{ page.url }}">{{ page.title }}</a>
-                            <li{% if page.id == current_page.id %} class="active"{% endif %}>
+                        </li>
-                                <a href="{{ page.url }}">{{ page.title }}</a>
-                            </li>
-                        {% endif %}
                     {% endfor %}
                 </ul>
             </div>