diff --git a/src/setupdns.html b/src/setupdns.html
index c53c9313c..74e075f81 100644
--- a/src/setupdns.html
+++ b/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 DNS Setup </title>
+    <title> Cloudron Domain Setup </title>
 
     <link id="favicon" href="/api/v1/cloudron/avatar" rel="icon" type="image/png">
 
@@ -59,26 +59,37 @@
                                 <h1>Cloudron Setup</h1>
                                 <h3>Provide a domain for your Cloudron</h3>
                                 <p>Apps will be installed on subdomains of this domain</p>
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="col-md-8 col-md-offset-2">
+                                <br/>
+
                                 <div class="form-group" style="margin-bottom: 0;" ng-class="{ 'has-error': dnsCredentialsForm.domain.$dirty && dnsCredentialsForm.domain.$invalid }">
+                                    <label class="control-label">Primary Domain</label>
                                     <input type="text" class="form-control" ng-model="dnsCredentials.domain" name="domain" placeholder="example.com" required autofocus ng-disabled="dnsCredentials.busy">
                                 </div>
                             </div>
                         </div>
                         <br/>
                         <div class="row">
-                            <div class="col-md-8 col-md-offset-2 text-center">
-                                <h3>Choose how this domain is managed</h3>
+                            <div class="col-md-8 col-md-offset-2">
+                                <h3 class="text-center">Domain Configuration</h3>
                                 <p class="has-error text-center" ng-show="dnsCredentials.error">{{ dnsCredentials.error }}</p>
 
+                                <br/>
                                 <div class="form-group">
+                                    <label class="control-label">Domain Provider</label>
                                     <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'">
+                                    <label class="control-label">Access Key Id</label>
                                     <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'">
+                                    <label class="control-label">Secret Access Key</label>
                                     <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">
                                     <br/>
                                     <span>This domain must be hosted on <a href="https://aws.amazon.com/route53/?nc2=h_m1" target="_blank">AWS Route53</a>.</span>
@@ -86,6 +97,7 @@
 
                                 <!-- Google Cloud DNS -->
                                 <div class="form-group" ng-class="{ 'has-error': false }" ng-show="dnsCredentials.provider === 'gcdns'">
+                                    <label class="control-label">Service Account Key</label>
                                     <div class="input-group">
                                         <input type="file" id="gcdnsKeyFileInput" style="display:none"/>
                                         <input type="text" class="form-control" placeholder="Service Account Key" ng-model="dnsCredentials.gcdnsKey.keyFileName" id="gcdnsKeyInput" name="cert" onclick="getElementById('gcdnsKeyFileInput').click();" style="cursor: pointer;" ng-required="dnsCredentials.provider === 'gcdns'" ng-disabled="dnsCredentials.busy">
@@ -99,6 +111,7 @@
 
                                 <!-- DigitalOcean -->
                                 <div class="form-group" ng-class="{ 'has-error': dnsCredentialsForm.digitalOceanToken.$dirty && dnsCredentialsForm.digitalOceanToken.$invalid }" ng-show="dnsCredentials.provider === 'digitalocean'">
+                                    <label class="control-label">DigitalOcean Token</label>
                                     <input type="text" class="form-control" ng-model="dnsCredentials.digitalOceanToken" name="digitalOceanToken" placeholder="API Token" ng-required="dnsCredentials.provider === 'digitalocean'" ng-disabled="dnsCredentials.busy">
                                     <br/>
                                     <span>This domain must be hosted on <a href="https://www.digitalocean.com/community/tutorials/how-to-set-up-a-host-name-with-digitalocean#step-two%E2%80%94change-your-domain-server" target="_blank">DigitalOcean</a>.</span>
@@ -106,6 +119,7 @@
 
                                 <!-- Gandi -->
                                 <div class="form-group" ng-class="{ 'has-error': dnsCredentialsForm.gandiApiKey.$dirty && dnsCredentialsForm.gandiApiKey.$invalid }" ng-show="dnsCredentials.provider === 'gandi'">
+                                    <label class="control-label">Gandi API Key</label>
                                     <input type="text" class="form-control" ng-model="dnsCredentials.gandiApiKey" name="gandiApiKey" placeholder="API Key" ng-required="dnsCredentials.provider === 'gandi'" ng-disabled="dnsCredentials.busy">
                                     <br/>
                                     <span>This domain must be hosted on <a href="http://doc.livedns.gandi.net/" target="_blank">Gandi LiveDNS</a>.</span>
@@ -113,9 +127,11 @@
 
                                 <!-- GoDaddy -->
                                 <div class="form-group" ng-class="{ 'has-error': dnsCredentialsForm.godaddyApiKey.$dirty && dnsCredentialsForm.godaddyApiKey.$invalid }" ng-show="dnsCredentials.provider === 'godaddy'">
+                                    <label class="control-label">API Key <sup><a href="https://developer.godaddy.com/keys" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
                                     <input type="text" class="form-control" ng-model="dnsCredentials.godaddyApiKey" name="godaddyApiKey" placeholder="API Key" ng-minlength="1" ng-required="dnsCredentials.provider === 'godaddy'" ng-disabled="dnsCredentials.busy">
                                 </div>
                                 <div class="form-group" ng-class="{ 'has-error': dnsCredentialsForm.godaddyApiSecret.$dirty && dnsCredentialsForm.godaddyApiSecret.$invalid }" ng-show="dnsCredentials.provider === 'godaddy'">
+                                    <label class="control-label">API Secret</label>
                                     <input type="text" class="form-control" ng-model="dnsCredentials.godaddyApiSecret" name="godaddyApiSecret" placeholder="API Secret" ng-required="dnsCredentials.provider === 'godaddy'" ng-disabled="dnsCredentials.busy">
                                     <br/>
                                     <span>This domain must be hosted on <a href="https://developer.godaddy.com/keys#" target="_blank">GoDaddy</a>.</span>
@@ -123,9 +139,11 @@
 
                                 <!-- Cloudflare -->
                                 <div class="form-group" ng-class="{ 'has-error': dnsCredentialsForm.cloudflareToken.$dirty && dnsCredentialsForm.cloudflareToken.$invalid }" ng-show="dnsCredentials.provider === 'cloudflare'">
+                                    <label class="control-label">Global API Key</label>
                                     <input type="text" class="form-control" ng-model="dnsCredentials.cloudflareToken" name="cloudflareToken" placeholder="Global API Key" ng-required="dnsCredentials.provider === 'cloudflare'" ng-disabled="dnsCredentials.busy">
                                 </div>
                                 <div class="form-group" ng-class="{ 'has-error': dnsCredentialsForm.cloudflareEmail.$dirty && dnsCredentialsForm.cloudflareEmail.$invalid }" ng-show="dnsCredentials.provider === 'cloudflare'">
+                                    <label class="control-label">Cloudflare Email</label>
                                     <input type="email" class="form-control" ng-model="dnsCredentials.cloudflareEmail" name="cloudflareEmail" placeholder="Cloudflare Account Email" ng-required="dnsCredentials.provider === 'cloudflare'" ng-disabled="dnsCredentials.busy">
                                     <br/>
                                     <span>This domain must be hosted on <a href="https://www.cloudflare.com" target="_blank">Cloudflare</a>.</span>
@@ -133,9 +151,11 @@
 
                                 <!-- Name.com -->
                                 <div class="form-group" ng-class="{ 'has-error': dnsCredentialsForm.nameComUsername.$dirty && dnsCredentialsForm.nameComUsername.$invalid }" ng-show="dnsCredentials.provider === 'namecom'">
+                                    <label class="control-label">Name.com Username</label>
                                     <input type="text" class="form-control" ng-model="dnsCredentials.nameComUsername" name="nameComUsername" placeholder="Name.com Username" ng-required="dnsCredentials.provider === 'namecom'" ng-disabled="dnsCredentials.busy">
                                 </div>
                                 <div class="form-group" ng-class="{ 'has-error': dnsCredentialsForm.nameComToken.$dirty && dnsCredentialsForm.nameComToken.$invalid }" ng-show="dnsCredentials.provider === 'namecom'">
+                                    <label class="control-label">API Token <sup><a href="https://www.name.com/account/settings/api" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
                                     <input type="text" class="form-control" ng-model="dnsCredentials.nameComToken" name="nameComToken" placeholder="Name.com API Token" ng-required="dnsCredentials.provider === 'namecom'" ng-disabled="dnsCredentials.busy">
                                     <br/>
                                     <span>This domain must be hosted on <a href="https://www.name.com/account/settings/api" target="_blank">Name.com</a>.</span>
@@ -165,15 +185,17 @@
                                 </div>
 
                                 <br/>
-                                <a href="" ng-click="dnsCredentials.advancedVisible = true" ng-hide="dnsCredentials.advancedVisible">Advanced settings...</a>
+                                <div class="text-center">
+                                    <a href="" ng-click="dnsCredentials.advancedVisible = true" ng-hide="dnsCredentials.advancedVisible">Advanced settings...</a>
+                                </div>
                                 <div  uib-collapse="!dnsCredentials.advancedVisible">
                                     <div class="form-group">
-                                        <h4>Zone Name</h4>
+                                        <label class="control-label">Zone Name</label>
                                         <input type="text" class="form-control" ng-model="dnsCredentials.zoneName" name="zoneName" placeholder="{{dnsCredentials.domain | zoneName}}" ng-disabled="dnsCredentials.busy">
                                     </div>
 
                                     <div class="form-group">
-                                        <h4>Certificate Provider</h4>
+                                        <label class="control-label">Certificate Provider</label>
                                         <select class="form-control" ng-model="dnsCredentials.tlsConfig.provider" ng-options="a.value as a.name for a in tlsProvider" ng-disabled="dnsCredentials.busy"></select>
                                     </div>
                                 </div>
diff --git a/src/views/domains.html b/src/views/domains.html
index c50010c88..b2a32c6fd 100644
--- a/src/views/domains.html
+++ b/src/views/domains.html
@@ -22,16 +22,17 @@
 
             <!-- Route53 -->
             <div class="form-group" ng-class="{ 'has-error': false }" ng-show="domainConfigure.provider === 'route53'">
-              <label class="control-label">Access key id</label>
+              <label class="control-label">Access Key Id</label>
               <input type="text" class="form-control" ng-model="domainConfigure.accessKeyId" name="accessKeyId" ng-disabled="domainConfigure.busy" ng-minlength="16" ng-maxlength="32" ng-required="domainConfigure.provider === 'route53'">
             </div>
             <div class="form-group" ng-class="{ 'has-error': false }" ng-show="domainConfigure.provider === 'route53'">
-              <label class="control-label">Secret access key</label>
+              <label class="control-label">Secret Access Key</label>
               <input type="text" class="form-control" ng-model="domainConfigure.secretAccessKey" name="secretAccessKey" ng-disabled="domainConfigure.busy" ng-required="domainConfigure.provider === 'route53'">
             </div>
 
             <!-- Google Cloud DNS -->
             <div class="form-group" ng-class="{ 'has-error': false }" ng-show="domainConfigure.provider === 'gcdns'">
+              <label class="control-label">Service Account Key</label>
               <div class="input-group">
                 <input type="file" id="gcdnsKeyFileInput" style="display:none"/>
                 <input type="text" class="form-control" placeholder="Service Account Key" ng-model="domainConfigure.gcdnsKey.keyFileName" id="gcdnsKeyInput" name="cert" onclick="getElementById('gcdnsKeyFileInput').click();" style="cursor: pointer;" ng-disabled="domainConfigure.busy" ng-required="domainConfigure.provider === 'gcdns'">
@@ -43,7 +44,7 @@
 
             <!-- DigitalOcean -->
             <div class="form-group" ng-class="{ 'has-error': false }" ng-show="domainConfigure.provider === 'digitalocean'">
-              <label class="control-label">DigitalOcean token</label>
+              <label class="control-label">DigitalOcean Token</label>
               <input type="text" class="form-control" ng-model="domainConfigure.digitalOceanToken" name="digitalOceanToken" ng-disabled="domainConfigure.busy" ng-required="domainConfigure.provider === 'digitalocean'">
             </div>
 
@@ -65,21 +66,21 @@
 
             <!-- Cloudflare -->
             <div class="form-group" ng-class="{ 'has-error': false }" ng-show="domainConfigure.provider === 'cloudflare'">
-              <label class="control-label">Cloudflare token</label>
+              <label class="control-label">Global API Key</label>
               <input type="text" class="form-control" ng-model="domainConfigure.cloudflareToken" name="cloudflareToken" placeholder="Global API Key" ng-required="domainConfigure.provider === 'cloudflare'" ng-disabled="domainConfigure.busy">
             </div>
             <div class="form-group" ng-class="{ 'has-error': false }" ng-show="domainConfigure.provider === 'cloudflare'">
-              <label class="control-label">Cloudflare email</label>
+              <label class="control-label">Cloudflare Email</label>
               <input type="email" class="form-control" ng-model="domainConfigure.cloudflareEmail" name="cloudflareEmail" placeholder="Cloudflare Account Email" ng-required="domainConfigure.provider === 'cloudflare'" ng-disabled="domainConfigure.busy">
             </div>
 
             <!-- Name.com -->
             <div class="form-group" ng-class="{ 'has-error': false }" ng-show="domainConfigure.provider === 'namecom'">
-              <label class="control-label">Name.com username</label>
+              <label class="control-label">Name.com Username</label>
               <input type="text" class="form-control" ng-model="domainConfigure.nameComUsername" name="nameComUsername" ng-disabled="domainConfigure.busy" ng-required="domainConfigure.provider === 'namecom'">
             </div>
             <div class="form-group" ng-class="{ 'has-error': false }" ng-show="domainConfigure.provider === 'namecom'">
-              <label class="control-label">Name.com API token <sup><a href="https://www.name.com/account/settings/api" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
+              <label class="control-label">API Token <sup><a href="https://www.name.com/account/settings/api" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
               <input type="text" class="form-control" ng-model="domainConfigure.nameComToken" name="nameComToken" ng-disabled="domainConfigure.busy" ng-minlength="1" ng-required="domainConfigure.provider === 'namecom'">
             </div>
 
@@ -100,7 +101,7 @@
             </p>
 
             <p ng-show="domainConfigure.provider === 'namecom'">
-              This domain must be hosted on <a href=https://www.name.com/account/settings/api" target="_blank">Name.com</a>.
+              This domain must be hosted on <a href="https://www.name.com/account/settings/api" target="_blank">Name.com</a>.
             </p>
 
             <p ng-show="domainConfigure.provider === 'cloudflare'">