diff --git a/customize.dist/src/less/toolbar.less b/customize.dist/src/less/toolbar.less
index 8befac1ab..4330c98af 100644
--- a/customize.dist/src/less/toolbar.less
+++ b/customize.dist/src/less/toolbar.less
@@ -95,6 +95,7 @@
     }
 
     button {
+        color: #000;
         background-color: inherit;
         background-image: linear-gradient(to bottom,#fff,#e4e4e4);
         border: 1px solid #A6A6A6;
@@ -253,13 +254,12 @@
         input {
             font-size: 1.5em;
             vertical-align: middle;
-            height: 100%;
             box-sizing: border-box;
             border: 1px solid black;
             background: #fff;
             cursor: auto;
             width: 300px;
-            padding: 0px 5px;
+            padding: 5px 5px;
         }
     }
     .cryptpad-link {
diff --git a/customize.dist/toolbar.css b/customize.dist/toolbar.css
index e0e0bda64..bf5458f84 100644
--- a/customize.dist/toolbar.css
+++ b/customize.dist/toolbar.css
@@ -164,6 +164,7 @@
   margin-right: 2px;
 }
 .cryptpad-toolbar button {
+  color: #000;
   background-color: inherit;
   background-image: linear-gradient(to bottom, #fff, #e4e4e4);
   border: 1px solid #A6A6A6;
@@ -324,13 +325,12 @@
 .cryptpad-toolbar-top .cryptpad-title input {
   font-size: 1.5em;
   vertical-align: middle;
-  height: 100%;
   box-sizing: border-box;
   border: 1px solid black;
   background: #fff;
   cursor: auto;
   width: 300px;
-  padding: 0px 5px;
+  padding: 5px 5px;
 }
 .cryptpad-toolbar-top .cryptpad-link {
   position: absolute;
diff --git a/www/drive/file.css b/www/drive/file.css
index 5f25a8957..65e03f713 100644
--- a/www/drive/file.css
+++ b/www/drive/file.css
@@ -66,6 +66,7 @@ li {
 .contextMenu {
   display: none;
   position: absolute;
+  z-index: 50;
 }
 .contextMenu li {
   padding: 0;
@@ -248,6 +249,7 @@ span.fa-folder-open {
 }
 #content div.grid li input {
   width: 100%;
+  margin-top: 5px;
 }
 #content div.grid li .fa {
   display: block;
diff --git a/www/drive/file.less b/www/drive/file.less
index 930d82ec1..cdbba0e56 100644
--- a/www/drive/file.less
+++ b/www/drive/file.less
@@ -95,6 +95,7 @@ li {
 .contextMenu {
     display: none;
     position: absolute;
+    z-index: 50;
     li {
         padding: 0;
         font-size: 16px;
@@ -293,6 +294,7 @@ span {
             }
             input {
                 width: 100%;
+                margin-top: 5px;
             }
             .fa {
                 display: block;
diff --git a/www/drive/main.js b/www/drive/main.js
index 43d49ca7f..7719814f1 100644
--- a/www/drive/main.js
+++ b/www/drive/main.js
@@ -1423,7 +1423,8 @@ define([
                     // Open the menu
                     $iframe.find('.contextMenu').css({
                         top: ($context.offset().top + 32) + 'px',
-                        right: '0px'
+                        right: '0px',
+                        left: ''
                     });
                     $li.contextmenu();
                 });
diff --git a/www/poll/index.html b/www/poll/index.html
index 363cae7e6..87a80b078 100644
--- a/www/poll/index.html
+++ b/www/poll/index.html
@@ -88,6 +88,7 @@
             margin: auto;
 
             min-width: 80%;
+            width: 80%;
             min-height: 5em;
             font-size: 20px;
             font-weight: bold;