diff --git a/InvenTree/templates/InvenTree/settings/barcode.html b/InvenTree/templates/InvenTree/settings/barcode.html
new file mode 100644
index 0000000000..32b85151d7
--- /dev/null
+++ b/InvenTree/templates/InvenTree/settings/barcode.html
@@ -0,0 +1,20 @@
+{% extends "panel.html" %}
+{% load i18n %}
+{% load inventree_extras %}
+
+{% block label %}barcodes{% endblock %}
+
+{% block heading %}
+{% trans "Barcode Settings" %}
+{% endblock %}
+
+{% block content %}
+
+<table class='table table-striped table-condensed'>
+    {% include "InvenTree/settings/header.html" %}
+    <tbody>
+        {% include "InvenTree/settings/setting.html" with key="BARCODE_ENABLE" icon="fa-qrcode" %}
+    </tbody>
+</table>
+
+{% endblock %}
\ No newline at end of file
diff --git a/InvenTree/templates/InvenTree/settings/global.html b/InvenTree/templates/InvenTree/settings/global.html
index 45b83e3851..d43bec80c0 100644
--- a/InvenTree/templates/InvenTree/settings/global.html
+++ b/InvenTree/templates/InvenTree/settings/global.html
@@ -2,11 +2,11 @@
 {% load i18n %}
 {% load inventree_extras %}
 
-{% block label %}global{% endblock %}
+{% block label %}server{% endblock %}
 
 
 {% block heading %}
-{% trans "Global InvenTree Settings" %}
+{% trans "Server Settings" %}
 {% endblock %}
 
 {% block content %}
@@ -22,12 +22,9 @@
     </tbody>
 </table>
 
-<h4>{% trans "Barcode Settings" %}</h4>
 <table class='table table-striped table-condensed'>
     {% include "InvenTree/settings/header.html" %}
     <tbody>
-        {% include "InvenTree/settings/setting.html" with key="BARCODE_ENABLE" icon="fa-qrcode" %}
-    </tbody>
 </table>
 
 <h4>{% trans "Search Settings" %}</h4>
diff --git a/InvenTree/templates/InvenTree/settings/navbar.html b/InvenTree/templates/InvenTree/settings/navbar.html
index 4dcb92c8b2..d5da2ca5de 100644
--- a/InvenTree/templates/InvenTree/settings/navbar.html
+++ b/InvenTree/templates/InvenTree/settings/navbar.html
@@ -36,9 +36,15 @@
         <b>{% trans "InvenTree Settings" %}</b>
     </li>
 
-    <li class='list-group-item' title='{% trans "Global" %}'>
-        <a href='#' class='nav-toggle' id='select-global'>
-            <span class='fas fa-globe'></span> {% trans "Global" %}
+    <li class='list-group-item' title='{% trans "Server" %}'>
+        <a href='#' class='nav-toggle' id='select-server'>
+            <span class='fas fa-server'></span> {% trans "Server" %}
+        </a>
+    </li>
+
+    <li class='list-group-item' title='{% trans "Barcodes" %}'>
+        <a href='#' class='nav-toggle' id='select-barcodes'>
+            <span class='fas fa-qrcode'></span> {% trans "Barcodes" %}
         </a>
     </li>
 
diff --git a/InvenTree/templates/InvenTree/settings/settings.html b/InvenTree/templates/InvenTree/settings/settings.html
index 1d18261b2a..246f36a0b4 100644
--- a/InvenTree/templates/InvenTree/settings/settings.html
+++ b/InvenTree/templates/InvenTree/settings/settings.html
@@ -20,6 +20,7 @@
 {% if user.is_staff %}
 
 {% include "InvenTree/settings/global.html" %}
+{% include "InvenTree/settings/barcode.html" %}
 {% include "InvenTree/settings/currencies.html" %}
 {% include "InvenTree/settings/report.html" %}
 {% include "InvenTree/settings/part.html" %}
diff --git a/InvenTree/templates/InvenTree/settings/tabs.html b/InvenTree/templates/InvenTree/settings/tabs.html
deleted file mode 100644
index cde540898c..0000000000
--- a/InvenTree/templates/InvenTree/settings/tabs.html
+++ /dev/null
@@ -1,46 +0,0 @@
-{% load i18n %}
-
-<h4><span class='fas fa-user'></span> {% trans "User Settings" %}</h4>
-<ul class='nav nav-pills nav-stacked'>
-    <li{% ifequal tab 'user' %} class='active'{% endifequal %}>
-        <a href="#"><span class='fas fa-user'></span> {% trans "Account" %}</a>
-    </li>
-    <li{% ifequal tab 'theme' %} class='active'{% endifequal %}>
-        <a href="{% url 'settings-appearance' %}"><span class='fas fa-fill'></span> {% trans "Appearance" %}</a>
-    </li>
-    <li{% ifequal tab 'user_settings' %} class='active'{% endifequal %}>
-        <a href="#"><span class='fas fa-cog'></span> {% trans "User Settings" %}</a>
-    </li>
-</ul>
-{% if user.is_staff %}
-<h4><span class='fas fa-cogs'></span> {% trans "InvenTree Settings" %}</h4>
-<ul class='nav nav-pills nav-stacked'>
-    <li {% if tab == 'global' %} class='active' {% endif %}>
-        <a href='#'><span class='fas fa-globe'></span> {% trans "Global" %}</a>
-    </li>
-    <li {% if tab == 'currencies' %} class='active'{% endif %}>
-        <a href="{% url 'settings-currencies' %}"><span class='fas fa-dollar-sign'></span> {% trans "Currencies" %}</a>
-    </li>
-    <li {% if tab == 'report' %} class='active' {% endif %}>
-        <a href='#'><span class='fas fa-file-pdf'></span> {% trans "Report" %}</a>
-    </li>
-    <li{% ifequal tab 'category' %} class='active'{% endifequal %}>
-        <a href="{% url 'settings-category' %}"><span class='fa fa-sitemap'></span> {% trans "Categories" %}</a>
-    </li>
-    <li{% ifequal tab 'part' %} class='active'{% endifequal %}>
-        <a href="#"><span class='fas fa-shapes'></span> {% trans "Parts" %}</a>
-    </li>
-    <li {% if tab == 'stock' %} class='active'{% endif %}>
-        <a href='#'><span class='fas fa-boxes'></span> {% trans "Stock" %}</a>
-    </li>
-    <li {% if tab == 'build' %} class='active'{% endif %}>
-        <a href="#"><span class='fas fa-tools'></span> {% trans "Build Orders" %}</a>
-    </li>
-    <li {% if tab == 'po' %} class='active'{% endif %}>
-        <a href="#"><span class='fas fa-shopping-cart'></span> {% trans "Purchase Orders" %}</a>
-    </li>
-    <li {% if tab == 'so' %} class='active'{% endif %}>
-        <a href="#"><span class='fas fa-truck'></span> {% trans "Sales Orders" %}</a>
-    </li>
-</ul>
-{% endif %}