diff --git a/src/static/css/admin.css b/src/static/css/admin.css
index fe40b6282..67706fa2f 100644
--- a/src/static/css/admin.css
+++ b/src/static/css/admin.css
@@ -1,123 +1,138 @@
-body {
-  margin: 0;
-  height: 100%;
-  color: #333;
-  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;
-  border-top: 8px solid rgba(51,51,51,.8);
-}
-#wrapper {
-  margin-top: 160px;
-  padding: 15px;
-  background: #fff;
-  opacity: .9;
-  box-shadow: 0px 1px 8px rgba(0,0,0,0.3);
-  max-width: 700px;
-  margin: auto;
-  border-radius: 0 0 7px 7px;
-}
-h1 {
-  font-size: 29px;
-}
-h2 {
-  font-size: 24px;
-}
-.seperator {
-  margin: 10px 0;
-  height: 1px;
-  background: #aaa;
-  background: -webkit-linear-gradient(left, #fff, #aaa 20%, #aaa 80%, #fff);
-  background: -moz-linear-gradient(left, #fff, #aaa 20%, #aaa 80%, #fff);
-  background: -ms-linear-gradient(left, #fff, #aaa 20%, #aaa 80%, #fff);
-  background: -o-linear-gradient(left, #fff, #aaa 20%, #aaa 80%, #fff);
-}
-form {
-  margin-bottom: 0;
-}
-#inner {
-  width: 300px;
-  margin: 0 auto;
-}
-button, input {
-  font-weight: bold;
-  font-size: 15px;
-}
-input[type="button"] {
-  height: 30px;
-  margin: 0;
-  display: block;
-}
-input[value="Uninstall"], input[value="Install"] {
-  float: right;
-  width: 100px;
-}
-input[type="text"] {
-  border-radius: 3px;
-  box-sizing: border-box;
-  -moz-box-sizing: border-box;   
-  padding: 10px;
-  *padding: 0; /* IE7 hack */
-  width: 100%;
-  outline: none;
-  border: 1px solid #ddd;
-  margin: 0 0 5px 1px;
-  max-width: 500px;
-}
-button{
-  display:block;
-}
-table {
-  border: 1px solid #ddd;
-  border-radius: 3px;
-  border-spacing: 0;
-  width: 100%;
-  margin: 20px 0;
-}
-table thead tr {
-  background: #eee;
-}
-td, th {
-  padding: 5px;
-}
-.template {
-  display: none;
-}
-.dialog {
-  display: none;
-  position: absolute;
-  left: 50%;
-  top: 50%;
-  width: 700px;
-  height: 500px;
-  margin-left: -350px;
-  margin-top: -250px;
-  border: 3px solid #999999;
-  background: #eeeeee;
-}
-.dialog .title {
-  margin: 0;
-  padding: 2px;
-  border-bottom: 3px solid #999999;
-  font-size: 24px;
-  line-height: 24px;
-  height: 24px;
-  overflow: hidden;
-}
-.dialog .title .close {
-  float: right;
-}
-.dialog .history {
-  background: #222222;
-  color: #eeeeee;
-  position: absolute;
-  top: 41px;
-  bottom: 10px;
-  left: 10px;
-  right: 10px;
-  padding: 2px;
-  overflow: auto;
-}
\ No newline at end of file
+body {
+  margin: 0;
+  height: 100%;
+  color: #333;
+  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;
+  border-top: 8px solid rgba(51,51,51,.8);
+}
+#wrapper {
+  border-top: 1px solid #999;
+  margin-top: 160px;
+  padding: 15px;
+  background: #eee;
+  background: -webkit-linear-gradient(#fff,#ccc);
+  background: -moz-linear-gradient(#fff,#ccc);
+  background: -ms-linear-gradient(#fff,#ccc);
+  background: -o-linear-gradient(#fff,#ccc);
+  opacity: .9;
+  box-shadow: 0px 1px 8px rgba(0,0,0,0.3);
+  max-width: 1200px;
+  margin: auto;
+}
+#inner {
+  width: 300px;
+  margin: 0 auto;
+}
+#button:hover {
+  cursor: pointer;
+  background: #666;
+  background: -webkit-linear-gradient(#707070,#666666 50%,#5B5B5B 51%,#474747);
+  background: -moz-linear-gradient(#707070,#666666 50%,#5B5B5B 51%,#474747);
+  background: -ms-linear-gradient(#707070,#666666 50%,#5B5B5B 51%,#474747);
+  background: -o-linear-gradient(#707070,#666666 50%,#5B5B5B 51%,#474747);
+}
+#button:active {
+  box-shadow: inset 0 1px 12px rgba(0,0,0,0.9);
+  background: #444;
+}
+#label {
+  text-align: left;
+  text-shadow: 0 1px 1px #fff;
+  margin: 16px auto 0;
+}
+form {
+  border: 1px solid #bbb;
+  border-radius: 3px;
+  position: relative;
+}
+button, input {
+  font-weight: bold;
+  font-size: 15px;
+}
+input[type="button"] {
+  height:30px;
+}
+input[type="text"] {
+  border-radius: 3px;
+  box-sizing: border-box;
+  -moz-box-sizing: border-box;   
+  padding: 10px 45px 10px 10px;
+  *padding: 0; /* IE7 hack */
+  width: 100%;
+  outline: none;
+  border: none;
+}
+button{
+  display:block;
+}
+@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;
+    background: -moz-linear-gradient(#aaa,#eee 60%) center fixed;
+    background: -ms-linear-gradient(#aaa,#eee 60%) center fixed;
+  }
+  #wrapper {
+    margin-top: 0;
+  }
+  #inner {
+    width: 95%;        
+  }
+  #label {
+    text-align: center;
+  }
+}
+
+table {
+  border-collapse: collapse;
+}
+td, th {
+  border: 1px solid black;
+  padding-left: 10px;
+  padding-right: 10px;
+  padding-top: 2px;
+  padding-bottom: 2px;
+}
+.template {
+  display: none;
+}
+.dialog {
+  display: none;
+  position: absolute;
+  left: 50%;
+  top: 50%;
+  width: 700px;
+  height: 500px;
+  margin-left: -350px;
+  margin-top: -250px;
+  border: 3px solid #999999;
+  background: #eeeeee;
+}
+.dialog .title {
+  margin: 0;
+  padding: 2px;
+  border-bottom: 3px solid #999999;
+  font-size: 24px;
+  line-height: 24px;
+  height: 24px;
+  overflow: hidden;
+}
+.dialog .title .close {
+  float: right;
+}
+.dialog .history {
+  background: #222222;
+  color: #eeeeee;
+  position: absolute;
+  top: 41px;
+  bottom: 10px;
+  left: 10px;
+  right: 10px;
+  padding: 2px;
+  overflow: auto;
+}
diff --git a/src/templates/admin/plugins.html b/src/templates/admin/plugins.html
index dafbcff90..6f38d0480 100644
--- a/src/templates/admin/plugins.html
+++ b/src/templates/admin/plugins.html
@@ -1,170 +1,166 @@
-<html>
-  <head>
-    <title>Plugin manager</title>
-    <link href="../../static/css/admin.css" rel="stylesheet" type="text/css" />
-    <script src="../../static/js/jquery.js"></script>
-    <script src="../../socket.io/socket.io.js"></script>
-    <script>
-      $(document).ready(function () {
-        var socket = io.connect().of("/pluginfw/installer");
-
-        var doUpdate = false;
-
-        function updateHandlers() {
-          $("#progress.dialog .close").unbind('click').click(function () {
-            $("#progress.dialog").hide();
-          });
-
-          $("#do-search").unbind('click').click(function () {
-            if ($("#search-query")[0].value != "")
-              socket.emit("search", $("#search-query")[0].value);
-          });
-  
-          $(".do-install").unbind('click').click(function (e) {
-            var row = $(e.target).closest("tr");
-            doUpdate = true;
-            socket.emit("install", row.find(".name").html());
-          });
-
-          $(".do-uninstall").unbind('click').click(function (e) {
-            var row = $(e.target).closest("tr");
-            doUpdate = true;
-            socket.emit("uninstall", row.find(".name").html());
-          });
-        }
-
-        updateHandlers();
-
-        socket.on('progress', function (data) {
-          $("#progress.dialog .close").hide();
-          $("#progress.dialog").show();
-          var message = "Unknown status";
-          if (data.message) {
-            message = "<span class='status'>" + data.message.toString() + "</span>";
-          }
-          if (data.error) {
-            message = "<span class='error'>" + data.error.toString() + "<span>";            
-          }
-          $("#progress.dialog .message").html(message);
-          $("#progress.dialog .history").append("<div>" + message + "</div>");
-
-          if (data.progress >= 1) {
-            if (data.error) {
-              $("#progress.dialog .close").show();
-            } else {
-              if (doUpdate) {
-                doUpdate = false;
-                socket.emit("load");
-              }
-              $("#progress.dialog").hide();
-            }
-          }
-        });
-
-        socket.on('search-result', function (data) {
-          $("#search-results *").remove();
-          for (plugin_name in data.results) {
-            var plugin = data.results[plugin_name];
-            var row = $("#search-result-template").clone();
-
-            for (attr in plugin) {
-              row.find("." + attr).html(plugin[attr]);
-            }
-            $("#search-results").append(row);
-          }
-          updateHandlers();
-        });
-
-        socket.on('installed-results', function (data) {
-          $("#installed-plugins *").remove();
-          for (plugin_name in data.results) {
-            var plugin = data.results[plugin_name];
-            var row = $("#installed-plugin-template").clone();
-
-            for (attr in plugin.package) {
-              row.find("." + attr).html(plugin.package[attr]);
-            }
-            $("#installed-plugins").append(row);
-          }
-          updateHandlers();
-        });
-
-        socket.emit("load");
-
-      });
-    </script>
-  </head>
-  <body>
-    <div id="wrapper">
-
-      <h1>Etherpad Lite</h1>
-
-      <div class="seperator"></div>
-
-      <% if (errors.length) { %>
-        <div class="errors">
-          <% errors.forEach(function (item) { %>
-            <div class="error"><%= item.toString() %></div>
-          <% }) %>
-        </div>
-      <% } %>
-
-
-      <h2>Installed plugins</h2>
-      <table>
-        <thead>
-          <tr>
-            <th>Name</th>
-            <th>Description</th>
-            <td></td>
-          </tr>
-        </thead>
-        <tbody class="template">
-          <tr id="installed-plugin-template">
-            <td class="name"></td>
-            <td class="description"></td>
-            <td class="actions">
-              <input type="button" value="Uninstall" class="do-uninstall">
-            </td>
-          </tr>
-        </tbody>
-        <tbody id="installed-plugins">
-        </tbody>
-      </table>
-      <div class="seperator"></div>
-      <h2>Search for plugins to install</h2>
-      <form>
-        <input type="text" name="search" placeholder="Search term" id="search-query">
-        <input type="button" value="Search" id="do-search">
-      </form>
-      <table>
-        <thead>
-          <tr>
-            <th>Name</th>
-            <th>Description</th>
-            <td></td>
-          </tr>
-        </thead>
-        <tbody class="template">
-          <tr id="search-result-template">
-            <td class="name"></td>
-            <td class="description"></td>
-            <td class="actions">
-              <input type="button" value="Install" class="do-install">
-           </td>
-          </tr>
-        </tbody>
-        <tbody id="search-results">
-        </tbody>
-      </table>
-
-      <div id="progress" class="dialog">
-        <h1 class="title">
-          Please wait: <span class="message"></span>
-        <input type="button" class="close" value="Close">
-        </h1>
-        <div class="history"></div>
-      </div>
-    </div>
-  </body>
-</html>
\ No newline at end of file
+<html>
+  <head>
+    <title>Plugin manager</title>
+    <link href="../../static/css/admin.css" rel="stylesheet" type="text/css" />
+    <script src="../../static/js/jquery.js"></script>
+    <script src="../../socket.io/socket.io.js"></script>
+    <script>
+      $(document).ready(function () {
+        var socket = io.connect().of("/pluginfw/installer");
+
+        var doUpdate = false;
+
+        function updateHandlers() {
+          $("#progress.dialog .close").unbind('click').click(function () {
+            $("#progress.dialog").hide();
+          });
+
+          $("#do-search").unbind('click').click(function () {
+            if ($("#search-query")[0].value != "")
+              socket.emit("search", $("#search-query")[0].value);
+          });
+  
+          $(".do-install").unbind('click').click(function (e) {
+            var row = $(e.target).closest("tr");
+            doUpdate = true;
+            socket.emit("install", row.find(".name").html());
+          });
+
+          $(".do-uninstall").unbind('click').click(function (e) {
+            var row = $(e.target).closest("tr");
+            doUpdate = true;
+            socket.emit("uninstall", row.find(".name").html());
+          });
+        }
+
+        updateHandlers();
+
+        socket.on('progress', function (data) {
+          $("#progress.dialog .close").hide();
+          $("#progress.dialog").show();
+          var message = "Unknown status";
+          if (data.message) {
+            message = "<span class='status'>" + data.message.toString() + "</span>";
+          }
+          if (data.error) {
+            message = "<span class='error'>" + data.error.toString() + "<span>";            
+          }
+          $("#progress.dialog .message").html(message);
+          $("#progress.dialog .history").append("<div>" + message + "</div>");
+
+          if (data.progress >= 1) {
+            if (data.error) {
+              $("#progress.dialog .close").show();
+            } else {
+              if (doUpdate) {
+                doUpdate = false;
+                socket.emit("load");
+              }
+              $("#progress.dialog").hide();
+            }
+          }
+        });
+
+        socket.on('search-result', function (data) {
+          $("#search-results *").remove();
+          for (plugin_name in data.results) {
+            var plugin = data.results[plugin_name];
+            var row = $("#search-result-template").clone();
+
+            for (attr in plugin) {
+              row.find("." + attr).html(plugin[attr]);
+            }
+            $("#search-results").append(row);
+          }
+          updateHandlers();
+        });
+
+        socket.on('installed-results', function (data) {
+          $("#installed-plugins *").remove();
+          for (plugin_name in data.results) {
+            var plugin = data.results[plugin_name];
+            var row = $("#installed-plugin-template").clone();
+
+            for (attr in plugin.package) {
+              row.find("." + attr).html(plugin.package[attr]);
+            }
+            $("#installed-plugins").append(row);
+          }
+          updateHandlers();
+        });
+
+        socket.emit("load");
+
+      });
+    </script>
+  </head>
+  <body>
+    <div id="wrapper">
+
+      <% if (errors.length) { %>
+        <div class="errors">
+          <% errors.forEach(function (item) { %>
+            <div class="error"><%= item.toString() %></div>
+          <% }) %>
+        </div>
+      <% } %>
+
+
+      <h1>Installed plugins</h1>
+      <table>
+        <thead>
+          <tr>
+            <th>Name</th>
+            <th>Description</th>
+            <td></td>
+          </tr>
+        </thead>
+        <tbody class="template">
+          <tr id="installed-plugin-template">
+            <td class="name"></td>
+            <td class="description"></td>
+            <td class="actions">
+              <input type="button" value="Uninstall" class="do-uninstall">
+            </td>
+          </tr>
+        </tbody>
+        <tbody id="installed-plugins">
+        </tbody>
+      </table>
+  
+      <h1>Search for plugins to install</h1>
+      <form>
+        <input type="text" name="search" value="" id="search-query">
+        <input type="button" value="Search" id="do-search">
+      </form>
+      <table>
+        <thead>
+          <tr>
+            <th>Name</th>
+            <th>Description</th>
+            <td></td>
+          </tr>
+        </thead>
+        <tbody class="template">
+          <tr id="search-result-template">
+            <td class="name"></td>
+            <td class="description"></td>
+            <td class="actions">
+              <input type="button" value="Install" class="do-install">
+           </td>
+          </tr>
+        </tbody>
+        <tbody id="search-results">
+        </tbody>
+      </table>
+
+      <div id="progress" class="dialog">
+        <h1 class="title">
+          Please wait: <span class="message"></span>
+        <input type="button" class="close" value="Close">
+        </h1>
+        <div class="history"></div>
+      </div>
+    </div>
+  </body>
+</html>