2 files changed, 5 insertions, 4 deletions
diff --git a/debug_toolbar/templates/debug_toolbar/panels/cache.html b/debug_toolbar/templates/debug_toolbar/panels/cache.html
index 21ea173..0dad9b1 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/cache.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/cache.html
@@ -31,6 +31,7 @@
 		<td>{{ cache.get_many }}</td>
 	</tr>
 </table>
+{% if cache.calls %}
 <h3>Breakdown</h3>
 <table>
 	<thead>
@@ -51,4 +52,4 @@
 			</tr>
 		{% endfor %}
 	</tbody>
-</table>
-\ No newline at end of file
+</table>{% endif %}
diff --git a/debug_toolbar/templates/debug_toolbar/panels/templates.html b/debug_toolbar/templates/debug_toolbar/panels/templates.html
index 575d507..a0e1c1c 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/templates.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/templates.html
@@ -1,4 +1,4 @@
-<h3>Template path(s):</h3>
+<h3>Template path{{ template_dirs|length|pluralize }}:</h3>
 {% if template_dirs %}
 	<ol>
 	{% for template in template_dirs %}
@@ -6,7 +6,7 @@
 	{% endfor %}
 	</ol>
 {% else %}
-	None
+    <p>None</p>
 {% endif %}
 <h3>Templates Used</h3>
 {% if templates %}
@@ -21,5 +21,5 @@
 {% endfor %}
 </dl>
 {% else %}
-	None
+    <p>None</p>
 {% endif %}