diff --git a/dashboard/public/views/backups.html b/dashboard/public/views/backups.html
index b499cd487..6c482103e 100644
--- a/dashboard/public/views/backups.html
+++ b/dashboard/public/views/backups.html
@@ -452,9 +452,7 @@
 
 <div class="content">
 
-  <div class="text-left">
-    <h1>{{ 'backups.title' | tr }}</h1>
-  </div>
+  <h1 class="section-header">{{ 'backups.title' | tr }}</h1>
 
   <div class="text-left">
     <h3>{{ 'backups.location.title' | tr }}</h3>
@@ -527,24 +525,22 @@
     </div>
   </div>
 
-  <div class="text-left section-header">
-    <h3>
-      {{ 'backups.schedule.title' | tr }}
-      <!-- <a class="btn btn-sm btn-default pull-right" ng-href="/logs.html?taskId={{cleanupBackups.taskId}}" target="_blank" uib-tooltip="{{ 'backups.logs.showLogs' | tr }}"><i class="fas fa-align-left"></i></a> -->
-      <div class="btn-group btn-group-sm pull-right">
-        <button type="button" class="btn btn-small btn-default dropdown-toggle" ng-show="cleanupTasks.length" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" uib-tooltip="{{ 'backups.logs.showLogs' | tr }}">
-          <i class="fas fa-align-left"></i> <span class="caret"></span>
-        </button>
-        <ul class="dropdown-menu">
-          <li ng-repeat="task in cleanupTasks">
-            <a ng-href="/logs.html?taskId={{task.id}}" target="_blank" class="text-right">
-            {{ task.ts | prettyLongDate }} <i class="fa" style="margin-left: 20px" ng-class="{ 'status-active fa-check-circle': !task.active && task.success, 'fa-circle-notch fa-spin': task.active, 'status-error fa-times-circle': !task.active && !task.success }"></i>
-            </a>
-          </li>
-        </ul>
-      </div>
-    </h3>
-  </div>
+  <h3 class="section-header">
+    {{ 'backups.schedule.title' | tr }}
+    <!-- <a class="btn btn-sm btn-default pull-right" ng-href="/logs.html?taskId={{cleanupBackups.taskId}}" target="_blank" uib-tooltip="{{ 'backups.logs.showLogs' | tr }}"><i class="fas fa-align-left"></i></a> -->
+    <div class="btn-group btn-group-sm pull-right">
+      <button type="button" class="btn btn-small btn-default dropdown-toggle" ng-show="cleanupTasks.length" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" uib-tooltip="{{ 'backups.logs.showLogs' | tr }}">
+        <i class="fas fa-align-left"></i> <span class="caret"></span>
+      </button>
+      <ul class="dropdown-menu">
+        <li ng-repeat="task in cleanupTasks">
+          <a ng-href="/logs.html?taskId={{task.id}}" target="_blank" class="text-right">
+          {{ task.ts | prettyLongDate }} <i class="fa" style="margin-left: 20px" ng-class="{ 'status-active fa-check-circle': !task.active && task.success, 'fa-circle-notch fa-spin': task.active, 'status-error fa-times-circle': !task.active && !task.success }"></i>
+          </a>
+        </li>
+      </ul>
+    </div>
+  </h3>
 
   <div class="card" style="margin-bottom: 15px;">
     <p ng-bind-html=" 'backups.schedule.description' | tr "></p>
@@ -573,23 +569,21 @@
     </div>
   </div>
 
-  <div class="text-left section-header">
-    <h3>
-      {{ 'backups.listing.title' | tr }}
-      <div class="btn-group btn-group-sm pull-right">
-        <button type="button" class="btn btn-small btn-default dropdown-toggle" ng-show="backupTasks.length" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" uib-tooltip="{{ 'backups.logs.showLogs' | tr }}">
-          <i class="fas fa-align-left"></i> <span class="caret"></span>
-        </button>
-        <ul class="dropdown-menu">
-          <li ng-repeat="task in backupTasks">
-            <a ng-href="/logs.html?taskId={{task.id}}" target="_blank" class="text-right">
-            {{ task.ts | prettyLongDate }} <i class="fa" style="margin-left: 20px" ng-class="{ 'status-active fa-check-circle': !task.active && task.success, 'fa-circle-notch fa-spin': task.active, 'status-error fa-times-circle': !task.active && !task.success }"></i>
-            </a>
-          </li>
-        </ul>
-      </div>
-    </h3>
-  </div>
+  <h3 class="section-header">
+    {{ 'backups.listing.title' | tr }}
+    <div class="btn-group btn-group-sm pull-right">
+      <button type="button" class="btn btn-small btn-default dropdown-toggle" ng-show="backupTasks.length" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" uib-tooltip="{{ 'backups.logs.showLogs' | tr }}">
+        <i class="fas fa-align-left"></i> <span class="caret"></span>
+      </button>
+      <ul class="dropdown-menu">
+        <li ng-repeat="task in backupTasks">
+          <a ng-href="/logs.html?taskId={{task.id}}" target="_blank" class="text-right">
+          {{ task.ts | prettyLongDate }} <i class="fa" style="margin-left: 20px" ng-class="{ 'status-active fa-check-circle': !task.active && task.success, 'fa-circle-notch fa-spin': task.active, 'status-error fa-times-circle': !task.active && !task.success }"></i>
+          </a>
+        </li>
+      </ul>
+    </div>
+  </h3>
 
   <div class="card card-large">
     <div class="row">
diff --git a/dashboard/public/views/branding.html b/dashboard/public/views/branding.html
index a9431cc32..889f8d65c 100644
--- a/dashboard/public/views/branding.html
+++ b/dashboard/public/views/branding.html
@@ -27,9 +27,7 @@
 
 <div class="content">
 
-  <div class="text-left">
-    <h1>{{ 'branding.title' | tr }}</h1>
-  </div>
+  <h1 class="section-header">{{ 'branding.title' | tr }}</h1>
 
   <div class="card" style="margin-bottom: 15px;">
 
@@ -79,9 +77,7 @@
 
   </div>
 
-  <div class="text-left">
-    <h3>{{ 'branding.footer.title' | tr }}</h3>
-  </div>
+  <h3 class="section-header">{{ 'branding.footer.title' | tr }}</h3>
 
   <div class="card">
     <div class="row">
diff --git a/dashboard/public/views/domains.html b/dashboard/public/views/domains.html
index 23a908296..f7cbe2cb2 100644
--- a/dashboard/public/views/domains.html
+++ b/dashboard/public/views/domains.html
@@ -333,12 +333,10 @@
 </div>
 
 <div class="content">
-  <div class="text-left">
-    <h1>
-      {{ 'domains.title' | tr }}
-      <button class="btn btn-primary btn-outline pull-right" ng-show="domains.length <= pageSize" ng-click="domainAdd.show()"><i class="fa fa-plus"></i> {{ 'domains.addDomain' | tr }}</button>
-    </h1>
-  </div>
+  <h1 class="section-header">
+    {{ 'domains.title' | tr }}
+    <button class="btn btn-primary btn-outline" ng-show="domains.length <= pageSize" ng-click="domainAdd.show()"><i class="fa fa-plus"></i> {{ 'domains.addDomain' | tr }}</button>
+  </h1>
 
   <div class="users-toolbar" ng-show="domains.length > pageSize">
     <input type="text" id="domainSearchInput" class="form-control" style="max-width: 350px;" ng-model="domainSearchString" placeholder="{{ 'main.searchPlaceholder' | tr }}"/>
@@ -389,23 +387,21 @@
     </div>
   </div>
 
-  <div class="text-left section-header">
-    <h3>
-      {{ 'domains.renewCerts.title' | tr }}
-      <div class="btn-group btn-group-sm pull-right">
-        <button type="button" class="btn btn-small btn-default dropdown-toggle" ng-show="renewCerts.tasks.length" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" uib-tooltip="{{ 'domains.renewCerts.showLogsAction' | tr }}">
-          <i class="fas fa-align-left"></i> <span class="caret"></span>
-        </button>
-        <ul class="dropdown-menu">
-          <li ng-repeat="task in renewCerts.tasks">
-            <a ng-href="/logs.html?taskId={{task.id}}" target="_blank" class="text-right">
-            {{ task.ts | prettyLongDate }} <i class="fa" style="margin-left: 20px" ng-class="{ 'status-active fa-check-circle': !task.active && task.success, 'fa-circle-notch fa-spin': task.active, 'status-error fa-times-circle': !task.active && !task.success }"></i>
-            </a>
-          </li>
-        </ul>
-      </div>
-    </h3>
-  </div>
+  <h3 class="section-header">
+    {{ 'domains.renewCerts.title' | tr }}
+    <div class="btn-group btn-group-sm pull-right">
+      <button type="button" class="btn btn-small btn-default dropdown-toggle" ng-show="renewCerts.tasks.length" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" uib-tooltip="{{ 'domains.renewCerts.showLogsAction' | tr }}">
+        <i class="fas fa-align-left"></i> <span class="caret"></span>
+      </button>
+      <ul class="dropdown-menu">
+        <li ng-repeat="task in renewCerts.tasks">
+          <a ng-href="/logs.html?taskId={{task.id}}" target="_blank" class="text-right">
+          {{ task.ts | prettyLongDate }} <i class="fa" style="margin-left: 20px" ng-class="{ 'status-active fa-check-circle': !task.active && task.success, 'fa-circle-notch fa-spin': task.active, 'status-error fa-times-circle': !task.active && !task.success }"></i>
+          </a>
+        </li>
+      </ul>
+    </div>
+  </h3>
 
   <div class="card">
     <div class="row">
@@ -433,23 +429,21 @@
     </div>
   </div>
 
-  <div class="text-left section-header">
-    <h3>
-      {{ 'domains.syncDns.title' | tr }}
-      <div class="btn-group btn-group-sm pull-right">
-        <button type="button" class="btn btn-small btn-default dropdown-toggle" ng-show="syncDns.tasks.length" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" uib-tooltip="{{ 'domains.renewCerts.showLogsAction' | tr }}">
-          <i class="fas fa-align-left"></i> <span class="caret"></span>
-        </button>
-        <ul class="dropdown-menu">
-          <li ng-repeat="task in syncDns.tasks">
-            <a ng-href="/logs.html?taskId={{task.id}}" target="_blank" class="text-right">
-            {{ task.ts | prettyLongDate }} <i class="fa" style="margin-left: 20px" ng-class="{ 'status-active fa-check-circle': !task.active && task.success, 'fa-circle-notch fa-spin': task.active, 'status-error fa-times-circle': !task.active && !task.success }"></i>
-            </a>
-          </li>
-        </ul>
-      </div>
-    </h3>
-  </div>
+  <h3 class="section-header">
+    {{ 'domains.syncDns.title' | tr }}
+    <div class="btn-group btn-group-sm pull-right">
+      <button type="button" class="btn btn-small btn-default dropdown-toggle" ng-show="syncDns.tasks.length" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" uib-tooltip="{{ 'domains.renewCerts.showLogsAction' | tr }}">
+        <i class="fas fa-align-left"></i> <span class="caret"></span>
+      </button>
+      <ul class="dropdown-menu">
+        <li ng-repeat="task in syncDns.tasks">
+          <a ng-href="/logs.html?taskId={{task.id}}" target="_blank" class="text-right">
+          {{ task.ts | prettyLongDate }} <i class="fa" style="margin-left: 20px" ng-class="{ 'status-active fa-check-circle': !task.active && task.success, 'fa-circle-notch fa-spin': task.active, 'status-error fa-times-circle': !task.active && !task.success }"></i>
+          </a>
+        </li>
+      </ul>
+    </div>
+  </h3>
 
   <div class="card">
     <div class="row">
@@ -477,23 +471,21 @@
     </div>
   </div>
 
-  <div class="text-left section-header">
-    <h3>
-      {{ 'domains.changeDashboardDomain.title' | tr }}
-      <div class="btn-group btn-group-sm pull-right">
-        <button type="button" class="btn btn-small btn-default dropdown-toggle" ng-show="changeDashboard.tasks.length" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" uib-tooltip="{{ 'domains.renewCerts.showLogsAction' | tr }}">
-          <i class="fas fa-align-left"></i> <span class="caret"></span>
-        </button>
-        <ul class="dropdown-menu">
-          <li ng-repeat="task in changeDashboard.tasks">
-            <a ng-href="/logs.html?taskId={{task.id}}" target="_blank" class="text-right">
-            {{ task.ts | prettyLongDate }} <i class="fa" style="margin-left: 20px" ng-class="{ 'status-active fa-check-circle': !task.active && task.success, 'fa-circle-notch fa-spin': task.active, 'status-error fa-times-circle': !task.active && !task.success }"></i>
-            </a>
-          </li>
-        </ul>
-      </div>
-    </h3>
-  </div>
+  <h3 class="section-header">
+    {{ 'domains.changeDashboardDomain.title' | tr }}
+    <div class="btn-group btn-group-sm pull-right">
+      <button type="button" class="btn btn-small btn-default dropdown-toggle" ng-show="changeDashboard.tasks.length" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" uib-tooltip="{{ 'domains.renewCerts.showLogsAction' | tr }}">
+        <i class="fas fa-align-left"></i> <span class="caret"></span>
+      </button>
+      <ul class="dropdown-menu">
+        <li ng-repeat="task in changeDashboard.tasks">
+          <a ng-href="/logs.html?taskId={{task.id}}" target="_blank" class="text-right">
+          {{ task.ts | prettyLongDate }} <i class="fa" style="margin-left: 20px" ng-class="{ 'status-active fa-check-circle': !task.active && task.success, 'fa-circle-notch fa-spin': task.active, 'status-error fa-times-circle': !task.active && !task.success }"></i>
+          </a>
+        </li>
+      </ul>
+    </div>
+  </h3>
 
   <div class="card">
     <div class="row">
diff --git a/dashboard/public/views/emails.html b/dashboard/public/views/emails.html
index 13d46c0f8..fdb694997 100644
--- a/dashboard/public/views/emails.html
+++ b/dashboard/public/views/emails.html
@@ -151,21 +151,17 @@
 </div>
 
 <div class="content">
-  <div class="text-left">
-    <h1>
-      {{ 'emails.title' | tr }}
+  <h1 class="section-header">
+    {{ 'emails.title' | tr }}
 
-      <div class="pull-right">
-        <a class="btn btn-default" ng-show="user.isAtLeastAdmin" href="#/emails-queue">{{ 'emails.action.queue' | tr }}</a>
-        <a class="btn btn-default" ng-show="user.isAtLeastAdmin" href="#/emails-eventlog">{{ 'eventlog.title' | tr }}</a>
-      </div>
-    </h1>
-  </div>
+    <div class="pull-right">
+      <a class="btn btn-default" ng-show="user.isAtLeastAdmin" href="#/emails-queue">{{ 'emails.action.queue' | tr }}</a>
+      <a class="btn btn-default" ng-show="user.isAtLeastAdmin" href="#/emails-eventlog">{{ 'eventlog.title' | tr }}</a>
+    </div>
+  </h1>
 
   <!-- domain listing -->
-  <div class="text-left">
-    <h3>{{ 'emails.domains.title' | tr }}</h3>
-  </div>
+  <h3 class="section-header">{{ 'emails.domains.title' | tr }}</h3>
 
   <div class="card" style="margin-bottom: 15px;">
     <div class="row ng-hide" ng-hide="ready">
@@ -223,9 +219,7 @@
   </div>
 
   <!-- mailbox sharing -->
-  <div class="text-left section-header" ng-show="user.isAtLeastAdmin">
-    <h3>{{ 'emails.mailboxSharing.title' | tr }}</h3>
-  </div>
+  <h3 class="section-header" ng-show="user.isAtLeastAdmin">{{ 'emails.mailboxSharing.title' | tr }}</h3>
 
   <div class="card" ng-show="user.isAtLeastAdmin" style="margin-bottom: 15px;">
     <div class="row">
@@ -244,23 +238,21 @@
   </div>
 
   <!-- server location -->
-  <div class="text-left section-header" ng-show="user.isAtLeastAdmin">
-    <h3>
-      {{ 'emails.settings.location' | tr }}
-      <div class="btn-group btn-group-sm pull-right">
-        <button type="button" class="btn btn-small btn-default dropdown-toggle" ng-show="mailLocation.tasks.length" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" uib-tooltip="{{ 'main.action.showLogs' | tr }}">
-          <i class="fas fa-align-left"></i> <span class="caret"></span>
-        </button>
-        <ul class="dropdown-menu">
-          <li ng-repeat="task in mailLocation.tasks">
-            <a ng-href="/logs.html?taskId={{task.id}}" target="_blank" class="text-right">
-            {{ task.ts | prettyLongDate }} <i class="fa" style="margin-left: 20px" ng-class="{ 'status-active fa-check-circle': !task.active && task.success, 'fa-circle-notch fa-spin': task.active, 'status-error fa-times-circle': !task.active && !task.success }"></i>
-            </a>
-          </li>
-        </ul>
-      </div>
-    </h3>
-  </div>
+  <h3 class="section-header" ng-show="user.isAtLeastAdmin">
+    {{ 'emails.settings.location' | tr }}
+    <div class="btn-group btn-group-sm pull-right">
+      <button type="button" class="btn btn-small btn-default dropdown-toggle" ng-show="mailLocation.tasks.length" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" uib-tooltip="{{ 'main.action.showLogs' | tr }}">
+        <i class="fas fa-align-left"></i> <span class="caret"></span>
+      </button>
+      <ul class="dropdown-menu">
+        <li ng-repeat="task in mailLocation.tasks">
+          <a ng-href="/logs.html?taskId={{task.id}}" target="_blank" class="text-right">
+          {{ task.ts | prettyLongDate }} <i class="fa" style="margin-left: 20px" ng-class="{ 'status-active fa-check-circle': !task.active && task.success, 'fa-circle-notch fa-spin': task.active, 'status-error fa-times-circle': !task.active && !task.success }"></i>
+          </a>
+        </li>
+      </ul>
+    </div>
+  </h3>
 
   <div class="card" ng-show="user.isAtLeastAdmin">
     <div class="row">
@@ -312,9 +304,7 @@
   </div>
 
   <!-- settings -->
-  <div class="text-left section-header" ng-show="user.isAtLeastAdmin">
-    <h3>{{ 'emails.settings.title' | tr }}</h3>
-  </div>
+  <h3 class="section-header" ng-show="user.isAtLeastAdmin">{{ 'emails.settings.title' | tr }}</h3>
 
   <div class="card" ng-show="user.isAtLeastAdmin" style="margin-bottom: 15px;">
     <p ng-bind-html=" 'emails.settings.info' | tr "></p>
diff --git a/dashboard/public/views/network.html b/dashboard/public/views/network.html
index 3adff3852..f37792927 100644
--- a/dashboard/public/views/network.html
+++ b/dashboard/public/views/network.html
@@ -145,14 +145,10 @@
 </div>
 
 <div class="content">
-  <div class="text-left">
-    <h1>{{ 'network.title' | tr }}</h1>
-  </div>
+  <h1 class="section-header">{{ 'network.title' | tr }}</h1>
 
   <!-- IPv4 -->
-  <div class="text-left">
-    <h3>{{ 'network.ip.title' | tr }}</h3>
-  </div>
+  <h3 class="section-header">{{ 'network.ip.title' | tr }}</h3>
 
   <div class="card">
     <div class="row">
@@ -199,61 +195,57 @@
     </div>
   </div>
 
-    <!-- IPv6 -->
-    <div class="text-left section-header">
-      <h3>{{ 'network.ipv6.title' | tr }}</h3>
-    </div>
+  <!-- IPv6 -->
+  <h3 class="section-header">{{ 'network.ipv6.title' | tr }}</h3>
 
-    <div class="card">
-      <div class="row">
-        <div class="col-xs-12">
-          {{ 'network.ipv6.description' | tr }}
-        </div>
-      </div>
-
-      <br/>
-      <div class="row">
-        <div class="col-xs-2">
-          <span class="text-muted">{{ 'network.ip.provider' | tr }}</span>
-        </div>
-        <div class="col-xs-10 text-right">
-          <span>{{ prettyIpProviderName(ipv6Configure.provider) }}</span>
-        </div>
-      </div>
-
-      <div class="row" ng-show="ipv6Configure.provider !== 'noop'">
-        <div class="col-xs-2">
-          <span class="text-muted">{{ 'network.ip.address' | tr }}</span>
-        </div>
-        <div class="col-xs-10 text-right">
-          <span ng-show="ipv6Configure.ipv6">{{ ipv6Configure.ipv6 }}</span>
-          <span ng-show="!ipv6Configure.ipv6 && ipv6Configure.serverIPv6">{{ ipv6Configure.serverIPv6 }} ({{ 'network.ip.detected' | tr }})</span>
-          <span ng-show="ipv6Configure.displayError" class="text-danger">{{ ipv6Configure.displayError }}</span>
-        </div>
-      </div>
-
-      <div class="row" ng-show="ipv6Configure.ifname">
-        <div class="col-xs-6">
-          <span class="text-muted">{{ 'network.ip.interface' | tr }}</span>
-        </div>
-        <div class="col-xs-6 text-right">
-          <span>{{ ipv6Configure.ifname }}</span>
-        </div>
-      </div>
-
-      <br/>
-
-      <div class="row">
-        <div class="col-md-6 col-md-offset-6 text-right">
-          <button class="btn btn-outline btn-primary pull-right" ng-click="ipv6Configure.show()">{{ 'network.ip.configure' | tr }}</button>
-        </div>
+  <div class="card">
+    <div class="row">
+      <div class="col-xs-12">
+        {{ 'network.ipv6.description' | tr }}
       </div>
     </div>
 
+    <br/>
+    <div class="row">
+      <div class="col-xs-2">
+        <span class="text-muted">{{ 'network.ip.provider' | tr }}</span>
+      </div>
+      <div class="col-xs-10 text-right">
+        <span>{{ prettyIpProviderName(ipv6Configure.provider) }}</span>
+      </div>
+    </div>
+
+    <div class="row" ng-show="ipv6Configure.provider !== 'noop'">
+      <div class="col-xs-2">
+        <span class="text-muted">{{ 'network.ip.address' | tr }}</span>
+      </div>
+      <div class="col-xs-10 text-right">
+        <span ng-show="ipv6Configure.ipv6">{{ ipv6Configure.ipv6 }}</span>
+        <span ng-show="!ipv6Configure.ipv6 && ipv6Configure.serverIPv6">{{ ipv6Configure.serverIPv6 }} ({{ 'network.ip.detected' | tr }})</span>
+        <span ng-show="ipv6Configure.displayError" class="text-danger">{{ ipv6Configure.displayError }}</span>
+      </div>
+    </div>
+
+    <div class="row" ng-show="ipv6Configure.ifname">
+      <div class="col-xs-6">
+        <span class="text-muted">{{ 'network.ip.interface' | tr }}</span>
+      </div>
+      <div class="col-xs-6 text-right">
+        <span>{{ ipv6Configure.ifname }}</span>
+      </div>
+    </div>
+
+    <br/>
+
+    <div class="row">
+      <div class="col-md-6 col-md-offset-6 text-right">
+        <button class="btn btn-outline btn-primary pull-right" ng-click="ipv6Configure.show()">{{ 'network.ip.configure' | tr }}</button>
+      </div>
+    </div>
+  </div>
+
   <!-- Firewall -->
-  <div class="text-left section-header">
-    <h3>{{ 'network.firewall.title' | tr }}</h3>
-  </div>
+  <h3 class="section-header">{{ 'network.firewall.title' | tr }}</h3>
 
   <div class="card">
     <div class="row">
@@ -276,23 +268,21 @@
   </div>
 
   <!-- Dynamic DNS -->
-  <div class="text-left section-header">
-    <h3>
-      {{ 'network.dyndns.title' | tr }}
-      <div class="btn-group btn-group-sm pull-right">
-        <button type="button" class="btn btn-small btn-default dropdown-toggle" ng-show="dyndnsConfigure.tasks.length" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" uib-tooltip="{{ 'network.dyndns.showLogsAction' | tr }}">
-          <i class="fas fa-align-left"></i> <span class="caret"></span>
-        </button>
-        <ul class="dropdown-menu">
-          <li ng-repeat="task in dyndnsConfigure.tasks">
-            <a ng-href="/logs.html?taskId={{task.id}}" target="_blank" class="text-right">
-            {{ task.ts | prettyLongDate }} <i class="fa" style="margin-left: 20px" ng-class="{ 'status-active fa-check-circle': !task.active && task.success, 'fa-circle-notch fa-spin': task.active, 'status-error fa-times-circle': !task.active && !task.success }"></i>
-            </a>
-          </li>
-        </ul>
-      </div>
-    </h3>
-  </div>
+  <h3 class="section-header">
+    {{ 'network.dyndns.title' | tr }}
+    <div class="btn-group btn-group-sm pull-right">
+      <button type="button" class="btn btn-small btn-default dropdown-toggle" ng-show="dyndnsConfigure.tasks.length" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" uib-tooltip="{{ 'network.dyndns.showLogsAction' | tr }}">
+        <i class="fas fa-align-left"></i> <span class="caret"></span>
+      </button>
+      <ul class="dropdown-menu">
+        <li ng-repeat="task in dyndnsConfigure.tasks">
+          <a ng-href="/logs.html?taskId={{task.id}}" target="_blank" class="text-right">
+          {{ task.ts | prettyLongDate }} <i class="fa" style="margin-left: 20px" ng-class="{ 'status-active fa-check-circle': !task.active && task.success, 'fa-circle-notch fa-spin': task.active, 'status-error fa-times-circle': !task.active && !task.success }"></i>
+          </a>
+        </li>
+      </ul>
+    </div>
+  </h3>
 
   <div class="card">
     <div class="row">
diff --git a/dashboard/public/views/notifications.html b/dashboard/public/views/notifications.html
index 054294d65..bf2ffb05b 100644
--- a/dashboard/public/views/notifications.html
+++ b/dashboard/public/views/notifications.html
@@ -1,15 +1,12 @@
 <div class="content content-large">
 
-  <div class="text-left">
-    <h1>{{ 'notifications.title' | tr }}
-
-      <div class="title-toolbar">
-        <button class="btn btn-default" ng-click="showPrevPage()" ng-disabled="busy || currentPage <= 1"><i class="fa fa-angle-double-left"></i> {{ 'main.pagination.prev' | tr }}</button>
-        <button class="btn btn-default" ng-click="showNextPage()" ng-disabled="busy || perPage > notifications.length">{{ 'main.pagination.next' | tr }} <i class="fa fa-angle-double-right"></i></button>
-        <button class="btn btn-primary" ng-click="clearAll()" ng-disabled="!$parent.notificationCount || clearAllBusy"><i class="fa fa-circle-notch fa-spin" ng-show="clearAllBusy"></i><i class="fa fa-check" ng-hide="clearAllBusy"></i> {{ 'notifications.markAllAsRead' | tr }}</button>
-      </div>
-    </h1>
-  </div>
+  <h1 class="section-header">
+    {{ 'notifications.title' | tr }}
+    <div style="flex-grow: 1;"></div>
+    <button class="btn btn-default" ng-click="showPrevPage()" ng-disabled="busy || currentPage <= 1"><i class="fa fa-angle-double-left"></i> {{ 'main.pagination.prev' | tr }}</button>
+    <button class="btn btn-default" ng-click="showNextPage()" ng-disabled="busy || perPage > notifications.length">{{ 'main.pagination.next' | tr }} <i class="fa fa-angle-double-right"></i></button>
+    <button class="btn btn-primary" ng-click="clearAll()" ng-disabled="!$parent.notificationCount || clearAllBusy"><i class="fa fa-circle-notch fa-spin" ng-show="clearAllBusy"></i><i class="fa fa-check" ng-hide="clearAllBusy"></i> {{ 'notifications.markAllAsRead' | tr }}</button>
+  </h1>
 
   <div class="col-lg-12 text-center" ng-show="busy">
     <h2><i class="fa fa-circle-notch fa-spin"></i></h2>
diff --git a/dashboard/public/views/profile.html b/dashboard/public/views/profile.html
index 6bd1bef82..217b2f223 100644
--- a/dashboard/public/views/profile.html
+++ b/dashboard/public/views/profile.html
@@ -387,9 +387,7 @@
 
 <div class="content">
 
-  <div class="text-left">
-    <h1>{{ 'profile.title' | tr }}</h1>
-  </div>
+  <h1 class="section-header">{{ 'profile.title' | tr }}</h1>
 
   <div class="card">
     <div style="display: flex; flex-wrap: wrap;">
@@ -450,11 +448,7 @@
     </div>
   </div>
 
-  <br>
-
-  <div class="text-left">
-    <h3>{{ 'profile.appPasswords.title' | tr }}<button class="btn btn-primary btn-sm pull-right" ng-click="appPasswordAdd.show()"><i class="fa fa-plus"></i> {{ 'profile.appPasswords.newPassword' | tr }}</button></h3>
-  </div>
+  <h3 class="section-header">{{ 'profile.appPasswords.title' | tr }}<button class="btn btn-primary btn-sm pull-right" ng-click="appPasswordAdd.show()"><i class="fa fa-plus"></i> {{ 'profile.appPasswords.newPassword' | tr }}</button></h3>
 
   <div class="card">
     <div class="grid-item-top">
@@ -491,11 +485,7 @@
     </div>
   </div>
 
-  <br ng-show="user.isAtLeastAdmin"/>
-
-  <div class="text-left" ng-show="user.isAtLeastAdmin">
-    <h3>{{ 'profile.apiTokens.title' | tr }} <button class="btn btn-primary btn-sm pull-right" ng-click="tokens.add.show()"><i class="fa fa-plus"></i> {{ 'profile.apiTokens.newApiToken' | tr }}</button></h3>
-  </div>
+  <h3 class="section-header" ng-show="user.isAtLeastAdmin">{{ 'profile.apiTokens.title' | tr }} <button class="btn btn-primary btn-sm pull-right" ng-click="tokens.add.show()"><i class="fa fa-plus"></i> {{ 'profile.apiTokens.newApiToken' | tr }}</button></h3>
 
   <div class="card" ng-show="user.isAtLeastAdmin">
     <div class="grid-item-top">
@@ -538,11 +528,7 @@
     </div>
   </div>
 
-  <br/>
-
-  <div class="text-left">
-    <h3>{{ 'profile.loginTokens.title' | tr }}</h3>
-  </div>
+  <h3 class="section-header">{{ 'profile.loginTokens.title' | tr }}</h3>
 
   <div class="card">
     <div class="grid-item-top">
diff --git a/dashboard/public/views/services.html b/dashboard/public/views/services.html
index 9fb2cdbcd..e6b5527dc 100644
--- a/dashboard/public/views/services.html
+++ b/dashboard/public/views/services.html
@@ -47,10 +47,10 @@
 
 <div class="content">
 
-  <div class="text-left">
-    <h1>{{ 'services.title' | tr }}
-    <button class="btn btn-default pull-right" ng-click="refreshAll()">{{ 'services.refresh' | tr }}</button>
-  </div>
+  <h1 class="section-header">
+    {{ 'services.title' | tr }}
+    <button class="btn btn-default" ng-click="refreshAll()">{{ 'services.refresh' | tr }}</button>
+  </h1>
 
   <div class="card" style="margin-bottom: 15px;">
     <div class="row">
diff --git a/dashboard/public/views/settings.html b/dashboard/public/views/settings.html
index 85d328825..292773ef8 100644
--- a/dashboard/public/views/settings.html
+++ b/dashboard/public/views/settings.html
@@ -140,13 +140,9 @@
 
 <div class="content">
 
-  <div class="text-left">
-    <h1>{{ 'settings.title' | tr }}</h1>
-  </div>
+  <h1 class="section-header">{{ 'settings.title' | tr }}</h1>
 
-  <div class="text-left" ng-show="user.isAtLeastOwner && !config.isDemo">
-    <h3>{{ 'settings.appstoreAccount.title' | tr }}</h3>
-  </div>
+  <h3 class="section-header" ng-show="user.isAtLeastOwner && !config.isDemo">{{ 'settings.appstoreAccount.title' | tr }}</h3>
 
   <div class="card" style="margin-bottom: 15px;" ng-show="user.isAtLeastOwner && !config.isDemo">
     <div ng-show="subscriptionBusy" style="height: 155px;">
@@ -204,9 +200,7 @@
     </div>
   </div>
 
-  <div class="text-left section-header">
-    <h3>{{ 'settings.timezone.title' | tr }}</h3>
-  </div>
+  <h3 class="section-header">{{ 'settings.timezone.title' | tr }}</h3>
 
   <div class="card" style="margin-bottom: 15px;">
     <div class="row">
@@ -228,9 +222,7 @@
     </div>
   </div>
 
-  <div class="text-left section-header">
-    <h3>{{ 'settings.language.title' | tr }}</h3>
-  </div>
+  <h3 class="section-header">{{ 'settings.language.title' | tr }}</h3>
 
   <div class="card" style="margin-bottom: 15px;">
     <div class="row">
@@ -251,23 +243,21 @@
     </div>
   </div>
 
-  <div class="text-left section-header">
-    <h3>
-      {{ 'settings.updates.title' | tr }}
-      <div class="btn-group btn-group-sm pull-right">
-        <button type="button" class="btn btn-small btn-default dropdown-toggle" ng-show="update.tasks.length" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" uib-tooltip="{{ 'settings.updates.showLogsAction' | tr }}">
-          <i class="fas fa-align-left"></i> <span class="caret"></span>
-        </button>
-        <ul class="dropdown-menu">
-          <li ng-repeat="task in update.tasks">
-            <a ng-href="/logs.html?taskId={{task.id}}" target="_blank" class="text-right">
-            {{ task.ts | prettyLongDate }} <i class="fa" style="margin-left: 20px" ng-class="{ 'status-active fa-check-circle': !task.active && task.success, 'fa-circle-notch fa-spin': task.active, 'status-error fa-times-circle': !task.active && !task.success }"></i>
-            </a>
-          </li>
-        </ul>
-      </div>
-    </h3>
-  </div>
+  <h3 class="section-header">
+    {{ 'settings.updates.title' | tr }}
+    <div class="btn-group btn-group-sm pull-right">
+      <button type="button" class="btn btn-small btn-default dropdown-toggle" ng-show="update.tasks.length" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" uib-tooltip="{{ 'settings.updates.showLogsAction' | tr }}">
+        <i class="fas fa-align-left"></i> <span class="caret"></span>
+      </button>
+      <ul class="dropdown-menu">
+        <li ng-repeat="task in update.tasks">
+          <a ng-href="/logs.html?taskId={{task.id}}" target="_blank" class="text-right">
+          {{ task.ts | prettyLongDate }} <i class="fa" style="margin-left: 20px" ng-class="{ 'status-active fa-check-circle': !task.active && task.success, 'fa-circle-notch fa-spin': task.active, 'status-error fa-times-circle': !task.active && !task.success }"></i>
+          </a>
+        </li>
+      </ul>
+    </div>
+  </h3>
 
   <div class="card" style="margin-bottom: 15px;">
     <div class="row">
@@ -322,9 +312,7 @@
     </div>
   </div>
 
-  <div class="text-left section-header">
-    <h3>{{ 'settings.privateDockerRegistry.title' | tr }}</h3>
-  </div>
+  <h3 class="section-header">{{ 'settings.privateDockerRegistry.title' | tr }}</h3>
 
   <div class="card" style="margin-bottom: 15px;">
     <div class="row">
diff --git a/dashboard/public/views/support.html b/dashboard/public/views/support.html
index 4bd75821e..467d235ef 100644
--- a/dashboard/public/views/support.html
+++ b/dashboard/public/views/support.html
@@ -1,12 +1,8 @@
 <div class="content">
 
-  <div class="text-left">
-    <h1>{{ 'support.title' | tr }}</h1>
-  </div>
+  <h1 class="section-header">{{ 'support.title' | tr }}</h1>
 
-  <div class="text-left">
-    <h3>{{ 'support.help.title' | tr }}</h3>
-  </div>
+  <h3 class="section-header">{{ 'support.help.title' | tr }}</h3>
 
   <div class="card">
     <div class="grid-item-top">
@@ -18,9 +14,7 @@
     </div>
   </div>
 
-  <div class="text-left" ng-if="troubleshoot">
-    <h3>Troubleshoot</h3>
-  </div>
+  <h3 class="section-header" ng-if="troubleshoot">Troubleshoot</h3>
 
   <div class="card" ng-if="troubleshoot">
     <div class="grid-item-top">
@@ -37,9 +31,7 @@
     </div>
   </div>
 
-  <div class="text-left section-header">
-    <h3>{{ 'support.remoteSupport.title' | tr }}</h3>
-  </div>
+  <h3 class="section-header">{{ 'support.remoteSupport.title' | tr }}</h3>
 
   <div class="card">
     <div class="grid-item-top">
diff --git a/dashboard/public/views/system.html b/dashboard/public/views/system.html
index 891e6b1d1..80a3abe65 100644
--- a/dashboard/public/views/system.html
+++ b/dashboard/public/views/system.html
@@ -1,14 +1,11 @@
 <div class="container">
 
-  <div class="row">
-    <div class="col-md-12">
-      <h1>
-        {{ 'system.title' | tr }}
-        <a class="btn btn-default pull-right" href="/logs.html?id=box" target="_blank">{{ 'main.action.logs' | tr }}</a>
-        <button class="btn btn-default pull-right" ng-click="$parent.reboot.show()">{{ 'main.action.reboot' | tr }}</button>
-      </h1>
-    </div>
-  </div>
+  <h1 class="section-header">
+    {{ 'system.title' | tr }}
+    <div style="flex-grow: 1;"></div>
+    <a class="btn btn-default" href="/logs.html?id=box" target="_blank">{{ 'main.action.logs' | tr }}</a>
+    <button class="btn btn-default" ng-click="$parent.reboot.show()">{{ 'main.action.reboot' | tr }}</button>
+  </h1>
 
   <div class="row">
     <div class="col-md-12">
diff --git a/dashboard/public/views/user-settings.html b/dashboard/public/views/user-settings.html
index e8c6d51e5..77a9e161d 100644
--- a/dashboard/public/views/user-settings.html
+++ b/dashboard/public/views/user-settings.html
@@ -230,11 +230,7 @@
 
 <div class="content content-large">
 
-  <div class="text-left">
-    <h1>
-      {{ 'users.title' | tr }}
-    </h1>
-  </div>
+  <h1 class="section-header">{{ 'users.title' | tr }}</h1>
 
   <div class="card card-large">
     <form name="profileConfigForm" role="form" novalidate ng-submit="profileConfig.submit()" autocomplete="off">
@@ -266,23 +262,21 @@
 
   </div>
 
-  <div class="text-left section-header">
-    <h3>
-      {{ 'users.externalLdap.title' | tr }}
-      <div class="btn-group btn-group-sm pull-right">
-        <button type="button" class="btn btn-small btn-default dropdown-toggle" ng-show="externalLdap.tasks.length" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" uib-tooltip="{{ 'domains.renewCerts.showLogsAction' | tr }}">
-          <i class="fas fa-align-left"></i> <span class="caret"></span>
-        </button>
-        <ul class="dropdown-menu">
-          <li ng-repeat="task in externalLdap.tasks">
-            <a ng-href="/logs.html?taskId={{task.id}}" target="_blank" class="text-right">
-            {{ task.ts | prettyLongDate }} <i class="fa" style="margin-left: 20px" ng-class="{ 'status-active fa-check-circle': !task.active && task.success, 'fa-circle-notch fa-spin': task.active, 'status-error fa-times-circle': !task.active && !task.success }"></i>
-            </a>
-          </li>
-        </ul>
-      </div>
-    </h3>
-  </div>
+  <h3 class="section-header">
+    {{ 'users.externalLdap.title' | tr }}
+    <div class="btn-group btn-group-sm pull-right">
+      <button type="button" class="btn btn-small btn-default dropdown-toggle" ng-show="externalLdap.tasks.length" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" uib-tooltip="{{ 'domains.renewCerts.showLogsAction' | tr }}">
+        <i class="fas fa-align-left"></i> <span class="caret"></span>
+      </button>
+      <ul class="dropdown-menu">
+        <li ng-repeat="task in externalLdap.tasks">
+          <a ng-href="/logs.html?taskId={{task.id}}" target="_blank" class="text-right">
+          {{ task.ts | prettyLongDate }} <i class="fa" style="margin-left: 20px" ng-class="{ 'status-active fa-check-circle': !task.active && task.success, 'fa-circle-notch fa-spin': task.active, 'status-error fa-times-circle': !task.active && !task.success }"></i>
+          </a>
+        </li>
+      </ul>
+    </div>
+  </h3>
 
   <div class="card card-large">
     <div class="row">
@@ -427,9 +421,7 @@
     </div>
   </div>
 
-  <div class="text-left section-header">
-    <h3>{{ 'users.exposedLdap.title' | tr }}</h3>
-  </div>
+  <h3 class="section-header">{{ 'users.exposedLdap.title' | tr }}</h3>
 
   <div class="card card-large">
     <div class="row">
@@ -483,9 +475,7 @@
     </div>
   </div>
 
-  <div class="text-left section-header">
-    <h3>{{ 'oidc.title' | tr }}</h3>
-  </div>
+  <h3 class="section-header">{{ 'oidc.title' | tr }}</h3>
 
   <div class="card card-large">
     <div class="grid-item-top">
diff --git a/dashboard/public/views/users.html b/dashboard/public/views/users.html
index 50c9ef405..17c1cf2d4 100644
--- a/dashboard/public/views/users.html
+++ b/dashboard/public/views/users.html
@@ -401,11 +401,7 @@
 
 <div class="content content-large">
 
-  <div class="text-left">
-    <h1>
-      {{ 'main.navbar.users' | tr }}
-    </h1>
-  </div>
+  <h1 class="section-header">{{ 'main.navbar.users' | tr }}</h1>
 
   <div>
     <div class="users-toolbar">
@@ -483,16 +479,10 @@
     </div>
   </div>
 
-  <br/>
-
-  <div class="text-left">
-    <h3 style="margin-bottom: 15px;">
-      {{ 'users.groups.title' | tr }}
-      <button class="btn btn-primary btn-outline pull-right" ng-click="groupAdd.show()">
-        <i class="fa fa-plus"></i> {{ 'users.groups.newGroupAction' | tr }}
-      </button>
-    </h3>
-  </div>
+  <h3 class="section-header">
+    {{ 'users.groups.title' | tr }}
+    <button class="btn btn-primary btn-outline" ng-click="groupAdd.show()"><i class="fa fa-plus"></i> {{ 'users.groups.newGroupAction' | tr }}</button>
+  </h3>
 
   <div class="card card-large">
     <div class="grid-item-top">
diff --git a/dashboard/public/views/volumes.html b/dashboard/public/views/volumes.html
index 96c461d15..96815f786 100644
--- a/dashboard/public/views/volumes.html
+++ b/dashboard/public/views/volumes.html
@@ -185,9 +185,10 @@
 </div>
 
 <div class="content">
-  <div class="text-left">
-    <h1>{{ 'volumes.title' | tr }} <button class="btn btn-primary btn-outline pull-right" ng-click="volumeAdd.show()"><i class="fa fa-plus"></i> {{ 'volumes.addVolumeAction' | tr }}</button></h1>
-  </div>
+  <h1 class="section-header">
+    {{ 'volumes.title' | tr }}
+    <button class="btn btn-primary btn-outline" ng-click="volumeAdd.show()"><i class="fa fa-plus"></i> {{ 'volumes.addVolumeAction' | tr }}</button>
+  </h1>
 
   <div class="card card-large">
     <p ng-bind-html="'volumes.description' | tr"></p>
diff --git a/dashboard/src/theme.scss b/dashboard/src/theme.scss
index c510b363f..efe3b7336 100644
--- a/dashboard/src/theme.scss
+++ b/dashboard/src/theme.scss
@@ -342,7 +342,17 @@ h1, h2, h3 {
 }
 
 .section-header {
+    display: flex;
+    flex-wrap: wrap;
+    align-content: space-between;
+    justify-content: space-between;
+    align-items: end;
     margin-top: 50px;
+    gap: 5px;
+}
+
+h1.section-header {
+    margin-top: 20px;
 }
 
 .offscreen {