diff --git a/InvenTree/stock/templates/stock/item.html b/InvenTree/stock/templates/stock/item.html
index 517acb15fe..f72c910981 100644
--- a/InvenTree/stock/templates/stock/item.html
+++ b/InvenTree/stock/templates/stock/item.html
@@ -8,8 +8,9 @@
 
 {% include "stock/tabs.html" with tab="tracking" %}
 
-<hr>
 <h4>{% trans "Stock Tracking Information" %}</h4>
+<hr>
+
 <div id='table-toolbar'>
     <div class='btn-group'>
         <button class='btn btn-success' type='button' title='New tracking entry' id='new-entry'>New Entry</button>
diff --git a/InvenTree/stock/templates/stock/item_attachments.html b/InvenTree/stock/templates/stock/item_attachments.html
index 453ab7f09b..3861bebe6a 100644
--- a/InvenTree/stock/templates/stock/item_attachments.html
+++ b/InvenTree/stock/templates/stock/item_attachments.html
@@ -7,8 +7,8 @@
 
 {% include "stock/tabs.html" with tab='attachments' %}
 
-<hr>
 <h4>{% trans "Stock Item Attachments" %}</h4>
+<hr>
 
 {% include "attachment_table.html" with attachments=item.attachments.all %}
 
diff --git a/InvenTree/stock/templates/stock/item_notes.html b/InvenTree/stock/templates/stock/item_notes.html
index 31e818ef71..9dd21331b4 100644
--- a/InvenTree/stock/templates/stock/item_notes.html
+++ b/InvenTree/stock/templates/stock/item_notes.html
@@ -10,6 +10,7 @@
 {% include "stock/tabs.html" with tab="notes" %}
 
 {% if editing %}
+
 <h4>{% trans "Stock Item Notes" %}</h4>
 <hr>
 
diff --git a/InvenTree/stock/templates/stock/item_tests.html b/InvenTree/stock/templates/stock/item_tests.html
index 9172bfdde4..a3e21962e1 100644
--- a/InvenTree/stock/templates/stock/item_tests.html
+++ b/InvenTree/stock/templates/stock/item_tests.html
@@ -7,8 +7,8 @@
 
 {% include "stock/tabs.html" with tab='tests' %}
 
-<hr>
 <h4>{% trans "Test Results" %}</h4>
+<hr>
 
 <div id='button-toolbar'>
     <div class='button-toolbar container-fluid' style="float: right;">
diff --git a/InvenTree/stock/templates/stock/tabs.html b/InvenTree/stock/templates/stock/tabs.html
index ce14511b8a..5ec75ddc28 100644
--- a/InvenTree/stock/templates/stock/tabs.html
+++ b/InvenTree/stock/templates/stock/tabs.html
@@ -1,9 +1,6 @@
 {% load i18n %}
 
 <ul class='nav nav-tabs'>
-    <li{% ifequal tab 'children' %} class='active'{% endifequal %}>
-        <a href="{% url 'stock-item-children' item.id %}">{% trans "Children" %}{% if item.child_count > 0 %}<span class='badge'>{{ item.child_count }}</span>{% endif %}</a>
-    </li>
     <li{% ifequal tab 'tracking' %} class='active'{% endifequal %}>
         <a href="{% url 'stock-item-detail' item.id %}">
             {% trans "Tracking" %}
@@ -36,4 +33,9 @@
             {% if item.attachments.count > 0 %}<span class='badge'>{{ item.attachments.count }}</span>{% endif %}
         </a>
     </li>
+    {% if item.child_count > 0 %}
+    <li{% ifequal tab 'children' %} class='active'{% endifequal %}>
+        <a href="{% url 'stock-item-children' item.id %}">{% trans "Children" %}{% if item.child_count > 0 %}<span class='badge'>{{ item.child_count }}</span>{% endif %}</a>
+    </li>
+    {% endif %}
 </ul>
\ No newline at end of file