diff --git a/application/controllers/SetupController.php b/application/controllers/SetupController.php
index 3e2174282..cbcc2865f 100644
--- a/application/controllers/SetupController.php
+++ b/application/controllers/SetupController.php
@@ -34,11 +34,9 @@ class SetupController extends ActionController
 
             $this->view->success = $success;
             $this->view->report = $installer->getReport();
-            $this->render('install');
         } else {
             $wizard->handleRequest();
             $this->view->wizard = $wizard;
-            $this->render('wizard');
         }
     }
 }
diff --git a/application/views/scripts/setup/index.phtml b/application/views/scripts/setup/index.phtml
new file mode 100644
index 000000000..b48482593
--- /dev/null
+++ b/application/views/scripts/setup/index.phtml
@@ -0,0 +1,7 @@
+<div id="setup" class="container">
+<?php if (isset($wizard)): ?>
+  <?= $this->render('setup/parts/wizard.phtml'); ?>
+<?php else: ?>
+  <?= $this->render('setup/parts/install.phtml'); ?>
+<?php endif ?>
+</div>
\ No newline at end of file
diff --git a/application/views/scripts/setup/install.phtml b/application/views/scripts/setup/parts/install.phtml
similarity index 100%
rename from application/views/scripts/setup/install.phtml
rename to application/views/scripts/setup/parts/install.phtml
diff --git a/application/views/scripts/setup/parts/wizard.phtml b/application/views/scripts/setup/parts/wizard.phtml
new file mode 100644
index 000000000..94891f93e
--- /dev/null
+++ b/application/views/scripts/setup/parts/wizard.phtml
@@ -0,0 +1 @@
+<?= $wizard->getForm()->render(); ?>
\ No newline at end of file
diff --git a/application/views/scripts/setup/wizard.phtml b/application/views/scripts/setup/wizard.phtml
deleted file mode 100644
index 429e91ef9..000000000
--- a/application/views/scripts/setup/wizard.phtml
+++ /dev/null
@@ -1,3 +0,0 @@
-<div id="wizard" class="container">
-  <?= $wizard->getForm()->render(); ?>
-</div>
\ No newline at end of file
diff --git a/library/Icinga/Web/StyleSheet.php b/library/Icinga/Web/StyleSheet.php
index ed1cdbed9..87cd1b3c0 100644
--- a/library/Icinga/Web/StyleSheet.php
+++ b/library/Icinga/Web/StyleSheet.php
@@ -19,7 +19,7 @@ class StyleSheet
         'css/icinga/main-content.less',
         'css/icinga/tabs.less',
         'css/icinga/forms.less',
-        'css/icinga/wizard.less',
+        'css/icinga/setup.less',
         'css/icinga/widgets.less',
         'css/icinga/pagination.less',
         'css/icinga/monitoring-colors.less',
diff --git a/public/css/icinga/wizard.less b/public/css/icinga/setup.less
similarity index 87%
rename from public/css/icinga/wizard.less
rename to public/css/icinga/setup.less
index de6276503..9f9a3180f 100644
--- a/public/css/icinga/wizard.less
+++ b/public/css/icinga/setup.less
@@ -2,14 +2,14 @@
   overflow: auto; // TODO: Shouldn't be necessary, here, IMHO
 }
 
-#wizard div.buttons {
+#setup div.buttons {
   margin: 1.5em 0 0 1.8em;
 }
 
-#wizard table.requirements {
+#setup table.requirements {
   td {
     &.fulfilled {
-      background-color: lime;
+      background-color: green;
     }
 
     &.not-available {
@@ -35,7 +35,7 @@
   }
 }
 
-#wizard div.summary {
+#setup div.summary {
   div.page {
     h2 {
       font-size: 1.2em;