diff --git a/babybuddy/templates/babybuddy/nav-dropdown.html b/babybuddy/templates/babybuddy/nav-dropdown.html
index 080276a9..6e685b99 100644
--- a/babybuddy/templates/babybuddy/nav-dropdown.html
+++ b/babybuddy/templates/babybuddy/nav-dropdown.html
@@ -69,31 +69,12 @@
                             {% trans "Sleep" %}
                         </a>
                     {% endif %}
-                    {% if perms.core.add_temperature %}
-                        <a class="dropdown-item p-2" href="{% url 'core:temperature-add' %}">
-                            <i class="icon-temperature" aria-hidden="true"></i>
-                            {% trans "Temperature" %}
-                        </a>
-                    {% endif %}
                     {% if perms.core.add_tummytime %}
                         <a class="dropdown-item p-2" href="{% url 'core:tummytime-add' %}">
                             <i class="icon-tummytime" aria-hidden="true"></i>
                             {% trans "Tummy Time" %}
                         </a>
                     {% endif %}
-                    {% if perms.core.add_weight %}
-                        <a class="dropdown-item p-2" href="{% url 'core:weight-add' %}">
-                            <i class="icon-weight" aria-hidden="true"></i>
-                            {% trans "Weight" %}
-                        </a>
-                    {% endif %}
-                    {% if perms.core.add_pumping %}
-                        <a class="dropdown-item p-2" href="{% url 'core:pumping-add' %}">
-                            <i class="icon-pumping" aria-hidden="true"></i>
-                            {% trans "Pumping" %}
-                        </a>
-                    {% endif %}
-
                 </div>
             </div>
         </div>
@@ -172,6 +153,48 @@
                         </a>
                         <div class="dropdown-menu" aria-labelledby="nav-measurements-menu-link">
 
+                            {% if perms.core.view_bmi %}
+                                <a class="dropdown-item{% if request.path == '/bmi/' %} active{% endif %}"
+                                   href="{% url 'core:bmi-list' %}">
+                                    <i class="icon-bmi" aria-hidden="true"></i>
+                                    {% trans "BMI" %}
+                                </a>
+                            {% endif %}
+                            {% if perms.core.add_bmi %}
+                                <a class="dropdown-item pl-5{% if request.path == '/bmi/add/' %} active{% endif %}"
+                                   href="{% url 'core:bmi-add' %}"><i class="icon-add" aria-hidden="true"></i>
+                                    {% trans "BMI entry" %}
+                                </a>
+                            {% endif %}
+
+                            {% if perms.core.view_head_circumference %}
+                                <a class="dropdown-item{% if request.path == '/head-circumference/' %} active{% endif %}"
+                                   href="{% url 'core:head-circumference-list' %}">
+                                    <i class="icon-head-circumference aria-hidden="true"></i>
+                                    {% trans "Head Circumference" %}
+                                </a>
+                            {% endif %}
+                            {% if perms.core.add_head_circumference %}
+                                <a class="dropdown-item pl-5{% if request.path == '/head-circumference/add/' %} active{% endif %}"
+                                   href="{% url 'core:head-circumference-add' %}"><i class="icon-add" aria-hidden="true"></i>
+                                    {% trans "Head Circumference entry" %}
+                                </a>
+                            {% endif %}
+
+                            {% if perms.core.view_height %}
+                                <a class="dropdown-item{% if request.path == '/height/' %} active{% endif %}"
+                                   href="{% url 'core:height-list' %}">
+                                    <i class="icon-height" aria-hidden="true"></i>
+                                    {% trans "Height" %}
+                                </a>
+                            {% endif %}
+                            {% if perms.core.add_height %}
+                                <a class="dropdown-item pl-5{% if request.path == '/height/add/' %} active{% endif %}"
+                                   href="{% url 'core:height-add' %}"><i class="icon-add" aria-hidden="true"></i>
+                                    {% trans "Height entry" %}
+                                </a>
+                            {% endif %}
+
                             {% if perms.core.view_temperature %}
                                 <a class="dropdown-item{% if request.path == '/temperature/' %} active{% endif %}"
                                    href="{% url 'core:temperature-list' %}">
@@ -200,48 +223,6 @@
                                 </a>
                             {% endif %}
 
-                            {% if perms.core.view_height %}
-                                <a class="dropdown-item{% if request.path == '/height/' %} active{% endif %}"
-                                   href="{% url 'core:height-list' %}">
-                                    <i class="icon-height" aria-hidden="true"></i>
-                                    {% trans "Height" %}
-                                </a>
-                            {% endif %}
-                            {% if perms.core.add_height %}
-                                <a class="dropdown-item pl-5{% if request.path == '/height/add/' %} active{% endif %}"
-                                   href="{% url 'core:height-add' %}"><i class="icon-add" aria-hidden="true"></i>
-                                    {% trans "Height entry" %}
-                                </a>
-                            {% endif %}
-
-                            {% if perms.core.view_head_circumference %}
-                                <a class="dropdown-item{% if request.path == '/head-circumference/' %} active{% endif %}"
-                                   href="{% url 'core:head-circumference-list' %}">
-                                    <i class="icon-head-circumference aria-hidden="true"></i>
-                                    {% trans "Head Circumference" %}
-                                </a>
-                            {% endif %}
-                            {% if perms.core.add_head_circumference %}
-                                <a class="dropdown-item pl-5{% if request.path == '/head-circumference/add/' %} active{% endif %}"
-                                   href="{% url 'core:head-circumference-add' %}"><i class="icon-add" aria-hidden="true"></i>
-                                    {% trans "Head Circumference entry" %}
-                                </a>
-                            {% endif %}
-
-                            {% if perms.core.view_bmi %}
-                                <a class="dropdown-item{% if request.path == '/bmi/' %} active{% endif %}"
-                                   href="{% url 'core:bmi-list' %}">
-                                    <i class="icon-bmi" aria-hidden="true"></i>
-                                    {% trans "BMI" %}
-                                </a>
-                            {% endif %}
-                            {% if perms.core.add_bmi %}
-                                <a class="dropdown-item pl-5{% if request.path == '/bmi/add/' %} active{% endif %}"
-                                   href="{% url 'core:bmi-add' %}"><i class="icon-add" aria-hidden="true"></i>
-                                    {% trans "BMI entry" %}
-                                </a>
-                            {% endif %}
-
                         </div>
                     </li>
 
@@ -275,13 +256,27 @@
                                     {% trans "Feedings" %}
                                 </a>
                             {% endif %}
-                            {% if perms.core.add_diaperchange %}
+                            {% if perms.core.add_feeding %}
                                 <a class="dropdown-item pl-5{% if request.path == '/feedings/add/' %} active{% endif %}"
                                    href="{% url 'core:feeding-add' %}"><i class="icon-add" aria-hidden="true"></i>
                                     {% trans "Feeding" %}
                                 </a>
                             {% endif %}
 
+                            {% if perms.core.view_pumping %}
+                                <a class="dropdown-item{% if request.path == '/pumping/' %} active{% endif %}"
+                                   href="{% url 'core:pumping-list' %}">
+                                    <i class="icon-pumping" aria-hidden="true"></i>
+                                    {% trans "Pumping" %}
+                                </a>
+                            {% endif %}
+                            {% if perms.core.add_pumping %}
+                                <a class="dropdown-item pl-5{% if request.path == '/pumping/add/' %} active{% endif %}"
+                                   href="{% url 'core:pumping-add' %}"><i class="icon-add" aria-hidden="true"></i>
+                                    {% trans "Pumping entry" %}
+                                </a>
+                            {% endif %}
+
                             {% if perms.core.view_sleep %}
                                 <a class="dropdown-item{% if request.path == '/sleep/' %} active{% endif %}"
                                    href="{% url 'core:sleep-list' %}"><i class="icon-sleep" aria-hidden="true"></i>
@@ -307,21 +302,6 @@
                                     {% trans "Tummy Time entry" %}
                                 </a>
                             {% endif %}
-
-
-                            {% if perms.core.view_pumping %}
-                                <a class="dropdown-item{% if request.path == '/pumping/' %} active{% endif %}"
-                                   href="{% url 'core:pumping-list' %}">
-                                    <i class="icon-pumping" aria-hidden="true"></i>
-                                    {% trans "Pumping" %}
-                                </a>
-                            {% endif %}
-                            {% if perms.core.add_pumping %}
-                                <a class="dropdown-item pl-5{% if request.path == '/pumping/add/' %} active{% endif %}"
-                                   href="{% url 'core:pumping-add' %}"><i class="icon-add" aria-hidden="true"></i>
-                                    {% trans "Pumping entry" %}
-                                </a>
-                            {% endif %}
                         </div>
                     </li>
 
diff --git a/core/templates/core/bmi_list.html b/core/templates/core/bmi_list.html
index 78be8494..abbc24f2 100644
--- a/core/templates/core/bmi_list.html
+++ b/core/templates/core/bmi_list.html
@@ -18,7 +18,7 @@
     </h1>
     {% include 'babybuddy/filter.html' %}
     <div class="table-responsive">
-        <table class="table table-instances">
+        <table class="table table-instances table-striped table-hover">
             <thead class="thead-inverse">
                 <tr>
                     <th>{% trans "Actions" %}</th>
@@ -67,7 +67,7 @@
                     {% endif %}
                 {% empty %}
                     <tr>
-                        <th colspan="5">{% trans "No bmi entries found." %}</th>
+                        <th colspan="5">{% trans "No BMI entries found." %}</th>
                     </tr>
                 {% endfor %}
             </tbody>
diff --git a/core/templates/core/child_list.html b/core/templates/core/child_list.html
index 9d55f3d0..589c5b6a 100644
--- a/core/templates/core/child_list.html
+++ b/core/templates/core/child_list.html
@@ -64,7 +64,7 @@
                     </tr>
                 {% empty %}
                     <tr>
-                        <th colspan="4">{% trans "No children found." %}</th>
+                        <th colspan="5">{% trans "No children found." %}</th>
                     </tr>
                 {% endfor %}
             </tbody>
diff --git a/core/templates/core/diaperchange_list.html b/core/templates/core/diaperchange_list.html
index 28455049..09e6cf87 100644
--- a/core/templates/core/diaperchange_list.html
+++ b/core/templates/core/diaperchange_list.html
@@ -18,7 +18,7 @@
     </h1>
     {% include 'babybuddy/filter.html' %}
     <div class="table-responsive">
-        <table class="table table-instances">
+        <table class="table table-instances table-striped table-hover">
             <thead class="thead-inverse">
                 <tr>
                     <th>{% trans "Actions" %}</th>
diff --git a/core/templates/core/feeding_list.html b/core/templates/core/feeding_list.html
index e21336e4..4dc9e9ec 100644
--- a/core/templates/core/feeding_list.html
+++ b/core/templates/core/feeding_list.html
@@ -18,7 +18,7 @@
     </h1>
     {% include 'babybuddy/filter.html' %}
     <div class="table-responsive">
-        <table class="table table-instances">
+        <table class="table table-instances table-striped table-hover">
             <thead class="thead-inverse">
                 <tr>
                     <th>{% trans "Actions" %}</th>
diff --git a/core/templates/core/head_circumference_list.html b/core/templates/core/head_circumference_list.html
index 0b1208c4..88772556 100644
--- a/core/templates/core/head_circumference_list.html
+++ b/core/templates/core/head_circumference_list.html
@@ -18,7 +18,7 @@
     </h1>
     {% include 'babybuddy/filter.html' %}
     <div class="table-responsive">
-        <table class="table table-instances">
+        <table class="table table-instances table-striped table-hover">
             <thead class="thead-inverse">
                 <tr>
                     <th>{% trans "Actions" %}</th>
diff --git a/core/templates/core/height_list.html b/core/templates/core/height_list.html
index 660b1d3d..2abb39f9 100644
--- a/core/templates/core/height_list.html
+++ b/core/templates/core/height_list.html
@@ -18,7 +18,7 @@
     </h1>
     {% include 'babybuddy/filter.html' %}
     <div class="table-responsive">
-        <table class="table table-instances">
+        <table class="table table-instances table-striped table-hover">
             <thead class="thead-inverse">
                 <tr>
                     <th>{% trans "Actions" %}</th>
diff --git a/core/templates/core/note_list.html b/core/templates/core/note_list.html
index c24eb9f9..571e3d23 100644
--- a/core/templates/core/note_list.html
+++ b/core/templates/core/note_list.html
@@ -18,7 +18,7 @@
     </h1>
     {% include 'babybuddy/filter.html' %}
     <div class="table-responsive">
-        <table class="table table-striped table-hover">
+        <table class="table table-instances table-striped table-hover">
             <thead class="thead-inverse">
                 <tr>
                     <th>{% trans "Actions" %}</th>
@@ -61,7 +61,7 @@
                     </tr>
                 {% empty %}
                     <tr>
-                        <th colspan="4">{% trans "No notes found." %}</th>
+                        <th colspan="5">{% trans "No notes found." %}</th>
                     </tr>
                 {% endfor %}
             </tbody>
diff --git a/core/templates/core/pumping_list.html b/core/templates/core/pumping_list.html
index 4f6a9c3c..47ea15e4 100644
--- a/core/templates/core/pumping_list.html
+++ b/core/templates/core/pumping_list.html
@@ -18,7 +18,7 @@
     </h1>
     {% include 'babybuddy/filter.html' %}
     <div class="table-responsive">
-        <table class="table table-instances">
+        <table class="table table-instances table-striped table-hover">
             <thead class="thead-inverse">
                 <tr>
                     <th>{% trans "Actions" %}</th>
diff --git a/core/templates/core/sleep_list.html b/core/templates/core/sleep_list.html
index a1210cbd..23a2bc3d 100644
--- a/core/templates/core/sleep_list.html
+++ b/core/templates/core/sleep_list.html
@@ -18,7 +18,7 @@
     </h1>
     {% include 'babybuddy/filter.html' %}
     <div class="table-responsive">
-        <table class="table table-instances">
+        <table class="table table-instances table-striped table-hover">
             <thead class="thead-inverse">
                 <tr>
                     <th>{% trans "Actions" %}</th>
diff --git a/core/templates/core/temperature_list.html b/core/templates/core/temperature_list.html
index 2493e150..93100178 100644
--- a/core/templates/core/temperature_list.html
+++ b/core/templates/core/temperature_list.html
@@ -18,7 +18,7 @@
     </h1>
     {% include 'babybuddy/filter.html' %}
     <div class="table-responsive">
-        <table class="table table-instances">
+        <table class="table table-instances table-striped table-hover">
             <thead class="thead-inverse">
                 <tr>
                     <th>{% trans "Actions" %}</th>
diff --git a/core/templates/core/timer_list.html b/core/templates/core/timer_list.html
index b6b7d42d..8043d38e 100644
--- a/core/templates/core/timer_list.html
+++ b/core/templates/core/timer_list.html
@@ -18,7 +18,7 @@
     </h1>
     {% include 'babybuddy/filter.html' %}
     <div class="table-responsive">
-        <table class="table table-striped table-hover">
+        <table class="table table-instances table-striped table-hover">
             <thead class="thead-inverse">
             <tr>
                 <th>{% trans "Start" %}</th>
diff --git a/core/templates/core/tummytime_list.html b/core/templates/core/tummytime_list.html
index 5377f89e..e0cd5fe6 100644
--- a/core/templates/core/tummytime_list.html
+++ b/core/templates/core/tummytime_list.html
@@ -17,7 +17,7 @@
     </h1>
     {% include 'babybuddy/filter.html' %}
     <div class="table-responsive">
-        <table class="table table-striped table-hover">
+        <table class="table table-instances table-striped table-hover">
             <thead class="thead-inverse">
                 <tr>
                     <th>{% trans "Actions" %}</th>
diff --git a/core/templates/core/weight_list.html b/core/templates/core/weight_list.html
index c2b0fd55..c9bda834 100644
--- a/core/templates/core/weight_list.html
+++ b/core/templates/core/weight_list.html
@@ -18,7 +18,7 @@
     </h1>
     {% include 'babybuddy/filter.html' %}
     <div class="table-responsive">
-        <table class="table table-instances">
+        <table class="table table-instances table-striped table-hover">
             <thead class="thead-inverse">
                 <tr>
                     <th>{% trans "Actions" %}</th>