diff --git a/static/index.html b/static/index.html
index 97736d1ef..da24a7a7c 100644
--- a/static/index.html
+++ b/static/index.html
@@ -4,27 +4,24 @@
         <title>Etherpad Lite</title>
 
         <meta charset="utf-8"> 
-        <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
+        <meta name="viewport" content="width=device-width, user-scalable=0">
 
-        <style> 
-            *{ margin:0;padding:0; }
+        <style>
             body {
-              background: rgba(0,0,0,.05);
+              margin: 0;
+              height: 100%;
               color: #333;
-              font: 14px helvetica,sans-serif;
-              background: #ccc;
+              font: 14px helvetica, sans-serif;
+              background: #ddd;
               background: -webkit-radial-gradient(circle,#aaa,#eee 60%) center fixed;
               background: -moz-radial-gradient(circle,#aaa,#eee 60%) center fixed;
               background: -ms-radial-gradient(circle,#aaa,#eee 60%) center fixed;
               background: -o-radial-gradient(circle,#aaa,#eee 60%) center fixed;
-              overflow-x: hidden;
               border-top: 8px solid rgba(51,51,51,.8);
             }
-            #container {
-              text-shadow: 0 1px 1px #fff;
+            #wrapper {
               border-top: 1px solid #999;
               margin-top: 160px;
-              text-align: center;
               padding: 15px;
               background: #eee;
               background: -webkit-linear-gradient(#fff,#ccc);
@@ -34,6 +31,10 @@
               opacity: .9;
               box-shadow: 0px 1px 8px rgba(0,0,0,0.3);
             }
+            #inner {
+              width: 300px;
+              margin: 0 auto;
+            }
             #button {
               margin: 0 auto;
               border-radius: 3px;
@@ -43,7 +44,6 @@
               text-shadow: 0 -1px 0 rgba(0,0,0,.8);
               height: 70px;
               line-height: 70px;
-              width: 300px;
               background: #555;
               background: -webkit-linear-gradient(#5F5F5F,#565656 50%,#4C4C4C 51%,#373737);
               background: -moz-linear-gradient(#5F5F5F,#565656 50%,#4C4C4C 51%,#373737);
@@ -65,64 +65,69 @@
             }
             #label {
               text-align: left;
-              margin: 0 auto;
-              width: 300px;
+              text-shadow: 0 1px 1px #fff;
+              margin: 16px auto 0;
             }
-            input {
-              vertical-align: middle;
+            form {
+              height: 38px;
+              background: #fff;
+              border: 1px solid #bbb;
+              border-radius: 3px;
+              position: relative;
+            }
+            button, input {
               font-weight: bold;
               font-size: 15px;
             }
             input[type="text"] {
-              width: 243px;
-              padding: 10px 47px 10px 10px;
-              background: #fff;
-              border: 1px solid #bbb;
-              outline: none;
               border-radius: 3px;
-              text-shadow: 0 0 1px #fff;
+              box-sizing: border-box;
+              -moz-box-sizing: border-box;   
+              padding: 0 45px 0 10px;
+              width: 100%;
+              height: 100%;
+              outline: none;
+              border: none;
+              position: absolute;
             }
-            input[type="submit"] {
+            button[type="submit"] {
+              position: absolute;
+              right: 0;
               width: 45px;
-              margin-left: -50px;
-              padding: 8px;
+              height: 38px;
             }
-            input[type="submit"]::-moz-focus-inner { border: 0 }
-            @-moz-document url-prefix() { input[type="submit"] { padding: 7px } }     
             @media only screen and (min-device-width: 320px) and (max-device-width: 720px) {
               body {
                 background: #bbb;
                 background: -webkit-linear-gradient(#aaa,#eee 60%) center fixed;
-                height: 100%;
+                background: -moz-linear-gradient(#aaa,#eee 60%) center fixed;
+                background: -ms-linear-gradient(#aaa,#eee 60%) center fixed;
               }
-              #container {
+              #wrapper {
                 margin-top: 0;
-                text-align: left;
               }
-              #button, #label {
-                text-align: center;
+              #inner {
                 width: 95%;        
               }
-              form {
-               text-align: center;
-              }
-              input[type=text] {
-                width: 75%;
+              #label {
+                text-align: center;
               }
             }
-        </style> 
-
+        </style>
         <link href="static/custom/index.css" rel="stylesheet"> 
-        <script src="static/custom/index.js"></script>
 
-        <div id="container"> 
-            <div id="button" onclick="go2Random()" class="translate">New Pad</div><br><div id="label" class="translate">or create/open a Pad with the name</div> 
-            <form action="#" onsubmit="go2Name();return false;"> 
+        <div id="wrapper">
+            <div id="inner">
+                <div id="button" onclick="go2Random()" class="translate">New Pad</div>
+                <div id="label" class="translate">or create/open a Pad with the name</div> 
+                <form action="#" onsubmit="go2Name();return false;"> 
                     <input type="text" id="padname" autofocus x-webkit-speech> 
-                    <input type="submit" value="OK"> 
-            </form> 
+                    <button type="submit">OK</button>
+                </form>
+            </div>
         </div>
 
+        <script src="static/custom/index.js"></script>
         <script> 
             function go2Name() 
             {
diff --git a/static/pad.html b/static/pad.html
index 0345d65b0..d5eb2f567 100644
--- a/static/pad.html
+++ b/static/pad.html
@@ -5,7 +5,7 @@
 
         <meta charset="utf-8">
         <meta name="robots" content="noindex, nofollow">
-        <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
+        <meta name="viewport" content="width=device-width, user-scalable=0">
 
         <link href="../static/css/pad.css" rel="stylesheet">
         <link href="../static/custom/pad.css" rel="stylesheet">