diff --git a/extensions/wallet/cookieviewer/CookieViewer.html b/extensions/wallet/cookieviewer/CookieViewer.html
index 00f795c237a..36f338de11b 100644
--- a/extensions/wallet/cookieviewer/CookieViewer.html
+++ b/extensions/wallet/cookieviewer/CookieViewer.html
@@ -133,12 +133,13 @@
       top.frames[list_frame].document.write(
         "<form name='fSelectCookie'>" +
           "<p>" +
-            "<table border='0' width='100%' height='95%'>" +
+            "<b>site:cookie-name</b>" +
+            "<table border='0'>" +
               "<tr>" +
                 "<td width='100%' valign='top'>" +
                   "<center>" +
                     "<p>" +
-                      "<select name='selname' size='15' multiple='multiple' onchange='top.ViewCookieSelected();'>"
+                      "<select name='selname' size='10' multiple='multiple' onchange='top.ViewCookieSelected();'>"
       );
       for (i=1; !(i>=cookieList.length); i+=8) {
         if (!deleted_cookies[cookieList[i]]) {
@@ -202,12 +203,12 @@
       top.frames[list_frame].document.write(
         "<form name='fSelectPermission'>" +
           "<p>" +
-            "<table border='0' width='100%' height='95%'>" +
+            "<table border='0'>" +
               "<tr>" +
                 "<td width='100%' valign='top'>" +
                   "<center>" +
                     "<p>" +
-                      "<select name='selname' size='15' multiple='multiple'> "
+                      "<select name='selname' size='10' multiple='multiple'> "
       );
       for (i=1; !(i>=permissionList.length); i+=2) {
         if (!deleted_permissions[permissionList[i]]) {
diff --git a/extensions/wallet/editor/WalletEditor.html b/extensions/wallet/editor/WalletEditor.html
index 0a23a05eab1..a51a1c2196e 100644
--- a/extensions/wallet/editor/WalletEditor.html
+++ b/extensions/wallet/editor/WalletEditor.html
@@ -256,6 +256,9 @@
       function addSchema0() {
         var i;
         text = top.frames[schema_frame].document.schema.newSchema;
+        if (text.value == "") {
+          return;
+        }
         schemaIndex = 0;
         while ((schemaIndex<schemasLength) &&!(strings[values[schemas[schemaIndex]]] >= text.value)) {
           schemaIndex++;
@@ -286,6 +289,9 @@
       function addValue0() {
         var i;
         text = top.frames[value_frame].document.value.newValue;
+        if (text.value == "") {
+          return;
+        }
         stringIndex = values[schemas[currentSchema]+currentValue];
         if(strings[values[schemas[currentSchema]+currentValue]+1]=="") {
           addString(values[schemas[currentSchema]+currentValue]+1, text.value);
@@ -309,6 +315,9 @@
 
       function addSynonym0() {
         text = top.frames[synonym_frame].document.synonym.newSynonym;
+        if (text.value == "") {
+          return;
+        }
         addString(values[schemas[currentSchema]+currentValue]+2, text.value);
       }
 
@@ -418,12 +427,15 @@
 // (bug 3317 workaround)
                   "<button onclick=\"setTimeout('parent.deleteSchema();',0)\">Remove</button>" +
                 "</td>" +
+              "</tr>" +
+              "<tr>" +
                 "<td>" +
-//                "<button onclick='parent.addSchema();'>Add New...</button>" +
+                  "<nobr>" +
+                    "<input type='text' size='8' name='newSchema'>" +
+//                  "<button onclick='parent.addSchema();'>Add</button>" +
 // (bug 3317 workaround)
-                  "<button onclick=\"setTimeout('parent.addSchema();',0)\">Add New...</button>" +
-                  "<br/>" +
-                  "<input type='text' size='8' name='newSchema'>" +
+                    "<button onclick=\"setTimeout('parent.addSchema();',0)\">Add</button>" +
+                  "</nobr>" +
                 "</td>" +
               "</tr>" +
             "</table>" +
@@ -465,11 +477,12 @@
 // (bug 3317 workaround)
                   "<button onclick=\"setTimeout('parent.deleteValue();',0)\">Remove</button>" +
                   "<br/>" +
-                  "<br/>" +
-//                "<button onclick='parent.addValue();'>Add New...</button>" +
+                  "<nobr>" +
+                    "<input type='text' size='8' name='newValue'>" +
+//                  "<button onclick='parent.addValue();'>Add</button>" +
 // (bug 3317 workaround)
-                  "<button onclick=\"setTimeout('parent.addValue();',0)\">Add New...</button>" +
-                  "<input type='text' size='8' name='newValue'>" +
+                    "<button onclick=\"setTimeout('parent.addValue();',0)\">Add</button>" +
+                  "</nobr>" +
                 "</td>" +
               "</tr>" +
             "</table>" +
@@ -482,7 +495,7 @@
         top.frames[synonym_frame].document.open();
         top.frames[synonym_frame].document.write(
           "<body bgcolor='#cccccc' name='schema'>" +
-          "<b>Entries that mean the same:</b><br>" +
+          "<b>Entries that mean the same as the above:</b><br>" +
           "<form name=synonym>" +
             "<table border='0' width='50%' bgcolor='#cccccc'>" +
               "<tr>" +
@@ -509,11 +522,12 @@
 // (bug 3317 workaround)
                   "<button onclick=\"setTimeout('parent.deleteSynonym();',0)\">Remove</button>" +
                   "<br/>" +
-                  "<br/>" +
-//                "<button onclick='parent.addSynonym();'>Add New...</button>" +
+                  "<nobr>" +
+                    "<input type='text' size='8' name='newSynonym'>" +
+//                  "<button onclick='parent.addSynonym();'>Add</button>" +
 // (bug 3317 workaround)
-                  "<button onclick=\"setTimeout('parent.addSynonym();',0)\">Add New...</button>" +
-                  "<input type='text' size='8' name='newSynonym'>" +
+                    "<button onclick=\"setTimeout('parent.addSynonym();',0)\">Add</button>" +
+                  "</nobr>" +
                 "</td>" +
               "</tr>" +
             "</table>" +
@@ -551,11 +565,11 @@
     </script>
   </head>
 
-  <frameset rows="15,110,30" frameborder="no" border="0" bordercolor="#cccccc" onload="loadFrames();"> 
+  <frameset rows="15,115,30" frameborder="no" border="0" bordercolor="#cccccc" onload="loadFrames();"> 
     <frame src="about:blank" frameborder="no" id="title_frame" bordercolor="#cccccc" scrolling="no"/>
-    <frameset cols="200,200" bordercolor="#cccccc">
-      <frame src="about:blank" id="schema_frame" frameborder="no" bordercolor="#cccccc" scrolling="auto"/>
-      <frameset rows="52%,48%" bordercolor="#cccccc">
+    <frameset cols="100,200" bordercolor="#cccccc">
+      <frame src="about:blank" id="schema_frame" frameborder="no bordercolor="#cccccc" scrolling="auto"/>
+      <frameset rows="53%,47%" bordercolor="#cccccc">
         <frame src="about:blank" id="value_frame" frameborder="no" bordercolor="#cccccc" scrolling="auto"/>
         <frame src="about:blank" id="synonym_frame" frameborder="no" bordercolor="#cccccc" scrolling="auto"/>
       </frameset>
diff --git a/extensions/wallet/signonviewer/SignonViewer.html b/extensions/wallet/signonviewer/SignonViewer.html
index 179df1decdf..afd31f41a10 100644
--- a/extensions/wallet/signonviewer/SignonViewer.html
+++ b/extensions/wallet/signonviewer/SignonViewer.html
@@ -175,12 +175,13 @@
       top.frames[list_frame].document.write(
         "<form name='fSelectSignon'>" +
           "<p>" +
-            "<table border='0' width='100%' height='95%'>" +
+            "<b>site:username</b>" +
+            "<table border='0'>" +
               "<tr>" +
                 "<td width='100%' valign='top'>" +
                   "<center>" +
                     "<p>" +
-                      "<select name='selname' size='15' multiple='multiple'> "
+                      "<select name='selname' size='10' multiple='multiple'> "
       );
       for (i=1; !(i>=signonList.length); i++) {
         if (!deleted_signons[i-1]) {
@@ -250,12 +251,12 @@
       top.frames[list_frame].document.write(
         "<form name='fSelectReject'>" +
           "<p>" +
-            "<table border='0' width='100%' height='95%'>" +
+            "<table border='0'>" +
               "<tr>" +
                 "<td width='100%' valign='top'>" +
                   "<center>" +
                     "<p>" +
-                      "<select name='selname' size='15' multiple='multiple'> "
+                      "<select name='selname' size='10' multiple='multiple'> "
       );
       for (i=1; !(i>=rejectList.length); i++) {
         if (!deleted_rejects[i-1]) {
@@ -324,12 +325,12 @@
       top.frames[list_frame].document.write(
         "<form name='fSelectNopreview'>" +
           "<p>" +
-            "<table border='0' width='100%' height='95%'>" +
+            "<table border='0'>" +
               "<tr>" +
                 "<td width='100%' valign='top'>" +
                   "<center>" +
                     "<p>" +
-                      "<select name='selname' size='15' multiple='multiple'> "
+                      "<select name='selname' size='10' multiple='multiple'> "
       );
       for (i=1; !(i>=nopreviewList.length); i++) {
         if (!deleted_nopreviews[i-1]) {
@@ -398,12 +399,12 @@
       top.frames[list_frame].document.write(
         "<form name='fSelectNocapture'>" +
           "<p>" +
-            "<table border='0' width='100%' height='95%'>" +
+            "<table border='0'>" +
               "<tr>" +
                 "<td width='100%' valign='top'>" +
                   "<center>" +
                     "<p>" +
-                      "<select name='selname' size='15' multiple='multiple'> "
+                      "<select name='selname' size='10' multiple='multiple'> "
       );
       for (i=1; !(i>=nocaptureList.length); i++) {
         if (!deleted_nocaptures[i-1]) {
diff --git a/extensions/wallet/walletpreview/WalletPreview.html b/extensions/wallet/walletpreview/WalletPreview.html
index 4a7ba242369..6bd5d93e0b0 100644
--- a/extensions/wallet/walletpreview/WalletPreview.html
+++ b/extensions/wallet/walletpreview/WalletPreview.html
@@ -60,7 +60,7 @@
         )
         if(count == 0) {
           top.frames[list_frame].document.write(
-                      "<option VALUE='"+prefillList[i+1]+"'></option>" +
+                      "<option VALUE='"+prefillList[i+1]+"'>&lt;do not prefill&gt;</option>" +
                     "</select><br/>" +
                   "</td>" +
                 "</tr>"