diff --git a/app/src/main/res/layout/activity_alarm_details.xml b/app/src/main/res/layout/activity_alarm_details.xml
index 10a7f296f..5cc1b4703 100644
--- a/app/src/main/res/layout/activity_alarm_details.xml
+++ b/app/src/main/res/layout/activity_alarm_details.xml
@@ -1,209 +1,211 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:orientation="vertical"
-    android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
-    android:paddingBottom="@dimen/activity_vertical_margin"
     tools:context="nodomain.freeyourgadget.gadgetbridge.activities.AlarmDetails">
 
 
     <LinearLayout
-        android:orientation="horizontal"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="10dp">
+        android:layout_marginBottom="10dp"
+        android:orientation="horizontal">
 
         <CheckBox
+            android:id="@+id/alarm_cb_smart_wakeup"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:id="@+id/alarm_cb_smart_wakeup"/>
+            android:layout_height="wrap_content" />
 
         <TextView
+            android:id="@+id/alarm_label_smart_wakeup"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:text="@string/alarm_smart_wakeup"
-            android:id="@+id/alarm_label_smart_wakeup"
-            android:labelFor="@id/alarm_cb_smart_wakeup" />
+            android:labelFor="@id/alarm_cb_smart_wakeup"
+            android:text="@string/alarm_smart_wakeup" />
     </LinearLayout>
 
     <TimePicker
         android:id="@+id/alarm_time_picker"
-        android:timePickerMode="clock"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="20dp" />
+        android:layout_marginBottom="20dp"
+        android:timePickerMode="clock" />
 
     <LinearLayout
-        android:orientation="horizontal"
+        android:id="@+id/dowSelector"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:baselineAligned="false"
-        android:id="@+id/dowSelector">
+        android:orientation="horizontal">
 
         <LinearLayout
-            android:orientation="vertical"
             android:layout_width="wrap_content"
-            android:layout_height="match_parent">
+            android:layout_height="match_parent"
+            android:orientation="vertical">
 
             <CheckBox
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
                 android:id="@+id/alarm_cb_mon"
-                android:layout_gravity="center_horizontal"
-                android:gravity="center_horizontal|bottom"/>
-
-            <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/alarm_mon_short"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center_horizontal|bottom" />
+
+            <TextView
                 android:id="@+id/alarm_label_cb_mon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
+                android:gravity="center_horizontal|top"
                 android:labelFor="@id/alarm_cb_mon"
-                android:gravity="center_horizontal|top"/>
+                android:text="@string/alarm_mon_short" />
 
         </LinearLayout>
 
         <LinearLayout
-            android:orientation="vertical"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:layout_weight="1">
+            android:layout_weight="1"
+            android:orientation="vertical">
 
             <CheckBox
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
                 android:id="@+id/alarm_cb_tue"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
                 android:gravity="center_horizontal|bottom" />
 
             <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/alarm_tue_short"
                 android:id="@+id/alarm_label_cb_tue"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
+                android:gravity="center_horizontal|top"
                 android:labelFor="@id/alarm_cb_tue"
-                android:gravity="center_horizontal|top" />
+                android:text="@string/alarm_tue_short" />
 
         </LinearLayout>
 
         <LinearLayout
-            android:orientation="vertical"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:layout_weight="1">
+            android:layout_weight="1"
+            android:orientation="vertical">
 
             <CheckBox
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
                 android:id="@+id/alarm_cb_wed"
-                android:layout_gravity="center_horizontal"
-                android:gravity="center_horizontal|bottom"/>
-
-            <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/alarm_wed_short"
-                android:id="@+id/alarm_label_cb_wed"
-                android:layout_gravity="center_horizontal"
-                android:labelFor="@id/alarm_cb_wed"
-                android:gravity="center_horizontal|top" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:orientation="vertical"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_weight="1">
-
-            <CheckBox
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:id="@+id/alarm_cb_thu"
                 android:layout_gravity="center_horizontal"
                 android:gravity="center_horizontal|bottom" />
 
             <TextView
+                android:id="@+id/alarm_label_cb_wed"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/alarm_thu_short"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center_horizontal|top"
+                android:labelFor="@id/alarm_cb_wed"
+                android:text="@string/alarm_wed_short" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:orientation="vertical">
+
+            <CheckBox
+                android:id="@+id/alarm_cb_thu"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center_horizontal|bottom" />
+
+            <TextView
                 android:id="@+id/alarm_label_cb_thu"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
+                android:gravity="center_horizontal|top"
                 android:labelFor="@id/alarm_cb_thu"
-                android:gravity="center_horizontal|top" />
+                android:text="@string/alarm_thu_short" />
 
         </LinearLayout>
 
         <LinearLayout
-            android:orientation="vertical"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:layout_weight="1">
+            android:layout_weight="1"
+            android:orientation="vertical">
 
             <CheckBox
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
                 android:id="@+id/alarm_cb_fri"
-                android:layout_gravity="center_horizontal"
-                android:gravity="center_horizontal|bottom"/>
-
-            <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/alarm_fri_short"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center_horizontal|bottom" />
+
+            <TextView
                 android:id="@+id/alarm_label_cb_fri"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
+                android:gravity="center_horizontal|top"
                 android:labelFor="@id/alarm_cb_fri"
-                android:gravity="center_horizontal|top" />
+                android:text="@string/alarm_fri_short" />
 
         </LinearLayout>
 
         <LinearLayout
-            android:orientation="vertical"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:layout_weight="1">
+            android:layout_weight="1"
+            android:orientation="vertical">
 
             <CheckBox
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
                 android:id="@+id/alarm_cb_sat"
-                android:layout_gravity="center_horizontal"
-                android:gravity="center_horizontal|bottom"/>
-
-            <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/alarm_sat_short"
-                android:id="@+id/alarm_label_cb_sat"
                 android:layout_gravity="center_horizontal"
+                android:gravity="center_horizontal|bottom" />
+
+            <TextView
+                android:id="@+id/alarm_label_cb_sat"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center_horizontal|top"
                 android:labelFor="@id/alarm_cb_sat"
-                android:gravity="center_horizontal|top" />
+                android:text="@string/alarm_sat_short" />
 
         </LinearLayout>
 
         <LinearLayout
-            android:orientation="vertical"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:layout_weight="1">
+            android:layout_weight="1"
+            android:orientation="vertical">
 
             <CheckBox
+                android:id="@+id/alarm_cb_sun"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:id="@+id/alarm_cb_sun"
-                android:layout_gravity="center_horizontal"/>
+                android:layout_gravity="center_horizontal" />
 
             <TextView
+                android:id="@+id/alarm_label_cb_sun"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/alarm_sun_short"
-                android:id="@+id/alarm_label_cb_sun"
                 android:layout_gravity="center_horizontal"
+                android:gravity="center_horizontal|top"
                 android:labelFor="@id/alarm_cb_sun"
-                android:gravity="center_horizontal|top" />
+                android:text="@string/alarm_sun_short" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_android_pairing.xml b/app/src/main/res/layout/activity_android_pairing.xml
index 328e84027..566f808d5 100644
--- a/app/src/main/res/layout/activity_android_pairing.xml
+++ b/app/src/main/res/layout/activity_android_pairing.xml
@@ -1,12 +1,16 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
-    android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
     android:paddingBottom="@dimen/activity_vertical_margin"
     tools:context="nodomain.freeyourgadget.gadgetbridge.activities.AndroidPairingActivity">
 
-    <TextView android:text="@string/android_pairing_hint" android:layout_width="wrap_content"
+    <TextView
+        android:text="@string/android_pairing_hint"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content" />
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/activity_appblacklist.xml b/app/src/main/res/layout/activity_appblacklist.xml
index 831675a38..5ad2fbef9 100644
--- a/app/src/main/res/layout/activity_appblacklist.xml
+++ b/app/src/main/res/layout/activity_appblacklist.xml
@@ -1,6 +1,8 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
-    android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
     android:paddingBottom="@dimen/activity_vertical_margin"
diff --git a/app/src/main/res/layout/activity_appinstaller.xml b/app/src/main/res/layout/activity_appinstaller.xml
index eb13abc1b..3dc4aa3e1 100644
--- a/app/src/main/res/layout/activity_appinstaller.xml
+++ b/app/src/main/res/layout/activity_appinstaller.xml
@@ -14,8 +14,7 @@
         android:id="@+id/itemListView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentEnd="false">
-    </ListView>
+        android:layout_alignParentEnd="false"></ListView>
 
     <TextView
         android:id="@+id/infoTextView"
@@ -67,8 +66,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@+id/installButton"
-        android:layout_alignParentEnd="false">
-    </ListView>
+        android:layout_alignParentEnd="false"></ListView>
 
     <android.widget.Space
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/activity_charts_durationdialog.xml b/app/src/main/res/layout/activity_charts_durationdialog.xml
index da1fbf9d8..20247d687 100644
--- a/app/src/main/res/layout/activity_charts_durationdialog.xml
+++ b/app/src/main/res/layout/activity_charts_durationdialog.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <TextView
         android:id="@+id/charts_duration_label"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
-    </TextView>
+        android:layout_height="wrap_content"></TextView>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_configure_alarms.xml b/app/src/main/res/layout/activity_configure_alarms.xml
index a22fcc189..10cd04bd1 100644
--- a/app/src/main/res/layout/activity_configure_alarms.xml
+++ b/app/src/main/res/layout/activity_configure_alarms.xml
@@ -1,6 +1,8 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
-    android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
     android:paddingBottom="@dimen/activity_vertical_margin"
diff --git a/app/src/main/res/layout/activity_discovery.xml b/app/src/main/res/layout/activity_discovery.xml
index 50c39ddda..485e5d6bd 100644
--- a/app/src/main/res/layout/activity_discovery.xml
+++ b/app/src/main/res/layout/activity_discovery.xml
@@ -1,6 +1,8 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
-    android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
     android:paddingBottom="@dimen/activity_vertical_margin"
diff --git a/app/src/main/res/layout/activity_fragmentappmanager.xml b/app/src/main/res/layout/activity_fragmentappmanager.xml
index 65699327f..448573644 100644
--- a/app/src/main/res/layout/activity_fragmentappmanager.xml
+++ b/app/src/main/res/layout/activity_fragmentappmanager.xml
@@ -25,6 +25,7 @@
         </android.support.v4.view.ViewPager>
 
     </LinearLayout>
+
     <android.support.design.widget.FloatingActionButton
         android:id="@+id/fab"
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/activity_mi_band_pairing.xml b/app/src/main/res/layout/activity_mi_band_pairing.xml
index 9df8b8c74..032735126 100644
--- a/app/src/main/res/layout/activity_mi_band_pairing.xml
+++ b/app/src/main/res/layout/activity_mi_band_pairing.xml
@@ -1,12 +1,16 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
-    android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
     android:paddingBottom="@dimen/activity_vertical_margin"
     tools:context="nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandPairingActivity">
 
-    <TextView android:text="@string/pairing" android:layout_width="wrap_content"
+    <TextView
+        android:text="@string/pairing"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:id="@+id/miband_pair_message" />
 
diff --git a/app/src/main/res/layout/activity_pebble_pairing.xml b/app/src/main/res/layout/activity_pebble_pairing.xml
index d0793d61f..661f53834 100644
--- a/app/src/main/res/layout/activity_pebble_pairing.xml
+++ b/app/src/main/res/layout/activity_pebble_pairing.xml
@@ -1,12 +1,16 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
-    android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
     android:paddingBottom="@dimen/activity_vertical_margin"
     tools:context="nodomain.freeyourgadget.gadgetbridge.devices.pebble.PebblePairingActivity">
 
-    <TextView android:text="@string/pairing" android:layout_width="wrap_content"
+    <TextView
+        android:text="@string/pairing"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:id="@+id/pebble_pair_message" />
 
diff --git a/app/src/main/res/layout/activity_weather_notification.xml b/app/src/main/res/layout/activity_weather_notification.xml
index bbb5a7377..3aeeff188 100644
--- a/app/src/main/res/layout/activity_weather_notification.xml
+++ b/app/src/main/res/layout/activity_weather_notification.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent" android:layout_margin="10dp">
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_margin="10dp">
 
     <TextView
         android:text="Weather on your Pebble"
@@ -9,17 +11,16 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:textStyle="bold"
-        android:textSize="20dp"/>
+        android:textSize="20dp" />
 
     <android.support.v4.widget.Space
         android:layout_width="match_parent"
         android:layout_height="@dimen/activity_vertical_margin" />
 
     <TextView
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:id="@+id/weather_notification_label"
-    android:text="@string/weather_notification_label"
-    />
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/weather_notification_label"
+        android:text="@string/weather_notification_label" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/alarm_item.xml b/app/src/main/res/layout/alarm_item.xml
index 6bfa02f7d..a4d887feb 100644
--- a/app/src/main/res/layout/alarm_item.xml
+++ b/app/src/main/res/layout/alarm_item.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent" android:layout_height="wrap_content">
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
 
 
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="16dp" >
+        android:layout_margin="16dp">
 
         <TextView
             android:id="@+id/alarm_item_time"
diff --git a/app/src/main/res/layout/fragment_charts.xml b/app/src/main/res/layout/fragment_charts.xml
index 495e70ee2..f3771e1cd 100644
--- a/app/src/main/res/layout/fragment_charts.xml
+++ b/app/src/main/res/layout/fragment_charts.xml
@@ -1,12 +1,12 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="nodomain.freeyourgadget.gadgetbridge.activities.charts.ChartsActivity$PlaceholderFragment">
 
     <com.github.mikephil.charting.charts.CombinedChart
         android:id="@+id/activitysleepchart"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        />
+        android:layout_height="match_parent" />
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_dummy.xml b/app/src/main/res/layout/fragment_dummy.xml
index 8d624bcbc..485a44c83 100644
--- a/app/src/main/res/layout/fragment_dummy.xml
+++ b/app/src/main/res/layout/fragment_dummy.xml
@@ -1,12 +1,16 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
-    android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
     android:paddingBottom="@dimen/activity_vertical_margin"
     tools:context="nodomain.freeyourgadget.gadgetbridge.activities.charts.ChartsActivity$PlaceholderFragment">
 
-    <TextView android:id="@+id/section_label" android:layout_width="wrap_content"
+    <TextView
+        android:id="@+id/section_label"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content" />
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_live_activity.xml b/app/src/main/res/layout/fragment_live_activity.xml
index 565b5e362..b79c14695 100644
--- a/app/src/main/res/layout/fragment_live_activity.xml
+++ b/app/src/main/res/layout/fragment_live_activity.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="fill_parent"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
     android:layout_height="fill_parent">
 
     <LinearLayout
@@ -13,15 +14,13 @@
             android:id="@+id/livechart_steps_per_minute_current"
             android:layout_width="fill_parent"
             android:layout_height="fill_parent"
-            android:layout_weight="20">
-        </nodomain.freeyourgadget.gadgetbridge.activities.charts.CustomBarChart>
+            android:layout_weight="20"></nodomain.freeyourgadget.gadgetbridge.activities.charts.CustomBarChart>
 
         <nodomain.freeyourgadget.gadgetbridge.activities.charts.CustomBarChart
             android:id="@+id/livechart_steps_total"
             android:layout_width="fill_parent"
             android:layout_height="fill_parent"
-            android:layout_weight="20">
-        </nodomain.freeyourgadget.gadgetbridge.activities.charts.CustomBarChart>
+            android:layout_weight="20"></nodomain.freeyourgadget.gadgetbridge.activities.charts.CustomBarChart>
 
         <!--
         <com.github.mikephil.charting.charts.PieChart
@@ -44,8 +43,7 @@
         android:id="@+id/livechart_steps_per_minute_history"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
-        android:layout_weight="20">
-    </com.github.mikephil.charting.charts.LineChart>
+        android:layout_weight="20"></com.github.mikephil.charting.charts.LineChart>
 
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_sleepchart.xml b/app/src/main/res/layout/fragment_sleepchart.xml
index 67ee2ac5c..55bd9faea 100644
--- a/app/src/main/res/layout/fragment_sleepchart.xml
+++ b/app/src/main/res/layout/fragment_sleepchart.xml
@@ -1,5 +1,6 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="nodomain.freeyourgadget.gadgetbridge.activities.charts.ChartsActivity$PlaceholderFragment"
     android:orientation="vertical">
@@ -8,8 +9,7 @@
         android:id="@+id/sleepchart_pie_light_deep"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
-        android:layout_weight="20">
-    </com.github.mikephil.charting.charts.PieChart>
+        android:layout_weight="20"></com.github.mikephil.charting.charts.PieChart>
 
     <com.github.mikephil.charting.charts.CombinedChart
         android:id="@+id/sleepchart"
diff --git a/app/src/main/res/layout/fragment_weeksteps_chart.xml b/app/src/main/res/layout/fragment_weeksteps_chart.xml
index 1936a3aa2..260b249cd 100644
--- a/app/src/main/res/layout/fragment_weeksteps_chart.xml
+++ b/app/src/main/res/layout/fragment_weeksteps_chart.xml
@@ -1,5 +1,6 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="nodomain.freeyourgadget.gadgetbridge.activities.charts.ChartsActivity$PlaceholderFragment"
     android:orientation="vertical">
@@ -8,8 +9,7 @@
         android:id="@+id/todaystepschart"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
-        android:layout_weight="20">
-    </com.github.mikephil.charting.charts.PieChart>
+        android:layout_weight="20"></com.github.mikephil.charting.charts.PieChart>
 
     <com.github.mikephil.charting.charts.BarChart
         android:id="@+id/weekstepschart"
diff --git a/app/src/main/res/layout/item_with_details.xml b/app/src/main/res/layout/item_with_details.xml
index 6e16333f2..fe035b4ef 100644
--- a/app/src/main/res/layout/item_with_details.xml
+++ b/app/src/main/res/layout/item_with_details.xml
@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?android:attr/activatedBackgroundIndicator"
-    android:padding="8dp" >
+    android:padding="8dp">
 
     <ImageView
         android:id="@+id/item_image"
@@ -28,15 +28,14 @@
             android:scrollHorizontally="false"
             style="@style/Base.TextAppearance.AppCompat.SearchResult.Title"
             android:text="Item Name"
-            android:maxLines="1"/>
+            android:maxLines="1" />
 
         <TextView
             android:id="@+id/item_details"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             style="@style/Base.TextAppearance.AppCompat.SearchResult"
-            android:text="Item Description"
-            />
+            android:text="Item Description" />
     </LinearLayout>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_with_details_horizontal.xml b/app/src/main/res/layout/item_with_details_horizontal.xml
index 8c3180255..3ebd3f37b 100644
--- a/app/src/main/res/layout/item_with_details_horizontal.xml
+++ b/app/src/main/res/layout/item_with_details_horizontal.xml
@@ -37,8 +37,7 @@
             android:layout_height="wrap_content"
             android:textColor="@color/secondarytext"
             android:textSize="12sp"
-            android:text="Item Description"
-            />
+            android:text="Item Description" />
     </LinearLayout>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_with_details_small.xml b/app/src/main/res/layout/item_with_details_small.xml
index 2680ac7db..be088544a 100644
--- a/app/src/main/res/layout/item_with_details_small.xml
+++ b/app/src/main/res/layout/item_with_details_small.xml
@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?android:attr/activatedBackgroundIndicator"
-    android:padding="4dp" >
+    android:padding="4dp">
 
     <ImageView
         android:id="@+id/item_image"
@@ -28,15 +28,14 @@
             android:scrollHorizontally="false"
 
             style="@style/Base.TextAppearance.AppCompat.Body1"
-            android:text="Item Name"/>
+            android:text="Item Name" />
 
         <TextView
             android:id="@+id/item_details"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             style="@style/Base.TextAppearance.AppCompat.Body2"
-            android:text="Item Description"
-            />
+            android:text="Item Description" />
     </LinearLayout>
 
 </RelativeLayout>
\ No newline at end of file