diff --git a/.idea/misc.xml b/.idea/misc.xml
index fbb6828..5d19981 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -37,7 +37,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/BreakReminder.java b/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/BreakReminder.java
index 437ba8c..4367ab5 100644
--- a/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/BreakReminder.java
+++ b/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/BreakReminder.java
@@ -297,10 +297,10 @@ public class BreakReminder extends AppCompatActivity
             // Handle the profile action
             Intent intent = new Intent(this, SettingsActivity.class);
             this.startActivity(intent);
-        } else if (id == R.id.nav_statistics) {
+        //} else if (id == R.id.nav_statistics) {
             // Show statistics
-            Intent intent = new Intent(this, StatisticsActivity.class);
-            this.startActivity(intent);
+            //Intent intent = new Intent(this, StatisticsActivity.class);
+            //this.startActivity(intent);
         } else if (id == R.id.nav_help) {
             // Show help
             Intent intent = new Intent(this, HelpActivity.class);
diff --git a/app/src/main/res/layout/activity_break.xml b/app/src/main/res/layout/activity_break.xml
index 458ba6a..4d24fb7 100644
--- a/app/src/main/res/layout/activity_break.xml
+++ b/app/src/main/res/layout/activity_break.xml
@@ -4,10 +4,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_margin="15dp"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
     tools:context="orgprivacy_friendly_apps.secuso.privacyfriendlybreakreminder.BreakActivity">
 
     <TextView
diff --git a/app/src/main/res/layout/activity_break_decider.xml b/app/src/main/res/layout/activity_break_decider.xml
index 532dbf7..50c9cf2 100644
--- a/app/src/main/res/layout/activity_break_decider.xml
+++ b/app/src/main/res/layout/activity_break_decider.xml
@@ -3,10 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    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:layout_margin="10dp"
     tools:context=".BreakDeciderActivity">
 
     <Button
diff --git a/app/src/main/res/layout/exercise_type.xml b/app/src/main/res/layout/exercise_type.xml
index bec5361..c510b9d 100644
--- a/app/src/main/res/layout/exercise_type.xml
+++ b/app/src/main/res/layout/exercise_type.xml
@@ -9,7 +9,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_gravity="center_horizontal"
-        android:layout_margin="20dp">
+        android:layout_margin="10dp">
 
         <TextView
             android:layout_width="100dp"
diff --git a/app/src/main/res/layout/first_dialog.xml b/app/src/main/res/layout/first_dialog.xml
index 384c031..b33e974 100644
--- a/app/src/main/res/layout/first_dialog.xml
+++ b/app/src/main/res/layout/first_dialog.xml
@@ -9,7 +9,7 @@
         android:gravity="center"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="@dimen/activity_horizontal_margin">
+        android:layout_margin="10dp">
 
         <TextView
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/help.xml b/app/src/main/res/layout/help.xml
index 139efc8..113cbdd 100644
--- a/app/src/main/res/layout/help.xml
+++ b/app/src/main/res/layout/help.xml
@@ -7,7 +7,7 @@
     <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_margin="20dp"
+        android:layout_margin="10dp"
         android:orientation="vertical"
         android:scrollbarAlwaysDrawVerticalTrack="true"
         android:scrollbars="vertical"
@@ -58,7 +58,7 @@
             android:layout_toRightOf="@+id/imageView"
             android:text="@string/help_start_screen"
             android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textSize="7pt"
+            android:textSize="5pt"
             android:layout_marginLeft="5dp"/>
 
         <TextView
diff --git a/app/src/main/res/layout/help2.xml b/app/src/main/res/layout/help2.xml
index 1086572..68900c2 100644
--- a/app/src/main/res/layout/help2.xml
+++ b/app/src/main/res/layout/help2.xml
@@ -2,7 +2,7 @@
 <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="20dp">
+    android:layout_margin="10dp">
 
 
     <ImageView
diff --git a/app/src/main/res/layout/new_profile.xml b/app/src/main/res/layout/new_profile.xml
index 63fb642..23bd392 100644
--- a/app/src/main/res/layout/new_profile.xml
+++ b/app/src/main/res/layout/new_profile.xml
@@ -4,7 +4,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:weightSum="1"
-    android:layout_margin="20dp">
+    android:layout_margin="10dp">
 
     <RelativeLayout
         android:layout_width="fill_parent"
diff --git a/app/src/main/res/menu/activity_break_reminder_drawer.xml b/app/src/main/res/menu/activity_break_reminder_drawer.xml
index 4e312e4..79be3a4 100644
--- a/app/src/main/res/menu/activity_break_reminder_drawer.xml
+++ b/app/src/main/res/menu/activity_break_reminder_drawer.xml
@@ -9,10 +9,11 @@
             android:id="@+id/nav_settings"
             android:icon="@drawable/ic_menu_manage"
             android:title="@string/title_activity_settings" />
-        <item
+        <!--<item
             android:id="@+id/nav_statistics"
             android:icon="@drawable/drawer_statistic_logo"
             android:title="@string/statistics" />
+            -->
     </group>
 
     <group android:checkableBehavior="single">