diff --git a/app/src/main/java/com/example/mobilecenter/sampleapp_android/AnalyticsActivity.java b/app/src/main/java/com/example/mobilecenter/sampleapp_android/AnalyticsActivity.java
index 2d34e348..8953bf19 100644
--- a/app/src/main/java/com/example/mobilecenter/sampleapp_android/AnalyticsActivity.java
+++ b/app/src/main/java/com/example/mobilecenter/sampleapp_android/AnalyticsActivity.java
@@ -70,7 +70,6 @@ public void onClick(DialogInterface dialog, int id) {
         }
     }
 
-
     public static class ColorDialog extends DialogFragment {
         public Dialog onCreateDialog(Bundle savedInstanceState) {
             AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
@@ -96,6 +95,5 @@ public void onClick(DialogInterface dialog, int index) {
             return builder.create();
         }
     }
-
 }
 
diff --git a/app/src/main/java/com/example/mobilecenter/sampleapp_android/CrashesActivity.java b/app/src/main/java/com/example/mobilecenter/sampleapp_android/CrashesActivity.java
index b12569cc..2dd49ab8 100644
--- a/app/src/main/java/com/example/mobilecenter/sampleapp_android/CrashesActivity.java
+++ b/app/src/main/java/com/example/mobilecenter/sampleapp_android/CrashesActivity.java
@@ -61,6 +61,4 @@ public void onClick(DialogInterface dialog, int id) {
             return builder.create();
         }
     }
-
-
 }
diff --git a/app/src/main/res/drawable/analytics.png b/app/src/main/res/drawable/analytics.png
index 7386a763..1f5fe031 100644
Binary files a/app/src/main/res/drawable/analytics.png and b/app/src/main/res/drawable/analytics.png differ
diff --git a/app/src/main/res/drawable/build.png b/app/src/main/res/drawable/build.png
index 40b110b0..93e4b84a 100644
Binary files a/app/src/main/res/drawable/build.png and b/app/src/main/res/drawable/build.png differ
diff --git a/app/src/main/res/drawable/crashes.png b/app/src/main/res/drawable/crashes.png
index 69243de9..7aff22da 100644
Binary files a/app/src/main/res/drawable/crashes.png and b/app/src/main/res/drawable/crashes.png differ
diff --git a/app/src/main/res/drawable/distribute.png b/app/src/main/res/drawable/distribute.png
index 4aeee310..d34ab2fd 100644
Binary files a/app/src/main/res/drawable/distribute.png and b/app/src/main/res/drawable/distribute.png differ
diff --git a/app/src/main/res/drawable/mclogo.png b/app/src/main/res/drawable/mclogo.png
index 22c6cffb..2edc5072 100644
Binary files a/app/src/main/res/drawable/mclogo.png and b/app/src/main/res/drawable/mclogo.png differ
diff --git a/app/src/main/res/drawable/push.png b/app/src/main/res/drawable/push.png
index e53f2a2c..f322ad0e 100644
Binary files a/app/src/main/res/drawable/push.png and b/app/src/main/res/drawable/push.png differ
diff --git a/app/src/main/res/drawable/test.png b/app/src/main/res/drawable/test.png
index 54866675..9c229656 100644
Binary files a/app/src/main/res/drawable/test.png and b/app/src/main/res/drawable/test.png differ
diff --git a/app/src/main/res/layout/analytics_root.xml b/app/src/main/res/layout/analytics_root.xml
index 9f0bb9bc..52362f7c 100644
--- a/app/src/main/res/layout/analytics_root.xml
+++ b/app/src/main/res/layout/analytics_root.xml
@@ -3,8 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:background="@color/colorAnalyticsBackground">
+    android:background="@color/colorAnalyticsBackground"
+    android:orientation="vertical">
 
     <Button
         android:id="@+id/customEventButton"
@@ -48,17 +48,17 @@
         android:id="@+id/analyticsTextView"
         android:layout_width="300dp"
         android:layout_height="110dp"
+        android:layout_alignLeft="@+id/customEventButton"
+        android:layout_alignStart="@+id/customEventButton"
+        android:layout_below="@+id/analyticsImageView"
+        android:layout_marginTop="24dp"
         android:clickable="false"
         android:contextClickable="false"
         android:cursorVisible="false"
         android:defaultFocusHighlightEnabled="false"
         android:fadeScrollbars="false"
-        android:textSize="17sp"
         android:text="@string/analytics_description"
         android:textAppearance="@style/TextAppearance.AppCompat"
-        android:layout_below="@+id/analyticsImageView"
-        android:layout_alignLeft="@+id/customEventButton"
-        android:layout_alignStart="@+id/customEventButton"
-        android:layout_marginTop="24dp" />
+        android:textSize="17sp" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/build_root.xml b/app/src/main/res/layout/build_root.xml
index d1d2ff8b..d055e7d1 100644
--- a/app/src/main/res/layout/build_root.xml
+++ b/app/src/main/res/layout/build_root.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent" android:layout_height="match_parent"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:background="@color/colorBuildBackground">
 
     <ImageView
@@ -32,7 +33,7 @@
         android:fadeScrollbars="false"
         android:text="@string/build_description"
         android:textAppearance="@style/TextAppearance.AppCompat"
-        android:textSize="17sp"
-        android:textColor="@android:color/white"/>
+        android:textColor="@android:color/white"
+        android:textSize="17sp" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/crashes_root.xml b/app/src/main/res/layout/crashes_root.xml
index d5fe3391..f02127af 100644
--- a/app/src/main/res/layout/crashes_root.xml
+++ b/app/src/main/res/layout/crashes_root.xml
@@ -9,14 +9,14 @@
         android:id="@+id/crashButton"
         android:layout_width="300dp"
         android:layout_height="55dp"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
         android:layout_marginBottom="39dp"
         android:backgroundTint="@android:color/white"
         android:text="@string/crashes_crashButton"
         android:textAllCaps="false"
         android:textSize="17sp"
-        android:textStyle="normal"
-        android:layout_alignParentBottom="true"
-        android:layout_centerHorizontal="true" />
+        android:textStyle="normal" />
 
     <ImageView
         android:id="@+id/analyticsImageView"
@@ -34,6 +34,9 @@
         android:id="@+id/crashesTextView"
         android:layout_width="300dp"
         android:layout_height="140dp"
+        android:layout_alignLeft="@+id/crashButton"
+        android:layout_alignStart="@+id/crashButton"
+        android:layout_below="@+id/analyticsImageView"
         android:layout_marginTop="26dp"
         android:clickable="false"
         android:contextClickable="false"
@@ -41,11 +44,8 @@
         android:defaultFocusHighlightEnabled="false"
         android:fadeScrollbars="false"
         android:text="@string/crashes_description"
-        android:textColor="@android:color/white"
         android:textAppearance="@style/TextAppearance.AppCompat"
-        android:textSize="17sp"
-        android:layout_below="@+id/analyticsImageView"
-        android:layout_alignLeft="@+id/crashButton"
-        android:layout_alignStart="@+id/crashButton" />
+        android:textColor="@android:color/white"
+        android:textSize="17sp" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/distribute_root.xml b/app/src/main/res/layout/distribute_root.xml
index 07c4dcc7..9cbb89a1 100644
--- a/app/src/main/res/layout/distribute_root.xml
+++ b/app/src/main/res/layout/distribute_root.xml
@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent" android:layout_height="match_parent"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:background="@color/colorDistributeBackground">
 
     <ImageView
         android:id="@+id/distributeImageView"
         android:layout_width="match_parent"
         android:layout_height="200dp"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentTop="true"
         android:adjustViewBounds="true"
         android:background="@color/colorDistributeImageBackground"
         android:scaleType="fitCenter"
-        app:srcCompat="@drawable/distribute"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true" />
+        app:srcCompat="@drawable/distribute" />
 
     <TextView
         android:id="@+id/distributeTextView"
diff --git a/app/src/main/res/layout/push_root.xml b/app/src/main/res/layout/push_root.xml
index 8e14c60b..7116eb76 100644
--- a/app/src/main/res/layout/push_root.xml
+++ b/app/src/main/res/layout/push_root.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent" android:layout_height="match_parent"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:background="@color/colorPushBackground">
 
     <ImageView
diff --git a/app/src/main/res/layout/test_root.xml b/app/src/main/res/layout/test_root.xml
index d3da3a56..6b81bc52 100644
--- a/app/src/main/res/layout/test_root.xml
+++ b/app/src/main/res/layout/test_root.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent" android:layout_height="match_parent"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:background="@color/colorTestBackground">
 
     <ImageView
diff --git a/app/src/main/res/layout/welcome_root.xml b/app/src/main/res/layout/welcome_root.xml
index 24961b1f..c33fc1ff 100644
--- a/app/src/main/res/layout/welcome_root.xml
+++ b/app/src/main/res/layout/welcome_root.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent" android:layout_height="match_parent"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:background="@color/colorWelcomeBackground">
 
     <ImageView