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 a15ac11..29ae33f 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
@@ -245,13 +245,18 @@ public class BreakReminder extends AppCompatActivity
     public void onResume() {
         super.onResume();
 
+        SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(this);
+        // If chosen, set screen to "stay on"
+        boolean stayOn = sharedPrefs.getBoolean("notifications_stayOn", false);
+
+        if (stayOn)
+            getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+
         //FIXME Add flag if New Profile or Resume
         if (addNewProfile) {
             fillProfiles();
             profileSpinner = (Spinner) findViewById(R.id.spinner);
             addNewProfile = false;
-        } else {
-
         }
     }
 
diff --git a/app/src/main/res/layout/activity_break_decider.xml b/app/src/main/res/layout/activity_break_decider.xml
index 0aff464..532dbf7 100644
--- a/app/src/main/res/layout/activity_break_decider.xml
+++ b/app/src/main/res/layout/activity_break_decider.xml
@@ -15,9 +15,11 @@
         android:layout_height="wrap_content"
         android:text="@string/take_the_break"
         android:id="@+id/button_break"
+        android:textColor="@color/white"
         android:layout_alignParentBottom="true"
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
+        android:background="@drawable/button_normal"
         android:layout_marginBottom="47dp" />
 
     <Button
@@ -28,6 +30,8 @@
         android:id="@+id/button_skip"
         android:layout_alignTop="@+id/button_break"
         android:layout_alignParentRight="true"
+        android:background="@drawable/button_normal"
+        android:textColor="@color/white"
         android:layout_alignParentEnd="true" />
 
     <TextView
diff --git a/app/src/main/res/layout/content_break_reminder.xml b/app/src/main/res/layout/content_break_reminder.xml
index 9def67c..5aff274 100644
--- a/app/src/main/res/layout/content_break_reminder.xml
+++ b/app/src/main/res/layout/content_break_reminder.xml
@@ -9,7 +9,7 @@
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    android:background="@color/middleblue"
+    android:background="@color/white"
     tools:context="orgprivacy_friendly_apps.secuso.privacyfriendlybreakreminder.BreakReminder"
     tools:showIn="@layout/app_bar_break_reminder">
 
@@ -18,14 +18,10 @@
         android:id="@+id/spinner"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignEnd="@+id/textView"
-        android:layout_alignLeft="@+id/button_playStop"
-        android:layout_alignParentTop="true"
-        android:layout_alignRight="@+id/textView"
-        android:layout_alignStart="@+id/button_playStop"
-        android:layout_marginTop="84dp"
+        android:layout_marginTop="83dp"
         android:popupBackground="@color/white"
-        android:spinnerMode="dropdown" />
+        android:spinnerMode="dropdown"
+        android:layout_centerHorizontal="true" />
 
 
     <Button
@@ -45,15 +41,14 @@
         style="?android:attr/buttonStyleSmall"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignEnd="@+id/textView"
         android:layout_alignParentBottom="true"
-        android:layout_alignRight="@+id/textView"
         android:layout_marginBottom="182dp"
         android:textColor="@color/white"
         android:background="@drawable/button_normal"
         android:text="@string/reset"
         android:layout_toRightOf="@+id/button_playStop"
-        android:layout_toEndOf="@+id/button_playStop" />
+        android:layout_alignRight="@+id/textView"
+        android:layout_alignEnd="@+id/textView" />
 
 
     <!--
@@ -73,15 +68,15 @@
         android:id="@+id/textView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_above="@+id/button_playStop"
-        android:layout_centerHorizontal="true"
         android:clickable="true"
         android:enabled="true"
         android:text="@string/break_reminder_time"
         android:textAppearance="?android:attr/textAppearanceLarge"
         android:textIsSelectable="false"
         android:textSize="60sp"
-        android:textStyle="bold" />
+        android:textStyle="bold"
+        android:layout_above="@+id/button_reset"
+        android:layout_centerHorizontal="true" />
 
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/exercise_type.xml b/app/src/main/res/layout/exercise_type.xml
index 59aeccb..44721da 100644
--- a/app/src/main/res/layout/exercise_type.xml
+++ b/app/src/main/res/layout/exercise_type.xml
@@ -31,6 +31,8 @@
             android:layout_alignBottom="@+id/textView8"
             android:layout_toRightOf="@+id/textView8"
             android:layout_toEndOf="@+id/textView8"
+            android:digits="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890"
+            android:maxLength="9"
             android:inputType="text" />
 
         <TextView
@@ -111,6 +113,8 @@
             android:id="@+id/button_et_add"
             android:layout_above="@+id/button_et_save"
             android:layout_alignRight="@+id/checkBox3"
+            android:background="@drawable/button_normal"
+            android:textColor="@color/white"
             android:layout_alignEnd="@+id/checkBox3" />
 
         <Button
@@ -120,6 +124,8 @@
             android:id="@+id/button_et_edit"
             android:layout_alignBottom="@+id/button_et_add"
             android:layout_toRightOf="@+id/textView9"
+            android:background="@drawable/button_normal"
+            android:textColor="@color/white"
             android:layout_toEndOf="@+id/textView9" />
 
         <Button
@@ -129,6 +135,8 @@
             android:id="@+id/button_et_save"
             android:layout_alignParentBottom="true"
             android:layout_alignLeft="@+id/button_et_add"
+            android:background="@drawable/button_normal"
+            android:textColor="@color/white"
             android:layout_alignStart="@+id/button_et_add" />
 
         <Button
@@ -138,6 +146,8 @@
             android:id="@+id/button_et_cancel"
             android:layout_alignBottom="@+id/button_et_save"
             android:layout_alignLeft="@+id/button_et_edit"
+            android:background="@drawable/button_normal"
+            android:textColor="@color/white"
             android:layout_alignStart="@+id/button_et_edit" />
 
         <Spinner
diff --git a/app/src/main/res/layout/new_profile.xml b/app/src/main/res/layout/new_profile.xml
index a72d6df..3b8483a 100644
--- a/app/src/main/res/layout/new_profile.xml
+++ b/app/src/main/res/layout/new_profile.xml
@@ -31,6 +31,8 @@
             android:layout_marginEnd="42dp"
             android:layout_marginRight="42dp"
             android:inputType="text"
+            android:digits="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890"
+            android:maxLength="9"
             android:textSize="25sp" />
 
         <SeekBar
@@ -97,10 +99,12 @@
             android:id="@+id/button_profile_select"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignBottom="@+id/checkBox"
-            android:layout_toEndOf="@+id/checkBox"
-            android:layout_toRightOf="@+id/checkBox"
-            android:text="@string/new_profile_select" />
+            android:background="@drawable/button_normal"
+            android:textColor="@color/white"
+            android:text="@string/new_profile_select"
+            android:layout_above="@+id/textView16"
+            android:layout_alignLeft="@+id/button_profile_cancel"
+            android:layout_alignStart="@+id/button_profile_cancel" />
 
         <TextView
             android:id="@+id/textView7"
@@ -130,6 +134,8 @@
             android:text="@string/new_profile_save"
             android:layout_alignParentBottom="true"
             android:layout_toLeftOf="@+id/textView4"
+            android:background="@drawable/button_normal"
+            android:textColor="@color/white"
             android:layout_toStartOf="@+id/textView4" />
 
         <Button
@@ -139,6 +145,8 @@
             android:text="@string/new_profile_cancel"
             android:layout_alignParentBottom="true"
             android:layout_toRightOf="@+id/textView4"
+            android:background="@drawable/button_normal"
+            android:textColor="@color/white"
             android:layout_toEndOf="@+id/textView4" />
 
         <TextView
diff --git a/app/src/main/res/layout/spinner_layout.xml b/app/src/main/res/layout/spinner_layout.xml
index 2f08df7..3666a15 100644
--- a/app/src/main/res/layout/spinner_layout.xml
+++ b/app/src/main/res/layout/spinner_layout.xml
@@ -5,4 +5,5 @@
     android:gravity="center"
     android:padding="5dip"
     android:textColor="@color/black"
-    android:textSize="26sp" />
\ No newline at end of file
+    android:textSize="26sp"
+    android:layout_centerHorizontal="true"/>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b114af9..8d16c5c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -29,7 +29,7 @@
     <!-- settings for Notifications -->
     <string name="pref_header_notifications">Notifications</string>
 
-    <string name="pref_title_new_message_notifications">New message notifications</string>
+    <string name="pref_title_new_message_notifications">Allowing notifications</string>
 
     <string name="pref_title_ringtone">Ringtone</string>
     <string name="pref_ringtone_silent">Silent</string>
diff --git a/app/src/main/res/xml/pref_general.xml b/app/src/main/res/xml/pref_general.xml
index ba79c45..9c7c23c 100644
--- a/app/src/main/res/xml/pref_general.xml
+++ b/app/src/main/res/xml/pref_general.xml
@@ -11,6 +11,8 @@
         android:maxLines="1"
         android:selectAllOnFocus="true"
         android:singleLine="true"
+        android:digits="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890"
+        android:maxLength="9"
         android:title="@string/pref_title_display_name" />
 
 
diff --git a/app/src/main/res/xml/pref_notification.xml b/app/src/main/res/xml/pref_notification.xml
index 1a6ca7c..26cf90d 100644
--- a/app/src/main/res/xml/pref_notification.xml
+++ b/app/src/main/res/xml/pref_notification.xml
@@ -3,7 +3,7 @@
     <!-- A 'parent' preference, which enables/disables child preferences (below)
          when checked/unchecked. -->
     <SwitchPreference
-        android:defaultValue="true"
+        android:defaultValue="false"
         android:key="notifications_new_message"
         android:title="@string/pref_title_new_message_notifications" />