diff --git a/code/boot.js b/code/boot.js
index b940911e..61450938 100644
--- a/code/boot.js
+++ b/code/boot.js
@@ -32,12 +32,11 @@ window.setupStyles = function() {
       '#chatcontrols { bottom: '+(CHAT_SHRINKED+24)+'px; }',
       '#chat { height: '+CHAT_SHRINKED+'px; } ',
       '.leaflet-right { margin-right: '+(SIDEBAR_WIDTH+1)+'px } ',
-      '#updatestatus { width:'+(SIDEBAR_WIDTH-2*4+1)+'px;  } ',
+      '#updatestatus { width:'+(SIDEBAR_WIDTH+2)+'px;  } ',
       '#sidebar { width:'+(SIDEBAR_WIDTH + HIDDEN_SCROLLBAR_ASSUMED_WIDTH + 1 /*border*/)+'px;  } ',
       '#sidebartoggle { right:'+(SIDEBAR_WIDTH+1)+'px;  } ',
       '#scrollwrapper  { width:'+(SIDEBAR_WIDTH + 2*HIDDEN_SCROLLBAR_ASSUMED_WIDTH)+'px; right:-'+(2*HIDDEN_SCROLLBAR_ASSUMED_WIDTH-2)+'px } ',
-      '#sidebar input, h2  { width:'+(SIDEBAR_WIDTH - 2*4)+'px !important } ',
-      '#sidebar > *, #gamestat span, .imgpreview img { width:'+SIDEBAR_WIDTH+'px;  }'].join("\n")
+      '#sidebar > *, #gamestat span, .imgpreview img { width:'+(SIDEBAR_WIDTH+1)+'px;  }'].join("\n")
     + '</style>');
 
   if(L.Browser.mobile) {
diff --git a/style.css b/style.css
index 4b693dc2..c840dd9c 100644
--- a/style.css
+++ b/style.css
@@ -282,6 +282,9 @@ summary {
 
 #sidebar > * {
   border-bottom: 1px solid #20A8B1;
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
 }
 
 
@@ -310,6 +313,10 @@ h2 {
   padding: 0 4px;
   margin: 0;
   cursor:help;
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+  width: 100%;
 }
 
 h2 span {
@@ -335,9 +342,8 @@ h2 sup, h2 sub {
 
 
 /* gamestats */
-#gamestat, #gamestat span {
+#gamestat {
   height: 22px;
-  line-height: 22px;
 }
 
 #gamestat span {
@@ -345,6 +351,8 @@ h2 sup, h2 sub {
   float: left;
   font-weight: bold;
   cursor:help;
+  height: 21px;
+  line-height: 22px;
 }
 
 #gamestat .res {
@@ -361,12 +369,13 @@ h2 sup, h2 sub {
 input {
   background-color: rgba(0, 0, 0, 0.3);
   color: #ffce00;
-  height: 22px;
+  height: 21px;
   line-height: 22px;
   padding: 0 4px;
   font-size: 14px;
   border:0;
   font-family:inherit;
+  box-sizing: border-box;
 }
 
 ::-webkit-input-placeholder {
@@ -392,6 +401,9 @@ h3 {
   overflow:hidden;
   text-overflow: "~";
   white-space: nowrap;
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
 }
 
 .imgpreview {
@@ -587,6 +599,9 @@ aside:nth-child(odd) span {
   position: fixed;
   right: 0;
   z-index:3002;
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
 }