diff --git a/webadmin/src/views/certs.html b/webadmin/src/views/certs.html
index f9d00f382..c88b360af 100644
--- a/webadmin/src/views/certs.html
+++ b/webadmin/src/views/certs.html
@@ -9,29 +9,29 @@
                     <fieldset>
                         <p class="has-error text-center" ng-show="dnsCredentials.error">{{ dnsCredentials.error }}</p>
 
-                        <div class="form-group" ng-class="{ 'has-error': dnsCredentialsForm.customDomainId.$invalid }" uib-tooltip="{{ config.provider === 'caas' ? '' : 'Currently domain change is not supported' }}">
-                            <label class="control-label" for="customDomainId">Domain Name</label>
+                        <div class="form-group" ng-class="{ 'has-error': dnsCredentialsForm.customDomainId.$invalid }" uib-tooltip="{{ config.provider === 'caas' ? '' : 'Changing the domain is not yet supported' }}">
+                            <label class="control-label" for="customDomainId">Domain name</label>
                             <input type="text" class="form-control" ng-model="dnsCredentials.customDomain" id="customDomainId" name="customDomainId" ng-disabled="dnsCredentials.busy || config.provider !== 'caas'" domain-validator placeholder="example.com" required autofocus>
                         </div>
 
                         <div class="form-group">
-                            <label class="control-label" for="dnsCredentialsProvider">DNS API Provider</label>
+                            <label class="control-label" for="dnsCredentialsProvider">DNS API provider</label>
                             <select class="form-control" id="dnsCredentialsProvider" 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': false }" ng-show="dnsCredentials.provider === 'route53'">
-                            <label class="control-label" for="dnsCredentialsAccessKeyId">Access Key Id</label>
+                            <label class="control-label" for="dnsCredentialsAccessKeyId">Access key id</label>
                             <input type="text" class="form-control" ng-model="dnsCredentials.accessKeyId" id="dnsCredentialsAccessKeyId" name="accessKeyId" ng-disabled="dnsCredentials.busy" ng-minlength="16" ng-maxlength="32" ng-required="dnsCredentials.provider === 'route53'">
                         </div>
                         <div class="form-group" ng-class="{ 'has-error': false }" ng-show="dnsCredentials.provider === 'route53'">
-                            <label class="control-label" for="dnsCredentialsSecretAccessKey">Secret Access Key</label>
+                            <label class="control-label" for="dnsCredentialsSecretAccessKey">Secret access key</label>
                             <input type="text" class="form-control" ng-model="dnsCredentials.secretAccessKey" id="dnsCredentialsSecretAccessKey" name="secretAccessKey" ng-disabled="dnsCredentials.busy" ng-required="dnsCredentials.provider === 'route53'">
                         </div>
 
                         <!-- DigitalOcean -->
                         <div class="form-group" ng-class="{ 'has-error': false }" ng-show="dnsCredentials.provider === 'digitalocean'">
-                            <label class="control-label" for="dnsCredentialsDigitalOceanToken">API Token</label>
+                            <label class="control-label" for="dnsCredentialsDigitalOceanToken">API token</label>
                             <input type="text" class="form-control" ng-model="dnsCredentials.digitalOceanToken" id="dnsCredentialsDigitalOceanToken" name="digitalOceanToken" ng-disabled="dnsCredentials.busy" ng-required="dnsCredentials.provider === 'digitalocean'">
                         </div>
 
@@ -75,12 +75,12 @@
 
             <table width="100%">
                 <tr>
-                    <td class="text-muted" style="vertical-align: top;">Domain Name</td>
+                    <td class="text-muted" style="vertical-align: top;">Domain name</td>
                     <td class="text-right" style="vertical-align: top; white-space: nowrap;">{{ config.fqdn }}</td>
                 </tr>
 
                 <tr ng-hide="dnsConfig.provider === 'noop' || dnsConfig.provider === 'manual'">
-                    <td class="text-muted" style="vertical-align: top;">DNS Provider</td>
+                    <td class="text-muted" style="vertical-align: top;">DNS provider</td>
                     <td class="text-right" style="vertical-align: top; white-space: nowrap;">{{ dnsConfig.provider }}</td>
                 </tr>
 
@@ -107,16 +107,16 @@
                 </tr>
 
                 <tr ng-show="config.isCustomDomain && dnsConfig.provider === 'route53'">
-                    <td class="text-muted" style="vertical-align: top;">Access Key Id</td>
+                    <td class="text-muted" style="vertical-align: top;">Access key id</td>
                     <td class="text-right" style="vertical-align: top; white-space: nowrap;">{{ dnsConfig.accessKeyId || 'unset' }}</td>
                 </tr>
                 <tr ng-show="config.isCustomDomain && dnsConfig.provider === 'route53'">
-                    <td class="text-muted" style="vertical-align: top;">Secret Access Key</td>
+                    <td class="text-muted" style="vertical-align: top;">Secret access key</td>
                     <td class="text-right" style="vertical-align: top; white-space: nowrap;" ng-click-reveal="dnsConfig.secretAccessKey"><i>hidden</i></td>
                 </tr>
 
                 <tr ng-show="config.isCustomDomain && dnsConfig.provider === 'digitalocean'">
-                    <td class="text-muted" style="vertical-align: top;">API Token</td>
+                    <td class="text-muted" style="vertical-align: top;">API token</td>
                     <td class="text-right" style="vertical-align: top; white-space: nowrap;" ng-click-reveal="dnsConfig.token"><i>hidden</i></td>
                 </tr>
 
@@ -125,6 +125,7 @@
                     <td><br/></td>
                     <td></td>
                 </tr>
+
                 <tr>
                     <td class="text-muted" style="vertical-align: top;"></td>
                     <td class="text-right" style="vertical-align: top;"><button class="btn btn-outline btn-primary" ng-click="showChangeDnsCredentials()">Change</button></td>
@@ -151,10 +152,10 @@
         <div class="col-md-12">
             <form name="defaultCertForm" ng-submit="setDefaultCert()">
                 <fieldset>
-                    <p>By default, certificates are obtained via <a href="https://letsencrypt.org/" target="_blank">Let’s Encrypt</a>.</p>
+                    <p>Certificates are obtained via <a href="https://letsencrypt.org/" target="_blank">Let’s Encrypt</a>.</p>
                     <br/>
                     <label class="control-label" for="defaultCertInput">Fallback Certificate</label>
-                    <p>A wildcard certificate that will be used for apps, if getting a Let’s Encrypt certificate failed. This might be due to rate limits on Let’s Encrypt side.</p>
+                    <p>This wildcard certificate that will be used for apps, if getting a Let’s Encrypt certificate failed. This might be due to rate limits on Let’s Encrypt side.</p>
                     <div class="has-error text-center" ng-show="defaultCert.error">{{ defaultCert.error }}</div>
                     <div class="text-success text-center" ng-show="defaultCert.success"><b>Upload successful</b></div>
                     <div class="form-group" ng-class="{ 'has-error': (!defaultCert.cert.$dirty && defaultCert.error) }">
diff --git a/webadmin/src/views/settings.html b/webadmin/src/views/settings.html
index e1e9451e2..0cfaa7486 100644
--- a/webadmin/src/views/settings.html
+++ b/webadmin/src/views/settings.html
@@ -70,10 +70,12 @@
                 The Cloudron will setup Email related DNS records automatically.
                 If this domain is already configured for Email with some other provider, it will <b>overwrite</b> those records, potentially breaking the setup.
                 Disabling Cloudron Email later will <b>not</b> put the old records back.
+                <br/>
+                <br/>
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-                <button type="button" class="btn btn-success" ng-click="email.enable()">Enable</button>
+                <button type="button" class="btn btn-success" ng-click="email.enable()">I understand, enable</button>
             </div>
         </div>
     </div>
@@ -143,7 +145,7 @@
                 <h4 class="modal-title">Configure Backup Storage</h4>
             </div>
             <div class="modal-body">
-                <p>Only AWS S3 or API compatible services are supported. <sup><a ng-href="{{ config.webServerOrigin }}/references/selfhosting.html#backups" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></p>
+                <p>Only Amazon S3 or API compatible services are supported. <sup><a ng-href="{{ config.webServerOrigin }}/references/selfhosting.html#backups" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></p>
                 <form name="configureBackupForm" role="form" novalidate ng-submit="configureBackup.submit()" autocomplete="off">
                     <fieldset>
                         <p class="has-error text-center" ng-show="configureBackup.error">{{ configureBackup.error.generic }}</p>
@@ -160,27 +162,27 @@
                         </div>
 
                         <div class="form-group" ng-class="{ 'has-error': configureBackup.error.region }">
-                            <label class="control-label" for="inputConfigureBackupRegion">S3 Region</label>
+                            <label class="control-label" for="inputConfigureBackupRegion">Region</label>
                             <select class="form-control" name="region" id="inputConfigureBackupRegion" ng-model="configureBackup.region" ng-options="a.value as a.name for a in s3Regions" ng-disabled="configureBackup.busy" required></select>
                         </div>
 
                         <div class="form-group" ng-class="{ 'has-error': configureBackup.error.accessKeyId }">
-                            <label class="control-label" for="inputConfigureBackupAccessKeyId">Access Key Id</label>
+                            <label class="control-label" for="inputConfigureBackupAccessKeyId">Access key id</label>
                             <input type="text" class="form-control" ng-model="configureBackup.accessKeyId" id="inputConfigureBackupAccessKeyId" name="accessKeyId" ng-disabled="configureBackup.busy" required>
                         </div>
 
                         <div class="form-group" ng-class="{ 'has-error': configureBackup.error.secretAccessKey }">
-                            <label class="control-label" for="inputConfigureBackupSecretAccessKey">Secret Access Key</label>
+                            <label class="control-label" for="inputConfigureBackupSecretAccessKey">Secret access key</label>
                             <input type="text" class="form-control" ng-model="configureBackup.secretAccessKey" id="inputConfigureBackupSecretAccessKey" name="secretAccessKey" ng-disabled="configureBackup.busy" required>
                         </div>
 
                         <div class="form-group" ng-class="{ 'has-error': configureBackup.error.endpoint }">
                             <label class="control-label" for="inputConfigureBackupEndpoint">Endpoint (optional)</label>
-                            <input type="text" class="form-control" ng-model="configureBackup.endpoint" id="inputConfigureBackupEndpoint" name="endpoint" ng-disabled="configureBackup.busy" placeholder="URL of S3 compatible storage (Minio, Swift). Leave empty when using S3.">
+                            <input type="text" class="form-control" ng-model="configureBackup.endpoint" id="inputConfigureBackupEndpoint" name="endpoint" ng-disabled="configureBackup.busy" placeholder="URL of S3 compatible storage (Minio, Swift). Leave empty when using Amazon S3.">
                         </div>
 
                         <div class="form-group" ng-class="{ 'has-error': configureBackup.error.key }">
-                            <label class="control-label" for="inputConfigureBackupKey">Encryption Key (optional)</label>
+                            <label class="control-label" for="inputConfigureBackupKey">Encryption key (optional)</label>
                             <input type="text" class="form-control" ng-model="configureBackup.key" id="inputConfigureBackupKey" name="prefix" ng-disabled="configureBackup.busy" placeholder="Encryption key for all backups">
                         </div>
 
@@ -226,7 +228,7 @@
                     <td class="text-right" style="vertical-align: top; white-space: nowrap;">{{ config.cloudronName }} <a href="" ng-click="cloudronNameChange.show()"><i class="fa fa-pencil text-small"></i></a></td>
                 </tr>
                 <tr ng-show="appstoreConfig.profile">
-                    <td class="text-muted" style="vertical-align: top;">Appstore Account</td>
+                    <td class="text-muted" style="vertical-align: top;">App store account</td>
                     <td class="text-right" style="vertical-align: top; white-space: nowrap;">{{ appstoreConfig.profile.email }}</td>
                 </tr>
                 <tr ng-show="config.provider === 'caas'">
@@ -287,8 +289,11 @@
 <div class="card" style="margin-bottom: 15px;">
     <div class="row">
         <div class="col-md-12">
-            Cloudron has a built-in email server that allows users to send and receive email for your domain. Apps can still send email regardless of this setting.
-            The <a href="https://cloudron.io/references/usermanual.html#email" target="_blank">User manual</a> has information on how to setup your mail client.
+            Cloudron has a built-in email server that allows users to send and receive email for your domain.
+            The <a href="https://cloudron.io/references/usermanual.html#email" target="_blank">User manual</a> has information on how to setup email clients.
+            <br/>
+            <br/>
+            Apps can send email regardless of this setting. If this option is enabled, apps are able to receive emails.
         </div>
     </div>
     <br/>
@@ -354,7 +359,7 @@
 
     <div class="row">
         <div class="col-xs-6">
-            <span class="text-muted">Last Backup</span>
+            <span class="text-muted">Last backup</span>
         </div>
         <div class="col-xs-6 text-right">
             <span ng-show="lastBackup">{{ lastBackup.creationTime | prettyDate }}</span>
@@ -392,9 +397,8 @@
 <div class="card" style="margin-bottom: 15px;">
     <div class="row">
         <div class="col-md-12">
-            Configure the auto-update schedule for the platform and for the installed apps:<br/>
-            <br/>
-            <p class="text-danger text-center text-bold" ng-show="autoUpdate.error">{{ autoUpdate.error }}</p>
+            <p>Configure the auto-update schedule for the platform and the apps:</p>
+            <p class="text-danger" ng-show="autoUpdate.error"><br/>{{ autoUpdate.error }}</p>
         </div>
     </div>
 
diff --git a/webadmin/src/views/tokens.html b/webadmin/src/views/tokens.html
index fd1804c7e..c96f9f3b0 100644
--- a/webadmin/src/views/tokens.html
+++ b/webadmin/src/views/tokens.html
@@ -3,15 +3,15 @@
     <div class="modal-dialog">
         <div class="modal-content">
             <div class="modal-header">
-                <h4 class="modal-title" ng-hide="config.developerMode">Enable API Access</h4>
-                <h4 class="modal-title" ng-show="config.developerMode">Disable API Access</h4>
+                <h4 class="modal-title" ng-hide="config.developerMode">Enable API access</h4>
+                <h4 class="modal-title" ng-show="config.developerMode">Disable API access</h4>
             </div>
             <div class="modal-body">
                 <form name="developerModeChangeForm" role="form" novalidate ng-submit="doChangeDeveloperMode(developerModeChangeForm)" autocomplete="off">
                     <fieldset>
                         <input type="password" style="display: none;">
                         <div class="form-group" ng-class="{ 'has-error': (!developerModeChangeForm.password.$dirty && developerModeChange.error.password) || (developerModeChangeForm.password.$dirty && developerModeChangeForm.password.$invalid) }">
-                            <label class="control-label" for="inputDeveloperModeChangePassword">Give your password to verify that you are performing that action</label>
+                            <label class="control-label" for="inputDeveloperModeChangePassword">Give your password to verify this action</label>
                             <div class="control-label" ng-show="(!developerModeChangeForm.password.$dirty && developerModeChange.error.password) || (developerModeChangeForm.password.$dirty && developerModeChangeForm.password.$invalid)">
                                 <small ng-show=" developerModeChangeForm.password.$dirty && developerModeChangeForm.password.$invalid">A password is required</small>
                                 <small ng-show="!developerModeChangeForm.password.$dirty && developerModeChange.error.password">Wrong password</small>
@@ -127,7 +127,7 @@
             The Cloudron <a href="https://cloudron.io/references/api.html" target="_blank">REST API</a> can be used to manage all aspects of the Cloudron like adding users and installing apps.
             <br/>
             <br/>
-            You can develop apps for the Cloudron using the <a href="https://cloudron.io/references/cli.html" target="_blank">CLI tool</a>. See the <a href="{{ config.webServerOrigin }}/documentation.html" target="_blank">docs</a> for more information.
+            You can develop apps for the Cloudron using the <a href="https://cloudron.io/references/cli.html" target="_blank">command-line tool</a>. See the <a href="{{ config.webServerOrigin }}/documentation.html" target="_blank">docs</a> for more information.
         </div>
     </div>
     <br/>