diff --git a/langs/english.json b/langs/english.json
index c03586bb..1f310c3a 100644
--- a/langs/english.json
+++ b/langs/english.json
@@ -1098,6 +1098,9 @@
 		"panel_debug_memory_stats_mspaninuse":"MSpanInuse",
 		"panel_debug_memory_stats_mcacheinuse":"MCacheInuse",
 		"panel_debug_memory_stats_mspansys":"MSpanSys",
+		"panel_debug_memory_stats_mcachesys":"MCacheSys",
+		"panel_debug_memory_stats_gcsys":"GCSys",
+		"panel_debug_memory_stats_othersys":"OtherSys",
 
 		"panel_debug_caches":"Caches",
 		"panel_debug_caches_topic":"Topic Cache",
@@ -1124,6 +1127,8 @@
 		"panel_debug_database_views_langs":"Views Langs",
 		"panel_debug_database_views_referrers":"Views Referrers",
 		"panel_debug_database_views_systems":"Views Systems",
+		"panel_debug_database_post_analytics":"Post Analytics",
+		"panel_debug_database_topic_analytics":"Topic Analytics",
 
 		"panel_debug_disk":"Disk",
 		"panel_debug_disk_static_files":"Static Files",
diff --git a/templates/panel_debug.html b/templates/panel_debug.html
index a493203c..4f45c22d 100644
--- a/templates/panel_debug.html
+++ b/templates/panel_debug.html
@@ -24,10 +24,7 @@
 	{{template "panel_debug_stat.html" .CPUs}}
 	{{template "panel_debug_stat_q.html"}}
 </div>
-
-<div class="colstack_item colstack_head colstack_sub_head">
-	<div class="rowitem"><h2>{{lang "panel_debug_memory_stats"}}</h2></div>
-</div>{{flush}}
+{{template "panel_debug_subhead.html" "panel_debug_memory_stats"}}
 <div id="panel_debug" class="colstack_grid">
 	{{template "panel_debug_stat_head.html" "panel_debug_memory_stats_sys"}}
 	{{template "panel_debug_stat_head.html" "panel_debug_memory_stats_heapsys"}}
@@ -50,18 +47,14 @@
 	<div class="grid_item grid_stat"><span>{{.MemStats.MCacheInuse}} ({{bunit .MemStats.MCacheInuse}})</span></div>
 	<div class="grid_item grid_stat"><span>{{.MemStats.MSpanSys}} ({{bunit .MemStats.MSpanSys}})</span></div>
 
-	
-	<div class="grid_item grid_stat grid_stat_head"><span>MCacheSys</span></div>
-	<div class="grid_item grid_stat grid_stat_head"><span>GCSys</span></div>
-	<div class="grid_item grid_stat grid_stat_head"><span>OtherSys</span></div>
-
+	{{template "panel_debug_stat_head.html" "panel_debug_memory_stats_mcachesys"}}
+	{{template "panel_debug_stat_head.html" "panel_debug_memory_stats_gcsys"}}
+	{{template "panel_debug_stat_head.html" "panel_debug_memory_stats_othersys"}}
 	<div class="grid_item grid_stat"><span>{{.MemStats.MCacheSys}} ({{bunit .MemStats.MCacheSys}})</span></div>
 	<div class="grid_item grid_stat"><span>{{.MemStats.GCSys}} ({{bunit .MemStats.GCSys}})</span></div>
 	<div class="grid_item grid_stat"><span>{{.MemStats.OtherSys}} ({{bunit .MemStats.OtherSys}})</span></div>
 </div>
-<div class="colstack_item colstack_head colstack_sub_head">
-	<div class="rowitem"><h2>{{lang "panel_debug_caches"}}</h2></div>
-</div>
+{{template "panel_debug_subhead.html" "panel_debug_caches"}}
 <div id="panel_debug" class="colstack_grid">
 	{{template "panel_debug_stat_head.html" "panel_debug_caches_topic"}}
 	{{template "panel_debug_stat_head.html" "panel_debug_caches_user"}}
@@ -77,9 +70,7 @@
 	{{template "panel_debug_stat_q.html"}}
 	{{template "panel_debug_stat_q.html"}}
 </div>
-<div class="colstack_item colstack_head colstack_sub_head">
-	<div class="rowitem"><h2>{{lang "panel_debug_database"}}</h2></div>
-</div>{{flush}}
+{{template "panel_debug_subhead.html" "panel_debug_database"}}
 <div id="panel_debug" class="colstack_grid">
 	{{template "panel_debug_stat_head.html" "panel_debug_database_topics"}}
 	{{template "panel_debug_stat_head.html" "panel_debug_database_users"}}
@@ -130,16 +121,14 @@
 	{{template "panel_debug_stat.html" .Database.ViewsReferrers}}
 	{{template "panel_debug_stat.html" .Database.ViewsSystems}}
 
-	<div class="grid_item grid_stat grid_stat_head"><span>Post Analytics</span></div>
-	<div class="grid_item grid_stat grid_stat_head"><span>Topic Analytics</span></div>
+	{{template "panel_debug_stat_head.html" "panel_debug_database_post_analytics"}}
+	{{template "panel_debug_stat_head.html" "panel_debug_database_topic_analytics"}}
 	{{template "panel_debug_stat_head_q.html"}}
 	{{template "panel_debug_stat.html" .Database.PostChunks}}
 	{{template "panel_debug_stat.html" .Database.TopicChunks}}
 	{{template "panel_debug_stat_q.html"}}
 </div>
-<div class="colstack_item colstack_head colstack_sub_head">
-	<div class="rowitem"><h2>{{lang "panel_debug_disk"}}</h2></div>
-</div>{{flush}}
+{{template "panel_debug_subhead.html" "panel_debug_disk"}}
 <div id="panel_debug" class="colstack_grid">
 	{{template "panel_debug_stat_head.html" "panel_debug_disk_static_files"}}
 	{{template "panel_debug_stat_head.html" "panel_debug_disk_attachments"}}
diff --git a/templates/panel_debug_subhead.html b/templates/panel_debug_subhead.html
new file mode 100644
index 00000000..f450b5b4
--- /dev/null
+++ b/templates/panel_debug_subhead.html
@@ -0,0 +1,3 @@
+<div class="colstack_item colstack_head colstack_sub_head">
+	<div class="rowitem"><h2>{{lang .}}</h2></div>
+</div>{{flush}}
\ No newline at end of file
diff --git a/templates/panel_plugins.html b/templates/panel_plugins.html
index c361161b..252cd791 100644
--- a/templates/panel_plugins.html
+++ b/templates/panel_plugins.html
@@ -1,21 +1,21 @@
-	<div class="colstack_item colstack_head">
-		<div class="rowitem"><h1>{{lang "panel_plugins_head"}}</h1></div>
+<div class="colstack_item colstack_head">
+	<div class="rowitem"><h1>{{lang "panel_plugins_head"}}</h1></div>
+</div>
+<div id="panel_plugins" class="colstack_item complex_rowlist">
+	{{range .ItemList}}
+	<div class="rowitem editable_parent">
+		<span class="panel_plugin_meta">
+			<a{{if .URL}} href="{{.URL}}" {{end}}class="editable_block" class="panel_upshift">{{.Name}}</a><br />
+			<small style="margin-left:2px;">{{lang "panel_plugins_author_prefix"}}{{.Author}}</small>
+		</span>
+		<span class="to_right">
+			{{if .Settings}}<a href="/panel/settings/" class="panel_tag panel_plugin_settings panel_right_button">{{lang "panel_plugins_settings"}}</a>{{end}}
+			{{if .Active}}<a href="/panel/plugins/deactivate/{{.UName}}?s={{$.CurrentUser.Session}}" class="panel_tag panel_plugin_deactivate panel_right_button">{{lang "panel_plugins_deactivate"}}</a>
+			{{else if .Installable}}
+				{{/** TODO: Write a custom template interpreter to fix this nonsense **/}}
+				{{if .Installed}}<a href="/panel/plugins/activate/{{.UName}}?s={{$.CurrentUser.Session}}" class="panel_tag panel_plugin_activate panel_right_button">{{lang "panel_plugins_activate"}}</a>{{else}}<a href="/panel/plugins/install/{{.UName}}?s={{$.CurrentUser.Session}}" class="panel_tag panel_plugin_install panel_right_button">{{lang "panel_plugins_install"}}</a>{{end}}
+			{{else}}<a href="/panel/plugins/activate/{{.UName}}?s={{$.CurrentUser.Session}}" class="panel_tag panel_plugin_activate panel_right_button">{{lang "panel_plugins_activate"}}</a>{{end}}
+		</span>
 	</div>
-	<div id="panel_plugins" class="colstack_item complex_rowlist">
-		{{range .ItemList}}
-		<div class="rowitem editable_parent">
-			<span class="panel_plugin_meta">
-				<a{{if .URL}} href="{{.URL}}" {{end}}class="editable_block" class="panel_upshift">{{.Name}}</a><br />
-				<small style="margin-left:2px;">{{lang "panel_plugins_author_prefix"}}{{.Author}}</small>
-			</span>
-			<span class="to_right">
-				{{if .Settings}}<a href="/panel/settings/" class="panel_tag panel_plugin_settings panel_right_button">{{lang "panel_plugins_settings"}}</a>{{end}}
-				{{if .Active}}<a href="/panel/plugins/deactivate/{{.UName}}?s={{$.CurrentUser.Session}}" class="panel_tag panel_plugin_deactivate panel_right_button">{{lang "panel_plugins_deactivate"}}</a>
-				{{else if .Installable}}
-					{{/** TODO: Write a custom template interpreter to fix this nonsense **/}}
-					{{if .Installed}}<a href="/panel/plugins/activate/{{.UName}}?s={{$.CurrentUser.Session}}" class="panel_tag panel_plugin_activate panel_right_button">{{lang "panel_plugins_activate"}}</a>{{else}}<a href="/panel/plugins/install/{{.UName}}?s={{$.CurrentUser.Session}}" class="panel_tag panel_plugin_install panel_right_button">{{lang "panel_plugins_install"}}</a>{{end}}
-				{{else}}<a href="/panel/plugins/activate/{{.UName}}?s={{$.CurrentUser.Session}}" class="panel_tag panel_plugin_activate panel_right_button">{{lang "panel_plugins_activate"}}</a>{{end}}
-			</span>
-		</div>
-		{{end}}
-	</div>
\ No newline at end of file
+	{{end}}
+</div>
\ No newline at end of file