diff --git a/modules/server_add/views/server_add_tree_dialog.html.php b/modules/server_add/views/server_add_tree_dialog.html.php
index 8e9c1c01..21952849 100644
--- a/modules/server_add/views/server_add_tree_dialog.html.php
+++ b/modules/server_add/views/server_add_tree_dialog.html.php
@@ -19,8 +19,6 @@
     </li>
   </ul>
 
-  <?= form::open(url::abs_site("server_add/start/$item->id"), array("method" => "post")) ?>
-  <?= access::csrf_form_field(); ?>
   <ul id="gServerAddTree" class="gCheckboxTree">
     <?= $tree ?>
   </ul>
@@ -31,10 +29,16 @@
   </div>
 
   <span>
-    <input id="gServerAddAddButton" class="submit ui-state-disabled" disabled="disabled"
-           type="submit" value="<?= t("Add") ?>">
+    <button id="gServerAddAddButton" class="ui-state-default ui-state-disabled ui-corner-all"
+            disabled="disabled">
+      <?= t("Add") ?>
+    </button>
+
+    <button class="ui-state-default ui-corner-all" onclick="closeDialog(); window.location.reload();">
+      <?= t("Close") ?>
+    </button>
   </span>
-  <?= form::close() ?>
+
   <script type="text/javascript">
     $("#gServerAddAddButton").ready(function() {
       $("#gServerAddAddButton").click(function(event) {
@@ -47,7 +51,4 @@
     });
   </script>
 
-  <button class="ui-state-default ui-corner-all" onclick="closeDialog(); window.location.reload();">
-    <?= t("Close") ?>
-  </button>
 </div>
diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index c4670a4d..0c65cd96 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -899,8 +899,14 @@ form .gError,
 
 /* Server Add */
 
+#gServerAdd button {
+  float: left;
+  margin-bottom: .5em;
+}
+
 #gServerAddTree {
   cursor: pointer;
+  padding-left: 4px;
 }
 
 #gServerAddTree li {