diff --git a/InvenTree/company/templates/company/company_base.html b/InvenTree/company/templates/company/company_base.html
index b9cd650395..e19e8e4e37 100644
--- a/InvenTree/company/templates/company/company_base.html
+++ b/InvenTree/company/templates/company/company_base.html
@@ -56,7 +56,29 @@
 {% endblock %}
 
 {% block details %}
-<p>{{ company.description }}</p>
+<table class='table table-striped table-condensed'>
+    <col width='25'>
+    <tr>
+        <td><span class='fas fa-info-circle'></span></td>
+        <td>{% trans "Description" %}</td>
+        <td>{{ company.description }}</td>
+    </tr>
+    <tr>
+        <td><span class='fas fa-industry'></span></td>
+        <td>{%trans "Manufacturer" %}</td>
+        <td>{% include "yesnolabel.html" with value=company.is_manufacturer %}</td>
+    </tr>
+    <tr>
+        <td><span class='fas fa-building'></span></td>
+        <td>{% trans "Supplier" %}</td>
+        <td>{% include 'yesnolabel.html' with value=company.is_supplier %}</td>
+    </tr>
+    <tr>
+        <td><span class='fas fa-user-tie'></span></td>
+        <td>{% trans "Customer" %}</td>
+        <td>{% include 'yesnolabel.html' with value=company.is_customer %}</td>
+    </tr>
+</table>
 
 {% endblock %}
 
@@ -110,22 +132,6 @@
     <td>{{ company.contact }}{% include "clip.html"%}</td>
 </tr>
 {% endif %}
-
-<tr>
-    <td><span class='fas fa-industry'></span></td>
-    <td>{%trans "Manufacturer" %}</td>
-    <td>{% include "yesnolabel.html" with value=company.is_manufacturer %}</td>
-</tr>
-<tr>
-    <td><span class='fas fa-building'></span></td>
-    <td>{% trans "Supplier" %}</td>
-    <td>{% include 'yesnolabel.html' with value=company.is_supplier %}</td>
-</tr>
-<tr>
-    <td><span class='fas fa-user-tie'></span></td>
-    <td>{% trans "Customer" %}</td>
-    <td>{% include 'yesnolabel.html' with value=company.is_customer %}</td>
-</tr>
 </table>
 {% endblock %}
 
diff --git a/InvenTree/part/templates/part/category.html b/InvenTree/part/templates/part/category.html
index 9e6a923dda..4797571fda 100644
--- a/InvenTree/part/templates/part/category.html
+++ b/InvenTree/part/templates/part/category.html
@@ -76,6 +76,13 @@
         <td>{% trans "Category Path" %}</td>
         <td>{{ category.pathstring }}</td>
     </tr>
+    {% if category.default_keywords %}
+    <tr>
+        <td><span class='fas fa-key'></span></td>
+        <td>{% trans "Keywords" %}</td>
+        <td>{{ category.default_keywords }}</td>
+    </tr>
+    {% endif %}
     {% else %}
     <tr>
         <td><span class='fas fa-sitemap'></span></td>
@@ -98,13 +105,6 @@
         <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>
diff --git a/InvenTree/part/templates/part/part_base.html b/InvenTree/part/templates/part/part_base.html
index 9619a55b38..581b796352 100644
--- a/InvenTree/part/templates/part/part_base.html
+++ b/InvenTree/part/templates/part/part_base.html
@@ -100,60 +100,64 @@
 {% block details %}
 
 <!-- Properties -->
-<h4>
-    <div id='part-properties-wrapper' style='padding-top: 5px; padding-right: 5px;' class='d-flex flex-wrap'>
-        <div id='part-properties' class='btn-group' role='group' style='padding-top: 5px;'>
-            {% if part.is_template %}
-            &ensp;
-            <span class='fas fa-clone' title='{% trans "Part is a template part (variants can be made from this part)" %}'></span>
-            {% endif %}
-            {% if part.assembly %}
-            &ensp;
-            <span class='fas fa-tools' title='{% trans "Part can be assembled from other parts" %}'></span>
-            {% endif %}
-            {% if part.component %}
-            &ensp;
-            <span class='fas fa-th' title='{% trans "Part can be used in assemblies" %}'></span>
-            {% endif %}
-            {% if part.trackable %}
-            &ensp;
-            <span class='fas fa-directions' title='{% trans "Part stock is tracked by serial number" %}'></span>
-            {% endif %}
-            {% if part.purchaseable %}
-            &ensp;
-            <span class='fas fa-shopping-cart' title='{% trans "Part can be purchased from external suppliers" %}'></span>
-            {% endif %}
-            {% if part.salable %}
-            &ensp;
-            <span class='fas fa-dollar-sign' title='{% trans "Part can be sold to customers" %}'></span>
-            {% endif %}
-            <!-- Part active -->
-            {% if not part.active %}
-            &ensp;
-            <div class='badge rounded-pill bg-danger'>
-                <span class='fas fa-skull-crossbones' title='{% trans "Part is virtual (not a physical part)" %}'></span>
-                {% trans 'Inactive' %}
-            </div>
-            {% endif %}
-            <!-- Part virtual -->
-            {% if part.virtual and part.active %}
-            &ensp;
-            <div class='badge rounded-pill bg-warning'>
-                <span class='fas fa-ghost' title='{% trans "Part is virtual (not a physical part)" %}'></span>
-                {% trans 'Virtual' %}
-            </div>
-            {% endif %}
-        </div>
-            
-        {% include "spacer.html" %}        
-        <button type='button' class='btn btn-outline-secondary' data-bs-toggle='collapse' href='#collapse-part-details' role='button' id='toggle-details-button'>
-            {% trans "Show Part Details" %}
-        </button>
-    </div>
-</h4>
-
 <table class='table table-striped table-condensed' id='part-info-table'>
     <col width='25'>
+    <tr>
+        <td colspan='3' style='padding: 3px;'>
+                <div id='part-properties-wrapper' class='d-flex flex-wrap'>
+                    <div id='part-properties' class='btn-group' role='group';'>
+                        <h5>
+                        {% if part.is_template %}
+                        &ensp;
+                        <span class='fas fa-clone' title='{% trans "Part is a template part (variants can be made from this part)" %}'></span>
+                        {% endif %}
+                        {% if part.assembly %}
+                        &ensp;
+                        <span class='fas fa-tools' title='{% trans "Part can be assembled from other parts" %}'></span>
+                        {% endif %}
+                        {% if part.component %}
+                        &ensp;
+                        <span class='fas fa-th' title='{% trans "Part can be used in assemblies" %}'></span>
+                        {% endif %}
+                        {% if part.trackable %}
+                        &ensp;
+                        <span class='fas fa-directions' title='{% trans "Part stock is tracked by serial number" %}'></span>
+                        {% endif %}
+                        {% if part.purchaseable %}
+                        &ensp;
+                        <span class='fas fa-shopping-cart' title='{% trans "Part can be purchased from external suppliers" %}'></span>
+                        {% endif %}
+                        {% if part.salable %}
+                        &ensp;
+                        <span class='fas fa-dollar-sign' title='{% trans "Part can be sold to customers" %}'></span>
+                        {% endif %}
+                        <!-- Part active -->
+                        {% if not part.active %}
+                        &ensp;
+                        <div class='badge rounded-pill bg-danger'>
+                            <span class='fas fa-skull-crossbones' title='{% trans "Part is virtual (not a physical part)" %}'></span>
+                            {% trans 'Inactive' %}
+                        </div>
+                        {% endif %}
+                        <!-- Part virtual -->
+                        {% if part.virtual and part.active %}
+                        &ensp;
+                        <div class='badge rounded-pill bg-warning'>
+                            <span class='fas fa-ghost' title='{% trans "Part is virtual (not a physical part)" %}'></span>
+                            {% trans 'Virtual' %}
+                        </div>
+                        {% endif %}
+                        </h5>
+                    </div>
+                    
+                    {% include "spacer.html" %}
+
+                    <button type='button' class='btn btn-outline-secondary' data-bs-toggle='collapse' href='#collapse-part-details' role='button' id='toggle-details-button'>
+                        {% trans "Show Part Details" %}
+                    </button>
+                </div>
+        </td>
+    </tr>
     <tr>
         <td><span class='fas fa-shapes'></span></td>
         <td>{% trans "Part Name" %}</td>
diff --git a/InvenTree/stock/templates/stock/item_base.html b/InvenTree/stock/templates/stock/item_base.html
index 111007cd71..37ff88073b 100644
--- a/InvenTree/stock/templates/stock/item_base.html
+++ b/InvenTree/stock/templates/stock/item_base.html
@@ -148,8 +148,6 @@
     {% endif %}
 </h4>
 
-
-
 <div class='info-messages'>
 
     {% setting_object 'STOCK_OWNERSHIP_CONTROL' as owner_control %}