diff --git a/InvenTree/part/templates/part/part_base.html b/InvenTree/part/templates/part/part_base.html
index 9fe6c7b486..073f3eeff9 100644
--- a/InvenTree/part/templates/part/part_base.html
+++ b/InvenTree/part/templates/part/part_base.html
@@ -18,19 +18,14 @@
         <div class="media-body">
             <h3>
                 {{ part.full_name }}
+            </h3>
+            <p> 
+                <h3>
+                <!-- Admin View -->
                 {% if user.is_staff and roles.part.change %}
                 <a  href="{% url 'admin:part_part_change' part.pk %}"><span title="{% trans 'Admin view' %}" class='fas fa-user-shield'></span></a>
                 {% endif %}
-                {% if not part.active %}
-                <div class='label label-large label-large-red'>
-                    {% trans 'Inactive' %}
-                </div>
-                {% endif %}
-            </h3>   
-            {% if part.description %}
-            <p><em>{{ part.description }}</em></p>
-            {% endif %}
-            <p>
+                <!-- Properties -->
                 <div id='part-properties' class='btn-group' role='group'>
                     {% if part.virtual %}
                     <span class='fas fa-ghost' title='{% trans "Part is virtual (not a physical part)" %}'></span>
@@ -54,6 +49,13 @@
                     <span class='fas fa-dollar-sign' title='{% trans "Part can be sold to customers" %}'></span>
                     {% endif %}
                 </div>
+                <!-- Part active -->
+                {% if not part.active %}
+                <div class='label label-large label-large-red'>
+                    {% trans 'Inactive' %}
+                </div>
+                {% endif %}
+                </h3>
             </p>
 
             <div class='btn-group action-buttons' role='group'>
@@ -122,40 +124,6 @@
                 </div>
                 {% endif %}
             </div>
-            <table class='table table-condensed'>
-                <col width='25'>
-                {% if part.keywords %}
-                <tr>
-                    <td><span class='fas fa-key'></span></td>
-                    <td>{% trans "Keywords" %}</td>
-                    <td>{{ part.keywords }}</td>
-                </tr>
-                {% endif %}
-                {% if part.link %}
-                <tr>
-                    <td><span class='fas fa-link'></span></td>
-                    <td>{% trans "External Link" %}</td>
-                    <td><a href="{{ part.link }}">{{ part.link }}</a></td>
-                </tr>
-                {% endif %}
-                <tr>
-                    <td><span class='fas fa-calendar-alt'></span></td>
-                    <td>{% trans "Creation Date" %}</td>
-                    <td>
-                        {{ part.creation_date }}
-                        {% if part.creation_user %}
-                        <span class='badge'>{{ part.creation_user }}</span>
-                        {% endif %}
-                    </td>
-                </tr>
-                {% if part.trackable and part.getLatestSerialNumber %}
-                <tr>
-                    <td><span class='fas fa-hashtag'></span></td>
-                    <td>{% trans "Latest Serial Number" %}</td>
-                    <td>{{ part.getLatestSerialNumber }}{% include "clip.html"%}</td>
-                </tr>
-            {% endif %}
-            </table>
         </div>
         </div>
 
@@ -174,14 +142,69 @@
         </div>
     </div>
     <div class="col-sm-6">
-        <table class="table table-striped">
+        <table class='table table-condensed table-striped'>
             <col width='25'>
+            {% if part.description %}
+                <td><span class='fas fa-info-circle'></span></td>
+                <td>{% trans "Description" %}</td>
+                <td>{{ part.description }}{% include "clip.html"%}</td>
+            {% endif %}
+            {% if part.revision %}
+            <tr>
+                <td><span class='fas fa-code-branch'></span></td>
+                <td>{% trans "Revision" %}</td>
+                <td>{{ part.revision }}{% include "clip.html"%}</td>
+            </tr>
+            {% endif %}
+            {% if part.keywords %}
+            <tr>
+                <td><span class='fas fa-key'></span></td>
+                <td>{% trans "Keywords" %}</td>
+                <td>{{ part.keywords }}{% include "clip.html"%}</td>
+            </tr>
+            {% endif %}
+            {% if part.link %}
+            <tr>
+                <td><span class='fas fa-link'></span></td>
+                <td>{% trans "External Link" %}</td>
+                <td><a href="{{ part.link }}">{{ part.link }}</a>{% include "clip.html"%}</td>
+            </tr>
+            {% endif %}
+            <tr>
+                <td><span class='fas fa-calendar-alt'></span></td>
+                <td>{% trans "Creation Date" %}</td>
+                <td>
+                    {{ part.creation_date }}
+                    {% if part.creation_user %}
+                    <span class='badge'>{{ part.creation_user }}</span>
+                    {% endif %}
+                </td>
+            </tr>
+            {% if part.trackable and part.getLatestSerialNumber %}
+            <tr>
+                <td><span class='fas fa-hashtag'></span></td>
+                <td>{% trans "Latest Serial Number" %}</td>
+                <td>{{ part.getLatestSerialNumber }}{% include "clip.html"%}</td>
+            </tr>
+            {% endif %}
+            {% if part.default_location %}
+            <tr>
+                <td><span class='fas fa-search-location'></span></td>
+                <td>{% trans "Default Location" %}</td>
+                <td>{{ part.default_location }}</td>
+            </tr>
+            {% endif %}
+            {% if part.default_supplier %}
+            <tr>
+                <td><span class='fas fa-building'></span></td>
+                <td>{% trans "Default Supplier" %}</td>
+                <td>{{ part.default_supplier }}</td>
+            </tr>
+            {% endif %}
             <tr>
                 <td><span class='fas fa-boxes'></span></td>
-                <td>
-                    <h4>{% trans "Available Stock" %}</h4>
-                </td>
-                <td><h4>{% decimal available %}{% if part.units %} {{ part.units }}{% endif %}</h4></td>
+                <td>{% trans "Available Stock" %}</td>
+                <td>{% decimal available %}{% if part.units %} {{ part.units }}{% endif %}</td>
             </tr>
             <tr>
                 <td><span class='fas fa-map-marker-alt'></span></td>