diff --git a/.gitignore b/.gitignore
index d637105f..b2b79cbf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,4 +27,5 @@ RouterGen
 Patcher
 Gosora
 Installer
-template_*.go
\ No newline at end of file
+template_*.go
+template_*.jgo
\ No newline at end of file
diff --git a/public/init.js b/public/init.js
index 2428f4c7..7d35cbfe 100644
--- a/public/init.js
+++ b/public/init.js
@@ -180,8 +180,8 @@ function initPhrases(loggedIn, panel = false) {
 	let e = "";
 	if(loggedIn && !panel) e = ",topic_list,topic";
 	else if(panel) e = ",analytics,panel"; // TODO: Request phrases for just one section of the control panel?
-	else e = ",topic_list";
-	fetchPhrases("status,alerts,paginator"+e) // TODO: Break this up?
+	else e = ",status,topic_list";
+	fetchPhrases("alerts,paginator"+e) // TODO: Break this up?
 }
 
 function fetchPhrases(plist) {
diff --git a/templates/header.html b/templates/header.html
index 4fae1421..fe999d9e 100644
--- a/templates/header.html
+++ b/templates/header.html
@@ -7,7 +7,7 @@
 		{{range .Header.PreScriptsAsync}}
 		<script async type="text/javascript" src="/static/{{.}}"></script>{{end}}
 		<meta property="x-loggedin" content="{{.CurrentUser.Loggedin}}" />
-		<script type="text/javascript" src="/static/init.js?i=4"></script>
+		<script type="text/javascript" src="/static/init.js?i=5"></script>
 		{{range .Header.ScriptsAsync}}
 		<script async type="text/javascript" src="/static/{{.}}"></script>{{end}}
 		<script type="text/javascript" src="/static/jquery-3.1.1.min.js"></script>
diff --git a/templates/panel_analytics_agent_views.html b/templates/panel_analytics_agent_views.html
index ad644839..7b70f43a 100644
--- a/templates/panel_analytics_agent_views.html
+++ b/templates/panel_analytics_agent_views.html
@@ -1,20 +1,19 @@
 {{template "header.html" . }}
 <div class="colstack panel_stack">
 {{template "panel_menu.html" . }}
-	<main id="panel_analytics_right" class="colstack_right">
+<form id="timeRangeForm" name="timeRangeForm" action="/panel/analytics/agent/{{.Agent}}" method="get"></form>
+	<main id="panel_analytics_right" class="colstack_right analytics">
 {{template "panel_before_head.html" . }}
-		<form id="timeRangeForm" name="timeRangeForm" action="/panel/analytics/agent/{{.Agent}}" method="get">
-			<div class="colstack_item colstack_head">
-				<div class="rowitem">
-					<a>{{.FriendlyAgent}}{{lang "panel_statistics_views_head_suffix"}}</a>
-					{{template "panel_analytics_time_range.html" . }}
-				</div>
+		<div class="colstack_item colstack_head">
+			<div class="rowitem">
+				<h1>{{.FriendlyAgent}}{{lang "panel_statistics_views_head_suffix"}}</h1>
+				{{template "panel_analytics_time_range.html" . }}
 			</div>
-		</form>
+		</div>
 		<div id="panel_analytics_views" class="colstack_graph_holder">
 			<div class="ct_chart"></div>
 		</div>
 	</main>
 </div>
 {{template "panel_analytics_script.html" . }}
-{{template "footer.html" . }}
+{{template "footer.html" . }}
\ No newline at end of file
diff --git a/templates/panel_analytics_agents.html b/templates/panel_analytics_agents.html
index 9f206422..7346c99c 100644
--- a/templates/panel_analytics_agents.html
+++ b/templates/panel_analytics_agents.html
@@ -1,16 +1,15 @@
 {{template "header.html" . }}
 <div class="colstack panel_stack">
 {{template "panel_menu.html" . }}
-	<main id="panel_analytics_right" class="colstack_right">
+<form id="timeRangeForm" name="timeRangeForm" action="/panel/analytics/agents/" method="get"></form>
+	<main id="panel_analytics_right" class="colstack_right analytics">
 {{template "panel_before_head.html" . }}
-		<form id="timeRangeForm" name="timeRangeForm" action="/panel/analytics/agents/" method="get">
-			<div class="colstack_item colstack_head">
-				<div class="rowitem">
-					<a>{{lang "panel_statistics_user_agents_head"}}</a>
-					{{template "panel_analytics_time_range.html" . }}
-				</div>
+		<div class="colstack_item colstack_head">
+			<div class="rowitem">
+				<h1>{{lang "panel_statistics_user_agents_head"}}</h1>
+				{{template "panel_analytics_time_range.html" . }}
 			</div>
-		</form>
+		</div>
 		<div id="panel_analytics_agents_chart" class="colstack_graph_holder">
 			<div class="ct_chart"></div>
 		</div>
@@ -25,4 +24,4 @@
 	</main>
 </div>
 {{template "panel_analytics_script.html" . }}
-{{template "footer.html" . }}
+{{template "footer.html" . }}
\ No newline at end of file
diff --git a/templates/panel_analytics_forum_views.html b/templates/panel_analytics_forum_views.html
index 1f2ad5ce..abf80441 100644
--- a/templates/panel_analytics_forum_views.html
+++ b/templates/panel_analytics_forum_views.html
@@ -1,20 +1,19 @@
 {{template "header.html" . }}
 <div class="colstack panel_stack">
 {{template "panel_menu.html" . }}
-	<main id="panel_analytics_right" class="colstack_right">
+<form id="timeRangeForm" name="timeRangeForm" action="/panel/analytics/forum/{{.Agent}}" method="get"></form>
+	<main id="panel_analytics_right" class="colstack_right analytics">
 {{template "panel_before_head.html" . }}
-		<form id="timeRangeForm" name="timeRangeForm" action="/panel/analytics/forum/{{.Agent}}" method="get">
-			<div class="colstack_item colstack_head">
-				<div class="rowitem">
-					<a>{{.FriendlyAgent}}{{lang "panel_statistics_views_head_suffix"}}</a>
-					{{template "panel_analytics_time_range.html" . }}
-				</div>
+		<div class="colstack_item colstack_head">
+			<div class="rowitem">
+				<h1>{{.FriendlyAgent}}{{lang "panel_statistics_views_head_suffix"}}</h1>
+				{{template "panel_analytics_time_range.html" . }}
 			</div>
-		</form>
+		</div>
 		<div id="panel_analytics_views" class="colstack_graph_holder">
 			<div class="ct_chart"></div>
 		</div>
 	</main>
 </div>
 {{template "panel_analytics_script.html" . }}
-{{template "footer.html" . }}
+{{template "footer.html" . }}
\ No newline at end of file
diff --git a/templates/panel_analytics_forums.html b/templates/panel_analytics_forums.html
index f2eb606e..80d36401 100644
--- a/templates/panel_analytics_forums.html
+++ b/templates/panel_analytics_forums.html
@@ -1,16 +1,15 @@
 {{template "header.html" . }}
 <div class="colstack panel_stack">
 {{template "panel_menu.html" . }}
-	<main id="panel_analytics_right" class="colstack_right">
+<form id="timeRangeForm" name="timeRangeForm" action="/panel/analytics/forums/" method="get"></form>
+	<main id="panel_analytics_right" class="colstack_right analytics">
 {{template "panel_before_head.html" . }}
-		<form id="timeRangeForm" name="timeRangeForm" action="/panel/analytics/forums/" method="get">
-			<div class="colstack_item colstack_head">
-				<div class="rowitem">
-					<a>{{lang "panel_statistics_forums_head"}}</a>
-					{{template "panel_analytics_time_range.html" . }}
-				</div>
+		<div class="colstack_item colstack_head">
+			<div class="rowitem">
+				<h1>{{lang "panel_statistics_forums_head"}}</h1>
+				{{template "panel_analytics_time_range.html" . }}
 			</div>
-		</form>
+		</div>
 		<div id="panel_analytics_forums_chart" class="colstack_graph_holder">
 			<div class="ct_chart"></div>
 		</div>
diff --git a/templates/panel_analytics_lang_views.html b/templates/panel_analytics_lang_views.html
index 9073ce17..4e82d111 100644
--- a/templates/panel_analytics_lang_views.html
+++ b/templates/panel_analytics_lang_views.html
@@ -1,20 +1,19 @@
 {{template "header.html" . }}
 <div class="colstack panel_stack">
 {{template "panel_menu.html" . }}
-	<main id="panel_analytics_right" class="colstack_right">
+<form id="timeRangeForm" name="timeRangeForm" action="/panel/analytics/lang/{{.Agent}}" method="get"></form>
+	<main id="panel_analytics_right" class="colstack_right analytics">
 {{template "panel_before_head.html" . }}
-		<form id="timeRangeForm" name="timeRangeForm" action="/panel/analytics/lang/{{.Agent}}" method="get">
-			<div class="colstack_item colstack_head">
-				<div class="rowitem">
-					<a>{{.FriendlyAgent}}{{lang "panel_statistics_views_head_suffix"}}</a>
-					{{template "panel_analytics_time_range.html" . }}
-				</div>
+		<div class="colstack_item colstack_head">
+			<div class="rowitem">
+				<h1>{{.FriendlyAgent}}{{lang "panel_statistics_views_head_suffix"}}</h1>
+				{{template "panel_analytics_time_range.html" . }}
 			</div>
-		</form>
+		</div>
 		<div id="panel_analytics_langs" class="colstack_graph_holder">
 			<div class="ct_chart"></div>
 		</div>
 	</main>
 </div>
 {{template "panel_analytics_script.html" . }}
-{{template "footer.html" . }}
+{{template "footer.html" . }}
\ No newline at end of file
diff --git a/templates/panel_analytics_langs.html b/templates/panel_analytics_langs.html
index df3ec502..1f7792c4 100644
--- a/templates/panel_analytics_langs.html
+++ b/templates/panel_analytics_langs.html
@@ -1,16 +1,15 @@
 {{template "header.html" . }}
 <div class="colstack panel_stack">
 {{template "panel_menu.html" . }}
-	<main id="panel_analytics_right" class="colstack_right">
+<form id="timeRangeForm" name="timeRangeForm" action="/panel/analytics/langs/" method="get"></form>
+	<main id="panel_analytics_right" class="colstack_right analytics">
 {{template "panel_before_head.html" . }}
-		<form id="timeRangeForm" name="timeRangeForm" action="/panel/analytics/langs/" method="get">
-			<div class="colstack_item colstack_head">
-				<div class="rowitem">
-					<a>{{lang "panel_statistics_languages_head"}}</a>
-					{{template "panel_analytics_time_range.html" . }}
-				</div>
+		<div class="colstack_item colstack_head">
+			<div class="rowitem">
+				<h1>{{lang "panel_statistics_languages_head"}}</h1>
+				{{template "panel_analytics_time_range.html" . }}
 			</div>
-		</form>
+		</div>
 		<div id="panel_analytics_langs_chart" class="colstack_graph_holder">
 			<div class="ct_chart"></div>
 		</div>
diff --git a/templates/panel_analytics_posts.html b/templates/panel_analytics_posts.html
index 27b84d35..1228d913 100644
--- a/templates/panel_analytics_posts.html
+++ b/templates/panel_analytics_posts.html
@@ -1,16 +1,15 @@
 {{template "header.html" . }}
 <div class="colstack panel_stack">
 {{template "panel_menu.html" . }}
-	<main id="panel_analytics_right" class="colstack_right">
+<form id="timeRangeForm" name="timeRangeForm" action="/panel/analytics/posts/" method="get"></form>
+	<main id="panel_analytics_right" class="colstack_right analytics">
 {{template "panel_before_head.html" . }}
-		<form id="timeRangeForm" name="timeRangeForm" action="/panel/analytics/posts/" method="get">
-			<div class="colstack_item colstack_head">
-				<div class="rowitem">
-					<a>{{lang "panel_statistics_post_counts_head"}}</a>
-					{{template "panel_analytics_time_range.html" . }}
-				</div>
+		<div class="colstack_item colstack_head">
+			<div class="rowitem">
+				<h1>{{lang "panel_statistics_post_counts_head"}}</h1>
+				{{template "panel_analytics_time_range.html" . }}
 			</div>
-		</form>
+		</div>
 		<div id="panel_analytics_posts" class="colstack_graph_holder">
 			<div class="ct_chart" aria-label="{{lang "panel_statistics_post_counts_chart_aria"}}"></div>
 		</div>
@@ -28,4 +27,4 @@
 	</main>
 </div>
 {{template "panel_analytics_script.html" . }}
-{{template "footer.html" . }}
+{{template "footer.html" . }}
\ No newline at end of file
diff --git a/templates/panel_analytics_referrer_views.html b/templates/panel_analytics_referrer_views.html
index edb41d08..011a08da 100644
--- a/templates/panel_analytics_referrer_views.html
+++ b/templates/panel_analytics_referrer_views.html
@@ -1,20 +1,19 @@
 {{template "header.html" . }}
 <div class="colstack panel_stack">
 {{template "panel_menu.html" . }}
-	<main id="panel_analytics_right" class="colstack_right">
+<form id="timeRangeForm" name="timeRangeForm" action="/panel/analytics/referrer/{{.Agent}}" method="get"></form>
+	<main id="panel_analytics_right" class="colstack_right analytics">
 {{template "panel_before_head.html" . }}
-		<form id="timeRangeForm" name="timeRangeForm" action="/panel/analytics/referrer/{{.Agent}}" method="get">
-			<div class="colstack_item colstack_head">
-				<div class="rowitem">
-					<a>{{.Agent}}{{lang "panel_statistics_views_head_suffix"}}</a>
-					{{template "panel_analytics_time_range.html" . }}
-				</div>
+		<div class="colstack_item colstack_head">
+			<div class="rowitem">
+				<h1>{{.Agent}}{{lang "panel_statistics_views_head_suffix"}}</h1>
+				{{template "panel_analytics_time_range.html" . }}
 			</div>
-		</form>
+		</div>
 		<div id="panel_analytics_referrers" class="colstack_graph_holder">
 			<div class="ct_chart"></div>
 		</div>
 	</main>
 </div>
 {{template "panel_analytics_script.html" . }}
-{{template "footer.html" . }}
+{{template "footer.html" . }}
\ No newline at end of file
diff --git a/templates/panel_analytics_referrers.html b/templates/panel_analytics_referrers.html
index 63b826fa..fd1e3f7a 100644
--- a/templates/panel_analytics_referrers.html
+++ b/templates/panel_analytics_referrers.html
@@ -1,16 +1,15 @@
 {{template "header.html" . }}
 <div class="colstack panel_stack">
 {{template "panel_menu.html" . }}
-	<main id="panel_analytics_right" class="colstack_right">
+<form id="timeRangeForm" name="timeRangeForm" action="/panel/analytics/referrers/" method="get"></form>
+	<main id="panel_analytics_right" class="colstack_right analytics">
 {{template "panel_before_head.html" . }}
-		<form id="timeRangeForm" name="timeRangeForm" action="/panel/analytics/referrers/" method="get">
-			<div class="colstack_item colstack_head">
-				<div class="rowitem">
-					<a>{{lang "panel_statistics_referrers_head"}}</a>
-					{{template "panel_analytics_time_range.html" . }}
-				</div>
+		<div class="colstack_item colstack_head">
+			<div class="rowitem">
+				<h1>{{lang "panel_statistics_referrers_head"}}</h1>
+				{{template "panel_analytics_time_range.html" . }}
 			</div>
-		</form>
+		</div>
 		<div id="panel_analytics_referrers" class="colstack_item rowlist">
 			{{range .ItemList}}
 			<div class="rowitem panel_compactrow editable_parent">
@@ -21,4 +20,4 @@
 		</div>
 	</main>
 </div>
-{{template "footer.html" . }}
+{{template "footer.html" . }}
\ No newline at end of file
diff --git a/templates/panel_analytics_route_views.html b/templates/panel_analytics_route_views.html
index 9e284d09..9710aa2b 100644
--- a/templates/panel_analytics_route_views.html
+++ b/templates/panel_analytics_route_views.html
@@ -1,16 +1,15 @@
 {{template "header.html" . }}
 <div class="colstack panel_stack">
 {{template "panel_menu.html" . }}
-	<main id="panel_analytics_right" class="colstack_right">
+<form id="timeRangeForm" name="timeRangeForm" action="/panel/analytics/route/{{.Route}}" method="get"></form>
+	<main id="panel_analytics_right" class="colstack_right analytics">
 {{template "panel_before_head.html" . }}
-		<form id="timeRangeForm" name="timeRangeForm" action="/panel/analytics/route/{{.Route}}" method="get">
-			<div class="colstack_item colstack_head">
-				<div class="rowitem">
-					<a>{{.Route}}{{lang "panel_statistics_views_head_suffix"}}</a>
-					{{template "panel_analytics_time_range.html" . }}
-				</div>
+		<div class="colstack_item colstack_head">
+			<div class="rowitem">
+				<h1>{{.Route}}{{lang "panel_statistics_views_head_suffix"}}</h1>
+				{{template "panel_analytics_time_range.html" . }}
 			</div>
-		</form>
+		</div>
 		<div id="panel_analytics_views" class="colstack_graph_holder">
 			<div class="ct_chart"></div>
 		</div>
@@ -28,4 +27,4 @@
 	</main>
 </div>
 {{template "panel_analytics_script.html" . }}
-{{template "footer.html" . }}
+{{template "footer.html" . }}
\ No newline at end of file
diff --git a/templates/panel_analytics_routes.html b/templates/panel_analytics_routes.html
index 35d9f6cb..39b0963b 100644
--- a/templates/panel_analytics_routes.html
+++ b/templates/panel_analytics_routes.html
@@ -1,16 +1,15 @@
 {{template "header.html" . }}
 <div class="colstack panel_stack">
 {{template "panel_menu.html" . }}
-	<main id="panel_analytics_right" class="colstack_right">
+<form id="timeRangeForm" name="timeRangeForm" action="/panel/analytics/routes/" method="get"></form>
+	<main id="panel_analytics_right" class="colstack_right analytics">
 {{template "panel_before_head.html" . }}
-		<form id="timeRangeForm" name="timeRangeForm" action="/panel/analytics/routes/" method="get">
-			<div class="colstack_item colstack_head">
-				<div class="rowitem">
-					<a>{{lang "panel_statistics_routes_head"}}</a>
-					{{template "panel_analytics_time_range.html" . }}
-				</div>
+		<div class="colstack_item colstack_head">
+			<div class="rowitem">
+				<h1>{{lang "panel_statistics_routes_head"}}</h1>
+				{{template "panel_analytics_time_range.html" . }}
 			</div>
-		</form>
+		</div>
 		<div id="panel_analytics_routes_chart" class="colstack_graph_holder">
 			<div class="ct_chart"></div>
 		</div>
@@ -25,4 +24,4 @@
 	</main>
 </div>
 {{template "panel_analytics_script.html" . }}
-{{template "footer.html" . }}
+{{template "footer.html" . }}
\ No newline at end of file
diff --git a/templates/panel_analytics_system_views.html b/templates/panel_analytics_system_views.html
index 7847946c..6364367b 100644
--- a/templates/panel_analytics_system_views.html
+++ b/templates/panel_analytics_system_views.html
@@ -1,20 +1,19 @@
 {{template "header.html" . }}
 <div class="colstack panel_stack">
 {{template "panel_menu.html" . }}
-	<main id="panel_analytics_right" class="colstack_right">
+<form id="timeRangeForm" name="timeRangeForm" action="/panel/analytics/system/{{.Agent}}" method="get"></form>
+	<main id="panel_analytics_right" class="colstack_right analytics">
 {{template "panel_before_head.html" . }}
-		<form id="timeRangeForm" name="timeRangeForm" action="/panel/analytics/system/{{.Agent}}" method="get">
-			<div class="colstack_item colstack_head">
-				<div class="rowitem">
-					<a>{{.FriendlyAgent}}{{lang "panel_statistics_views_head_suffix"}}</a>
-					{{template "panel_analytics_time_range.html" . }}
-				</div>
+		<div class="colstack_item colstack_head">
+			<div class="rowitem">
+				<h1>{{.FriendlyAgent}}{{lang "panel_statistics_views_head_suffix"}}</h1>
+				{{template "panel_analytics_time_range.html" . }}
 			</div>
-		</form>
+		</div>
 		<div id="panel_analytics_systems" class="colstack_graph_holder">
 			<div class="ct_chart"></div>
 		</div>
 	</main>
 </div>
 {{template "panel_analytics_script.html" . }}
-{{template "footer.html" . }}
+{{template "footer.html" . }}
\ No newline at end of file
diff --git a/templates/panel_analytics_systems.html b/templates/panel_analytics_systems.html
index 03c2db43..f1e77b27 100644
--- a/templates/panel_analytics_systems.html
+++ b/templates/panel_analytics_systems.html
@@ -1,16 +1,15 @@
 {{template "header.html" . }}
 <div class="colstack panel_stack">
 {{template "panel_menu.html" . }}
-	<main id="panel_analytics_right" class="colstack_right">
+<form id="timeRangeForm" name="timeRangeForm" action="/panel/analytics/systems/" method="get"></form>
+	<main id="panel_analytics_right" class="colstack_right analytics">
 {{template "panel_before_head.html" . }}
-		<form id="timeRangeForm" name="timeRangeForm" action="/panel/analytics/systems/" method="get">
-			<div class="colstack_item colstack_head">
-				<div class="rowitem">
-					<a>{{lang "panel_statistics_operating_systems_head"}}</a>
-					{{template "panel_analytics_time_range.html" . }}
-				</div>
+		<div class="colstack_item colstack_head">
+			<div class="rowitem">
+				<h1>{{lang "panel_statistics_operating_systems_head"}}</h1>
+				{{template "panel_analytics_time_range.html" . }}
 			</div>
-		</form>
+		</div>
 		<div id="panel_analytics_systems_chart" class="colstack_graph_holder">
 			<div class="ct_chart"></div>
 		</div>
@@ -25,4 +24,4 @@
 	</main>
 </div>
 {{template "panel_analytics_script.html" . }}
-{{template "footer.html" . }}
+{{template "footer.html" . }}
\ No newline at end of file
diff --git a/templates/panel_analytics_time_range.html b/templates/panel_analytics_time_range.html
index 02073190..a08d6ea8 100644
--- a/templates/panel_analytics_time_range.html
+++ b/templates/panel_analytics_time_range.html
@@ -1,4 +1,4 @@
-<select class="timeRangeSelector to_right" name="timeRange">
+<select form="timeRangeForm" class="timeRangeSelector to_right" name="timeRange">
 	<option val="one-year"{{if eq .TimeRange "one-year"}} selected{{end}}>{{lang "panel_statistics_time_range_one_year"}}</option>
 	<option val="three-months"{{if eq .TimeRange "three-months"}} selected{{end}}>{{lang "panel_statistics_time_range_three_months"}}</option>
 	<option val="one-month"{{if eq .TimeRange "one-month"}} selected{{end}}>{{lang "panel_statistics_time_range_one_month"}}</option>
diff --git a/templates/panel_analytics_topics.html b/templates/panel_analytics_topics.html
index 48c057e9..3adf513f 100644
--- a/templates/panel_analytics_topics.html
+++ b/templates/panel_analytics_topics.html
@@ -1,16 +1,15 @@
 {{template "header.html" . }}
 <div class="colstack panel_stack">
 {{template "panel_menu.html" . }}
-	<main id="panel_analytics_right" class="colstack_right">
+<form id="timeRangeForm" name="timeRangeForm" action="/panel/analytics/topics/" method="get"></form>
+	<main id="panel_analytics_right" class="colstack_right analytics">
 {{template "panel_before_head.html" . }}
-		<form id="timeRangeForm" name="timeRangeForm" action="/panel/analytics/topics/" method="get">
-			<div class="colstack_item colstack_head">
-				<div class="rowitem">
-					<a>{{lang "panel_statistics_topic_counts_head"}}</a>
-					{{template "panel_analytics_time_range.html" . }}
-				</div>
+		<div class="colstack_item colstack_head">
+			<div class="rowitem">
+				<h1>{{lang "panel_statistics_topic_counts_head"}}</h1>
+				{{template "panel_analytics_time_range.html" . }}
 			</div>
-		</form>
+		</div>
 		<div id="panel_analytics_topics" class="colstack_graph_holder">
 			<div class="ct_chart" aria-label="{{lang "panel_statistics_topic_counts_chart_aria"}}"></div>
 		</div>
diff --git a/templates/panel_analytics_views.html b/templates/panel_analytics_views.html
index e01f8f27..2cc482f4 100644
--- a/templates/panel_analytics_views.html
+++ b/templates/panel_analytics_views.html
@@ -1,16 +1,15 @@
 {{template "header.html" . }}
 <div class="colstack panel_stack">
 {{template "panel_menu.html" . }}
-	<main id="panel_analytics_right" class="colstack_right">
+<form id="timeRangeForm" name="timeRangeForm" action="/panel/analytics/views/" method="get"></form>
+	<main id="panel_analytics_right" class="colstack_right analytics">
 {{template "panel_before_head.html" . }}
-		<form id="timeRangeForm" name="timeRangeForm" action="/panel/analytics/views/" method="get">
-			<div class="colstack_item colstack_head">
-				<div class="rowitem">
-					<h1>{{lang "panel_statistics_requests_head"}}</h1>
-					{{template "panel_analytics_time_range.html" . }}
-				</div>
+		<div class="colstack_item colstack_head">
+			<div class="rowitem">
+				<h1>{{lang "panel_statistics_requests_head"}}</h1>
+				{{template "panel_analytics_time_range.html" . }}
 			</div>
-		</form>
+		</div>
 		<div id="panel_analytics_views" class="colstack_graph_holder">
 			<div class="ct_chart" aria-label="{{lang "panel_statistics_requests_chart_aria"}}"></div>
 		</div>
@@ -28,4 +27,4 @@
 	</main>
 </div>
 {{template "panel_analytics_script.html" . }}
-{{template "footer.html" . }}
+{{template "footer.html" . }}
\ No newline at end of file
diff --git a/themes/cosora/public/panel.css b/themes/cosora/public/panel.css
index 3f58dfaa..fa9477cd 100644
--- a/themes/cosora/public/panel.css
+++ b/themes/cosora/public/panel.css
@@ -304,6 +304,12 @@
 .timeRangeSelector {
 	margin-top: -5px;
 }
+.colstack_graph_holder + .rowlist {
+	margin-top: 8px;
+}
+.analytics .colstack_head h1 {
+	margin-top: 2px;
+}
 
 /* Experimental header tweaks */
 .colstack_head a {
diff --git a/themes/shadow/public/panel.css b/themes/shadow/public/panel.css
index fec4921b..20ae1217 100644
--- a/themes/shadow/public/panel.css
+++ b/themes/shadow/public/panel.css
@@ -20,6 +20,9 @@
 	margin-left: 2px;
 }
 
+.analytics .colstack_head:first-child {
+	padding-bottom: 4px;
+}
 .timeRangeSelector {
 	padding: 2px;
 	margin-top: -3px;