diff --git a/ogcp/templates/commands.html b/ogcp/templates/commands.html
index 28ad9b0..74d4181 100644
--- a/ogcp/templates/commands.html
+++ b/ogcp/templates/commands.html
@@ -16,40 +16,40 @@
 {% endblock %}
 
 {% block commands %}
-  <input class="btn btn-light" type="submit" value="{{ _('Power on (WoL)') }}"
+  <input class="btn btn-light{% block nav_wol %}{% endblock %}" type="submit" value="{{ _('Power on (WoL)') }}"
          form="scopesForm" formaction="{{ url_for('action_wol') }}" formmethod="get">
-  <input class="btn btn-light" type="submit" value="{{ _('Power off') }}"
+  <input class="btn btn-light{% block nav_poweroff %}{% endblock %}" type="submit" value="{{ _('Power off') }}"
          form="scopesForm" formaction="{{ url_for('action_poweroff') }}" formmethod="get">
-  <input class="btn btn-light" type="submit" value="{{ _('Reboot') }}"
+  <input class="btn btn-light{% block nav_reboot %}{% endblock %}" type="submit" value="{{ _('Reboot') }}"
          form="scopesForm" formaction="{{ url_for('action_reboot') }}" formmethod="get">
-  <input class="btn btn-light" type="submit" value="{{ _('Refresh') }}"
+  <input class="btn btn-light{% block nav_refresh %}{% endblock %}" type="submit" value="{{ _('Refresh') }}"
          form="scopesForm" formaction="{{ url_for('action_refresh') }}" formmethod="post">
-  <input class="btn btn-light" type="submit" value="{{ _('Hardware') }}"
+  <input class="btn btn-light{% block nav_hardware %}{% endblock %}" type="submit" value="{{ _('Hardware') }}"
          form="scopesForm" formaction="{{ url_for('action_hardware') }}" formmethod="get">
-  <input class="btn btn-light" type="submit" value="{{ _('Software') }}"
+  <input class="btn btn-light{% block nav_software %}{% endblock %}" type="submit" value="{{ _('Software') }}"
          form="scopesForm" formaction="{{ url_for('action_software') }}" formmethod="get">
-  <input class="btn btn-light" type="submit" value="{{ _('Start session') }}"
+  <input class="btn btn-light{% block nav_session %}{% endblock %}" type="submit" value="{{ _('Start session') }}"
          form="scopesForm" formaction="{{ url_for('action_session') }}" formmethod="get">
-  <input class="btn btn-light" type="submit" value="{{ _('Restore Image') }}"
+  <input class="btn btn-light{% block nav_restore_image %}{% endblock %}" type="submit" value="{{ _('Restore Image') }}"
          form="scopesForm" formaction="{{ url_for('action_image_restore') }}" formmethod="get">
-  <input class="btn btn-light" type="submit" value="{{ _('Partition & Format') }}"
+  <input class="btn btn-light{% block nav_setup %}{% endblock %}" type="submit" value="{{ _('Partition & Format') }}"
          form="scopesForm" formaction="{{ url_for('action_setup_show') }}" formmethod="get">
-  <input class="btn btn-light" type="submit" value="{{ _('Client details') }}"
+  <input class="btn btn-light{% block nav_client_details %}{% endblock %}" type="submit" value="{{ _('Client details') }}"
          form="scopesForm" formaction="{{ url_for('action_client_info') }}" formmethod="get">
-  <input class="btn btn-light" type="submit" value="{{ _('Create image') }}"
+  <input class="btn btn-light{% block nav_create_image %}{% endblock %}" type="submit" value="{{ _('Create image') }}"
          form="scopesForm" formaction="{{ url_for('action_image_create') }}" formmethod="get">
-  <input class="btn btn-light" type="submit" value="{{ _('Set boot mode') }}"
+  <input class="btn btn-light{% block nav_set_bootmode %}{% endblock %}" type="submit" value="{{ _('Set boot mode') }}"
          form="scopesForm" formaction="{{ url_for('action_mode') }}" formmethod="get">
-  <input class="btn btn-light" type="submit" value="{{ _('Set ogLive') }}"
+  <input class="btn btn-light{% block nav_set_oglive %}{% endblock %}" type="submit" value="{{ _('Set ogLive') }}"
          form="scopesForm" formaction="{{ url_for('action_oglive') }}" formmethod="get">
   <div class="dropdown btn">
-    <button class="btn btn-secondary btn-light dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-expanded="false">
+    <button class="btn btn-secondary btn-light dropdown-toggle{% block nav_logs %}{% endblock %}" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-expanded="false">
       Logs
     </button>
     <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
-    <input class="btn btn-light dropdown-item" type="submit" value="{{ _('Log') }}"
+    <input class="btn btn-light dropdown-item{% block nav_logs_log %}{% endblock %}" type="submit" value="{{ _('Log') }}"
            form="scopesForm" formaction="{{ url_for('action_legacy_log') }}" formmethod="get">
-    <input class="btn btn-light dropdown-item" type="submit" value="{{ _('Real time log') }}"
+    <input class="btn btn-light dropdown-item{% block nav_logs_rt %}{% endblock %}" type="submit" value="{{ _('Real time log') }}"
            form="scopesForm" formaction="{{ url_for('action_legacy_rt_log') }}" formmethod="get">
     </div>
   </div>