diff --git a/admin-root/config.html b/admin-root/config.html
index b7519418..d0751034 100644
--- a/admin-root/config.html
+++ b/admin-root/config.html
@@ -39,17 +39,21 @@ select {
 }
 #messages {
   background-color: yellow;
-  padding: 1em;
+  padding: .5em;
   border: 1px solid #8CACBB;
   width: 40em;
+  float: left;
+  margin-left: 1em;
+}
+#buttons {
+  float: left;
 }
 </style>
 <h1>Configuration</span></h1><span id="toggle_basic_advanced"></span>
 <div id="config_not_writable_warning" class="message_div" style="display: none;">Your config file is not writable, you can not change anything using this webpage</div>
-
 <form id="theform" method="get" action="#">
 </form>
 <div id="buttons"></div>
-<br />
 <div id="messages" class="message_div" style="display: none;"></div>
+<div style="clear: both;"><br /><br /><br /></div>
 @include ftr.html@
diff --git a/admin-root/config.js b/admin-root/config.js
index 394ee903..880fddce 100644
--- a/admin-root/config.js
+++ b/admin-root/config.js
@@ -196,9 +196,9 @@ var Config ={
     } else {
       // Create save and cancel buttons
 //      var save = Builder.node('button',{id: 'button_save', disabled: 'disabled'},'Save');
-      var save = Builder.node('button',{id: 'button_save'},'Save');
+      var save = Builder.node('input',{id: 'button_save',type: 'button', value:'Save'});
       Event.observe(save,'click',saveForm);
-      var cancel = Builder.node('button',{id: 'button_cancel'},'Cancel');
+      var cancel = Builder.node('input',{id: 'button_cancel',type: 'button',value:'Cancel'});
       Event.observe(cancel,'click',cancelForm);
       var spacer = document.createTextNode('\u00a0\u00a0');
       var buttons = $('buttons');
diff --git a/admin-root/index.html b/admin-root/index.html
index 1bc219fc..9985047f 100644
--- a/admin-root/index.html
+++ b/admin-root/index.html
@@ -28,7 +28,7 @@
   z-index: 10;
 }
 #button_stop_server, #button_start_scan, #button_start_full_scan {
-  width: 8em;
+  width: 10em;
   margin-bottom: .2em;
 }
 </style>