diff --git a/freepost/templates/layout.html b/freepost/templates/layout.html
index d1f92e7..6b9b7b5 100644
--- a/freepost/templates/layout.html
+++ b/freepost/templates/layout.html
@@ -44,38 +44,42 @@
                         </a>
                     {% endif %}
                 </div>
+                
+                <div class="menu">
+                    <a href="{{ url ('topic', name=topic) if topic else url ('homepage') }}" class="flex-item {{ 'active_page' if active_page == 'hot' }}">
+                        Hot
+                    </a>
+                    <a href="{{ url ('topic', name=topic) if topic else url ('homepage') }}?sort=new" class="flex-item {{ 'active_page' if active_page == 'new' }}">
+                        New
+                    </a>
+                    
+                    {% if user %}
+                        <a href="{{ url ('submit') }}{{ '?topic=' ~ topic if topic }}" class="flex-item {{ 'active_page' if active_page == 'submit' }}">
+                            Submit
+                        </a>
+                    {% endif %}
+                    
+                    <a href="{{ url ('search') }}" class="flex-item {{ 'active_page' if active_page == 'search' }}">Search</a>
+                    
+                    <a href="{{ url ('about') }}" class="flex-item {{ 'active_page' if active_page == 'about' }}">About</a>
+                    
+                    {% if user %}
+                        {% set unread_messages = new_messages (user.id) %}
                         
-                        {% if user %}
-                            <a href="{{ url ('submit') }}{{ '?topic=' ~ topic if topic }}" class="flex-item {{ 'active_page' if active_page == 'submit' }}">
-                                Submit
+                        {% if unread_messages %}
+                            <a href="{{ url ('user_replies') }}" class="new_messages flex-item">
+                                {{ user.username }} ({{ unread_messages }})
                             </a>
-                        {% endif %}
-                        
-                        <a href="{{ url ('search') }}" class="flex-item {{ 'active_page' if active_page == 'search' }}">Search</a>
-                        
-                        <a href="{{ url ('about') }}" class="flex-item {{ 'active_page' if active_page == 'about' }}">About</a>
-                        
-                        {% if user %}
-                            {% set unread_messages = new_messages (user.id) %}
-                            
-                            {% if unread_messages %}
-                                <a href="{{ url ('user_replies') }}" class="new_messages flex-item">
-                                    {{ user.username }} ({{ unread_messages }})
-                                </a>
-                            {% else %}
-                                <a href="{{ url ('user_settings') }}" class="flex-item  {{ 'active_page' if active_page == 'user' }}">
-                                    {{ user.username }}
-                                </a>
-                            {% endif %}
-                        
-                            <a href="{{ url ('logout') }}" class="flex-item">Log out</a>
                         {% else %}
-                            <a href="{{ url ('login') }}" class="flex-item {{ 'active_page' if active_page == 'login' }}">Log in</a>
+                            <a href="{{ url ('user_settings') }}" class="flex-item  {{ 'active_page' if active_page == 'user' }}">
+                                {{ user.username }}
+                            </a>
                         {% endif %}
-                    </div>
                     
-                    <div class="submenu">
-                    </div>
+                        <a href="{{ url ('logout') }}" class="flex-item">Log out</a>
+                    {% else %}
+                        <a href="{{ url ('login') }}" class="flex-item {{ 'active_page' if active_page == 'login' }}">Log in</a>
+                    {% endif %}
                 </div>
             </div>