diff --git a/src/app/appsettings/appsettings.page.html b/src/app/appsettings/appsettings.page.html
index 963be1c..42436e8 100644
--- a/src/app/appsettings/appsettings.page.html
+++ b/src/app/appsettings/appsettings.page.html
@@ -41,7 +41,7 @@
       </ion-label>
     </ion-item-divider>
     <ion-item routerLink="/appsettings/notifications">
-      <ion-label>Local Push-Notifications</ion-label>
+      <ion-label>Local push notifications</ion-label>
       <ion-badge slot="end" color="success" *ngIf="appSettings.notificationsEnabled">enabled</ion-badge>
       <ion-badge slot="end" color="light" *ngIf="!appSettings.notificationsEnabled">disabled</ion-badge>
     </ion-item>
@@ -53,7 +53,7 @@
       </ion-label>
     </ion-item-divider>
     <ion-item routerLink="/appsettings/odometer">
-      <ion-label>Use Odometer</ion-label>
+      <ion-label>Use odometer</ion-label>
       <ion-badge slot="end" color="success" *ngIf="appSettings.useOdometer">enabled</ion-badge>
       <ion-badge slot="end" color="light" *ngIf="!appSettings.useOdometer">disabled</ion-badge>
     </ion-item>
@@ -65,7 +65,7 @@
       </ion-label>
     </ion-item-divider>
     <ion-item>
-      <ion-label>App-Version</ion-label>
+      <ion-label>App version</ion-label>
       <ion-label>{{version}}</ion-label>
     </ion-item>
     <ion-item>
diff --git a/src/app/appsettings/notifications/notifications.page.html b/src/app/appsettings/notifications/notifications.page.html
index a6638be..849fe16 100644
--- a/src/app/appsettings/notifications/notifications.page.html
+++ b/src/app/appsettings/notifications/notifications.page.html
@@ -27,13 +27,8 @@
       </ion-card>
     </ion-item-group>
     <ion-item-group *ngIf="appSettings.notificationsEnabled">
-      <ion-item-divider>
-        <ion-label>
-          Notification types
-        </ion-label>
-      </ion-item-divider>
       <ion-item>
-        <ion-label position="stacked">Battery Warnings</ion-label>
+        <ion-label position="stacked">Battery warnings</ion-label>
         <ion-toggle slot="end" name="batteryNotificationEnabled" [(ngModel)]="appSettings.batteryNotificationEnabled"
                     (ngModelChange)="appSettings.toggleValue('batteryNotificationEnabled', $event)"></ion-toggle>
         <ion-grid>
@@ -64,7 +59,7 @@
       </ion-item>
 
       <ion-item>
-        <ion-label position="stacked">Current Warnings</ion-label>
+        <ion-label position="stacked">Current warnings</ion-label>
         <ion-toggle slot="end" name="currentNotificationEnabled" [(ngModel)]="appSettings.currentNotificationEnabled"
                     (ngModelChange)="appSettings.toggleValue('currentNotificationEnabled', $event)"></ion-toggle>
         <ion-grid *ngIf="appSettings.currentNotificationEnabled">
@@ -103,7 +98,7 @@
         </ion-grid>
       </ion-item>
       <ion-item>
-        <ion-label position="stacked">DutyCycle Warnings</ion-label>
+        <ion-label position="stacked">Duty cycle warnings</ion-label>
         <ion-toggle slot="end" name="dutycycleNotificationEnabled" [(ngModel)]="appSettings.dutycycleNotificationEnabled"
                     (ngModelChange)="appSettings.toggleValue('dutycycleNotificationEnabled', $event)"></ion-toggle>
         <ion-grid *ngIf="appSettings.dutycycleNotificationEnabled">
diff --git a/src/app/appsettings/odometer/odometer.page.html b/src/app/appsettings/odometer/odometer.page.html
index f82d6bf..f1e3112 100644
--- a/src/app/appsettings/odometer/odometer.page.html
+++ b/src/app/appsettings/odometer/odometer.page.html
@@ -13,7 +13,7 @@
 <ion-content>
   <ion-list>
     <ion-item>
-      <ion-label>Enable Odometer</ion-label>
+      <ion-label>Enable odometer</ion-label>
       <ion-toggle slot="end" name="notificationsEnabled" [(ngModel)]="appSettings.useOdometer" disabled="true"
                   (ngModelChange)="appSettings.toggleValue('useOdometer', $event)"></ion-toggle>
     </ion-item>
diff --git a/src/app/charts/overview-chart/overview-chart.component.html b/src/app/charts/overview-chart/overview-chart.component.html
index 53d81aa..f2e7a32 100644
--- a/src/app/charts/overview-chart/overview-chart.component.html
+++ b/src/app/charts/overview-chart/overview-chart.component.html
@@ -2,7 +2,7 @@
   <ion-row>
     <ion-col>
       <div id="dutyGaugeDiv" align="center">
-        <span style="font-size:14px;opacity:0.6">DutyCycle</span>
+        <span style="font-size:14px;opacity:0.6">Duty Cycle</span>
         <highcharts-chart
           *ngIf="isHighcharts"
           [Highcharts]="dutyGaugeChart"
diff --git a/src/app/device/device.page.html b/src/app/device/device.page.html
index 477c093..d4b65fc 100644
--- a/src/app/device/device.page.html
+++ b/src/app/device/device.page.html
@@ -29,10 +29,10 @@
         </ion-row>
         <ion-row *ngIf="bleService.isRescueDevice">
           <ion-col>
-            <p>HW-Version: {{hardwareVersion}}</p>
+            <p>Hardware version: {{hardwareVersion}}</p>
           </ion-col>
           <ion-col>
-            <p>FW-Version: {{softwareVersion}}</p>
+            <p>Firmware version: {{softwareVersion}}</p>
           </ion-col>
         </ion-row>
         <ion-row *ngIf="bleService.isRescueDevice">
@@ -40,7 +40,7 @@
             <p>Looptime: {{rescueData.loopTime}}</p>
           </ion-col>
           <ion-col>
-            <p>Max. Looptime: {{rescueData.maxLoopTime}}</p>
+            <p>Max looptime: {{rescueData.maxLoopTime}}</p>
           </ion-col>
         </ion-row>
       </ion-grid>
@@ -82,10 +82,10 @@
       </ion-col>
       <ion-col size="5">
         <div *ngIf="appSettings.metricSystemEnabled">
-          Abs.: {{(rescueData.tachometerAbs / 438 / 1000) | number: '1.1-1'}} km<br/>
+          Lifetime: {{(rescueData.tachometerAbs / 438 / 1000) | number: '1.1-1'}} km<br/>
         </div>
         <div *ngIf="!appSettings.metricSystemEnabled">
-          Abs.: {{(rescueData.tachometerAbs / 438 / 1000) | number: '1.1-1'}} mi<br/>
+          Lifetime: {{(rescueData.tachometerAbs / 438 / 1000) | number: '1.1-1'}} mi<br/>
         </div>
       </ion-col>
     </ion-row>
diff --git a/src/app/settings/battery/battery.component.html b/src/app/settings/battery/battery.component.html
index 01836c8..f40c2ef 100644
--- a/src/app/settings/battery/battery.component.html
+++ b/src/app/settings/battery/battery.component.html
@@ -5,34 +5,6 @@
     <ion-label>Select Battery Presets</ion-label>
   </ion-chip>
 </ion-item>
-<ion-item>
-  <ion-label position="stacked">Number of pixel</ion-label>
-  <ion-input class="ion-text-right" type="number" value="5" slot="end"
-             [(ngModel)]="rescueConf.numberPixelBatMon"></ion-input>
-</ion-item>
-<ion-item>
-  <ion-label class="ion-text-wrap">LED Maximum Brightness [{{rescueConf.lightbarMaxBrightness}}]
-    <ion-range min="0" max="255" step="1" [(ngModel)]="rescueConf.lightbarMaxBrightness" pin snaps color="secondary"
-               (ionKnobMoveEnd)="changeLightbarMaxBrightness($event)">
-      <ion-icon slot="start" size="small" color="secondary" name="sunny"></ion-icon>
-      <ion-icon slot="end" color="secondary" name="sunny"></ion-icon>
-    </ion-range>
-  </ion-label>
-</ion-item>
-<ion-item>
-  <ion-label class="ion-text-wrap">Turn off at ERPM [{{rescueConf.lightbarTurnOffErpm}}]
-      <ion-range min="0" max="5000" step="500" [(ngModel)]="rescueConf.lightbarTurnOffErpm" pin snaps color="secondary"
-                 (ionKnobMoveEnd)="changeLightbarTurnOffErpm($event)">
-      <ion-icon slot="start" size="small" color="secondary" name="speedometer-outline"></ion-icon>
-      <ion-icon slot="end" color="secondary" name="speedometer-outline"></ion-icon>
-    </ion-range>
-  </ion-label>
-</ion-item>
-<ion-item-divider>
-  <ion-label>
-    Battery Voltage settings
-  </ion-label>
-</ion-item-divider>
 <ion-item>
   <ion-label position="stacked">Battery drift</ion-label>
   <ion-input class="ion-text-right" type="number" inputmode="decimal"
@@ -41,7 +13,7 @@
              step="0.1" slot="end"></ion-input>
 </ion-item>
 <ion-item>
-  <ion-label position="stacked">Min. Voltage (V)</ion-label>
+  <ion-label position="stacked">Min voltage (V)</ion-label>
   <ion-input class="ion-text-right" type="number" inputmode="decimal"
              min="{{batteryPresets.minVoltage - 1}}" max="{{batteryPresets.maxVoltage}}"
              [(ngModel)]="rescueConf.minBatteryVoltage"
@@ -49,7 +21,7 @@
              step="0.1" slot="end"></ion-input>
 </ion-item>
 <ion-item>
-  <ion-label position="stacked">Low Bat. Warning (V)</ion-label>
+  <ion-label position="stacked">Low battery warning (V)</ion-label>
   <ion-input class="ion-text-right" type="number" inputmode="decimal"
              min="{{batteryPresets.minVoltage}}" max="{{batteryPresets.maxVoltage}}"
              [(ngModel)]="rescueConf.lowBatteryVoltage"
@@ -57,7 +29,7 @@
              step="0.1" slot="end"></ion-input>
 </ion-item>
 <ion-item>
-  <ion-label position="stacked">Max. Voltage (V)</ion-label>
+  <ion-label position="stacked">Max voltage (V)</ion-label>
   <ion-input class="ion-text-right" type="number" inputmode="decimal"
              min="{{batteryPresets.minVoltage}}" max="{{batteryPresets.maxVoltage + 1}}"
              [(ngModel)]="rescueConf.maxBatteryVoltage"
diff --git a/src/app/settings/canbus/canbus.component.html b/src/app/settings/canbus/canbus.component.html
index 6f617f9..fd30abf 100644
--- a/src/app/settings/canbus/canbus.component.html
+++ b/src/app/settings/canbus/canbus.component.html
@@ -1,19 +1,9 @@
 <ion-item>
-  <ion-text>
-    <p>Please configure your VESC-ID appropriately to match the ID in VESC.</p>
-  </ion-text>
-</ion-item>
-<ion-item>
-  <ion-label position="stacked">VESC-ID</ion-label>
+  <ion-label position="stacked">VESC ID</ion-label>
   <ion-input class="ion-text-right" type="number" value="25" [(ngModel)]="rescueConf.vescId" slot="end"></ion-input>
 </ion-item>
-<ion-item-divider>
-  <ion-label>
-    Time settings
-  </ion-label>
-</ion-item-divider>
 <ion-item>
-  <ion-label position="stacked" class="ion-text-wrap">Realtime-Data Interval [{{rescueConf.realtimeDataInterval}} ms]
+  <ion-label position="stacked" class="ion-text-wrap">Realtime data interval [{{rescueConf.realtimeDataInterval}} ms]
     <ion-range min="200" max="1000" step="50" value="{{rescueConf.realtimeDataInterval}}"
                (ionChange)="changeRealtimeDataInterval($event)" pin snaps color="secondary">
       <ion-icon slot="start" size="small" color="secondary" name="timer-outline"></ion-icon>
@@ -22,7 +12,7 @@
   </ion-label>
 </ion-item>
 <ion-item>
-  <ion-label position="stacked" class="ion-text-wrap">Balance-Data Interval [{{rescueConf.balanceDataInterval}} ms]
+  <ion-label position="stacked" class="ion-text-wrap">Balance data interval [{{rescueConf.balanceDataInterval}} ms]
     <ion-range min="200" max="1000" step="50" value="{{rescueConf.balanceDataInterval}}"
                (ionChange)="changeBalanceDataInterval($event)" pin snaps color="secondary">
       <ion-icon slot="start" size="small" color="secondary" name="timer-outline"></ion-icon>
diff --git a/src/app/settings/lights/lights.component.html b/src/app/settings/lights/lights.component.html
index 128f664..c0c9bfa 100644
--- a/src/app/settings/lights/lights.component.html
+++ b/src/app/settings/lights/lights.component.html
@@ -1,5 +1,5 @@
 <ion-item>
-  <ion-label position="stacked">Number of pixel</ion-label>
+  <ion-label position="stacked">Number of pixels</ion-label>
   <ion-input class="ion-text-right" type="number" value="32" [(ngModel)]="rescueConf.numberPixelLight"></ion-input>
 </ion-item>
 <ion-item>
@@ -9,13 +9,8 @@
     <ion-label>Change Type</ion-label>
   </ion-chip>
 </ion-item>
-<ion-item-divider>
-  <ion-label>
-    Light pattern
-  </ion-label>
-</ion-item-divider>
 <ion-item>
-  <ion-label position="stacked">Start Light Pattern</ion-label>
+  <ion-label position="stacked">Startup light pattern</ion-label>
   <ion-select [(ngModel)]="rescueConf.startLightIndex" interface="action-sheet">
     <ion-select-option value="1">Chasing</ion-select-option>
     <ion-select-option value="2">Cylone</ion-select-option>
@@ -24,22 +19,30 @@
   </ion-select>
 </ion-item>
 <ion-item>
-  <ion-label position="stacked">Idle Light Pattern</ion-label>
+  <ion-label position="stacked">Idle light pattern</ion-label>
   <ion-select [(ngModel)]="rescueConf.idleLightIndex" interface="action-sheet">
     <ion-select-option value="1">Chasing</ion-select-option>
     <ion-select-option value="2">Cylone</ion-select-option>
     <ion-select-option value="3">Rainbow</ion-select-option>
     <ion-select-option value="4">Pulsating</ion-select-option>
-    <ion-select-option value="5">Battery-Indicator</ion-select-option>
+    <ion-select-option value="5">Battery indicator</ion-select-option>
   </ion-select>
 </ion-item>
+<ion-item>
+  <ion-label position="stacked" class="ion-text-wrap">LED idle timeout [{{ (rescueConf.idleLightTimeout > 0 ? rescueConf.idleLightTimeout + 'ms' : 'infinite') }}]
+    <ion-range min="0" max="60000" step="500" [(ngModel)]="rescueConf.idleLightTimeout" pin snaps color="secondary">
+      <ion-icon slot="start" size="small" color="secondary" name="timer-outline"></ion-icon>
+      <ion-icon slot="end" color="secondary" name="timer-outline"></ion-icon>
+    </ion-range>
+  </ion-label>
+</ion-item>
 <ion-item-divider>
   <ion-label>
-    Light settings
+    Color and Brightness
   </ion-label>
 </ion-item-divider>
 <ion-item>
-  <ion-label class="ion-text-wrap">Front color</ion-label>
+  <ion-label position="stacked" class="ion-text-wrap">Front color</ion-label>
   {{lightColorPrimary}}
   <ion-note slot="end">
     <ngx-colors ngx-colors-trigger
@@ -51,7 +54,7 @@
   </ion-note>
 </ion-item>
 <ion-item>
-  <ion-label class="ion-text-wrap">Back color</ion-label>
+  <ion-label position="stacked" class="ion-text-wrap">Back color</ion-label>
   {{lightColorSecondary}}
   <ion-note slot="end">
     <ngx-colors ngx-colors-trigger
@@ -63,7 +66,7 @@
   </ion-note>
 </ion-item>
 <ion-item>
-  <ion-label class="ion-text-wrap">LED Maximum Brightness [{{rescueConf.lightMaxBrightness}}]
+  <ion-label position="stacked" class="ion-text-wrap">LED max brightness [{{rescueConf.lightMaxBrightness}}]
           <ion-range min="0" max="255" step="1" [(ngModel)]="rescueConf.lightMaxBrightness" pin snaps color="secondary">
             <ion-icon slot="start" size="small" color="secondary" name="sunny"></ion-icon>
             <ion-icon slot="end" color="secondary" name="sunny"></ion-icon>
@@ -71,33 +74,64 @@
         </ion-label>
 </ion-item>
 <ion-item>
-  <ion-label class="ion-text-wrap">LED Fading Duration [{{rescueConf.lightFadingDuration}} ms]
+  <ion-label  position="stacked"class="ion-text-wrap">LED fading duration [{{rescueConf.lightFadingDuration}} ms]
     <ion-range min="0" max="500" step="1" [(ngModel)]="rescueConf.lightFadingDuration" pin snaps color="secondary">
       <ion-icon slot="start" size="small" color="secondary" name="timer-outline"></ion-icon>
       <ion-icon slot="end" color="secondary" name="timer-outline"></ion-icon>
     </ion-range>
   </ion-label>
 </ion-item>
-<ion-item>
-  <ion-label class="ion-text-wrap">LED Idle Timeout [{{ (rescueConf.idleLightTimeout > 0 ? rescueConf.idleLightTimeout + 'ms' : 'infinite') }}]
-    <ion-range min="0" max="60000" step="500" [(ngModel)]="rescueConf.idleLightTimeout" pin snaps color="secondary">
-      <ion-icon slot="start" size="small" color="secondary" name="timer-outline"></ion-icon>
-      <ion-icon slot="end" color="secondary" name="timer-outline"></ion-icon>
-    </ion-range>
-  </ion-label>
-</ion-item>
 <ion-item-divider>
   <ion-label>
-    Brake light
+    Brake Light
   </ion-label>
 </ion-item-divider>
 <ion-item>
-  <ion-label position="stacked">Enable Brake Light</ion-label>
+  <ion-label position="stacked">Enable brake light</ion-label>
   <ion-toggle slot="end" name="brakeLightsEnabled" [(ngModel)]="rescueConf.brakeLightEnabled"></ion-toggle>
 </ion-item>
 <ion-item *ngIf="rescueConf.brakeLightEnabled">
-  <ion-label class="ion-text-wrap">Brake Light Amp Min [{{rescueConf.brakeLightMinAmp}} A]
+  <ion-label position="stacked" class="ion-text-wrap">Min brake light amps [{{rescueConf.brakeLightMinAmp}} A]
     <ion-range min="1" max="10" step="1" [(ngModel)]="rescueConf.brakeLightMinAmp" pin snaps color="secondary">
     </ion-range>
   </ion-label>
 </ion-item>
+<ion-item-divider>
+  <ion-grid>
+    <ion-row>
+      <ion-label>
+        Light Bar
+      </ion-label>
+    </ion-row>
+    <ion-row>
+      <ion-text>
+        <sub>
+          The light bar displays the current battery monitor status (settings below)
+        </sub>
+      </ion-text>
+    </ion-row>
+  </ion-grid>
+</ion-item-divider>
+<ion-item>
+  <ion-label position="stacked">Number of pixels</ion-label>
+  <ion-input class="ion-text-right" type="number" value="5" min="0" slot="end"
+             [(ngModel)]="rescueConf.numberPixelBatMon"></ion-input>
+</ion-item>
+<ion-item *ngIf="rescueConf.numberPixelBatMon !== 0">
+  <ion-label position="stacked" class="ion-text-wrap">Maximum LED brightness [{{rescueConf.lightbarMaxBrightness}}]
+    <ion-range min="0" max="255" step="1" [(ngModel)]="rescueConf.lightbarMaxBrightness" pin snaps color="secondary"
+               (ionKnobMoveEnd)="changeLightbarMaxBrightness($event)">
+      <ion-icon slot="start" size="small" color="secondary" name="sunny"></ion-icon>
+      <ion-icon slot="end" color="secondary" name="sunny"></ion-icon>
+    </ion-range>
+  </ion-label>
+</ion-item>
+<ion-item *ngIf="rescueConf.numberPixelBatMon !== 0">
+  <ion-label position="stacked" class="ion-text-wrap">Turn off at ERPM [{{rescueConf.lightbarTurnOffErpm}}]
+      <ion-range min="0" max="5000" step="500" [(ngModel)]="rescueConf.lightbarTurnOffErpm" pin snaps color="secondary"
+                 (ionKnobMoveEnd)="changeLightbarTurnOffErpm($event)">
+      <ion-icon slot="start" size="small" color="secondary" name="speedometer-outline"></ion-icon>
+      <ion-icon slot="end" color="secondary" name="speedometer-outline"></ion-icon>
+    </ion-range>
+  </ion-label>
+</ion-item>
diff --git a/src/app/settings/lights/lights.component.ts b/src/app/settings/lights/lights.component.ts
index 591d699..f8e52d8 100644
--- a/src/app/settings/lights/lights.component.ts
+++ b/src/app/settings/lights/lights.component.ts
@@ -1,6 +1,7 @@
 import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core';
 import {LedTypeComponent} from '../led-type/led-type.component';
 import {PopoverController} from '@ionic/angular';
+import { RescueConf } from 'src/app/models/RescueConf';
 import {NGXLogger} from 'ngx-logger';
 
 @Component({
@@ -17,6 +18,8 @@ export class LightsComponent implements OnInit {
   colorPickerFormat = 'hex';
   lightColorPrimary = '';
   lightColorSecondary = '';
+  @Input() rescueConf: RescueConf;
+
 
   constructor(
     private popoverController: PopoverController,
diff --git a/src/app/settings/settings.page.html b/src/app/settings/settings.page.html
index ee1c7e4..f0ef505 100644
--- a/src/app/settings/settings.page.html
+++ b/src/app/settings/settings.page.html
@@ -26,8 +26,8 @@
     </ion-card-header>
 
     <ion-card-content>
-      <p>Hardware-Version: {{hardwareVersion}}</p>
-      <p>Firmware-Version: {{softwareVersion}}</p>
+      <p>Hardware version: {{hardwareVersion}}</p>
+      <p>Firmware version: {{softwareVersion}}</p>
     </ion-card-content>
   </ion-card>
 
@@ -66,10 +66,21 @@
     </app-battery>
 
     <ion-item-divider>
-      <ion-label class="item-divider">
-        <ion-icon name="bus-outline"></ion-icon>
-        CANBUS
-      </ion-label>
+      <ion-grid>
+        <ion-row>
+          <ion-label class="item-divider">
+            <ion-icon name="bus-outline"></ion-icon>
+            CANBUS
+          </ion-label>
+        </ion-row>
+        <ion-row>
+          <ion-text>
+            <sub>
+              Please configure your VESC ID appropriately to match the ID in VESC® TOOL
+            </sub>
+          </ion-text>
+        </ion-row>
+      </ion-grid>
     </ion-item-divider>
     <app-canbus #canbusComponent
                 [rescueConf]="rescueConf">
@@ -82,35 +93,25 @@
       </ion-label>
     </ion-item-divider>
     <ion-item>
-      <ion-text>
-        <p>Send local push notifications if supported by your system.</p>
-      </ion-text>
-    </ion-item>
-    <ion-item>
-      <ion-label position="stacked">Enable Notifications</ion-label>
+      <ion-label position="stacked">Enable push notifications</ion-label>
       <ion-toggle slot="end" name="notificationsEnabled" checked
                   [(ngModel)]="rescueConf.isNotificationEnabled"
                   (ngModelChange)="toggleNotificationsEnabled($event)"></ion-toggle>
     </ion-item>
 
     <ion-item-group *ngIf="rescueConf.isNotificationEnabled">
-      <ion-item-divider>
-        <ion-label>
-          Notification types
-        </ion-label>
-      </ion-item-divider>
       <ion-item>
-        <ion-label position="stacked">Battery Warnings</ion-label>
+        <ion-label position="stacked">Battery warnings</ion-label>
         <ion-toggle slot="end" name="batteryNotificationEnabled" checked
                     [(ngModel)]="rescueConf.isBatteryNotificationEnabled"></ion-toggle>
       </ion-item>
       <ion-item>
-        <ion-label position="stacked">Current Warnings</ion-label>
+        <ion-label position="stacked">Current warnings</ion-label>
         <ion-toggle slot="end" name="currentNotificationEnabled" checked
                     [(ngModel)]="rescueConf.isCurrentNotificationEnabled"></ion-toggle>
       </ion-item>
       <ion-item>
-        <ion-label position="stacked">DutyCycle Warnings</ion-label>
+        <ion-label position="stacked">Duty cycle warnings</ion-label>
         <ion-toggle slot="end" name="dutycycleNotificationEnabled" checked
                     [(ngModel)]="rescueConf.isErpmNotificationEnabled"></ion-toggle>
       </ion-item>
@@ -119,11 +120,11 @@
     <ion-item-divider>
       <ion-label class="item-divider">
         <ion-icon name="bluetooth" slot="start"></ion-icon>
-        Bluetooth Settings
+        Bluetooth
       </ion-label>
     </ion-item-divider>
     <ion-item>
-      <ion-label class="ion-text-wrap">MTU size [{{rescueConf.mtuSize}}]
+      <ion-label position="stacked" class="ion-text-wrap">MTU size [{{rescueConf.mtuSize}}]
         <ion-range min="23" max="512" step="1" [(ngModel)]="rescueConf.mtuSize" pin snaps color="secondary">
           <ion-icon slot="start" size="small" color="secondary" name="apps"></ion-icon>
           <ion-icon slot="end" color="secondary" name="apps"></ion-icon>
@@ -138,7 +139,7 @@
       </ion-label>
     </ion-item-divider>
     <ion-item>
-      <ion-label position="stacked">LogLevel</ion-label>
+      <ion-label position="stacked">Log level</ion-label>
       <ion-select value="{{rescueConf.logLevel}}"
                   (ionChange)="changeLoglevel($event)"
                   interface="action-sheet">
diff --git a/src/app/settings/sounds/sounds.component.html b/src/app/settings/sounds/sounds.component.html
index f8bcc3c..6310d30 100644
--- a/src/app/settings/sounds/sounds.component.html
+++ b/src/app/settings/sounds/sounds.component.html
@@ -1,12 +1,12 @@
 <ion-item>
-  <ion-label position="stacked">Start Melody</ion-label>
+  <ion-label position="stacked">Startup</ion-label>
   <ion-select [(ngModel)]="rescueConf.startSoundIndex"
               (ionChange)="changeStartSoundIndex($event)"
               (ionFocus)="lock()" (ionBlur)="unlock()"
               interface="action-sheet">
-    <ion-select-option value="0">No Sound</ion-select-option>
+    <ion-select-option value="0">No sound</ion-select-option>
     <ion-select-option value="100">Simpsons</ion-select-option>
-    <ion-select-option value="101">Topgun</ion-select-option>
+    <ion-select-option value="101">Top Gun</ion-select-option>
     <ion-select-option value="102">A-Team</ion-select-option>
     <ion-select-option value="103">Mission Impossible</ion-select-option>
     <ion-select-option value="104">Danger Mouse</ion-select-option>
@@ -19,27 +19,27 @@
     <ion-select-option value="111">Star Wars - End</ion-select-option>
     <ion-select-option value="112">Star Wars - Cantina</ion-select-option>
     <ion-select-option value="113">Scooter - How much</ion-select-option>
-    <ion-select-option value="114">Back To The Future</ion-select-option>
+    <ion-select-option value="114">Back to the Future</ion-select-option>
   </ion-select>
 </ion-item>
 <ion-item>
-  <ion-label position="stacked">Battery Warning Sound</ion-label>
+  <ion-label position="stacked">Battery warning</ion-label>
   <ion-select [(ngModel)]="rescueConf.batteryWarningSoundIndex"
               (ionChange)="changeBatteryWarningSoundIndex($event)"
               (ionFocus)="lock()" (ionBlur)="unlock()" interface="action-sheet">
-  <ion-select-option value="0">No Sound</ion-select-option>
-    <ion-select-option value="400">Two Short Beeps</ion-select-option>
+  <ion-select-option value="0">No sound</ion-select-option>
+    <ion-select-option value="400">Two short beeps</ion-select-option>
     <ion-select-option value="402">Siren</ion-select-option>
-    <ion-select-option value="406">Negative Feedback Beep</ion-select-option>
+    <ion-select-option value="406">Negative feedback beep</ion-select-option>
   </ion-select>
 </ion-item>
 <ion-item>
-  <ion-label position="stacked">Battery Alarm Sound</ion-label>
+  <ion-label position="stacked">Battery alarm</ion-label>
   <ion-select [(ngModel)]="rescueConf.batteryAlarmSoundIndex"
               (ionChange)="changeBatteryAlarmSoundIndex($event)"
               (ionFocus)="lock()" (ionBlur)="unlock()" interface="action-sheet">
-  <ion-select-option value="0">No Sound</ion-select-option>
+  <ion-select-option value="0">No sound</ion-select-option>
     <ion-select-option value="402">Siren</ion-select-option>
-    <ion-select-option value="300">Death March</ion-select-option>
+    <ion-select-option value="300">Death march</ion-select-option>
   </ion-select>
 </ion-item>
diff --git a/src/app/update/update.page.html b/src/app/update/update.page.html
index 36b6c12..35ceda8 100644
--- a/src/app/update/update.page.html
+++ b/src/app/update/update.page.html
@@ -88,12 +88,12 @@
               WiFi connection
               <ion-icon name="checkmark-circle" color="success"></ion-icon>
             </ion-item>
-            If you want to update via Bluetooth instead, please unmark the checkbox
+            If you want to update via Bluetooth instead, please uncheck the checkbox
             <i>"enable WiFi update"</i> below<br/>
           </p>
         </div>
         <ion-item *ngIf="!updateInProgress && wifiSupported">
-          <ion-label>enable WiFi update</ion-label>
+          <ion-label>Enable WiFi update</ion-label>
           <ion-checkbox color="primary" (click)="toggle()" slot="start" id="enableWifiCheckbox"></ion-checkbox>
         </ion-item>
       </ion-card-content>
diff --git a/src/app/wizard/wizard.page.html b/src/app/wizard/wizard.page.html
index 8f3fd19..a8fae8e 100644
--- a/src/app/wizard/wizard.page.html
+++ b/src/app/wizard/wizard.page.html
@@ -2,12 +2,12 @@
   <ion-slides #wizard pager="true" (ionSlideDidChange)="slideChanged()">
     <ion-slide>
       <div class="slide">
-        <h2>Welcome to rESCue !</h2>
+        <h2>Welcome to rESCue!</h2>
         <img src="assets/slide-1.png"/>
-        <p>This <b>wizard</b> will guide you to the initial setup of your new rESCue device.</p>
+        <p>This wizard will guide you to the initial setup of your new rESCue device.</p>
         <p>Please <b>turn on your rESCue device</b> and hit the <i>scan</i> button below. Connect to the Bluetooth Low
           Energy
-          device named <b>rESCue</b></p>
+          device named <b>rESCue</b>.</p>
       </div>
       <ion-button size="large" (click)="scan()" color="primary" id="scanButton">Scan
         <ion-icon slot="end" name="bluetooth"></ion-icon>
@@ -28,8 +28,8 @@ <h2>Great, device connected!</h2>
       <div class="slide" *ngIf="!connected">
         <h2>Whoops, not connected!</h2>
         <img src="../../assets/slide-2-nok.png"/>
-        <p>Seems like we couldn't connect to any rESCue device.</p>
-        <p>Please make sure your rESCue device is <b>turned on</b> and you enabled Bluetooth on this computer.</p>
+        <p>It seems like we couldn't connect to any rESCue device.</p>
+        <p>Please make sure your rESCue device is <b>turned on</b> and Bluetooth is enabled.</p>
         <ion-button (click)="goBack()" fill="clear">
           <ion-icon slot="start" name="arrow-back"></ion-icon>
           Back
@@ -40,14 +40,14 @@ <h2>Whoops, not connected!</h2>
     <ion-slide>
       <h2>Configure CANBUS</h2>
       <img src="assets/slide-3.png"/>
-      <p>First let's configure the <b>CANBUS</b>. To allow rESCue to communicate with your <b>®VESC</b> it must know the
-        VESC-ID of your controller. Please find out what's the VESC-ID of your ®VESC by connecting to it via
-        ®VESC TOOL and looking up under <i>App-Settings -> General</i>.</p>
+      <p>First let's configure the <b>CANBUS</b>. To allow rESCue to communicate with your VESC® it must know the
+        VESC-ID of your controller. Please find out what's the VESC ID of your VESC® by connecting to it via
+        VESC® TOOL and looking up under <i>App-Settings -> General</i>.</p>
       <ion-card>
         <ion-card-content>
-          Please configure your VESC-ID appropriately to match the ID in ®VESC.
+          Please configure your VESC ID appropriately to match the ID in VESC®
           <ion-item>
-            <ion-label>VESC-ID</ion-label>
+            <ion-label>VESC ID</ion-label>
             <ion-input type="number" [(ngModel)]="vescId"></ion-input>
           </ion-item>
         </ion-card-content>
@@ -58,13 +58,13 @@ <h2>Configure CANBUS</h2>
     <ion-slide>
       <h2>Configure Lights</h2>
       <img src="assets/slide-4.png"/>
-      <p>rESCue uses <b>addressable LEDs</b> (aka Neopixel) for front- and backlight. Please connect them to the
-        JST-header
+      <p>rESCue uses <b>addressable LEDs</b> (aka Neopixel) for the front and back lights. Please connect them to the
+        JST header
         labeled <i>LIGHTS1</i> and tell us how many LEDs (pixel) are connected to your rESCue device.</p>
       <ion-card>
         <ion-card-content>
           <ion-item>
-            <ion-label>Number of pixel</ion-label>
+            <ion-label>Number of pixels</ion-label>
             <ion-input type="number" [(ngModel)]="numberOfPixelLights"></ion-input>
           </ion-item>
         </ion-card-content>
@@ -74,22 +74,22 @@ <h2>Configure Lights</h2>
     <ion-slide>
       <h2>Configure Battery</h2>
       <img src="assets/slide-6.png"/>
-      <p>Please configure your battery. How many cells in series and parallel do you have?</p>
+      <p>How many cells in series and parallel do you have?</p>
       <ion-list>
         <ion-item>
-          <ion-label position="stacked">Cell Count {{batteryCells}}s</ion-label>
+          <ion-label position="stacked">Cell count {{batteryCells}}s</ion-label>
           <ion-range (ionBlur)="lockSwipes(false)" (ionFocus)="lockSwipes(true)"
                      min="10" max="20" step="1" pin [(ngModel)]="batteryCells"
                      snaps color="secondary"></ion-range>
         </ion-item>
         <ion-item>
-          <ion-label position="stacked">Group Count {{batteryGroups}}p</ion-label>
+          <ion-label position="stacked">Group count {{batteryGroups}}p</ion-label>
           <ion-range (ionBlur)="lockSwipes(false)" (ionFocus)="lockSwipes(true)"
                      min="1" max="4" step="1" pin [(ngModel)]="batteryGroups"
                      snaps color="secondary"></ion-range>
         </ion-item>
         <ion-item>
-          <ion-label position="stacked">Cell Capacity {{cellCapacity}}mAh</ion-label>
+          <ion-label position="stacked">Cell capacity {{cellCapacity}}mAh</ion-label>
           <ion-range (ionBlur)="lockSwipes(false)" (ionFocus)="lockSwipes(true)"
                      min="1500" max="6000" step="100" pin  [(ngModel)]="cellCapacity"
                      snaps color="secondary"></ion-range>
@@ -100,20 +100,19 @@ <h2>Configure Battery</h2>
     <ion-slide>
       <h2>Configure Lightbar</h2>
       <img src="assets/slide-7.png"/>
-      <p>rESCue can use <b>addressable LEDs</b> (aka Neopixel) as a <b>Lightbar</b>. Please connect them to the
+      <p>rESCue can use <b>addressable LEDs</b> (aka Neopixel) as a <b>lightbar</b>. Please connect them to the
         JST-header labeled <i>LIGHTBAR1</i> and tell us how many LEDs (pixel) are connected to your rESCue device.</p>
-      <p>If you don't have a <b>Lightbar</b>, just check not to use it.</p>
+      <p>If you don't have a <b>lightbar</b>, just disable it.</p>
       <ion-card>
         <ion-card-content>
           <ion-item>
-            <ion-label>Number of pixel</ion-label>
-            <ion-input type="number" [(ngModel)]="numberOfPixelLightbar"></ion-input>
+            <ion-label>Enable lightbar</ion-label>
+            <ion-toggle [(ngModel)]="!noLightbar" (ionChange)="toggleLightbar()"></ion-toggle>
           </ion-item>
           <ion-item>
-            <ion-checkbox [(ngModel)]="noLightbar"></ion-checkbox>
-            <ion-label>Don't use Lightbar</ion-label>
+            <ion-label>Number of pixels</ion-label>
+            <ion-input type="number" min="1" [(ngModel)]="numberOfPixelLightbar"></ion-input>
           </ion-item>
-
         </ion-card-content>
       </ion-card>
     </ion-slide>
@@ -139,7 +138,7 @@ <h2>Configure Push Notifications</h2>
     </ion-slide>
 
     <ion-slide>
-      <h2>Congratulation </h2>
+      <h2>Congratulations!</h2>
       <img src="assets/slide-5.gif"/>
       <p>You <b>successfully</b> configured your rESCue device. The device will reboot now, please connect again.</p>
       <ion-button size="large" (click)="endWizard()" fill="clear">Continue
diff --git a/src/app/wizard/wizard.page.ts b/src/app/wizard/wizard.page.ts
index 855476f..0ac05b3 100644
--- a/src/app/wizard/wizard.page.ts
+++ b/src/app/wizard/wizard.page.ts
@@ -29,7 +29,6 @@ export class WizardPage implements OnInit {
   batteryCells = 12;
   batteryGroups = 2;
   cellCapacity = 3000;
-  noLightbar = false;
   vescId = 25;
   numberOfPixelLights = 32;
   numberOfPixelLightbar = 5;
@@ -45,6 +44,10 @@ export class WizardPage implements OnInit {
     this.deviceId = '';
   }
 
+  get noLightbar() {
+    return this.numberOfPixelLightbar === 0;
+  }
+
   async ngOnInit() {
     this.info = await Device.getInfo();
     this.platform = this.info.platform;
@@ -100,6 +103,14 @@ export class WizardPage implements OnInit {
     this.wizard.slideTo(0, 500);
   }
 
+  toggleLightbar() {
+    if (!this.numberOfPixelLightbar) {
+      this.numberOfPixelLightbar = 5;
+    } else {
+      this.numberOfPixelLightbar = 0;
+    }
+  }
+
   slideChanged() {
     if (!this.connected) {
       this.wizard.getActiveIndex().then((index) => {