diff --git a/application/views/scripts/setup/index.phtml b/application/views/scripts/setup/index.phtml
index b48482593..5c08ba950 100644
--- a/application/views/scripts/setup/index.phtml
+++ b/application/views/scripts/setup/index.phtml
@@ -1,7 +1,9 @@
 <div id="setup" class="container">
+  <div class="setup-content">
 <?php if (isset($wizard)): ?>
-  <?= $this->render('setup/parts/wizard.phtml'); ?>
+    <?= $this->render('setup/parts/wizard.phtml'); ?>
 <?php else: ?>
-  <?= $this->render('setup/parts/install.phtml'); ?>
+    <?= $this->render('setup/parts/install.phtml'); ?>
 <?php endif ?>
+  </div>
 </div>
\ No newline at end of file
diff --git a/public/css/icinga/setup.less b/public/css/icinga/setup.less
index 3680e53c8..2666000b7 100644
--- a/public/css/icinga/setup.less
+++ b/public/css/icinga/setup.less
@@ -2,8 +2,12 @@
   overflow: auto; // TODO: Shouldn't be necessary, here, IMHO
 }
 
+#setup .setup-content {
+  margin: 1.5em 1.8em 0 1.8em;
+}
+
 #setup div.buttons {
-  margin: 1.5em 0 0 1.8em;
+  margin-top: 1.5em;
 
   .double {
     position: absolute;