diff --git a/src/app/last-time/last-time.component.html b/src/app/last-time/last-time.component.html
index 60ef346..5f7ba54 100644
--- a/src/app/last-time/last-time.component.html
+++ b/src/app/last-time/last-time.component.html
@@ -22,6 +22,8 @@
               title="Double click to edit">
           {{ item.name }}
         </span>
+        <mat-icon class="edit-icon" aria-hidden="true"
+                  (click)="editTitle($event)">edit</mat-icon>
       }
     </mat-card-title>
     <mat-card-subtitle class="time">
diff --git a/src/app/settings/settings.component.html b/src/app/settings/settings.component.html
index 7b8a4a3..e5c0adf 100644
--- a/src/app/settings/settings.component.html
+++ b/src/app/settings/settings.component.html
@@ -1,100 +1,108 @@
 <h2>Settings</h2>
 
-<form id="settingsForm" [formGroup]="form" (ngSubmit)="save()">
+<mat-tab-group dynamicHeight>
+  <mat-tab label="General">
+    <form id="settingsForm" [formGroup]="form" (ngSubmit)="save()">
 
-  <mat-form-field>
-    <mat-label>Database name</mat-label>
-    <input matInput formControlName="dbName">
-  </mat-form-field>
+      <mat-form-field>
+        <mat-label>Database name</mat-label>
+        <input matInput formControlName="dbName">
+      </mat-form-field>
 
-  <div class="mat-form-field">
-    <div class="mat-form-field-wrapper">
-      <mat-checkbox class="mat-form-field-flex" formControlName="redirectToHttps">
-        Redirect to HTTPS
-      </mat-checkbox>
-    </div>
-  </div>
+      <div class="mat-form-field">
+        <div class="mat-form-field-wrapper">
+          <mat-checkbox class="mat-form-field-flex" formControlName="redirectToHttps">
+            Redirect to HTTPS
+          </mat-checkbox>
+        </div>
+      </div>
 
-  <div class="mat-form-field">
-    <div class="mat-form-field-wrapper">
-      <mat-checkbox class="mat-form-field-flex" formControlName="showDebug">
-        Show DEBUG Tab
-      </mat-checkbox>
-    </div>
-  </div>
+      <div class="mat-form-field">
+        <div class="mat-form-field-wrapper">
+          <mat-checkbox class="mat-form-field-flex" formControlName="showDebug">
+            Show DEBUG Tab
+          </mat-checkbox>
+        </div>
+      </div>
 
-  <hr class="section">
-  <h3>Remote Sync</h3>
+      <hr class="section">
+      <h3>Remote Sync</h3>
 
-  <div class="mat-form-field">
-    <div class="mat-form-field-wrapper">
-      <mat-checkbox class="mat-form-field-flex" formControlName="enableRemoteSync">
-        Enable Remote Sync
-      </mat-checkbox>
-    </div>
-  </div>
+      <div class="mat-form-field">
+        <div class="mat-form-field-wrapper">
+          <mat-checkbox class="mat-form-field-flex" formControlName="enableRemoteSync">
+            Enable Remote Sync
+          </mat-checkbox>
+        </div>
+      </div>
 
-  <mat-form-field>
-    <mat-label>User</mat-label>
-    <input matInput formControlName="user"
-           autocomplete="username"
-           [required]="form.controls['enableRemoteSync'].value">
-  </mat-form-field>
+      <mat-form-field>
+        <mat-label>User</mat-label>
+        <input matInput formControlName="user"
+               autocomplete="username"
+               [required]="form.controls['enableRemoteSync'].value">
+      </mat-form-field>
 
-  <mat-form-field>
-    <mat-label>Password</mat-label>
-    <input matInput formControlName="password" type="password"
-           autocomplete="current-password"
-           [required]="form.controls['enableRemoteSync'].value">
-  </mat-form-field>
+      <mat-form-field>
+        <mat-label>Password</mat-label>
+        <input matInput formControlName="password" type="password"
+               autocomplete="current-password"
+               [required]="form.controls['enableRemoteSync'].value">
+      </mat-form-field>
 
-  <mat-form-field>
-    <mat-label>Remote database endpoint</mat-label>
-    <input matInput placeholder="CouchDB URL" formControlName="endpoint"
-           [required]="form.controls['enableRemoteSync'].value">
-    <button matSuffix mat-icon-button aria-label="Add default"
-            (click)="fillDefaultEndpoint($event)">
-      <mat-icon>add</mat-icon>
-    </button>
-  </mat-form-field>
+      <mat-form-field>
+        <mat-label>Remote database endpoint</mat-label>
+        <input matInput placeholder="CouchDB URL" formControlName="endpoint"
+               [required]="form.controls['enableRemoteSync'].value">
+        <button matSuffix mat-icon-button aria-label="Add default"
+                (click)="fillDefaultEndpoint($event)">
+          <mat-icon>add</mat-icon>
+        </button>
+      </mat-form-field>
 
-  <div>
-    <button mat-raised-button (click)="cancel($event)">Cancel</button>
-    <button mat-raised-button color="primary"
-            type="submit"
-            [disabled]="!form.valid || !form.dirty">
-      Save
-    </button>
-  </div>
+      <div>
+        <button mat-raised-button (click)="cancel($event)">Cancel</button>
+        <button mat-raised-button color="primary"
+                type="submit"
+                [disabled]="!form.valid || !form.dirty">
+          Save
+        </button>
+      </div>
 
-  <hr class="section">
+    </form>
+  </mat-tab>
 
-  <div>
-    <p><b>DB Info:</b> {{ storageEstimated }}</p>
-    <p>
-      <button mat-raised-button color="primary"
-              (click)="dbExport($event)">
-        DB Export
-      </button>
+  <mat-tab label="DB Export & Import">
+    <div>
+      <p><b>DB Info:</b> {{ storageEstimated }}</p>
+      <p>
+        <button mat-raised-button color="primary"
+                (click)="dbExport($event)">
+          DB Export
+        </button>
+      </p>
+      <p>
+        <button mat-raised-button color="warn"
+                [disabled]="!importFileReady"
+                (click)="dbImport($event)">
+          DB Import
+        </button>
+        <input id="fileSelector" type="file"
+               (change)="importFileChange($event)">
+      </p>
+    </div>
+  </mat-tab>
+
+  <mat-tab label="Info & Update">
+    <p>App Version:
+      <b matTooltip="{{ version.commit_date }}">{{ version.commit }}</b>
     </p>
     <p>
-      <button mat-raised-button color="warn"
-              [disabled]="!importFileReady"
-              (click)="dbImport($event)">
-        DB Import
+      <button mat-stroked-button color="primary"
+              (click)="checkForUpdate($event)"
+              [disabled]="!isOnline()">check for update
       </button>
-      <input id="fileSelector" type="file"
-             (change)="importFileChange($event)">
     </p>
-  </div>
-
-  <hr class="section">
+  </mat-tab>
 
-  <p>App Version:
-    <b matTooltip="{{ version.commit_date }}">{{ version.commit }}</b>
-    <button mat-stroked-button color="primary"
-            (click)="checkForUpdate($event)"
-            [disabled]="!isOnline()">check for update
-    </button>
-  </p>
-</form>
+</mat-tab-group>
diff --git a/src/app/stopwatch/stopwatch.component.html b/src/app/stopwatch/stopwatch.component.html
index 52fc74e..84cb7ed 100644
--- a/src/app/stopwatch/stopwatch.component.html
+++ b/src/app/stopwatch/stopwatch.component.html
@@ -22,6 +22,8 @@
               title="Double click to edit">
           {{ item.name }}
         </span>
+        <mat-icon class="edit-icon" aria-hidden="true"
+                  (click)="editTitle($event)">edit</mat-icon>
       }
     </mat-card-title>
     <mat-card-subtitle class="time">
diff --git a/src/app/styles/styles.scss b/src/app/styles/styles.scss
index 84cad5e..03641f3 100644
--- a/src/app/styles/styles.scss
+++ b/src/app/styles/styles.scss
@@ -113,6 +113,7 @@ form {
     min-width: 150px;
     max-width: 500px;
     width: 100%;
+    margin-bottom: 1em;
 
     button {
         margin-left: 0.5em !important;
@@ -122,7 +123,7 @@ form {
 form, .lastTimeItem, .stopwatchItem {
     .mat-mdc-form-field {
         width: 100%;
-        max-width: 300px;
+        max-width: 400px;
     }
 }
 
@@ -160,6 +161,10 @@ mat-toolbar {
     height: 32px;
 }
 
+.mat-mdc-tab-body-wrapper {
+    margin-top: 2.5em;
+}
+
 #connection-status {
     float: right;
     padding: 2px;
@@ -214,6 +219,18 @@ mat-toolbar {
         @media only screen and (min-width: 320px) and (max-width: 767px) {
             font-size: 16px;
         }
+        .edit-icon {
+            font-size: 16px;
+            margin-left: 8px;
+            cursor: pointer;
+            opacity: 0;
+            transition: opacity 0.2s ease-in-out;
+        }
+        &:hover {
+            .edit-icon {
+                opacity: 1;
+            }
+        }
     }
     .edit {
         margin-bottom: 1em;