diff --git a/dashboard/templates/cards/diaperchange.html b/dashboard/templates/cards/diaperchange.html
index d63c4a31..cbba866f 100644
--- a/dashboard/templates/cards/diaperchange.html
+++ b/dashboard/templates/cards/diaperchange.html
@@ -5,9 +5,6 @@
{% block title %}{% endblock %}
-
{% block content %}{% endblock %}
-
-
\ No newline at end of file
diff --git a/dashboard/templates/cards/diaperchange_last.html b/dashboard/templates/cards/diaperchange_last.html
index c7f33c16..ae47eab7 100644
--- a/dashboard/templates/cards/diaperchange_last.html
+++ b/dashboard/templates/cards/diaperchange_last.html
@@ -6,10 +6,4 @@
{{ change.time|timesince }} ago
{% endblock %}
-{% block content %}
-
- {{ change.attributes|join:', ' }}
-
-{% endblock %}
-
-{% block footer %}{{ change.time }}{% endblock %}
\ No newline at end of file
+{% block content %}{{ change.attributes|join:', ' }}{% endblock %}
\ No newline at end of file
diff --git a/dashboard/templates/cards/diaperchange_types.html b/dashboard/templates/cards/diaperchange_types.html
index f46ad541..e1c808a3 100644
--- a/dashboard/templates/cards/diaperchange_types.html
+++ b/dashboard/templates/cards/diaperchange_types.html
@@ -33,6 +33,4 @@
{% endif %}
{% endfor %}
-{% endblock %}
-
-{% block footer %}Last change: {{ last_change.time }}{% endblock %}
\ No newline at end of file
+{% endblock %}
\ No newline at end of file
diff --git a/dashboard/templates/cards/feeding.html b/dashboard/templates/cards/feeding.html
index 0023f1d1..19bb505d 100644
--- a/dashboard/templates/cards/feeding.html
+++ b/dashboard/templates/cards/feeding.html
@@ -5,9 +5,6 @@
{% block title %}{% endblock %}
-
{% block content %}{% endblock %}
-
-
\ No newline at end of file
diff --git a/dashboard/templates/cards/feeding_last.html b/dashboard/templates/cards/feeding_last.html
index 82673c8a..cf8cd63f 100644
--- a/dashboard/templates/cards/feeding_last.html
+++ b/dashboard/templates/cards/feeding_last.html
@@ -7,12 +7,8 @@
{% endblock %}
{% block content %}
-
- {{ feeding.type }}, {{ feeding.method }}
- {% if feeding.amount %}
- , {{ feeding.amount }}oz.
- {% endif %}
-
-{% endblock %}
-
-{% block footer %}{{ feeding.end }}{% endblock %}
\ No newline at end of file
+ {{ feeding.type }}, {{ feeding.method }}
+ {% if feeding.amount %}
+ , {{ feeding.amount }}oz.
+ {% endif %}
+{% endblock %}
\ No newline at end of file
diff --git a/dashboard/templates/cards/feeding_last_method.html b/dashboard/templates/cards/feeding_last_method.html
index ab96b245..2bfbdf28 100644
--- a/dashboard/templates/cards/feeding_last_method.html
+++ b/dashboard/templates/cards/feeding_last_method.html
@@ -3,13 +3,5 @@
{% block header %}Last Feeding Method{% endblock %}
{% block title %}
- {{ feeding.method }}
-{% endblock %}
-
-{% block content %}
- {% if feeding.amount %}
- Amount: {{ feeding.amount }}oz.
- {% endif %}
-{% endblock %}
-
-{% block footer %}{{ feeding.end }}{% endblock %}
\ No newline at end of file
+ {{ feeding.method }}
+{% endblock %}
\ No newline at end of file
diff --git a/dashboard/templates/cards/sleep.html b/dashboard/templates/cards/sleep.html
index 21c340a0..91e335ba 100644
--- a/dashboard/templates/cards/sleep.html
+++ b/dashboard/templates/cards/sleep.html
@@ -5,9 +5,6 @@
{% block title %}{% endblock %}
-
{% block content %}{% endblock %}
-
-
\ No newline at end of file
diff --git a/dashboard/templates/cards/sleep_day.html b/dashboard/templates/cards/sleep_day.html
index c5982991..1cc48987 100644
--- a/dashboard/templates/cards/sleep_day.html
+++ b/dashboard/templates/cards/sleep_day.html
@@ -13,12 +13,4 @@
{% endif %}
{% endblock %}
-{% block content %}
- {% if total %}
-
- Average sleep duration: {{ average|duration_string }}.
-
- {% endif %}
-{% endblock %}
-
-{% block footer %}{{ count }} sleep entries{% endblock %}
\ No newline at end of file
+{% block content %}{{ count }} sleep entries{% endblock %}
\ No newline at end of file
diff --git a/dashboard/templates/cards/sleep_last.html b/dashboard/templates/cards/sleep_last.html
index 51b3315e..06f845cb 100644
--- a/dashboard/templates/cards/sleep_last.html
+++ b/dashboard/templates/cards/sleep_last.html
@@ -7,10 +7,4 @@
{{ sleep.end|timesince }} ago
{% endblock %}
-{% block content %}
-
- {{ sleep.duration|duration_string }}
-
-{% endblock %}
-
-{% block footer %}{{ sleep.end }}{% endblock %}
\ No newline at end of file
+{% block content %}{{ sleep.duration|duration_string }}{% endblock %}
\ No newline at end of file
diff --git a/dashboard/templates/cards/sleep_naps_day.html b/dashboard/templates/cards/sleep_naps_day.html
index 887e043c..78482895 100644
--- a/dashboard/templates/cards/sleep_naps_day.html
+++ b/dashboard/templates/cards/sleep_naps_day.html
@@ -1,7 +1,7 @@
{% extends 'cards/sleep.html' %}
{% load duration %}
-{% block header %}Today's Naps{% endblock %}
+{% block header %}Today's Naps (7AM - 7PM){% endblock %}
{% block title %}
{% if count %}
@@ -14,9 +14,5 @@
{% endblock %}
{% block content %}
-
- {{ total.duration__sum|duration_string }}
-
-{% endblock %}
-
-{% block footer %}Naps are sleep entries starting 7AM - 7PM.{% endblock %}
\ No newline at end of file
+ {{ total.duration__sum|duration_string }}
+{% endblock %}
\ No newline at end of file
diff --git a/dashboard/templates/cards/timer.html b/dashboard/templates/cards/timer.html
index 47362957..6448adc9 100644
--- a/dashboard/templates/cards/timer.html
+++ b/dashboard/templates/cards/timer.html
@@ -8,7 +8,4 @@
{% block content %}{% endblock %}
{% block listgroup %}{% endblock %}
-
\ No newline at end of file
diff --git a/dashboard/templates/cards/timer_list.html b/dashboard/templates/cards/timer_list.html
index 2910d7b1..39015d18 100644
--- a/dashboard/templates/cards/timer_list.html
+++ b/dashboard/templates/cards/timer_list.html
@@ -16,8 +16,4 @@
{% endfor %}
-{% endblock %}
-
-{% block footer %}
- Timers help us time things...
{% endblock %}
\ No newline at end of file
diff --git a/dashboard/templates/cards/tummytime.html b/dashboard/templates/cards/tummytime.html
index df58765a..583f9ca7 100644
--- a/dashboard/templates/cards/tummytime.html
+++ b/dashboard/templates/cards/tummytime.html
@@ -5,10 +5,7 @@
{% block title %}{% endblock %}
-
{% block content %}{% endblock %}
+
{% block content %}{% endblock %}
{% block listgroup %}{% endblock %}
-
\ No newline at end of file
diff --git a/dashboard/templates/cards/tummytime_day.html b/dashboard/templates/cards/tummytime_day.html
index cbdcce55..3f4192eb 100644
--- a/dashboard/templates/cards/tummytime_day.html
+++ b/dashboard/templates/cards/tummytime_day.html
@@ -17,6 +17,4 @@
{{ instance.duration|duration_string }} at {{ instance.end|time }}
{% endfor %}
-{% endblock %}
-
-{% block footer %}Last tummy time: {{ last.end|timesince }} ago{% endblock %}
\ No newline at end of file
+{% endblock %}
\ No newline at end of file
diff --git a/dashboard/templates/cards/tummytime_last.html b/dashboard/templates/cards/tummytime_last.html
index ba3d10e8..814bfe20 100644
--- a/dashboard/templates/cards/tummytime_last.html
+++ b/dashboard/templates/cards/tummytime_last.html
@@ -8,12 +8,8 @@
{% endblock %}
{% block content %}
-
- {{ tummytime.duration|duration_string }}
- {% if tummytime.milestone %}
-
{{ tummytime.milestone }}
- {% endif %}
-
-{% endblock %}
-
-{% block footer %}{{ tummytime.end }}{% endblock %}
\ No newline at end of file
+ {{ tummytime.duration|duration_string }}
+ {% if tummytime.milestone %}
+
{{ tummytime.milestone }}
+ {% endif %}
+{% endblock %}
\ No newline at end of file