diff --git a/templates/base.html b/templates/base.html
index 5fb6e8b..c43854a 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -53,31 +53,33 @@ <h1>AI Graph Tools</h1>
                   </a>
                 </li>
                 {% endif %}
-                {% if request.path == url_for('graph_page') %}
-                <li class="govuk-service-navigation__item govuk-service-navigation__item--active app-nav__push-right">
-                  <a class="govuk-service-navigation__link" href="{{ url_for('graph_page', run_path=run_path) }}" aria-current="true">
-                    <strong class="govuk-service-navigation__active-fallback">Graph</strong>
-                  </a>
-                </li>
-                {% else %}
-                <li class="govuk-service-navigation__item app-nav__push-right">
-                  <a class="govuk-service-navigation__link" href="{{ url_for('graph_page', run_path=run_path) }}">
-                    Graph
-                  </a>
-                </li>
-                {% endif %}
-                {% if request.path == url_for('metrics_page') %}
-                <li class="govuk-service-navigation__item govuk-service-navigation__item--active">
-                  <a class="govuk-service-navigation__link" href="{{ url_for('metrics_page', run_path=run_path) }}" aria-current="true">
-                    <strong class="govuk-service-navigation__active-fallback">Metrics</strong>
-                  </a>
-                </li>
-                {% else %}
-                <li class="govuk-service-navigation__item">
-                  <a class="govuk-service-navigation__link" href="{{ url_for('metrics_page', run_path=run_path) }}">
-                    Metrics
-                  </a>
-                </li>
+                {% if request.path == url_for('graph_page') or request.path == url_for('metrics_page') %}
+                  {% if request.path == url_for('graph_page') %}
+                  <li class="govuk-service-navigation__item govuk-service-navigation__item--active app-nav__push-right">
+                    <a class="govuk-service-navigation__link" href="{{ url_for('graph_page', run_path=run_path) }}" aria-current="true">
+                      <strong class="govuk-service-navigation__active-fallback">Graph</strong>
+                    </a>
+                  </li>
+                  {% else %}
+                  <li class="govuk-service-navigation__item app-nav__push-right">
+                    <a class="govuk-service-navigation__link" href="{{ url_for('graph_page', run_path=run_path) }}">
+                      Graph
+                    </a>
+                  </li>
+                  {% endif %}
+                  {% if request.path == url_for('metrics_page') %}
+                  <li class="govuk-service-navigation__item govuk-service-navigation__item--active">
+                    <a class="govuk-service-navigation__link" href="{{ url_for('metrics_page', run_path=run_path) }}" aria-current="true">
+                      <strong class="govuk-service-navigation__active-fallback">Table</strong>
+                    </a>
+                  </li>
+                  {% else %}
+                  <li class="govuk-service-navigation__item">
+                    <a class="govuk-service-navigation__link" href="{{ url_for('metrics_page', run_path=run_path) }}">
+                      Table
+                    </a>
+                  </li>
+                  {% endif %}
                 {% endif %}
               </ul>
             </nav>
diff --git a/templates/graph.html b/templates/graph.html
index 544a7a5..996f5a5 100644
--- a/templates/graph.html
+++ b/templates/graph.html
@@ -14,7 +14,7 @@
   </div>
 </div>
 <aside class="sidebar govuk-body">
-  <button id="list-view-btn" class="govuk-button govuk-button--secondary" style="margin-bottom: 20px;">Show in list view</button>
+  <button id="list-view-btn" class="govuk-button govuk-button--secondary" style="margin-bottom: 20px;">Show in table view</button>
   <h2 id="sidebar-title">No node selected</h2>
   <div id="node-details"><p>Select a node to view details.</p></div>
 </aside>