diff --git a/base.css b/base.css
index 9b160e9..6cc0029 100644
--- a/base.css
+++ b/base.css
@@ -58,10 +58,13 @@ main{
 }
 .so-pane > *{
     font-size: 24px;
-    text-align: center;
+    text-align: left;
     width: 180px;
     padding: 0 1px;
 }
+.so-pane > label{
+    background-color: transparent;
+}
 .nav-menu, .sort-menu, .data-hold{
 	display: none;
 }
@@ -121,7 +124,7 @@ main{
     text-align: center;
     vertical-align: middle;
     border-style: solid;
-    border-width: 1px;
+    border-width: 2px;
 }
 .main-box{
     display: -webkit-box;
diff --git a/dark.css b/dark.css
index 7675139..181b20b 100644
--- a/dark.css
+++ b/dark.css
@@ -1,4 +1,4 @@
-body, .so-pane > *{
+body{
 	color: #f9f9f9;
 	background-color: #050506;
 	border-color: #696969;
@@ -9,10 +9,10 @@ a{
 .header, .nav, footer, .so-pane{
 	background-color: #1d1d1e;
 }
-.home-button > div, .sort-button > div, .menu a{
+.home-button > div, .sort-button > div, .menu a, .so-pane > *{
 	color: #e0e0e0;
 }
-.home-button:hover, .menu a:hover, .hmb:hover, .sort-button:hover, .sort-menu:checked ~ .sort-button{
+.home-button:hover, .menu a:hover, .hmb:hover, .sort-button:hover, .sort-menu:checked ~ .sort-button, .so-pane > input, .so-pane > select{
 	background-color: #606061;
 }
 .hmb-line, .hmb-line::before, .hmb-line::after{
diff --git a/index.go.html b/index.go.html
index 7f5f3ff..b759015 100644
--- a/index.go.html
+++ b/index.go.html
@@ -33,6 +33,7 @@
         <input id="so-theme" type="hidden" name="light" />
         {{ end }}
         {{ $sort := 0 }}
+        <p>
         <label class="no-dec" for="so-order">Order by:</label>
         <select name="order" id="so-order">
             {{ if eq .OrderStartDate 0 }}
@@ -60,20 +61,25 @@
             {{ $sort = .OrderDuration }}
             {{ end }}
         </select>
+        </p>
+        <p>
         <label class="no-dec" for="so-sort">Sort:</label>
         <select name="sort" id="so-sort">
-            {{ if lt $sort 0 }}
+            {{ if gt $sort 0 }}
             <option value="asc" selected>Ascending</option>
             {{ else }}
             <option value="asc">Ascending</option>
             {{ end }}
-            {{ if gt $sort 0 }}
+            {{ if lt $sort 0 }}
             <option value="desc" selected>Descending</option>
             {{ else }}
             <option value="desc">Descending</option>
             {{ end }}
         </select>
+        </p>
+        <p>
         <input id="so-submit" type="submit" value="Commit">
+        </p>
     </form>
     <input class="nav-menu" type="checkbox" id="nav-menu"/>
     <label class="hmb" for="nav-menu" title="Navigation Links"><span class="hmb-line"></span></label>
diff --git a/light.css b/light.css
index db3374e..5c608bb 100644
--- a/light.css
+++ b/light.css
@@ -1,4 +1,4 @@
-body, .so-pane > *{
+body{
     color: #060606;
     background-color: #fafaf9;
     border-color: #969696;
@@ -9,10 +9,10 @@ a{
 .header, .nav, footer, .so-pane{
     background-color: #e2e2e1;
 }
-.home-button > div, .sort-button > div, .menu a{
+.home-button > div, .sort-button > div, .menu a, .so-pane > *{
     color: #1f1f1f;
 }
-.home-button:hover, .menu a:hover, .hmb:hover, .sort-button:hover, .sort-menu:checked ~ .sort-button{
+.home-button:hover, .menu a:hover, .hmb:hover, .sort-button:hover, .sort-menu:checked ~ .sort-button, .so-pane > input, .so-pane > select{
     background-color: #9f9f9e;
 }
 .hmb-line, .hmb-line::before, .hmb-line::after{