diff --git a/sysutils/nut/src/opnsense/mvc/app/views/OPNsense/Nut/index.volt b/sysutils/nut/src/opnsense/mvc/app/views/OPNsense/Nut/index.volt
index ce33ec2c3..e8fdcd68f 100644
--- a/sysutils/nut/src/opnsense/mvc/app/views/OPNsense/Nut/index.volt
+++ b/sysutils/nut/src/opnsense/mvc/app/views/OPNsense/Nut/index.volt
@@ -1,6 +1,6 @@
 {#
  # Copyright (C) 2017 Michael Muenz
- # Copyright (C) 2014–2017 Deciso B.V.
+ # Copyright (C) 2014-2017 Deciso B.V.
  # All rights reserved.
  #
  # Redistribution and use in source and binary forms, with or without
@@ -86,54 +86,9 @@
 </script>
 
 <ul class="nav nav-tabs" role="tablist"  id="maintabs">
-{% for tab in settings['tabs']|default([]) %}
-    {% if tab['subtabs']|default(false) %}
-        {# Tab with dropdown #}
-
-        {# Find active subtab #}
-            {% set active_subtab="" %}
-            {% for subtab in tab['subtabs']|default({}) %}
-                {% if subtab[0]==settings['activetab']|default("") %}
-                    {% set active_subtab=subtab[0] %}
-                {% endif %}
-            {% endfor %}
-
-        <li role="presentation" class="dropdown {% if settings['activetab']|default("") == active_subtab %}active{% endif %}">
-            <a data-toggle="dropdown" href="#" class="dropdown-toggle pull-right visible-lg-inline-block visible-md-inline-block visible-xs-inline-block visible-sm-inline-block" role="button" style="border-left: 1px dashed lightgray;">
-                <b><span class="caret"></span></b>
-            </a>
-            <a data-toggle="tab" href="#subtab_{{ tab['subtabs'][0][0] }}" class="visible-lg-inline-block visible-md-inline-block visible-xs-inline-block visible-sm-inline-block" style="border-right:0px;"><b>{{ tab[1] }}</b></a>
-            <ul class="dropdown-menu" role="menu">
-                {% for subtab in tab['subtabs']|default({}) %}
-                <li class="{% if settings['activetab']|default("") == subtab[0] %}active{% endif %}"><a data-toggle="tab" href="#subtab_{{subtab[0]}}">{{ subtab[1] }}</a></li>
-                {% endfor %}
-            </ul>
-        </li>
-    {% else %}
-        {# Standard Tab #}
-        <li {% if settings['activetab']|default("") == tab[0] %} class="active" {% endif %}>
-                <a data-toggle="tab" href="#tab_{{ tab[0] }}">
-                    <b>{{ tab[1] }}</b>
-                </a>
-        </li>
-    {% endif %}
-{% endfor %}
+    {{ partial("layout_partials/base_tabs_header",['formData':settings]) }}
 </ul>
 
 <div class="content-box tab-content">
-    {% for tab in settings['tabs']|default([]) %}
-        {% if tab['subtabs']|default(false) %}
-            {# Tab with dropdown #}
-            {% for subtab in tab['subtabs']|default({})%}
-                <div id="subtab_{{subtab[0]}}" class="tab-pane fade{% if settings['activetab']|default("") == subtab[0] %} in active {% endif %}">
-                    {{ partial("layout_partials/base_form",['fields':subtab[2],'id':'frm_'~subtab[0],'data_title':subtab[1],'apply_btn_id':'save_'~subtab[0]]) }}
-                </div>
-            {% endfor %}
-        {% endif %}
-        {% if tab['subtabs']|default(false)==false %}
-            <div id="tab_{{tab[0]}}" class="tab-pane fade{% if settings['activetab']|default("") == tab[0] %} in active {% endif %}">
-                {{ partial("layout_partials/base_form",['fields':tab[2],'id':'frm_'~tab[0],'apply_btn_id':'save_'~tab[0]]) }}
-            </div>
-        {% endif %}
-    {% endfor %}
+    {{ partial("layout_partials/base_tabs_content",['formData':settings]) }}
 </div>