diff --git a/templates/forum.html b/templates/forum.html
index 8455ce0c..e909b4d1 100644
--- a/templates/forum.html
+++ b/templates/forum.html
@@ -2,9 +2,9 @@
 
 <main id="forumItemList" itemscope itemtype="http://schema.org/ItemList">
 
-{{if gt .Page 1}}<div id="prevFloat" class="prev_button"><a class="prev_link" aria-label="{{lang "paginator.prev_page_aria"}}" rel="prev" href="{{.Forum.Link}}?page={{subtract .Page 1}}">{{lang "paginator.less_than"}}</a></div>{{end}}
-{{if ne .LastPage .Page}}<div id="nextFloat" class="next_button"><a class="next_link" aria-label="{{lang "paginator.next_page_aria"}}" rel="next" href="{{.Forum.Link}}?page={{add .Page 1}}">{{lang "paginator.greater_than"}}</a></div>{{end}}
-{{if not .CurrentUser.Loggedin}}<link rel="canonical" href="//{{.Site.URL}}{{.Forum.Link}}{{if gt .Page 1}}?page={{.Page}}{{end}}"/>{{end}}
+{{if gt .Page 1}}<div id="prevFloat"class="prev_button"><a class="prev_link"aria-label="{{lang "paginator.prev_page_aria"}}" rel="prev"href="{{.Forum.Link}}?page={{subtract .Page 1}}">{{lang "paginator.less_than"}}</a></div>{{end}}
+{{if ne .LastPage .Page}}<div id="nextFloat"class="next_button"><a class="next_link"aria-label="{{lang "paginator.next_page_aria"}}" rel="next"href="{{.Forum.Link}}?page={{add .Page 1}}">{{lang "paginator.greater_than"}}</a></div>{{end}}
+{{if not .CurrentUser.Loggedin}}<link rel="canonical"href="//{{.Site.URL}}{{.Forum.Link}}{{if gt .Page 1}}?page={{.Page}}{{end}}">{{end}}
 
 	<div id="forum_head_block" class="rowblock rowhead topic_list_title_block{{if .CurrentUser.Loggedin}} has_opt{{end}}">
 		<div class="rowitem forum_title">
@@ -15,12 +15,12 @@
 			{{if .CurrentUser.Perms.CreateTopic}}
 			<div class="opt dummy_opt"></div>
 			<div class="pre_opt auto_hide"></div>
-			<div class="opt create_topic_opt" title="{{lang "topic_list.create_topic_tooltip"}}" aria-label="{{lang "topic_list.create_topic_aria"}}"><a class="create_topic_link" href="/topics/create/{{.Forum.ID}}"></a></div>
+			<div class="opt create_topic_opt"title="{{lang "topic_list.create_topic_tooltip"}}" aria-label="{{lang "topic_list.create_topic_aria"}}"><a class="create_topic_link" href="/topics/create/{{.Forum.ID}}"></a></div>
 			{{/** TODO: Add a permissions check for this **/}}
-			<div class="opt mod_opt" title="{{lang "topic_list.moderate_tooltip"}}">
+			<div class="opt mod_opt"title="{{lang "topic_list.moderate_tooltip"}}">
 				<a class="moderate_link" href="#" aria-label="{{lang "topic_list.moderate_aria"}}"></a>
 			</div>
-			{{else}}<div class="opt locked_opt" title="{{lang "forum_locked_tooltip"}}" aria-label="{{lang "forum_locked_aria"}}"><a></a></div>{{end}}
+			{{else}}<div class="opt locked_opt"title="{{lang "forum_locked_tooltip"}}" aria-label="{{lang "forum_locked_aria"}}"><a></a></div>{{end}}
 		</div>
 		<div style="clear:both;"></div>
 	{{end}}
@@ -29,7 +29,7 @@
 	{{template "topics_mod_floater.html"}}
 	
 	{{if .CurrentUser.Perms.CreateTopic}}
-	<div id="forum_topic_create_form" class="rowblock topic_create_form quick_create_form auto_hide" aria-label="{{lang "quick_topic.aria"}}">
+	<div id="forum_topic_create_form"class="rowblock topic_create_form quick_create_form auto_hide"aria-label="{{lang "quick_topic.aria"}}">
 		<form id="quick_post_form" enctype="multipart/form-data" action="/topic/create/submit/?s={{.CurrentUser.Session}}" method="post"></form>
 		<img class="little_row_avatar" src="{{.CurrentUser.MicroAvatar}}" height=64 alt="{{lang "quick_topic.avatar_alt"}}" title="{{lang "quick_topic.avatar_tooltip"}}">
 		<input form="quick_post_form" id="topic_board_input" name="board" value="{{.Forum.ID}}" type="hidden">
@@ -52,11 +52,11 @@
 			<span class="selector"></span>
 			<a href="{{.Creator.Link}}"><img src="{{.Creator.MicroAvatar}}" height=64 alt="Avatar"title="{{.Creator.Name}}'s Avatar"aria-hidden="true"></a>
 			<span class="topic_inner_left">
-				<a class="rowtopic"href="{{.Link}}"itemprop="itemListElement" title="{{.Title}}"><span>{{.Title}}</span></a>
-				<br><a class="rowsmall starter" href="{{.Creator.Link}}" title="{{.Creator.Name}}">{{.Creator.Name}}</a>
+				<a class="rowtopic"href="{{.Link}}"itemprop="itemListElement"title="{{.Title}}"><span>{{.Title}}</span></a>
+				<br><a class="rowsmall starter"href="{{.Creator.Link}}"title="{{.Creator.Name}}">{{.Creator.Name}}</a>
 				{{/** TODO: Avoid the double '|' when both .IsClosed and .Sticky are set to true. We could probably do this with CSS **/}}
-				{{if .IsClosed}}<span class="rowsmall topic_status_e topic_status_closed" title="{{lang "status.closed_tooltip"}}"> | &#x1F512;&#xFE0E</span>{{end}}
-				{{if .Sticky}}<span class="rowsmall topic_status_e topic_status_sticky" title="{{lang "status.pinned_tooltip"}}"> | &#x1F4CD;&#xFE0E</span>{{end}}
+				{{if .IsClosed}}<span class="rowsmall topic_status_e topic_status_closed"title="{{lang "status.closed_tooltip"}}"> | &#x1F512;&#xFE0E</span>{{end}}
+				{{if .Sticky}}<span class="rowsmall topic_status_e topic_status_sticky"title="{{lang "status.pinned_tooltip"}}"> | &#x1F4CD;&#xFE0E</span>{{end}}
 			</span>
 			{{/** TODO: Phase this out of Cosora and remove it **/}}
 			<div class="topic_inner_right rowsmall">
@@ -75,8 +75,8 @@
 			<div class="topic_right_inside">
 				<a href="{{.LastUser.Link}}"><img src="{{.LastUser.MicroAvatar}}"height=64 alt="Avatar"title="{{.LastUser.Name}}'s Avatar"aria-hidden="true"></a>
 				<span>
-					<a href="{{.LastUser.Link}}" class="lastName" title="{{.LastUser.Name}}">{{.LastUser.Name}}</a><br>
-					<a href="{{.Link}}?page={{.LastPage}}{{if .LastReplyID}}#post-{{.LastReplyID}}{{end}}" class="rowsmall lastReplyAt" title="{{abstime .LastReplyAt}}">{{reltime .LastReplyAt}}</a>
+					<a href="{{.LastUser.Link}}"class="lastName"title="{{.LastUser.Name}}">{{.LastUser.Name}}</a><br>
+					<a href="{{.Link}}?page={{.LastPage}}{{if .LastReplyID}}#post-{{.LastReplyID}}{{end}}"class="rowsmall lastReplyAt"title="{{abstime .LastReplyAt}}">{{reltime .LastReplyAt}}</a>
 				</span>
 			</div>
 		</div>
diff --git a/templates/panel_analytics_time_range.html b/templates/panel_analytics_time_range.html
index 409b84b9..9544ca67 100644
--- a/templates/panel_analytics_time_range.html
+++ b/templates/panel_analytics_time_range.html
@@ -1,11 +1,11 @@
-<select form="timeRangeForm" class="timeRangeSelector to_right autoSubmitRedirect" name="timeRange">
-	<option value="one-year"{{if eq .TimeRange "one-year"}} selected{{end}}>{{lang "panel_stats_time_range_one_year"}}</option>
-	<option value="three-months"{{if eq .TimeRange "three-months"}} selected{{end}}>{{lang "panel_stats_time_range_three_months"}}</option>
-	<option value="one-month"{{if eq .TimeRange "one-month"}} selected{{end}}>{{lang "panel_stats_time_range_one_month"}}</option>
-	<option value="one-week"{{if eq .TimeRange "one-week"}} selected{{end}}>{{lang "panel_stats_time_range_one_week"}}</option>
-	<option value="two-days"{{if eq .TimeRange "two-days"}} selected{{end}}>{{lang "panel_stats_time_range_two_days"}}</option>
-	<option value="one-day"{{if eq .TimeRange "one-day"}} selected{{end}}>{{lang "panel_stats_time_range_one_day"}}</option>
-	<option value="twelve-hours"{{if eq .TimeRange "twelve-hours"}} selected{{end}}>{{lang "panel_stats_time_range_twelve_hours"}}</option>
-	<option value="six-hours"{{if eq .TimeRange "six-hours"}} selected{{end}}>{{lang "panel_stats_time_range_six_hours"}}</option>
+<select form="timeRangeForm"class="timeRangeSelector to_right autoSubmitRedirect"name="timeRange">
+	<option value="one-year"{{if eq .TimeRange "one-year"}}selected{{end}}>{{lang "panel_stats_time_range_one_year"}}</option>
+	<option value="three-months"{{if eq .TimeRange "three-months"}}selected{{end}}>{{lang "panel_stats_time_range_three_months"}}</option>
+	<option value="one-month"{{if eq .TimeRange "one-month"}}selected{{end}}>{{lang "panel_stats_time_range_one_month"}}</option>
+	<option value="one-week"{{if eq .TimeRange "one-week"}}selected{{end}}>{{lang "panel_stats_time_range_one_week"}}</option>
+	<option value="two-days"{{if eq .TimeRange "two-days"}}selected{{end}}>{{lang "panel_stats_time_range_two_days"}}</option>
+	<option value="one-day"{{if eq .TimeRange "one-day"}}selected{{end}}>{{lang "panel_stats_time_range_one_day"}}</option>
+	<option value="twelve-hours"{{if eq .TimeRange "twelve-hours"}}selected{{end}}>{{lang "panel_stats_time_range_twelve_hours"}}</option>
+	<option value="six-hours"{{if eq .TimeRange "six-hours"}}selected{{end}}>{{lang "panel_stats_time_range_six_hours"}}</option>
 </select>
-<noscript><input form="timeRangeForm" type="submit"></noscript>
\ No newline at end of file
+<noscript><input form="timeRangeForm"type="submit"></noscript>
\ No newline at end of file
diff --git a/templates/panel_user_edit.html b/templates/panel_user_edit.html
index be10b67a..fe6614dc 100644
--- a/templates/panel_user_edit.html
+++ b/templates/panel_user_edit.html
@@ -2,48 +2,48 @@
 	<div class="rowitem"><h1>{{lang "panel_user_head"}}</h1></div>
 </div>
 <div id="panel_user" class="colstack_item the_form">
-	<form id="user_form" action="/panel/users/edit/submit/{{.User.ID}}?s={{.CurrentUser.Session}}" method="post"></form>
-	<form id="avatar_form" enctype="multipart/form-data" action="/panel/users/avatar/submit/{{.User.ID}}?s={{.CurrentUser.Session}}" method="post"></form>
-	<form id="remove_avatar_form" action="/panel/users/avatar/remove/submit/{{.User.ID}}?s={{.CurrentUser.Session}}" method="post"></form>
+	<form id="user_form"action="/panel/users/edit/submit/{{.User.ID}}?s={{.CurrentUser.Session}}"method="post"></form>
+	<form id="avatar_form"enctype="multipart/form-data"action="/panel/users/avatar/submit/{{.User.ID}}?s={{.CurrentUser.Session}}"method="post"></form>
+	<form id="remove_avatar_form"action="/panel/users/avatar/remove/submit/{{.User.ID}}?s={{.CurrentUser.Session}}"method="post"></form>
 	<div class="formrow">
 		<div class="formitem formlabel"><a>{{lang "panel_user_avatar"}}</a></div>
 		<div class="formitem avataritem">
 			{{if .User.RawAvatar}}<img src="{{.User.Avatar}}"height=56 width=56>{{end}}
 			<div class="avatarbuttons">
-				<input form="avatar_form" id="select_avatar" name="avatar_file" type="file" required class="auto_hide">
-				<label for="select_avatar" class="formbutton">{{lang "panel_user_avatar_select"}}</label>
-				<button form="avatar_form" name="avatar_action" value=0>{{lang "panel_user_avatar_upload"}}</button>
-				{{if .User.RawAvatar}}<button form="remove_avatar_form" name="avatar_action" value=1>{{lang "panel_user_avatar_remove"}}</button>{{end}}
+				<input form="avatar_form"id="select_avatar"name="avatar_file"type="file" required class="auto_hide">
+				<label for="select_avatar"class="formbutton">{{lang "panel_user_avatar_select"}}</label>
+				<button form="avatar_form"name="avatar_action"value=0>{{lang "panel_user_avatar_upload"}}</button>
+				{{if .User.RawAvatar}}<button form="remove_avatar_form"name="avatar_action"value=1>{{lang "panel_user_avatar_remove"}}</button>{{end}}
 			</div>
 		</div>
 	</div>
 	<div class="formrow">
 		<div class="formitem formlabel"><a>{{lang "panel_user_name"}}</a></div>
-		<div class="formitem"><input form="user_form" name="name" type="text" value="{{.User.Name}}" placeholder="{{lang "panel_user_name_placeholder"}}" autocomplete="off"></div>
+		<div class="formitem"><input form="user_form"name="name"type="text"value="{{.User.Name}}"placeholder="{{lang "panel_user_name_placeholder"}}" autocomplete="off"></div>
 	</div>
 	{{if .CurrentUser.Perms.EditUserPassword}}<div class="formrow">
 		<div class="formitem formlabel"><a>{{lang "panel_user_password"}}</a></div>
-		<div class="formitem"><input form="user_form" name="password" type="password" placeholder="*****" autocomplete="off"></div>
+		<div class="formitem"><input form="user_form"name="password"type="password"placeholder="*****"autocomplete="off"></div>
 	</div>{{end}}
 	{{if .CurrentUser.Perms.EditUserEmail}}<div class="formrow">
 		<div class="formitem formlabel"><a>{{lang "panel_user_email"}}</a></div>
 		<div class="formitem">
-			{{if .ShowEmail}}<input form="user_form" name="show-email" value=1 type="hidden">
-			<input form="user_form" name="email" type="email" value="{{.User.Email}}" placeholder="example@localhost">{{else}}<input form="user_form" name="email" value="-1" type="hidden"><a href="/panel/users/edit/{{.User.ID}}?show-email=1"><button>{{lang "panel_user_show_email"}}</button></a>{{end}}
+			{{if .ShowEmail}}<input form="user_form"name="show-email"value=1 type="hidden">
+			<input form="user_form"name="email"type="email"value="{{.User.Email}}"placeholder="example@localhost">{{else}}<input form="user_form"name="email"value="-1"type="hidden"><a href="/panel/users/edit/{{.User.ID}}?show-email=1"><button>{{lang "panel_user_show_email"}}</button></a>{{end}}
 		</div>
 	</div>{{end}}
 	{{if .CurrentUser.Perms.EditUserGroup}}
 	<div class="formrow">
 		<div class="formitem formlabel"><a>{{lang "panel_user_group"}}</a></div>
 		<div class="formitem">
-			<select form="user_form" name="group">
+			<select form="user_form"name="group">
 			{{range .Groups}}<option{{if eq .ID $.User.Group}} selected{{end}} value={{.ID}}>{{.Name}}</option>{{end}}
 			</select>
 		</div>
 	</div>{{end}}
 	<div class="formrow">
 		<div class="formitem">
-			<button form="user_form" name="panel-button" class="formbutton">{{lang "panel_user_update_button"}}</button>
+			<button form="user_form"name="panel-button" class="formbutton">{{lang "panel_user_update_button"}}</button>
 		</div>
 	</div>
 </div>
\ No newline at end of file
diff --git a/templates/profile_comments_row.html b/templates/profile_comments_row.html
index 82a9c83e..33e311ac 100644
--- a/templates/profile_comments_row.html
+++ b/templates/profile_comments_row.html
@@ -1,18 +1,18 @@
 {{/** TODO: Temporary hack until we find a more granular way of doing this. Perhaps, a custom include function? **/}}
 {{if .Header.Theme.BgAvatars}}
 {{range .ItemList}}
-	<div id="post-{{.ID}}" class="rowitem passive deletable_block editable_parent simple {{.ClassName}}" style="background-image:url({{.Avatar}}),url(/s/post-avatar-bg.jpg);background-position:0px {{if le .ContentLines 5}}-1{{end}}0px;">
+	<div id="post-{{.ID}}"class="rowitem passive deletable_block editable_parent simple {{.ClassName}}"style="background-image:url({{.Avatar}}),url(/s/post-avatar-bg.jpg);background-position:0px {{if le .ContentLines 5}}-1{{end}}0px;">
 		<span class="editable_block user_content simple">{{.ContentHtml}}</span>
 		<span class="controls">
-			<a href="{{.UserLink}}" class="real_username username">{{.CreatedByName}}</a>&nbsp;&nbsp;
+			<a href="{{.UserLink}}"class="real_username username">{{.CreatedByName}}</a>&nbsp;&nbsp;
 
-			{{if $.CurrentUser.IsMod}}<a href="/profile/reply/edit/submit/{{.ID}}?s={{$.CurrentUser.Session}}" class="mod_button" title="{{lang "profile.comments_edit_tooltip"}}" aria-label="{{lang "profile.comments_edit_aria"}}"><button class="username edit_item edit_label"></button></a>
+			{{if $.CurrentUser.IsMod}}<a href="/profile/reply/edit/submit/{{.ID}}?s={{$.CurrentUser.Session}}"class="mod_button"title="{{lang "profile.comments_edit_tooltip"}}" aria-label="{{lang "profile.comments_edit_aria"}}"><button class="username edit_item edit_label"></button></a>
 
-			<a href="/profile/reply/delete/submit/{{.ID}}?s={{$.CurrentUser.Session}}" class="mod_button" title="{{lang "profile.comments_delete_tooltip"}}" aria-label="{{lang "profile.comments_delete_aria"}}"><button class="username delete_item delete_label"></button></a>{{end}}
+			<a href="/profile/reply/delete/submit/{{.ID}}?s={{$.CurrentUser.Session}}"class="mod_button"title="{{lang "profile.comments_delete_tooltip"}}" aria-label="{{lang "profile.comments_delete_aria"}}"><button class="username delete_item delete_label"></button></a>{{end}}
 
-			<a class="mod_button" href="/report/submit/{{.ID}}?s={{$.CurrentUser.Session}}&type=user-reply"><button class="username report_item flag_label" title="{{lang "profile.comments_report_tooltip"}}" aria-label="{{lang "profile.comments_report_aria"}}"></button></a>
+			<a class="mod_button"href="/report/submit/{{.ID}}?s={{$.CurrentUser.Session}}&type=user-reply"><button class="username report_item flag_label"title="{{lang "profile.comments_report_tooltip"}}" aria-label="{{lang "profile.comments_report_aria"}}"></button></a>
 
-			{{if .Tag}}<a class="username hide_on_mobile user_tag" style="float:right;">{{.Tag}}</a>{{end}}
+			{{if .Tag}}<a class="username hide_on_mobile user_tag"style="float:right;">{{.Tag}}</a>{{end}}
 		</span>
 	</div>
 {{end}}