diff --git a/src/setupdns.html b/src/setupdns.html
index d90f974e1..7f295ddc5 100644
--- a/src/setupdns.html
+++ b/src/setupdns.html
@@ -69,15 +69,13 @@
                                 <p style="margin-top: 5px; font-size: 13px;">Apps will be installed on subdomains of this domain. You can add more domains later.</p>
                             </div>
                         </div>
-                        <br/>
                         <div class="row">
                             <div class="col-md-10 col-md-offset-1">
-                                <h3 class="text-center">Domain Configuration</h3>
+                                <h3 class="text-center">Domain Configuration <sup><a href="https://cloudron.io/documentation/domains/#dns-providers" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup> </h3>
                                 <p class="has-error text-center" ng-show="error.dnsCredentials">{{ error.dnsCredentials }}</p>
 
-                                <br/>
                                 <div class="form-group">
-                                    <label class="control-label">DNS Provider <sup><a href="https://cloudron.io/documentation/domains/#dns-providers" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
+                                    <label class="control-label">DNS 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" ng-change="setDefaultTlsProvider()"></select>
                                 </div>
 
@@ -172,7 +170,7 @@
                                     <h3 class="text-center">Owner verification</h3>
                                     <p class="has-error text-center" ng-show="error.emi">{{ error.emi }}</p>
 
-                                    <div class="form-group" ng-class="{ 'has-error': dnsCredentialsForm.instanceId.$dirty && (dnsCredentialsForm.instanceId.$invalid || error.ami) }">
+                                    <div class="form-group" style="margin-bottom: 0;" ng-class="{ 'has-error': dnsCredentialsForm.instanceId.$dirty && (dnsCredentialsForm.instanceId.$invalid || error.ami) }">
                                         <label class="control-label">EC2 Instance Id</label>
                                         <input type="text" class="form-control" ng-model="instanceId" id="inputInstanceId" name="instanceId" placeholder="Instance id" ng-minlength="1" ng-required="provider === 'ami'" autocomplete="off">
                                     </div>