diff --git a/static/truewiki/truewiki.css b/static/truewiki/truewiki.css
index b4bb9b6..6a12842 100644
--- a/static/truewiki/truewiki.css
+++ b/static/truewiki/truewiki.css
@@ -20,7 +20,7 @@ body > * {
 
 body > header {
 	margin: 0px auto;
-	padding: 6px 10px 10px 10px;
+	padding: 6px 10px 6px 10px;
     box-shadow: 0px 0px 5px #000000;
     background-color: #333333;
 	display: flex;
@@ -119,7 +119,7 @@ main {
     padding: 5px 0 0 10px;
 }
 
-@media only screen and (min-width: 992px) {
+@media only screen and (min-width: 1020px) {
     #pagename {
         font-size: 300%;
     }
@@ -141,7 +141,7 @@ main {
     padding-right: 10px;
 }
 
-@media only screen and (min-width: 992px) {
+@media only screen and (min-width: 1020px) {
     #navigation-bar.right {
         visibility: visible;
     }
@@ -239,7 +239,6 @@ a.new {
 }
 main img {
     max-width: 900px;
-    width: 100%; /* Prevent overflow on small (e.g. mobile) screens */
 }
 
 .magnify {
@@ -535,7 +534,7 @@ header {
     width: 100%;
 }
 
-@media only screen and (min-width: 992px) {
+@media only screen and (min-width: 1020px) {
     #search {
         left: 420px;
         margin: auto;
@@ -543,6 +542,11 @@ header {
         top: -80px;
         width: 152px;
     }
+
+    main {
+        /* search-bar consumes space, even if we moved it away. */
+        margin-top: -10px;
+    }
 }
 
 #search input[type=text] {