diff --git a/templates/base.html.twig b/templates/base.html.twig
index d22905a8cc..c819e07c31 100644
--- a/templates/base.html.twig
+++ b/templates/base.html.twig
@@ -60,7 +60,7 @@
                               {% block left %}
                               {% endblock left %}
                               <nav id='instance'>
-                                    <a href="/">
+                                    <a href="{{ path('main_public') }}">
                                           <svg class="icon icon-logo">
                                                 <use xlink:href="#icon-logo"></use>
                                           </svg><b>GNU social</b>
diff --git a/templates/left/left.html.twig b/templates/left/left.html.twig
index ed0f3a8579..df08863eb0 100644
--- a/templates/left/left.html.twig
+++ b/templates/left/left.html.twig
@@ -40,7 +40,7 @@
                 </a>
               </div>
               <a href='#'>Messages</a>
-              <a href='#'>Replies</a>
+              <a href="{{ path("replies", {'nickname' : user_nickname}) }}" class='hover-effect {{ active("replies") }}'>Replies</a>
               <a href='#'>Favourites</a>
               <a href='#'>Reverse Favs</a>
               <a href="{{ path('settings_personal_info') }}" class='hover-effect {{ active('settings_') }}'>Settings</a>
diff --git a/templates/network/public.html.twig b/templates/network/public.html.twig
index 32a344d9ae..093f3ede42 100644
--- a/templates/network/public.html.twig
+++ b/templates/network/public.html.twig
@@ -67,7 +67,7 @@
             <nav class='main-nav'>
                 <ul>
                     <li>
-                        <a href="{{ path('main_all') }}" class='hover-effect {{ active('main_all') }}'>Timeline</a>
+                        <a href="{{ path('main_public') }}" class='hover-effect {{ active('main_public') }}'>Timeline</a>
                     </li>
                 </ul>
             </nav>
@@ -75,7 +75,7 @@
                 <nav class='main-nav'>
                     <ul>
                         <li>
-                            <a href="{{ path('main_all') }}" class='hover-effect {{ active('main_all') }}'>Public</a>
+                            <a href="{{ path('main_public') }}" class='hover-effect {{ active('main_public') }}'>Public</a>
                         </li>
                         {% if user_nickname is defined %}
                           <li>
@@ -83,7 +83,7 @@
                           </li>
                         {% endif %}
                         <li>
-                            <a href="#">Network</a>
+                            <a href="{{ path('main_all') }}" class='hover-effect {{ active('main_all') }}'>Network</a>
                         </li>
                     </ul>
                 </nav>