diff --git a/InvenTree/part/templates/part/cat_link.html b/InvenTree/part/templates/part/cat_link.html
index 71bda74721..fd6ca31c07 100644
--- a/InvenTree/part/templates/part/cat_link.html
+++ b/InvenTree/part/templates/part/cat_link.html
@@ -1,16 +1,10 @@
 {% load i18n %}
 
-<div class='navigation'>
-<nav aria-label="breadcrumb">
-  <ol class="breadcrumb">
-    <li><a href='#' id='toggle-part-tree'><strong><span class='fas fa-stream'></span></strong></a></li>
-    <li class="breadcrumb-item{% if category is None %} active" aria-current="page{% endif %}"><a href="/part/">{% trans "Parts" %}</a></li>
+<li><a href='#' id='toggle-part-tree'><strong><span class='fas fa-stream'></span></strong></a></li>
+<li class="breadcrumb-item{% if category is None %} active" aria-current="page{% endif %}"><a href="/part/">{% trans "Parts" %}</a></li>
 {% if category %}
 {% for path_item in category.parentpath %}
-    <li class="breadcrumb-item"><a href="{% url 'category-detail' path_item.id %}">{{ path_item.name }}</a></li>
+<li class="breadcrumb-item"><a href="{% url 'category-detail' path_item.id %}">{{ path_item.name }}</a></li>
 {% endfor %}
-    <li class="breadcrumb-item active" aria-current="page"><a href="{% url 'category-detail' category.id %}">{{ category.name }}</a></li>
+<li class="breadcrumb-item active" aria-current="page"><a href="{% url 'category-detail' category.id %}">{{ category.name }}</a></li>
 {% endif %}
-  </ol>
-</nav>
-</div>
\ No newline at end of file
diff --git a/InvenTree/part/templates/part/category.html b/InvenTree/part/templates/part/category.html
index 21c5d0061e..803d265af6 100644
--- a/InvenTree/part/templates/part/category.html
+++ b/InvenTree/part/templates/part/category.html
@@ -32,27 +32,25 @@
             <h3>{% trans "Part Categories" %}</h3>
             <p>{% trans "All parts" %}</p>
             {% endif %}
-            <p>
-                <div class='btn-group action-buttons'>
-                    {% if roles.part_category.add %}
-                    <button class='btn btn-default' id='cat-create' title='{% trans "Create new part category" %}'>
-                        <span class='fas fa-plus-circle icon-green'/>
-                    </button>
-                    {% endif %}
-                    {% if category %}
-                    {% if roles.part_category.change %}
-                    <button class='btn btn-default' id='cat-edit' title='{% trans "Edit part category" %}'>
-                        <span class='fas fa-edit icon-blue'/>
-                    </button>
-                    {% endif %}
-                    {% if roles.part_category.delete %}
-                    <button class='btn btn-default' id='cat-delete' title='{% trans "Delete part category" %}'>
-                        <span class='fas fa-trash-alt icon-red'/>
-                    </button>
-                    {% endif %}
-                    {% endif %}
-                </div>
-            </p>
+            <div class='btn-group' role='group'>
+                {% if roles.part_category.add %}
+                <button class='btn btn-outline-secondary' id='cat-create' title='{% trans "Create new part category" %}'>
+                    <span class='fas fa-plus-circle icon-green'/>
+                </button>
+                {% endif %}
+                {% if category %}
+                {% if roles.part_category.change %}
+                <button class='btn btn-outline-secondary' id='cat-edit' title='{% trans "Edit part category" %}'>
+                    <span class='fas fa-edit icon-blue'/>
+                </button>
+                {% endif %}
+                {% if roles.part_category.delete %}
+                <button class='btn btn-outline-secondary' id='cat-delete' title='{% trans "Delete part category" %}'>
+                    <span class='fas fa-trash-alt icon-red'/>
+                </button>
+                {% endif %}
+                {% endif %}
+            </div>
         </div>
         <div class='col-sm-6'>
             {% if category %}
diff --git a/InvenTree/part/templates/part/part_app_base.html b/InvenTree/part/templates/part/part_app_base.html
index b3bd862fbd..9476a6ec25 100644
--- a/InvenTree/part/templates/part/part_app_base.html
+++ b/InvenTree/part/templates/part/part_app_base.html
@@ -17,14 +17,12 @@
 <div id='part-tree'></div>
 {% endblock %}
 
-{% block pre_content %}
-
+{% block breadcrumbs %}
 {% if part %}
 {% include "part/cat_link.html" with category=part.category %}
 {% else %}
 {% include 'part/cat_link.html' with category=category %}
 {% endif %}
-
 {% endblock %}
 
 {% block js_ready %}
diff --git a/InvenTree/stock/templates/stock/item_base.html b/InvenTree/stock/templates/stock/item_base.html
index b7019ff887..b079b25cfa 100644
--- a/InvenTree/stock/templates/stock/item_base.html
+++ b/InvenTree/stock/templates/stock/item_base.html
@@ -12,7 +12,7 @@
 <div id='stock-tree'></div>
 {% endblock %}
 
-{% block pre_content %}
+{% block breadcrumbs %}
 {% include 'stock/loc_link.html' with location=item.location %}
 {% endblock %}
 
diff --git a/InvenTree/stock/templates/stock/loc_link.html b/InvenTree/stock/templates/stock/loc_link.html
index bd18714674..6e5b329b73 100644
--- a/InvenTree/stock/templates/stock/loc_link.html
+++ b/InvenTree/stock/templates/stock/loc_link.html
@@ -1,16 +1,10 @@
 {% load i18n %}
 
-<div class="navigation">
-<nav aria-label="breadcrumb">
-  <ol class="breadcrumb">
-    <li><a href='#' title='Toggle Stock Tree' id='toggle-stock-tree'><strong><span class='fas fa-stream'></span></strong></a></li>  
-    <li class="breadcrumb-item{% if location is None %} active" aria-current="page{% endif %}"><a href="/stock/">{% trans "Stock" %}</a></li>
+<li><a href='#' title='Toggle Stock Tree' id='toggle-stock-tree'><strong><span class='fas fa-stream'></span></strong></a></li>  
+<li class="breadcrumb-item{% if location is None %} active" aria-current="page{% endif %}"><a href="/stock/">{% trans "Stock" %}</a></li>
 {% if location %}
 {% for path_item in location.parentpath %}
-    <li class='breadcrumb-item'><a href="{% url 'stock-location-detail' path_item.id %}">{{ path_item.name }}</a></li>
+<li class='breadcrumb-item'><a href="{% url 'stock-location-detail' path_item.id %}">{{ path_item.name }}</a></li>
 {% endfor %}
-    <li class='breadcrumb-item active' aria-current='page'><a href="{% url 'stock-location-detail' location.id %}">{{ location.name }}</a></li>
+<li class='breadcrumb-item active' aria-current='page'><a href="{% url 'stock-location-detail' location.id %}">{{ location.name }}</a></li>
 {% endif %}
-  </ol>
- </nav>
-</div>
\ No newline at end of file
diff --git a/InvenTree/stock/templates/stock/stock_app_base.html b/InvenTree/stock/templates/stock/stock_app_base.html
index 209aea3956..d66dd6ce4e 100644
--- a/InvenTree/stock/templates/stock/stock_app_base.html
+++ b/InvenTree/stock/templates/stock/stock_app_base.html
@@ -17,7 +17,7 @@
 </div>
 {% endblock %}
 
-{% block pre_content %}
+{% block breadcrumbs %}
 {% if item %}
 {% include 'stock/loc_link.html' with location=item.location %}
 {% else %}
diff --git a/InvenTree/templates/base.html b/InvenTree/templates/base.html
index 1fbdc27b43..e545a748c0 100644
--- a/InvenTree/templates/base.html
+++ b/InvenTree/templates/base.html
@@ -68,8 +68,18 @@
 {% include "navbar.html" %}
 
 <div class='main body wrapper'>
-
+    
 <div class='inventree-body'>
+    
+    <div class='container-fluid'>
+        <nav aria-label='breadcrumb'>
+            <ol class='breadcrumb'>
+                {% block breadcrumbs %}
+                <li class='breadcrumb-item active'>Breadcrumbs Go Here!</li>
+                {% endblock %}
+            </ol>
+        </nav>
+    </div>
 
 <div class='containter-fluid inventree-pre-content'>    
     {% block pre_content %}
diff --git a/InvenTree/templates/js/translated/forms.js b/InvenTree/templates/js/translated/forms.js
index 2a71b2f4c5..535a6f316b 100644
--- a/InvenTree/templates/js/translated/forms.js
+++ b/InvenTree/templates/js/translated/forms.js
@@ -2024,6 +2024,8 @@ function constructHiddenInput(name, parameters) {
 // Construct a "checkbox" input
 function constructCheckboxInput(name, parameters) {
 
+    var todo = "refactor this with the new bootstrap slide-toggle thingy";
+
     return constructInputOptions(
         name,
         'form-check-input',