diff --git a/Dockerfile b/Dockerfile
index 03766c06..00befc03 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.10.3
+FROM golang:1.10
 RUN git clone https://github.com/Azareal/Gosora
 RUN mv Gosora app
 ADD . /app/
diff --git a/images/nox-wip-bulk-moderation.png b/images/nox-wip-bulk-moderation.png
new file mode 100644
index 00000000..0b557b94
Binary files /dev/null and b/images/nox-wip-bulk-moderation.png differ
diff --git a/images/nox-wip-forum-list.png b/images/nox-wip-forum-list.png
new file mode 100644
index 00000000..79c4fd43
Binary files /dev/null and b/images/nox-wip-forum-list.png differ
diff --git a/images/nox-wip-menu-editor.png b/images/nox-wip-menu-editor.png
new file mode 100644
index 00000000..dfaa91de
Binary files /dev/null and b/images/nox-wip-menu-editor.png differ
diff --git a/images/nox-wip-menu-items.png b/images/nox-wip-menu-items.png
new file mode 100644
index 00000000..be80259b
Binary files /dev/null and b/images/nox-wip-menu-items.png differ
diff --git a/images/nox-wip-panel-dashboard.png b/images/nox-wip-panel-dashboard.png
new file mode 100644
index 00000000..aca5760b
Binary files /dev/null and b/images/nox-wip-panel-dashboard.png differ
diff --git a/images/nox-wip-topic-list.png b/images/nox-wip-topic-list.png
new file mode 100644
index 00000000..4d8cb5ae
Binary files /dev/null and b/images/nox-wip-topic-list.png differ
diff --git a/langs/english.json b/langs/english.json
index 8b1928c5..54e43dab 100644
--- a/langs/english.json
+++ b/langs/english.json
@@ -758,6 +758,7 @@
 
 		"panel_themes_menus_head":"Menus",
 		"panel_themes_menus_main":"Main Menu",
+		"panel_themes_menus_items_head":"Menu Items",
 		"panel_themes_menus_item_edit_button_aria":"Edit menu item",
 		"panel_themes_menus_item_delete_button_aria":"Delete menu item",
 
diff --git a/templates/panel_pages_edit.html b/templates/panel_pages_edit.html
index 8f1ee5e4..27a08231 100644
--- a/templates/panel_pages_edit.html
+++ b/templates/panel_pages_edit.html
@@ -6,7 +6,7 @@
 		<div class="rowitem"><h1>{{lang "panel_pages_edit_head"}}</h1></div>
 	</div>
 	<form action="/panel/pages/edit/submit/{{.Page.ID}}?session={{.CurrentUser.Session}}" method="post">
-		<div id="panel_page_edit_item" class="colstack_item">
+		<div id="panel_page_edit_item" class="colstack_item the_form">
 			<div class="formrow">
 				<div class="formitem formlabel"><a>{{lang "panel_pages_name"}}</a></div>
 				<div class="formitem"><input name="name" type="text" value="{{.Page.Name}}" /></div>
diff --git a/templates/panel_themes_menus_items.html b/templates/panel_themes_menus_items.html
index 086028a6..bf249a14 100644
--- a/templates/panel_themes_menus_items.html
+++ b/templates/panel_themes_menus_items.html
@@ -3,7 +3,7 @@
 {{template "panel_menu.html" . }}
 	<main class="colstack_right">
 		<div class="colstack_item colstack_head">
-			<div class="rowitem"><h1>{{lang "panel_themes_menus_head"}}</h1></div>
+			<div class="rowitem"><h1>{{lang "panel_themes_menus_items_head"}}</h1></div>
 		</div>
 		<div id="panel_menu_item_holder" class="colstack_item rowlist">
 			{{range .ItemList}}
diff --git a/templates/panel_users.html b/templates/panel_users.html
index 59b9d892..b1f019fb 100644
--- a/templates/panel_users.html
+++ b/templates/panel_users.html
@@ -12,8 +12,8 @@
 			<img class="bgsub" src="{{.Avatar}}" alt="{{.Name}}'s Avatar" />
 			<a class="rowTitle editable_block"{{if $.CurrentUser.Perms.EditUser}} href="/panel/users/edit/{{.ID}}?session={{$.CurrentUser.Session}}"{{end}}>{{.Name}}</a>
 			<a href="{{.Link}}" class="tag-mini profile_url">{{lang "panel_users_profile"}}</a>
-			{{if (.Tag) and (.IsSuperMod)}}<span class="to_right"><span class="panel_tag">{{.Tag}}</span></span>{{end}}
 			<span class="panel_floater">
+				{{if (.Tag) and (.IsSuperMod)}}<span class="panel_tag">{{.Tag}}</span></span>{{end}}
 				{{if .IsBanned}}<a href="/users/unban/{{.ID}}?session={{$.CurrentUser.Session}}" class="panel_tag panel_right_button ban_button">{{lang "panel_users_unban"}}</a>{{else if not .IsSuperMod}}<a href="/user/{{.ID}}#ban_user" class="panel_tag panel_right_button ban_button">{{lang "panel_users_ban"}}</a>{{end}}
 				{{if not .Active}}<a href="/users/activate/{{.ID}}?session={{$.CurrentUser.Session}}" class="panel_tag panel_right_button">{{lang "panel_users_activate"}}</a>{{end}}
 			</span>
diff --git a/themes/nox/public/main.css b/themes/nox/public/main.css
index e5085e68..f3dc8185 100644
--- a/themes/nox/public/main.css
+++ b/themes/nox/public/main.css
@@ -195,6 +195,8 @@ h1, h2, h3, h4, h5 {
 .mod_floater_options {
 	width: 100%;
 	margin-right: 10px;
+	padding: 4px;
+	margin-bottom: 0px;
 }
 
 .rowhead, .opthead, .colstack_head {
@@ -434,6 +436,11 @@ input {
 	padding-bottom: 3px;
 	font-size: 16px;
 }
+input, select {
+	/*margin-left: 4px;*/
+	margin-left: 3px;
+	margin-bottom: 4px;
+}
 button, .formbutton, .panel_right_button {
 	background: rgb(110,110,210);
 	color: rgb(250,250,250);
diff --git a/themes/nox/public/panel.css b/themes/nox/public/panel.css
index e7760d5a..9f25551a 100644
--- a/themes/nox/public/panel.css
+++ b/themes/nox/public/panel.css
@@ -97,18 +97,30 @@
 
 input, select, textarea {
 	background: rgb(107,107,107);
-	color: rgb(217,217,217);
+	color: rgb(197,197,197);
 }
+.colstack_right input, .colstack_right select, .colstack_right textarea {
+	padding: 4px;
+	padding-bottom: 3px;
+	padding-left: 6px;
+	padding-right: 6px;
+}
+.colstack_right input {
+	padding-left: 6px;
+	padding-right: 6px;
+}
+
 input:focus, select:focus, textarea:focus {
 	outline: 1px solid rgb(137,137,137);
+	color: rgb(207,207,207);
 }
 /* ? - The background properties need to be redeclared for the new image or it won't work properly */
 input {
 	background-image: url(./fa-svg/pencil-alt-light.svg);
 	background-size: 12px;
 	background-repeat: no-repeat;
-	background-position: right 10px bottom 9px;
-    background-position-x: right 10px;
+	background-position: right 9px bottom 7px;
+    background-position-x: right 9px;
 }
 input::placeholder, textarea::placeholder {
 	color: rgb(167,167,167);
@@ -121,6 +133,9 @@ button, .formbutton {
 button, .formbutton, .panel_right_button {
 	background: rgb(100,100,200);
 }
+/*.formlabel {
+	font-size: 17px;
+}*/
 .panel_right_button {
 	margin-left: 2px;
 	padding: 5px;
@@ -190,9 +205,29 @@ button, .formbutton, .panel_right_button {
 	height: 80px;
 }
 
+#panel_users .rowitem .to_right {
+	order: 0;
+	margin-right: auto;
+}
+#panel_users .rowitem .profile_url {
+	order: 1;
+}
+#panel_users .rowitem .panel_floater {
+	order: 2;
+}
+
 .panel_submitrow {
 	margin-top: 8px;
 }
+.colstack_right .colstack_item:not(.colstack_head):not(.rowhead).panel_submitrow .rowitem {
+	padding-bottom: 14px;
+}
+.panel_submitrow .rowitem button:first-child {
+	margin-left: auto;
+}
+.panel_submitrow .rowitem button:last-child {
+	margin-right: auto;
+}
 
 .panel_plugin_meta {
 	display: flex;
diff --git a/themes/shadow/public/panel.css b/themes/shadow/public/panel.css
index 2aee7b23..cf48c57c 100644
--- a/themes/shadow/public/panel.css
+++ b/themes/shadow/public/panel.css
@@ -41,6 +41,9 @@
 	display: flex;
 }
 
+#panel_users .panel_tag {
+	float: right;
+}
 #panel_users .ban_button {
 	font-size: 10px;
 	float: none;
diff --git a/themes/tempra-simple/public/main.css b/themes/tempra-simple/public/main.css
index 38c88d7c..40391dc1 100644
--- a/themes/tempra-simple/public/main.css
+++ b/themes/tempra-simple/public/main.css
@@ -813,8 +813,7 @@ input[type=checkbox]:checked + label.poll_option_label .sel {
 	font-size: 30px;
 	border-width: 1px;
 	background-color: #FFFFFF;
-	border-style: dotted;
-	border-color: #505050;
+	border: 1px solid hsl(0,0%,80%);
 	padding: 0px;
 	padding-left: 5px;
 	padding-right: 5px;
@@ -828,6 +827,7 @@ input[type=checkbox]:checked + label.poll_option_label .sel {
 	display: block;
 	text-decoration: none;
 	color: #505050;
+	padding: 2px;
 }
 .prev_button {
 	left: 14px;