diff --git a/InvenTree/part/templates/part/category.html b/InvenTree/part/templates/part/category.html
index 8f62afd557..e5a22363b2 100644
--- a/InvenTree/part/templates/part/category.html
+++ b/InvenTree/part/templates/part/category.html
@@ -6,7 +6,103 @@
 {% include 'part/category_navbar.html' %}
 {% endblock %}
 
-{% block content %}
+{% block details_left %}
+{% if category %}
+<h4>
+    {% trans "Part Category" %}: {{ category.name }}
+    {% if user.is_staff and roles.part_category.change %}
+    <a href="{% url 'admin:part_partcategory_change' category.pk %}"><span title="{% trans 'Admin view' %}" class='fas fa-user-shield'></span></a>
+    {% endif %}
+</h4>
+<p>{{ category.description }}</p>
+{% else %}
+<h4>
+    {% trans "Parts" %}
+</h4>
+<p>{% trans "Top level part category" %}</p>
+{% endif %}
+
+<div class='btn-group' role='group'>
+    {% if roles.part_category.add %}
+    <button class='btn btn-success' 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>
+
+{% endblock %}
+
+{% block details_right %}
+
+{% if category %}
+<table class='table table-condensed table-striped'>
+    <col width='25'>
+    <tr>
+        <td><span class='fas fa-sitemap'></span></td>
+        <td>{% trans "Category Path" %}</td>
+        <td>{{ category.pathstring }}</td>
+    </tr>
+    <tr>
+        <td><span class='fas fa-info-circle'></span></td>
+        <td>{% trans "Category Description" %}</td>
+        <td>{{ category.description }}</td>
+    </tr>
+    {% if category.default_location %}
+    <tr>
+        <td><span class='fas fa-map-marker-alt'></span></td>
+        <td>{% trans "Default Location" %}</td>
+        <td><a href="{% url 'stock-location-detail' category.default_location.pk %}">{{ category.default_location.pathstring }}</a></td>
+    </tr>
+    {% endif %}
+    {% if category.default_keywords %}
+    <tr>
+        <td><span class='fas fa-key'></span></td>
+        <td>{% trans "Keywords" %}</td>
+        <td>{{ category.default_keywords }}</td>
+    </tr>
+    {% endif %}
+    <tr>
+        <td><span class='fas fa-sitemap'></span></td>
+        <td>{% trans "Subcategories" %}</td>
+        <td>{{ category.children.count }}</td>
+    </tr>
+    <tr>
+        <td><span class='fas fa-shapes'></span></td>
+        <td>{% trans "Parts (Including subcategories)" %}</td>
+        <td>{{ category.partcount }}</td>
+    </tr>
+</table>
+{% else %}
+<h3>{% trans "Category Details" %}</h3>
+<table class='table table-striped table-condensed'>
+    <col width='25'>
+    <tr>
+        <td><span class='fas fa-sitemap'></span></td>
+        <td>{% trans "Part Categories" %}</td>
+        <td>{{ category_count }}</td>
+    </tr>
+    <tr>
+        <td><span class='fas fa-shapes'></span></td>
+        <td>{% trans "Parts" %}</td>
+        <td>{{ part_count }}</td>
+    </tr>
+</table>
+{% endif %}
+{% endblock %}
+
+{% block page_content %}
 
 {% if messages %}
   {% for message in messages %}
@@ -16,105 +112,6 @@
   {% endfor %}
 {% endif %}
 
-
-<div class='panel panel-inventree'>
-    <div class='row'>
-        <div class='col-sm-6'>
-            {% if category %}
-            <h3>
-                {{ category.name }}
-                {% if user.is_staff and roles.part_category.change %}
-                <a href="{% url 'admin:part_partcategory_change' category.pk %}"><span title="{% trans 'Admin view' %}" class='fas fa-user-shield'></span></a>
-                {% endif %}
-            </h3>
-            <p>{{ category.description }}</p>
-            {% else %}
-            <h3>{% trans "Part Categories" %}</h3>
-            <p>{% trans "All parts" %}</p>
-            {% endif %}
-            <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 %}
-            <h3>{% trans "Category Details" %}</h3>
-            <table class='table table-condensed table-striped'>
-                <col width='25'>
-                <tr>
-                    <td><span class='fas fa-sitemap'></span></td>
-                    <td>{% trans "Category Path" %}</td>
-                    <td>{{ category.pathstring }}</td>
-                </tr>
-                <tr>
-                    <td><span class='fas fa-info-circle'></span></td>
-                    <td>{% trans "Category Description" %}</td>
-                    <td>{{ category.description }}</td>
-                </tr>
-                {% if category.default_location %}
-                <tr>
-                    <td><span class='fas fa-map-marker-alt'></span></td>
-                    <td>{% trans "Default Location" %}</td>
-                    <td><a href="{% url 'stock-location-detail' category.default_location.pk %}">{{ category.default_location.pathstring }}</a></td>
-                </tr>
-                {% endif %}
-                {% if category.default_keywords %}
-                <tr>
-                    <td><span class='fas fa-key'></span></td>
-                    <td>{% trans "Keywords" %}</td>
-                    <td>{{ category.default_keywords }}</td>
-                </tr>
-                {% endif %}
-                <tr>
-                    <td><span class='fas fa-sitemap'></span></td>
-                    <td>{% trans "Subcategories" %}</td>
-                    <td>{{ category.children.count }}</td>
-                </tr>
-                <tr>
-                    <td><span class='fas fa-shapes'></span></td>
-                    <td>{% trans "Parts (Including subcategories)" %}</td>
-                    <td>{{ category.partcount }}</td>
-                </tr>
-            </table>
-            {% else %}
-            <h3>{% trans "Category Details" %}</h3>
-            <table class='table table-striped table-condensed'>
-                <col width='25'>
-                <tr>
-                    <td><span class='fas fa-sitemap'></span></td>
-                    <td>{% trans "Part Categories" %}</td>
-                    <td>{{ category_count }}</td>
-                </tr>
-                <tr>
-                    <td><span class='fas fa-shapes'></span></td>
-                    <td>{% trans "Parts" %}</td>
-                    <td>{{ part_count }}</td>
-                </tr>
-            </table>
-            {% endif %}
-        </div>
-    </div>
-
-</div>
-
-{% block page_content %}
-
 <div class='panel panel-inventree panel-hidden' id='panel-parts'>
     <div class='panel-heading'>
         <h4>{% trans "Parts" %}</h4>
@@ -191,7 +188,6 @@
 
 {% endblock %}
 
-{% endblock %}
 {% block js_load %}
 {{ block.super }}
 {% endblock %}
diff --git a/InvenTree/stock/templates/stock/location.html b/InvenTree/stock/templates/stock/location.html
index 290df77536..7735be69b8 100644
--- a/InvenTree/stock/templates/stock/location.html
+++ b/InvenTree/stock/templates/stock/location.html
@@ -20,7 +20,7 @@
 <h4>
     {% trans "Stock" %}
 </h4>
-<p>{% trans "All stock items" %}</p>
+<p>{% trans "Top level stock location" %}</p>
 {% endif %}
 
 <div class='btn-group' role='group'>