diff --git a/webadmin/src/js/setupdns.js b/webadmin/src/js/setupdns.js
index 14964a7c9..cca60a5d5 100644
--- a/webadmin/src/js/setupdns.js
+++ b/webadmin/src/js/setupdns.js
@@ -10,11 +10,11 @@ app.controller('SetupDNSController', ['$scope', '$http', 'Client', function ($sc
     $scope.provider = '';
     $scope.showDNSSetup = false;
     $scope.dnsProvider = [
-        { name: 'Manual/Wildcard', value: 'manual' },
-        { name: 'Wildcard', value: 'wildcard' },
-        { name: 'No-op', value: 'noop' },
         { name: 'AWS Route53', value: 'route53' },
-        { name: 'Digital Ocean', value: 'digitalocean' }
+        { name: 'Digital Ocean', value: 'digitalocean' },
+        { name: 'Manual', value: 'manual' },
+        { name: 'Wildcard', value: 'wildcard' },
+        { name: 'No-op (only for development)', value: 'noop' }
     ];
     $scope.dnsCredentials = {
         error: null,
diff --git a/webadmin/src/setup.html b/webadmin/src/setup.html
index 9aa35e1ff..25a57577d 100644
--- a/webadmin/src/setup.html
+++ b/webadmin/src/setup.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width, height=device-height" />
 
-    <title> Cloudron Setup </title>
+    <title> Cloudron Admin Setup </title>
 
     <!-- Theme CSS -->
     <link href="theme.css" rel="stylesheet">
diff --git a/webadmin/src/setupdns.html b/webadmin/src/setupdns.html
index 496864978..1e962ac67 100644
--- a/webadmin/src/setupdns.html
+++ b/webadmin/src/setupdns.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width, height=device-height" />
 
-    <title> Cloudron Setup </title>
+    <title> Cloudron DNS Setup </title>
 
     <!-- Theme CSS -->
     <link href="theme.css" rel="stylesheet">
@@ -44,37 +44,32 @@
                                 <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>
+                                    </div>
                                     <p>Apps will be installed on subdomains of that domain.</p>
                                 </div>
                             </div>
                             <div class="row">
-                                <div class="col-md-4 col-md-offset-4 text-center">
+                                <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" 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>
-                                    </div>
-
                                     <div class="form-group" ng-show="dnsConfig.provider !== 'caas'">
-                                        <label class="control-label">DNS API Provider</label>
-                                        <select class="form-control" ng-model="dnsCredentials.provider" ng-options="a.value as a.name for a in dnsProvider">
-                                        </select>
+                                        <select class="form-control" ng-model="dnsCredentials.provider" ng-options="a.value as a.name for a in dnsProvider"></select>
                                     </div>
 
                                     <!-- Route53 -->
                                     <div class="form-group" ng-class="{ 'has-error': dnsCredentialsForm.accessKeyId.$dirty && dnsCredentialsForm.accessKeyId.$invalid }" ng-show="dnsCredentials.provider === 'route53'">
-                                        <label class="control-label">Access Key Id</label>
-                                        <input type="text" class="form-control" ng-model="dnsCredentials.accessKeyId" name="accessKeyId" ng-minlength="16" ng-maxlength="32" ng-required="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'">
                                     </div>
                                     <div class="form-group" ng-class="{ 'has-error': dnsCredentialsForm.secretAccessKey.$dirty && dnsCredentialsForm.secretAccessKey.$invalid }" ng-show="dnsCredentials.provider === 'route53'">
-                                        <label class="control-label">Secret Access Key</label>
-                                        <input type="text" class="form-control" ng-model="dnsCredentials.secretAccessKey" name="secretAccessKey" ng-required="dnsCredentials.provider === 'route53'">
+                                        <input type="text" class="form-control" ng-model="dnsCredentials.secretAccessKey" name="secretAccessKey" placeholder="Secret Access Key" ng-required="dnsCredentials.provider === 'route53'">
                                     </div>
 
                                     <!-- DigitalOcean -->
                                     <div class="form-group" ng-class="{ 'has-error': dnsCredentialsForm.digitalOceanToken.$dirty && dnsCredentialsForm.digitalOceanToken.$invalid }" ng-show="dnsCredentials.provider === 'digitalocean'">
-                                        <label class="control-label">API Token</label>
-                                        <input type="text" class="form-control" ng-model="dnsCredentials.digitalOceanToken" name="digitalOceanToken" ng-required="dnsCredentials.provider === 'digitalocean'">
+                                        <input type="text" class="form-control" ng-model="dnsCredentials.digitalOceanToken" name="digitalOceanToken" placeholder="API Token" ng-required="dnsCredentials.provider === 'digitalocean'">
                                     </div>
                                 </div>
                             </div>