diff --git a/webadmin/src/setup.html b/webadmin/src/setup.html
index 25a57577d..34a07883f 100644
--- a/webadmin/src/setup.html
+++ b/webadmin/src/setup.html
@@ -32,63 +32,70 @@
 
 <body class="setup" ng-app="Application" ng-controller="SetupController">
 
-    <center class="ng-cloak" ng-show="provider === 'caas' && !setupToken">
-        <h1> <i class="fa fa-frown-o fa-fw text-danger"></i> No setup token provided. </h1>
-        Please use the setup link for this cloudron.
-    </center>
+    <div class="main-container ng-cloak text-center" ng-show="provider === 'caas' && !setupToken">
+        <div class="row">
+            <div class="col-md-6 col-md-offset-3">
+                <h1> <i class="fa fa-frown-o fa-fw text-danger"></i> No setup token provided. </h1>
+                Please use the setup link for this cloudron.
+            </div>
+        </div>
+    </div>
 
-    <div class="main-container ng-cloak" ng-show="initialized">
+    <div class="main-container ng-cloak text-center" ng-show="!busy">
+        <div class="row">
+            <div class="col-md-6 col-md-offset-3">
+                <i class="fa fa-cog fa-spin fa-5x"></i>
+            </div>
+        </div>
+    </div>
+
+    <div class="main-container ng-cloak" ng-show="initialized && !busy">
         <div class="row">
             <div class="col-md-6 col-md-offset-3">
                 <div class="card" style="max-width: none; padding: 20px;">
-                    <div ng-show="busy">
-                        <i class="fa fa-spinner fa-pulse fa-5x"></i>
-                    </div>
-                    <div ng-hide="busy">
-                        <form role="form" name="setupForm" ng-submit="activateCloudron()" novalidate>
-                            <div class="row">
-                                <div class="col-md-12 text-center">
-                                    <h1>Welcome to your Cloudron</h1>
-                                    <h3>Create an Admin Account</h3>
-                                </div>
+                    <form role="form" name="setupForm" ng-submit="activateCloudron()" novalidate>
+                        <div class="row">
+                            <div class="col-md-12 text-center">
+                                <h1>Welcome to your Cloudron</h1>
+                                <h3>Create an Admin Account</h3>
                             </div>
-                            <div class="row">
-                                <div class="col-md-4 col-md-offset-4 text-center">
-                                    <div class="form-group" ng-class="{ 'has-error': setupForm.displayName.$dirty && setupForm.displayName.$invalid }">
-                                        <input type="text" class="form-control" ng-model="account.displayName" id="inputDisplayName" name="displayName" placeholder="Display Name" required autocomplete="off" autofocus>
-                                    </div>
-                                    <div ng-show="account.requireEmail" class="form-group" ng-class="{ 'has-error': setupForm.email.$dirty && setupForm.email.$invalid }">
-                                        <input type="email" class="form-control" ng-model="account.email" id="inputEmail" name="email" placeholder="Email" required autocomplete="off">
-                                    </div>
-                                    <div class="form-group" ng-class="{ 'has-error': setupForm.username.$dirty && setupForm.username.$invalid }">
-                                        <input type="text" class="form-control" ng-model="account.username" id="inputUsername" name="username" placeholder="Username" ng-maxlength="512" ng-minlength="3" required autocomplete="off">
-                                    </div>
-                                    <div class="form-group" ng-class="{ 'has-error': setupForm.password.$dirty && setupForm.password.$invalid }">
-                                        <input type="password" class="form-control" ng-model="account.password" id="inputPassword" name="password" placeholder="Password" ng-pattern="/^(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[^a-zA-Z0-9])(?!.*\s).{8,30}$/" required autocomplete="off">
-                                        <div class="control-label" ng-show="setupForm.password.$dirty && setupForm.password.$invalid">
-                                            <small ng-show="setupForm.password.$dirty && setupForm.password.$invalid">Password must be 8-30 character with at least one uppercase, one numeric and one special character</small>
-                                        </div>
+                        </div>
+                        <div class="row">
+                            <div class="col-md-8 col-md-offset-2 text-center">
+                                <div class="form-group" ng-class="{ 'has-error': setupForm.displayName.$dirty && setupForm.displayName.$invalid }">
+                                    <input type="text" class="form-control" ng-model="account.displayName" id="inputDisplayName" name="displayName" placeholder="Display Name" required autocomplete="off" autofocus>
+                                </div>
+                                <div ng-show="account.requireEmail" class="form-group" ng-class="{ 'has-error': setupForm.email.$dirty && setupForm.email.$invalid }">
+                                    <input type="email" class="form-control" ng-model="account.email" id="inputEmail" name="email" placeholder="Email" required autocomplete="off">
+                                </div>
+                                <div class="form-group" ng-class="{ 'has-error': setupForm.username.$dirty && setupForm.username.$invalid }">
+                                    <input type="text" class="form-control" ng-model="account.username" id="inputUsername" name="username" placeholder="Username" ng-maxlength="512" ng-minlength="3" required autocomplete="off">
+                                </div>
+                                <div class="form-group" ng-class="{ 'has-error': setupForm.password.$dirty && setupForm.password.$invalid }">
+                                    <input type="password" class="form-control" ng-model="account.password" id="inputPassword" name="password" placeholder="Password" ng-pattern="/^(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[^a-zA-Z0-9])(?!.*\s).{8,30}$/" required autocomplete="off">
+                                    <div class="control-label" ng-show="setupForm.password.$dirty && setupForm.password.$invalid">
+                                        <small ng-show="setupForm.password.$dirty && setupForm.password.$invalid">Password must be 8-30 character with at least one uppercase, one numeric and one special character</small>
                                     </div>
                                 </div>
                             </div>
-                            <div class="row" ng-hide="provider === 'caas'">
-                                <div class="col-md-12 text-center">
-                                    <div class="form-group">
-                                        <div class="checkbox">
-                                            <label>
-                                                <input type="checkbox" ng-model="createAppstoreAccount"> Create <a href="https://cloudron.io" target="_blank">Cloudron Store</a> account
-                                            </label>
-                                        </div>
+                        </div>
+                        <div class="row" ng-hide="provider === 'caas'">
+                            <div class="col-md-12 text-center">
+                                <div class="form-group">
+                                    <div class="checkbox">
+                                        <label>
+                                            <input type="checkbox" ng-model="createAppstoreAccount"> Create <a href="https://cloudron.io" target="_blank">Cloudron Store</a> account
+                                        </label>
                                     </div>
                                 </div>
                             </div>
-                            <div class="row">
-                                <div class="col-md-12 text-center">
-                                    <input type="submit" class="btn btn-primary" ng-disabled="setupForm.$invalid" value="Done">
-                                </div>
+                        </div>
+                        <div class="row">
+                            <div class="col-md-12 text-center">
+                                <input type="submit" class="btn btn-primary" ng-disabled="setupForm.$invalid" value="Done">
                             </div>
-                        </form>
-                    </div>
+                        </div>
+                    </form>
                 </div>
             </div>
         </div>
diff --git a/webadmin/src/setupdns.html b/webadmin/src/setupdns.html
index fdf2a3cb4..bb234a00e 100644
--- a/webadmin/src/setupdns.html
+++ b/webadmin/src/setupdns.html
@@ -31,65 +31,69 @@
 </head>
 
 <body class="setup" ng-app="Application" ng-controller="SetupDNSController">
-    <div class="main-container ng-cloak" ng-show="initialized">
+
+    <div class="main-container ng-cloak text-center" ng-show="!busy">
+        <div class="row">
+            <div class="col-md-6 col-md-offset-3">
+                <i class="fa fa-cog fa-spin fa-5x"></i>
+            </div>
+        </div>
+    </center>
+
+    <div class="main-container ng-cloak" ng-show="initialized && busy">
         <div class="row">
             <div class="col-md-6 col-md-offset-3">
                 <div class="card" style="max-width: none; padding: 20px;">
-                    <div ng-show="busy">
-                        <i class="fa fa-spinner fa-pulse fa-5x"></i>
-                    </div>
-                    <div ng-hide="busy">
-                        <form name="dnsCredentialsForm" role="form" novalidate ng-submit="setDnsCredentials()" autocomplete="off">
-                            <div class="row">
-                                <div class="col-md-12 text-center">
-                                    <h1>Domain Setup</h1>
-                                    <h3>Specify the domain for your Cloudron</h3>
-                                    <div class="form-group" ng-class="{ 'has-error': dnsCredentialsForm.domain.$dirty && dnsCredentialsForm.domain.$invalid }">
-                                        <input type="text" class="form-control" ng-model="dnsCredentials.domain" name="domain" ng-minlength="4" ng-maxlength="128" placeholder="example.com" required autofocus ng-disabled="dnsCredentials.busy">
-                                    </div>
-                                    <p>Apps will be installed on subdomains of that domain.</p>
+                    <form name="dnsCredentialsForm" role="form" novalidate ng-submit="setDnsCredentials()" autocomplete="off">
+                        <div class="row">
+                            <div class="col-md-12 text-center">
+                                <h1>Domain Setup</h1>
+                                <h3>Specify the domain for your Cloudron</h3>
+                                <div class="form-group" ng-class="{ 'has-error': dnsCredentialsForm.domain.$dirty && dnsCredentialsForm.domain.$invalid }">
+                                    <input type="text" class="form-control" ng-model="dnsCredentials.domain" name="domain" ng-minlength="4" ng-maxlength="128" placeholder="example.com" required autofocus ng-disabled="dnsCredentials.busy">
                                 </div>
+                                <p>Apps will be installed on subdomains of that domain.</p>
                             </div>
-                            <div class="row">
-                                <div class="col-md-12 text-center">
-                                    <h3>DNS Provider Configuration</h3>
-                                    <p class="has-error text-center" ng-show="dnsCredentials.error">{{ dnsCredentials.error }}</p>
+                        </div>
+                        <div class="row">
+                            <div class="col-md-12 text-center">
+                                <h3>DNS Provider Configuration</h3>
+                                <p class="has-error text-center" ng-show="dnsCredentials.error">{{ dnsCredentials.error }}</p>
 
-                                    <div class="form-group">
-                                        <select class="form-control" ng-model="dnsCredentials.provider" ng-options="a.value as a.name for a in dnsProvider" ng-disabled="dnsCredentials.busy"></select>
-                                    </div>
-
-                                    <!-- Route53 -->
-                                    <div class="form-group" ng-class="{ 'has-error': dnsCredentialsForm.accessKeyId.$dirty && dnsCredentialsForm.accessKeyId.$invalid }" ng-show="dnsCredentials.provider === 'route53'">
-                                        <input type="text" class="form-control" ng-model="dnsCredentials.accessKeyId" name="accessKeyId" placeholder="Access Key Id" ng-minlength="16" ng-maxlength="32" ng-required="dnsCredentials.provider === 'route53'" ng-disabled="dnsCredentials.busy">
-                                    </div>
-                                    <div class="form-group" ng-class="{ 'has-error': dnsCredentialsForm.secretAccessKey.$dirty && dnsCredentialsForm.secretAccessKey.$invalid }" ng-show="dnsCredentials.provider === 'route53'">
-                                        <input type="text" class="form-control" ng-model="dnsCredentials.secretAccessKey" name="secretAccessKey" placeholder="Secret Access Key" ng-required="dnsCredentials.provider === 'route53'" ng-disabled="dnsCredentials.busy">
-                                    </div>
-
-                                    <!-- DigitalOcean -->
-                                    <div class="form-group" ng-class="{ 'has-error': dnsCredentialsForm.digitalOceanToken.$dirty && dnsCredentialsForm.digitalOceanToken.$invalid }" ng-show="dnsCredentials.provider === 'digitalocean'">
-                                        <input type="text" class="form-control" ng-model="dnsCredentials.digitalOceanToken" name="digitalOceanToken" placeholder="API Token" ng-required="dnsCredentials.provider === 'digitalocean'" ng-disabled="dnsCredentials.busy">
-                                    </div>
-
-                                    <!-- Wildcard -->
-                                    <p ng-show="dnsCredentials.provider === 'wildcard'">
-                                        Setup a wildcard DNS A record manually. TODO more help text.
-                                    </p>
-
-                                    <!-- Manual -->
-                                    <p ng-show="dnsCredentials.provider === 'manual'">
-                                        All DNS records have to be setup manually. TODO more help text also for my.domain.com.
-                                    </p>
+                                <div class="form-group">
+                                    <select class="form-control" ng-model="dnsCredentials.provider" ng-options="a.value as a.name for a in dnsProvider" ng-disabled="dnsCredentials.busy"></select>
                                 </div>
-                            </div>
-                            <div class="row">
-                                <div class="col-md-12 text-center">
-                                    <button type="submit" class="btn btn-primary" ng-disabled="dnsCredentialsForm.$invalid"/><i class="fa fa-spinner fa-pulse" ng-show="dnsCredentials.busy"></i> Done</button>
+
+                                <!-- Route53 -->
+                                <div class="form-group" ng-class="{ 'has-error': dnsCredentialsForm.accessKeyId.$dirty && dnsCredentialsForm.accessKeyId.$invalid }" ng-show="dnsCredentials.provider === 'route53'">
+                                    <input type="text" class="form-control" ng-model="dnsCredentials.accessKeyId" name="accessKeyId" placeholder="Access Key Id" ng-minlength="16" ng-maxlength="32" ng-required="dnsCredentials.provider === 'route53'" ng-disabled="dnsCredentials.busy">
                                 </div>
+                                <div class="form-group" ng-class="{ 'has-error': dnsCredentialsForm.secretAccessKey.$dirty && dnsCredentialsForm.secretAccessKey.$invalid }" ng-show="dnsCredentials.provider === 'route53'">
+                                    <input type="text" class="form-control" ng-model="dnsCredentials.secretAccessKey" name="secretAccessKey" placeholder="Secret Access Key" ng-required="dnsCredentials.provider === 'route53'" ng-disabled="dnsCredentials.busy">
+                                </div>
+
+                                <!-- DigitalOcean -->
+                                <div class="form-group" ng-class="{ 'has-error': dnsCredentialsForm.digitalOceanToken.$dirty && dnsCredentialsForm.digitalOceanToken.$invalid }" ng-show="dnsCredentials.provider === 'digitalocean'">
+                                    <input type="text" class="form-control" ng-model="dnsCredentials.digitalOceanToken" name="digitalOceanToken" placeholder="API Token" ng-required="dnsCredentials.provider === 'digitalocean'" ng-disabled="dnsCredentials.busy">
+                                </div>
+
+                                <!-- Wildcard -->
+                                <p ng-show="dnsCredentials.provider === 'wildcard'">
+                                    Setup a wildcard DNS A record manually. TODO more help text.
+                                </p>
+
+                                <!-- Manual -->
+                                <p ng-show="dnsCredentials.provider === 'manual'">
+                                    All DNS records have to be setup manually. TODO more help text also for my.domain.com.
+                                </p>
                             </div>
-                        </form>
-                    </div>
+                        </div>
+                        <div class="row">
+                            <div class="col-md-12 text-center">
+                                <button type="submit" class="btn btn-primary" ng-disabled="dnsCredentialsForm.$invalid"/><i class="fa fa-cog fa-spin" ng-show="dnsCredentials.busy"></i> Done</button>
+                            </div>
+                        </div>
+                    </form>
                 </div>
             </div>
         </div>
