diff --git a/templates/router_manager/router_nav_tabs.html b/templates/router_manager/router_nav_tabs.html
index e411cc2..d46e94e 100644
--- a/templates/router_manager/router_nav_tabs.html
+++ b/templates/router_manager/router_nav_tabs.html
@@ -1,40 +1,40 @@
-<ul class="nav nav-tabs" role="tablist">
+<ul class="nav nav-tabs d-flex" role="tablist">
     <li class="nav-item">
         <a class="nav-link {% if request.path == '/router/list/' %}active{% endif %}" href="/router/list/" role="tab">
             Routers
         </a>
     </li>
     <li class="nav-item">
-        <a class="nav-link {% if request.path == '/router/group_list/' %}active{% endif %}" href="/router/group_list/"
-           role="tab">
+        <a class="nav-link {% if request.path == '/router/group_list/' %}active{% endif %}" href="/router/group_list/" role="tab">
             Router Groups
         </a>
     </li>
     <li class="nav-item">
-        <a class="nav-link {% if request.path == '/router/ssh_keys/' %}active{% endif %}" href="/router/ssh_keys/"
-           role="tab">
+        <a class="nav-link {% if request.path == '/router/ssh_keys/' %}active{% endif %}" href="/router/ssh_keys/" role="tab">
             SSH Keys
         </a>
     </li>
-    {% if filter_group_list %}
-        <!-- Dropdown aligned to the right -->
-        <li class="nav-item dropdown ml-auto">
-            <a class="nav-link dropdown-toggle " href="#" id="navbarDropdown" role="button" data-toggle="dropdown"
-               aria-haspopup="true" aria-expanded="false">
-                {% if filter_group %}{{ filter_group }}{% else %}All Routers{% endif %}
+    {% if request.path == '/router/list/' %}
+        <li class="nav-item ml-auto">
+            <a class="nav-link" href="#" id="showHideColumnsBtn" role="button">
+                <i class="fas fa-columns"></i> Show/Hide Columns
             </a>
-            <div class="dropdown-menu" aria-labelledby="navbarDropdown">
-                <a class="dropdown-item" href="?filter_group=all">All Routers</a>
-                {% for group_temp in filter_group_list %}
-                    <a class="dropdown-item" href="?filter_group={{ group_temp.uuid }}">{{ group_temp.name }}</a>
-                {% endfor %}
-            </div>
         </li>
+
+        {% if filter_group_list %}
+            <li class="nav-item dropdown">
+                <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown"
+                   aria-haspopup="true" aria-expanded="false">
+                    {% if filter_group %}{{ filter_group }}{% else %}All Routers{% endif %}
+                </a>
+                <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+                    <a class="dropdown-item" href="?filter_group=all">All Routers</a>
+                    {% for group_temp in filter_group_list %}
+                        <a class="dropdown-item" href="?filter_group={{ group_temp.uuid }}">{{ group_temp.name }}</a>
+                    {% endfor %}
+                </div>
+            </li>
+        {% endif %}
     {% endif %}
-    <!-- Show/Hide Columns button -->
-    <li class="nav-item">
-        <a class="nav-link" href="#" id="showHideColumnsBtn" role="button">
-            <i class="fas fa-columns"></i> Show/Hide Columns
-        </a>
-    </li>
+
 </ul>