diff --git a/langs/english.json b/langs/english.json
index 385e7d86..c03586bb 100644
--- a/langs/english.json
+++ b/langs/english.json
@@ -1095,6 +1095,9 @@
 		"panel_debug_memory_stats_heapidle":"HeapIdle",
 		"panel_debug_memory_stats_heapobjects":"HeapObjects",
 		"panel_debug_memory_stats_stackinuse":"StackInuse",
+		"panel_debug_memory_stats_mspaninuse":"MSpanInuse",
+		"panel_debug_memory_stats_mcacheinuse":"MCacheInuse",
+		"panel_debug_memory_stats_mspansys":"MSpanSys",
 
 		"panel_debug_caches":"Caches",
 		"panel_debug_caches_topic":"Topic Cache",
@@ -1106,6 +1109,28 @@
 		"panel_debug_database_topics":"Topics",
 		"panel_debug_database_users":"Users",
 		"panel_debug_database_replies":"Replies",
-		"panel_debug_disk":"Disk"
+		"panel_debug_database_profile_replies":"Profile Replies",
+		"panel_debug_database_activity_stream":"Activity Stream",
+		"panel_debug_database_likes":"Likes",
+		"panel_debug_database_attachments":"Attachments",
+		"panel_debug_database_polls":"Polls",
+		"panel_debug_database_login_logs":"Login Logs",
+		"panel_debug_database_reg_logs":"Reg Logs",
+		"panel_debug_database_mod_logs":"Mod Logs",
+		"panel_debug_database_admin_logs":"Admin Logs",
+		"panel_debug_database_views":"Views",
+		"panel_debug_database_views_agents":"Views Agents",
+		"panel_debug_database_views_forums":"Views Forums",
+		"panel_debug_database_views_langs":"Views Langs",
+		"panel_debug_database_views_referrers":"Views Referrers",
+		"panel_debug_database_views_systems":"Views Systems",
+
+		"panel_debug_disk":"Disk",
+		"panel_debug_disk_static_files":"Static Files",
+		"panel_debug_disk_attachments":"Attachments",
+		"panel_debug_disk_avatars":"Avatars",
+		"panel_debug_disk_log_files":"Log Files",
+		"panel_debug_disk_backups":"Backups",
+		"panel_debug_disk_git":"Git"
 	}
 }
\ No newline at end of file
diff --git a/templates/account_own_edit_password.html b/templates/account_own_edit_password.html
index 3d52e607..21f2bd27 100644
--- a/templates/account_own_edit_password.html
+++ b/templates/account_own_edit_password.html
@@ -26,4 +26,4 @@
 		</div>
 	</main>
 </div>
-{{template "footer.html" . }}
+{{template "footer.html" . }}
\ No newline at end of file
diff --git a/templates/panel_debug.html b/templates/panel_debug.html
index 4beb2fb8..a493203c 100644
--- a/templates/panel_debug.html
+++ b/templates/panel_debug.html
@@ -32,25 +32,20 @@
 	{{template "panel_debug_stat_head.html" "panel_debug_memory_stats_sys"}}
 	{{template "panel_debug_stat_head.html" "panel_debug_memory_stats_heapsys"}}
 	{{template "panel_debug_stat_head.html" "panel_debug_memory_stats_heapalloc"}}
-	
 	<div class="grid_item grid_stat"><span>{{.MemStats.Sys}} ({{bunit .MemStats.Sys}})</span></div>
 	<div class="grid_item grid_stat"><span>{{.MemStats.HeapSys}} ({{bunit .MemStats.HeapSys}})</span></div>
 	<div class="grid_item grid_stat"><span>{{.MemStats.HeapAlloc}} ({{bunit .MemStats.HeapAlloc}})</span></div>
-	
 
 	{{template "panel_debug_stat_head.html" "panel_debug_memory_stats_heapidle"}}
 	{{template "panel_debug_stat_head.html" "panel_debug_memory_stats_heapobjects"}}
 	{{template "panel_debug_stat_head.html" "panel_debug_memory_stats_stackinuse"}}
-	
 	<div class="grid_item grid_stat"><span>{{.MemStats.HeapIdle}} ({{bunit .MemStats.HeapIdle}})</span></div>
 	<div class="grid_item grid_stat"><span>{{.MemStats.HeapObjects}}</span></div>
 	<div class="grid_item grid_stat"><span>{{.MemStats.StackInuse}} ({{bunit .MemStats.StackInuse}})</span></div>
 
-
-	<div class="grid_item grid_stat grid_stat_head"><span>MSpanInuse</span></div>	
-	<div class="grid_item grid_stat grid_stat_head"><span>MCacheInuse</span></div>
-	<div class="grid_item grid_stat grid_stat_head"><span>MSpanSys</span></div>
-	
+	{{template "panel_debug_stat_head.html" "panel_debug_memory_stats_mspaninuse"}}
+	{{template "panel_debug_stat_head.html" "panel_debug_memory_stats_mcacheinuse"}}
+	{{template "panel_debug_stat_head.html" "panel_debug_memory_stats_mspansys"}}
 	<div class="grid_item grid_stat"><span>{{.MemStats.MSpanInuse}} ({{bunit .MemStats.MSpanInuse}})</span></div>
 	<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>
@@ -71,16 +66,13 @@
 	{{template "panel_debug_stat_head.html" "panel_debug_caches_topic"}}
 	{{template "panel_debug_stat_head.html" "panel_debug_caches_user"}}
 	{{template "panel_debug_stat_head.html" "panel_debug_caches_reply"}}
-
 	<div class="grid_item grid_stat"><span>{{.Cache.Topics}} / {{.Cache.TCap}}</span></div>
 	<div class="grid_item grid_stat"><span>{{.Cache.Users}} / {{.Cache.UCap}}</span></div>
 	<div class="grid_item grid_stat"><span>{{.Cache.Replies}} / {{.Cache.RCap}}</span></div>
 
-
 	{{template "panel_debug_stat_head.html" "panel_debug_caches_topic_list"}}
 	{{template "panel_debug_stat_head_q.html"}}
 	{{template "panel_debug_stat_head_q.html"}}
-
 	<div class="grid_item grid_stat"><span>{{if .Cache.TopicListThaw}}Thawed{{else}}Sleeping{{end}}</span></div>
 	{{template "panel_debug_stat_q.html"}}
 	{{template "panel_debug_stat_q.html"}}
@@ -92,92 +84,74 @@
 	{{template "panel_debug_stat_head.html" "panel_debug_database_topics"}}
 	{{template "panel_debug_stat_head.html" "panel_debug_database_users"}}
 	{{template "panel_debug_stat_head.html" "panel_debug_database_replies"}}
+	{{template "panel_debug_stat.html" .Database.Topics}}
+	{{template "panel_debug_stat.html" .Database.Users}}
+	{{template "panel_debug_stat.html" .Database.Replies}}
 
-	<div class="grid_item grid_stat"><span>{{.Database.Topics}}</span></div>
-	<div class="grid_item grid_stat"><span>{{.Database.Users}}</span></div>
-	<div class="grid_item grid_stat"><span>{{.Database.Replies}}</span></div>
+	{{template "panel_debug_stat_head.html" "panel_debug_database_profile_replies"}}
+	{{template "panel_debug_stat_head.html" "panel_debug_database_activity_stream"}}
+	{{template "panel_debug_stat_head.html" "panel_debug_database_likes"}}
+	{{template "panel_debug_stat.html" .Database.ProfileReplies}}
+	{{template "panel_debug_stat.html" .Database.ActivityStream}}
+	{{template "panel_debug_stat.html" .Database.Likes}}
 
-
-	<div class="grid_item grid_stat grid_stat_head"><span>Profile Replies</span></div>
-	<div class="grid_item grid_stat grid_stat_head"><span>Activity Stream</span></div>
-	<div class="grid_item grid_stat grid_stat_head"><span>Likes</span></div>
-
-	<div class="grid_item grid_stat"><span>{{.Database.ProfileReplies}}</span></div>
-	<div class="grid_item grid_stat"><span>{{.Database.ActivityStream}}</span></div>
-	<div class="grid_item grid_stat"><span>{{.Database.Likes}}</span></div>
-
-
-	<div class="grid_item grid_stat grid_stat_head"><span>Attachments</span></div>
-	<div class="grid_item grid_stat grid_stat_head"><span>Polls</span></div>
+	{{template "panel_debug_stat_head.html" "panel_debug_database_attachments"}}
+	{{template "panel_debug_stat_head.html" "panel_debug_database_polls"}}
 	{{template "panel_debug_stat_head_q.html"}}
-
-	<div class="grid_item grid_stat"><span>{{.Database.Attachments}}</span></div>
-	<div class="grid_item grid_stat"><span>{{.Database.Polls}}</span></div>
+	{{template "panel_debug_stat.html" .Database.Attachments}}
+	{{template "panel_debug_stat.html" .Database.Polls}}
 	{{template "panel_debug_stat_q.html"}}
 
+	{{template "panel_debug_stat_head.html" "panel_debug_database_login_logs"}}
+	{{template "panel_debug_stat_head.html" "panel_debug_database_reg_logs"}}
+	{{template "panel_debug_stat_head.html" "panel_debug_database_mod_logs"}}
+	{{template "panel_debug_stat.html" .Database.LoginLogs}}
+	{{template "panel_debug_stat.html" .Database.RegLogs}}
+	{{template "panel_debug_stat.html" .Database.ModLogs}}
 
-	<div class="grid_item grid_stat grid_stat_head"><span>Login Logs</span></div>
-	<div class="grid_item grid_stat grid_stat_head"><span>Reg Logs</span></div>
-	<div class="grid_item grid_stat grid_stat_head"><span>Mod Logs</span></div>
-
-	<div class="grid_item grid_stat"><span>{{.Database.LoginLogs}}</span></div>
-	<div class="grid_item grid_stat"><span>{{.Database.RegLogs}}</span></div>
-	<div class="grid_item grid_stat"><span>{{.Database.ModLogs}}</span></div>
-
-
-	<div class="grid_item grid_stat grid_stat_head"><span>Admin Logs</span></div>
+	{{template "panel_debug_stat_head.html" "panel_debug_database_admin_logs"}}
 	{{template "panel_debug_stat_head_q.html"}}
 	{{template "panel_debug_stat_head_q.html"}}
-
-	<div class="grid_item grid_stat"><span>{{.Database.AdminLogs}}</span></div>
+	{{template "panel_debug_stat.html" .Database.AdminLogs}}
 	{{template "panel_debug_stat_q.html"}}
 	{{template "panel_debug_stat_q.html"}}
 
+	{{template "panel_debug_stat_head.html" "panel_debug_database_views"}}
+	{{template "panel_debug_stat_head.html" "panel_debug_database_views_agents"}}
+	{{template "panel_debug_stat_head.html" "panel_debug_database_views_forums"}}
+	{{template "panel_debug_stat.html" .Database.Views}}
+	{{template "panel_debug_stat.html" .Database.ViewsAgents}}
+	{{template "panel_debug_stat.html" .Database.ViewsForums}}
 
-	<div class="grid_item grid_stat grid_stat_head"><span>Views</span></div>
-	<div class="grid_item grid_stat grid_stat_head"><span>Views Agents</span></div>
-	<div class="grid_item grid_stat grid_stat_head"><span>Views Forums</span></div>
-
-	<div class="grid_item grid_stat"><span>{{.Database.Views}}</span></div>
-	<div class="grid_item grid_stat"><span>{{.Database.ViewsAgents}}</span></div>
-	<div class="grid_item grid_stat"><span>{{.Database.ViewsForums}}</span></div>
-
-
-	<div class="grid_item grid_stat grid_stat_head"><span>Views Langs</span></div>
-	<div class="grid_item grid_stat grid_stat_head"><span>Views Referrers</span></div>
-	<div class="grid_item grid_stat grid_stat_head"><span>Views Systems</span></div>
-
-	<div class="grid_item grid_stat"><span>{{.Database.ViewsLangs}}</span></div>
-	<div class="grid_item grid_stat"><span>{{.Database.ViewsReferrers}}</span></div>
-	<div class="grid_item grid_stat"><span>{{.Database.ViewsSystems}}</span></div>
-
+	{{template "panel_debug_stat_head.html" "panel_debug_database_views_langs"}}
+	{{template "panel_debug_stat_head.html" "panel_debug_database_views_referrers"}}
+	{{template "panel_debug_stat_head.html" "panel_debug_database_views_systems"}}
+	{{template "panel_debug_stat.html" .Database.ViewsLangs}}
+	{{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_q.html"}}
-
-	<div class="grid_item grid_stat"><span>{{.Database.PostChunks}}</span></div>
-	<div class="grid_item grid_stat"><span>{{.Database.TopicChunks}}</span></div>
+	{{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}}
 <div id="panel_debug" class="colstack_grid">
-	<div class="grid_item grid_stat grid_stat_head"><span>Static Files</span></div>
-	<div class="grid_item grid_stat grid_stat_head"><span>Attachments</span></div>
-	<div class="grid_item grid_stat grid_stat_head"><span>Avatars</span></div>
-
+	{{template "panel_debug_stat_head.html" "panel_debug_disk_static_files"}}
+	{{template "panel_debug_stat_head.html" "panel_debug_disk_attachments"}}
+	{{template "panel_debug_stat_head.html" "panel_debug_disk_avatars"}}
 	<div class="grid_item grid_stat"><span>{{bunit .Disk.Static}}</span></div>
 	<div class="grid_item grid_stat"><span>{{bunit .Disk.Attachments}}</span></div>
 	<div class="grid_item grid_stat"><span>{{bunit .Disk.Avatars}}</span></div>
 
-
-	<div class="grid_item grid_stat grid_stat_head"><span>Log Files</span></div>
-	<div class="grid_item grid_stat grid_stat_head"><span>Backups</span></div>
-	<div class="grid_item grid_stat grid_stat_head"><span>Git</span></div>
-
+	{{template "panel_debug_stat_head.html" "panel_debug_disk_log_files"}}
+	{{template "panel_debug_stat_head.html" "panel_debug_disk_backups"}}
+	{{template "panel_debug_stat_head.html" "panel_debug_disk_git"}}
 	<div class="grid_item grid_stat"><span>{{bunit .Disk.Logs}}</span></div>
 	<div class="grid_item grid_stat"><span>{{bunit .Disk.Backups}}</span></div>
 	<div class="grid_item grid_stat"><span>{{bunit .Disk.Git}}</span></div>
-</div>
\ No newline at end of file
+</div>{{flush}}
\ No newline at end of file