diff --git a/app/src/BugReport/Feedback Pausentool.ods b/app/src/BugReport/Feedback Pausentool.ods
new file mode 100644
index 0000000..2d72fb4
Binary files /dev/null and b/app/src/BugReport/Feedback Pausentool.ods differ
diff --git a/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/BreakActivity.java b/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/BreakActivity.java
index ac08e8e..023e4d8 100644
--- a/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/BreakActivity.java
+++ b/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/BreakActivity.java
@@ -88,6 +88,10 @@ public class BreakActivity extends AppCompatActivity implements View.OnClickList
 
         //Keep screen on while on break
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+
+        View view = (View) findViewById(R.id.textViewBreak);
+        onClick(view);
+
     }
 
     public void onClick(View v) {
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 4367ab5..ce1f5f6 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
@@ -1,5 +1,6 @@
 package orgprivacy_friendly_apps.secuso.privacyfriendlybreakreminder;
 
+import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.Dialog;
 import android.app.DialogFragment;
@@ -8,11 +9,13 @@ import android.app.NotificationManager;
 import android.appwidget.AppWidgetManager;
 import android.content.ComponentName;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.media.Ringtone;
 import android.media.RingtoneManager;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.CountDownTimer;
 import android.os.Vibrator;
@@ -79,6 +82,7 @@ public class BreakReminder extends AppCompatActivity
             editor.putString("exercise_value", exercises);
             editor.putString("profiles", allProfiles);
             editor.putString("current_language", Locale.getDefault().getLanguage());
+            editor.putBoolean("notifications_stayOn", true);
             editor.apply();
 
             WelcomeDialog welcomeDialog = new WelcomeDialog();
@@ -103,7 +107,6 @@ public class BreakReminder extends AppCompatActivity
             editor.apply();
         }
 
-
         System.out.println("Alle Profile: " + sharedPrefs.getString("profiles", "-1"));
 
         // If chosen, set screen to "stay on"
@@ -514,7 +517,7 @@ public class BreakReminder extends AppCompatActivity
         this.startActivity(intent);
     }
 
-    public static class WelcomeDialog extends DialogFragment {
+    public static class WelcomeDialog extends DialogFragment{
 
         @Override
         public void onAttach(Activity activity) {
@@ -530,9 +533,20 @@ public class BreakReminder extends AppCompatActivity
             builder.setView(i.inflate(R.layout.first_dialog, null));
             builder.setIcon(R.mipmap.ic_launcher);
             builder.setTitle(getActivity().getString(R.string.app_name_long));
-            builder.setPositiveButton("Ok", null);
+
+            builder.setPositiveButton(getActivity().getString(R.string.dialog_positive), null);
+            builder.setNegativeButton(getActivity().getString(R.string.tutorial_help), new DialogInterface.OnClickListener() {
+                @TargetApi(Build.VERSION_CODES.M)
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    Context context = getContext();
+                    Intent intent = new Intent(context, HelpActivity.class);
+                    context.startActivity(intent);
+                }
+            });
 
             return builder.create();
         }
+
     }
 }
diff --git a/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/DynamicListPreference.java b/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/DynamicListPreference.java
index 3210155..f628e52 100644
--- a/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/DynamicListPreference.java
+++ b/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/DynamicListPreference.java
@@ -34,6 +34,7 @@ public class DynamicListPreference extends ListPreference implements DialogInter
         setEntries(entries());
         setEntryValues(entryValues());
         setValueIndex(Integer.parseInt(sharedPreferences.getString("current_profile", "1")));
+        setPositiveButtonText(mContext.getString(R.string.dialog_positive));
         return view;
     }
 
diff --git a/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/HelpActivity.java b/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/HelpActivity.java
index 9f9bcc7..96cb85e 100644
--- a/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/HelpActivity.java
+++ b/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/HelpActivity.java
@@ -1,20 +1,79 @@
 package orgprivacy_friendly_apps.secuso.privacyfriendlybreakreminder;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
 import android.view.MenuItem;
 import android.view.View;
+import android.widget.AdapterView;
 import android.widget.ImageView;
+import android.widget.ListView;
+import android.widget.TextView;
 
 public class HelpActivity extends AppCompatActivity {
 
+    boolean isInNextView = false;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.help);
+        setContentView(R.layout.help_overview);
         setupActionBar();
 
+        final ListView lv = (ListView) findViewById(R.id.listView2);
+
+        lv.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            public void onItemClick(AdapterView<?> myAdapter, View myView, int myItemInt, long mylng) {
+                String selectedFromList =(String) (lv.getItemAtPosition(myItemInt));
+                isInNextView = true;
+
+                setContentView(R.layout.help2);
+                TextView title = (TextView)  findViewById(R.id.titleText);
+                TextView description = (TextView)  findViewById(R.id.descriptionText);
+                ImageView img = (ImageView) findViewById(R.id.img);
+
+                switch (myItemInt){
+                    case 0:
+                        img.setImageResource(R.drawable.help_start_screen);
+                        title.setText(R.string.help_start_screen_title);
+                        description.setText(R.string.help_start_screen);
+                        break;
+                    case 1:
+                        img.setImageResource(R.drawable.help_settings_screen);
+                        title.setText(R.string.help_settings_screen_title);
+                        description.setText(R.string.help_settings_screen);
+                        break;
+                    case 2:
+                        img.setImageResource(R.drawable.help_create_profile_screen);
+                        title.setText(R.string.help_settings_screen_title);
+                        description.setText(R.string.help_settings_screen1);
+                        break;
+                    case 3:
+                        img.setImageResource(R.drawable.help_notification_screen);
+                        title.setText(R.string.help_settings_screen_title);
+                        description.setText(R.string.help_settings_screen2);
+                        break;
+                    case 4:
+                        img.setImageResource(R.drawable.help_create_profile_screen);
+                        title.setText(R.string.help_create_profile_screen_title);
+                        description.setText(R.string.help_create_profile_screen);
+                        break;
+                    case 5:
+                        img.setImageResource(R.drawable.help_break_screen);
+                        title.setText(R.string.help_break_screen_title);
+                        description.setText(R.string.help_break_screen);
+                        break;
+                    case 6:
+                        title.setText(R.string.disclaimer);
+                        img.setImageResource(R.drawable.ic_help);
+                        description.setText(R.string.disclaimer);
+                        break;
+                    default:
+
+                }
+            }
+        });
     }
 
     private void setupActionBar() {
@@ -28,53 +87,22 @@ public class HelpActivity extends AppCompatActivity {
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
+
         switch (item.getItemId()) {
             // Respond to the action bar's Up/Home button
             case android.R.id.home:
+                if(isInNextView){
+                    isInNextView = false;
+                    finish();
+                    Intent intent = new Intent(this, HelpActivity.class);
+                    startActivity(intent);
+                    return true;
+                }
+
                 finish();
                 return true;
         }
         return super.onOptionsItemSelected(item);
     }
 
-    public void clickHandler(View v){
-        switch (v.getId()){
-            case R.id.imageView:
-                setContentView(R.layout.help2);
-                ImageView img = (ImageView) findViewById(R.id.img_back);
-                img.setImageResource(R.drawable.help_start_screen);
-                break;
-            case R.id.imageView1:
-                setContentView(R.layout.help2);
-                img = (ImageView) findViewById(R.id.img_back);
-                img.setImageResource(R.drawable.help_settings_screen);
-                break;
-            case R.id.imageView2:
-                setContentView(R.layout.help2);
-                img = (ImageView) findViewById(R.id.img_back);
-                img.setImageResource(R.drawable.help_create_profile_screen);
-                break;
-            case R.id.imageView3:
-                setContentView(R.layout.help2);
-                img = (ImageView) findViewById(R.id.img_back);
-                img.setImageResource(R.drawable.help_break_screen);
-                break;
-            case R.id.imageView4:
-                setContentView(R.layout.help2);
-                img = (ImageView) findViewById(R.id.img_back);
-                img.setImageResource(R.drawable.help_general_screen);
-                break;
-            case R.id.imageView5:
-                setContentView(R.layout.help2);
-                img = (ImageView) findViewById(R.id.img_back);
-                img.setImageResource(R.drawable.help_notification_screen);
-                break;
-            case R.id.img_back:
-                setContentView(R.layout.help);
-                break;
-            default:
-
-        }
-    }
-
 }
diff --git a/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/ProfileActivity.java b/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/ProfileActivity.java
index 383e37b..5e34cbe 100644
--- a/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/ProfileActivity.java
+++ b/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/ProfileActivity.java
@@ -113,6 +113,7 @@ public class ProfileActivity extends AppCompatActivity implements View.OnClickLi
                     editor.putString("profiles", sharedPrefs.getString("profiles", "") + name + "," + interval_seekbar.getProgress() + "," + break_seekbar.getProgress() + "," + cont + "," + sharedPrefs.getString("exercise_value", "-1") + ";");
                     editor.apply();
                     finish();
+                    Toast.makeText(this, R.string.new_profile_success, Toast.LENGTH_LONG).show();
                     break;
                 }
             case R.id.button_profile_cancel:
diff --git a/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/SeekBarPreference.java b/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/SeekBarPreference.java
index f45acc0..3d9c778 100644
--- a/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/SeekBarPreference.java
+++ b/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/SeekBarPreference.java
@@ -150,6 +150,7 @@ public class SeekBarPreference extends DialogPreference implements SeekBar.OnSee
         super.showDialog(state);
 
         Button positiveButton = ((AlertDialog) getDialog()).getButton(AlertDialog.BUTTON_POSITIVE);
+        positiveButton.setText(mContext.getString(R.string.dialog_positive));
         positiveButton.setOnClickListener(this);
     }
 
diff --git a/app/src/main/res/drawable/ic_about.png b/app/src/main/res/drawable/ic_about.png
new file mode 100644
index 0000000..9566045
Binary files /dev/null and b/app/src/main/res/drawable/ic_about.png differ
diff --git a/app/src/main/res/drawable/ic_help.png b/app/src/main/res/drawable/ic_help.png
new file mode 100644
index 0000000..5604621
Binary files /dev/null and b/app/src/main/res/drawable/ic_help.png differ
diff --git a/app/src/main/res/drawable/tutorial_play_button2.png b/app/src/main/res/drawable/tutorial_play_button2.png
new file mode 100644
index 0000000..ca2ed8e
Binary files /dev/null and b/app/src/main/res/drawable/tutorial_play_button2.png differ
diff --git a/app/src/main/res/layout/activity_break.xml b/app/src/main/res/layout/activity_break.xml
index 4d24fb7..7942fa6 100644
--- a/app/src/main/res/layout/activity_break.xml
+++ b/app/src/main/res/layout/activity_break.xml
@@ -18,11 +18,10 @@
     <TextView
         android:id="@+id/textViewBreak"
         android:layout_width="160dp"
-        android:layout_height="130dp"
+        android:layout_height="80dp"
         android:layout_below="@+id/break_exercise_type"
         android:layout_centerHorizontal="true"
         android:layout_marginTop="10dp"
-        android:background="@drawable/circle_black"
         android:clickable="true"
         android:enabled="true"
         android:gravity="center"
@@ -62,6 +61,7 @@
         android:id="@+id/button_next"
         style="?android:attr/buttonStyleSmall"
         android:layout_width="wrap_content"
+        android:minWidth="110dp"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
diff --git a/app/src/main/res/layout/activity_break_decider.xml b/app/src/main/res/layout/activity_break_decider.xml
index 50c9cf2..dc000d4 100644
--- a/app/src/main/res/layout/activity_break_decider.xml
+++ b/app/src/main/res/layout/activity_break_decider.xml
@@ -9,27 +9,26 @@
     <Button
         style="?android:attr/buttonStyleSmall"
         android:layout_width="wrap_content"
+        android:minWidth="140dp"
         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" />
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentEnd="true" />
 
     <Button
         style="?android:attr/buttonStyleSmall"
         android:layout_width="wrap_content"
+        android:minWidth="140dp"
         android:layout_height="wrap_content"
         android:text="@string/skip_the_break"
         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" />
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentStart="true" />
 
     <TextView
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/activity_break_no_exercises.xml b/app/src/main/res/layout/activity_break_no_exercises.xml
index a1703c1..c8eee06 100644
--- a/app/src/main/res/layout/activity_break_no_exercises.xml
+++ b/app/src/main/res/layout/activity_break_no_exercises.xml
@@ -36,6 +36,7 @@
     <Button
         android:id="@+id/button_cancel"
         android:layout_width="wrap_content"
+        android:minWidth="110dp"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
diff --git a/app/src/main/res/layout/app_widget2x1.xml b/app/src/main/res/layout/app_widget2x1.xml
index 9dd34bd..00ce699 100644
--- a/app/src/main/res/layout/app_widget2x1.xml
+++ b/app/src/main/res/layout/app_widget2x1.xml
@@ -3,7 +3,8 @@
     android:layout_height="match_parent"
     android:padding="16dp"
     android:weightSum="1"
-    android:gravity="center|center_horizontal|center_vertical">
+    android:gravity="center|center_horizontal|center_vertical"
+    android:background="@color/colorPrimary">
 
 
     <RelativeLayout
diff --git a/app/src/main/res/layout/app_widget2x2.xml b/app/src/main/res/layout/app_widget2x2.xml
index bc5f891..d725d7c 100644
--- a/app/src/main/res/layout/app_widget2x2.xml
+++ b/app/src/main/res/layout/app_widget2x2.xml
@@ -3,7 +3,8 @@
     android:layout_height="match_parent"
     android:padding="16dp"
     android:weightSum="1"
-    android:gravity="center|center_horizontal|center_vertical">
+    android:gravity="center|center_horizontal|center_vertical"
+    android:background="@color/colorPrimary">
 
 
     <RelativeLayout
diff --git a/app/src/main/res/layout/app_widget3x3.xml b/app/src/main/res/layout/app_widget3x3.xml
index de5a075..46b6c4c 100644
--- a/app/src/main/res/layout/app_widget3x3.xml
+++ b/app/src/main/res/layout/app_widget3x3.xml
@@ -3,7 +3,8 @@
     android:layout_height="match_parent"
     android:padding="16dp"
     android:weightSum="1"
-    android:gravity="center|center_horizontal|center_vertical">
+    android:gravity="center|center_horizontal|center_vertical"
+    android:background="@color/colorPrimary">
 
 
     <RelativeLayout
diff --git a/app/src/main/res/layout/app_widget4x4.xml b/app/src/main/res/layout/app_widget4x4.xml
index ce5dae0..0864610 100644
--- a/app/src/main/res/layout/app_widget4x4.xml
+++ b/app/src/main/res/layout/app_widget4x4.xml
@@ -3,7 +3,8 @@
     android:layout_height="match_parent"
     android:padding="16dp"
     android:weightSum="1"
-    android:gravity="center|center_horizontal|center_vertical">
+    android:gravity="center|center_horizontal|center_vertical"
+    android:background="@color/colorPrimary">
 
 
     <RelativeLayout
diff --git a/app/src/main/res/layout/first_dialog.xml b/app/src/main/res/layout/first_dialog.xml
index b33e974..a3228c2 100644
--- a/app/src/main/res/layout/first_dialog.xml
+++ b/app/src/main/res/layout/first_dialog.xml
@@ -16,6 +16,25 @@
             android:layout_height="wrap_content"
             android:text="@string/tutorial_description" />
 
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textStyle="bold"
+            android:text="@string/tutorial_profiles"
+            android:layout_marginTop="20dp"
+            style="@style/Base.DialogWindowTitle.AppCompat"/>
+        <ImageView
+            android:layout_width="120dp"
+            android:layout_height="120dp"
+            android:layout_gravity="center"
+            android:src="@drawable/tutorial_spinner"/>
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="@string/tutorial_profile_description"/>
+
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -45,51 +64,15 @@
                 android:layout_width="100dp"
                 android:layout_height="100dp"
                 android:layout_gravity="center"
-                android:src="@drawable/tutorial_play_button"/>
+                android:src="@drawable/tutorial_play_button2"/>
         </LinearLayout>
+
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center"
             android:text="@string/tutorial_clock_description"/>
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textStyle="bold"
-            android:text="@string/tutorial_reset"
-            android:layout_marginTop="20dp"
-            style="@style/Base.DialogWindowTitle.AppCompat"/>
-        <ImageView
-            android:layout_width="100dp"
-            android:layout_height="80dp"
-            android:layout_gravity="center"
-            android:src="@drawable/tutorial_reset_button"/>
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/tutorial_reset_description"/>
-
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textStyle="bold"
-            android:text="@string/tutorial_profiles"
-            android:layout_marginTop="20dp"
-            style="@style/Base.DialogWindowTitle.AppCompat"/>
-        <ImageView
-            android:layout_width="120dp"
-            android:layout_height="120dp"
-            android:layout_gravity="center"
-            android:src="@drawable/tutorial_spinner"/>
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/tutorial_profile_description"/>
-
 
         <TextView
             android:layout_width="wrap_content"
@@ -98,5 +81,12 @@
             android:text="@string/disclaimer"
             android:layout_marginTop="20dp"/>
 
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text=""
+            android:layout_marginTop="20dp"/>
+
     </LinearLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/help2.xml b/app/src/main/res/layout/help2.xml
index 68900c2..a2497d2 100644
--- a/app/src/main/res/layout/help2.xml
+++ b/app/src/main/res/layout/help2.xml
@@ -1,15 +1,47 @@
 <?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">
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent">
 
-
-    <ImageView
-        android:layout_width="match_parent"
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical" android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:id="@+id/img_back"
-        android:clickable="true"
-        android:onClick="clickHandler"/>
+        android:layout_margin="10dp">
 
-</LinearLayout>
\ No newline at end of file
+        <TextView
+            android:id="@+id/titleText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:text="@string/help_start_screen_title"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textSize="12pt" />
+
+        <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:id="@+id/img"
+            android:clickable="true"
+            android:layout_marginTop="5dp"/>
+
+        <TextView
+            android:id="@+id/descriptionText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/help_break_screen"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textSize="6pt"
+            android:layout_marginTop="5dp"/>
+
+        <TextView
+            android:id="@+id/voidText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text=""
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textSize="6pt"
+            android:layout_marginTop="5dp"/>
+
+    </LinearLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/help_overview.xml b/app/src/main/res/layout/help_overview.xml
new file mode 100644
index 0000000..da9c3e5
--- /dev/null
+++ b/app/src/main/res/layout/help_overview.xml
@@ -0,0 +1,13 @@
+<?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">
+
+    <ListView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/listView2"
+        android:layout_gravity="center_horizontal"
+        android:entries="@array/help_overview_strings" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/new_profile.xml b/app/src/main/res/layout/new_profile.xml
index 23bd392..f10ec64 100644
--- a/app/src/main/res/layout/new_profile.xml
+++ b/app/src/main/res/layout/new_profile.xml
@@ -98,8 +98,7 @@
             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" />
+            android:layout_alignParentEnd="true" />
 
         <TextView
             android:id="@+id/textView7"
@@ -128,9 +127,10 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/save"
-            android:layout_alignParentBottom="true"
             android:background="@drawable/button_normal"
-            android:textColor="@color/white" />
+            android:textColor="@color/white"
+            android:layout_alignParentBottom="true"
+            android:layout_alignEnd="@+id/editProfileName" />
 
         <Button
             android:id="@+id/button_profile_cancel"
@@ -140,8 +140,7 @@
             android:background="@drawable/button_normal"
             android:textColor="@color/white"
             android:layout_alignParentBottom="true"
-            android:layout_alignParentRight="true"
-            android:layout_alignParentEnd="true" />
+            android:layout_alignParentStart="true" />
 
         <TextView
             android:layout_width="wrap_content"
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 79be3a4..68547b5 100644
--- a/app/src/main/res/menu/activity_break_reminder_drawer.xml
+++ b/app/src/main/res/menu/activity_break_reminder_drawer.xml
@@ -9,6 +9,14 @@
             android:id="@+id/nav_settings"
             android:icon="@drawable/ic_menu_manage"
             android:title="@string/title_activity_settings" />
+        <item
+            android:id="@+id/nav_help"
+            android:icon="@drawable/ic_help"
+            android:title="@string/help" />
+        <item
+            android:id="@+id/nav_about"
+            android:icon="@drawable/ic_about"
+            android:title="@string/about" />
         <!--<item
             android:id="@+id/nav_statistics"
             android:icon="@drawable/drawer_statistic_logo"
@@ -16,16 +24,5 @@
             -->
     </group>
 
-    <group android:checkableBehavior="single">
-        <item android:title="@string/information">
-            <menu>
-                <item
-                    android:id="@+id/nav_help"
-                    android:title="@string/help" />
-                <item
-                    android:id="@+id/nav_about"
-                    android:title="@string/about" />
-            </menu>
-        </item>
-    </group>
+
 </menu>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 84efb57..42b3a9a 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -21,7 +21,7 @@
     <string name="help_break_screen">1. Körperbereich ihrer aktuellen Übung.\n2. Die Uhr zeigt die verbleibende Zeit für die Pause an. Beim Klicken darauf startet oder hält die Zeit an.\n3. Zeigt der Bildschirm den Schriftzug \'Pause\' an, befindet man sich in einer 10Sek Pause. Dabei sieht man ein Vorschaubild der kommenden Übung. Sollte \'Seite 1/2\' oder \'Wiederholung 1/2\' angezeigt werden, soll die gezeigte und beschriebene Übung ausgeführt werden.\n4. Erläuterung der Ausgangslage.\n5. Beschreibung der Übung </string>
     <string name="help_break_screen_title">Pausenbildschirm</string>
     <string name="help_click_information">Um die Bilder in voller Größe zu betrachten, klicken sie auf die Bilder. Um die Bilder auf ursprüngliche Größe zu verkleinern, klicken Sie erneut auf das Bild!</string>
-    <string name="help_create_profile_screen">1. Wähle den Namen des Profils aus.\n2. Wählen Sie einen Arbeitsintervall aus.\n3. Wählen Sie eine Pausenlänge aus.\n4. Drücken Sie auf \'Auswählen\', um für Sie passende Übung auszuwählen. Sollten Sie keine Übungen in ihre Pause wünschen, ignorieren Sie diesen Knopf.\n5. Falls Sie diese Option auswählen, können Sie die Pause nicht überspringen.</string>
+    <string name="help_create_profile_screen">1. Wähle den Namen des Profils aus.\n2. Wählen Sie ihre Arbeitsdauer aus.\n3. Wählen Sie eine Pausenlänge aus.\n4. Drücken Sie auf \'Auswählen\', um für Sie passende Übung auszuwählen. Sollten Sie keine Übungen in ihre Pause wünschen, ignorieren Sie diesen Knopf.\n5. Falls Sie diese Option auswählen, können Sie die Pause nicht überspringen.</string>
     <string name="help_create_profile_screen_title">Erstellen eines neuen Profil Bildschirms</string>
     <string name="help_settings_screen">1. Öffnen Sie das Seitenmenü oben links und wählen Sie \'Einstellungen\' aus.\n2. Wählen Sie \'Allgemein\' aus, um die Einstellungen des Profils zu öffnen.\n3. Wählen Sie \'Benachrichtigungen\' aus, um die Benachrichtigungen ein- oder auszuschalten.</string>
     <string name="help_settings_screen1">1. Wählen Sie das zu ändernde Profil aus.\n2. Geben Sie den neuen Namen ein.\n3. Ändern des Arbeitsinvalls.\n4. Ändern der Pausenzeit.\n5. Wählen Sie \'Kontinuierlich\' aus, falls Sie die Pause nicht überspringen wollen.\n6. Wählen Sie die Körperbereiche aus, die Sie in der Pause ansprechen wollen.</string>
@@ -31,25 +31,25 @@
     <string name="help_settings_screen_title">Einstellungsbildschirm</string>
     <string name="help_start_screen">1. Klicken Sie auf die Fläche, um die Profile einzusehen und auszuwählen.\n2. Die Uhr zeigt die Zeit an und fungiert als Knopf, der die Zeit starten und stoppen kann.\n3. Der Knopf startet und stopt die Zeit.\n4. Der Knopf setzt die Zeit zurück.</string>
     <string name="information">Information</string>
-    <string name="interval">Intervall</string>
+    <string name="interval">Arbeitszeit</string>
     <string name="disclaimer">DISCLAIMER Platzhalter</string>
     <string name="more_info">Mehr Information finden Sie hier:</string>
     <string name="navigation_drawer_close"></string>
     <string name="new_profile_break">Pause</string>
-    <string name="new_profile_continuously">Kontinuierlich</string>
+    <string name="new_profile_continuously">Pause automatisch starten</string>
     <string name="new_profile_doubleName">Geben Sie einen anderen Namen ein! Es existiert schon ein Profil mit demselben Namen!</string>
     <string name="new_profile_emptyName">Bitte geben Sie einen Namen für das Profil ein!</string>
     <string name="new_profile_select">Auswählen</string>
     <string name="pref_current_exercises">Auswahl der Übungen</string>
     <string name="pref_current_profile">Auswahl des Profils</string>
     <string name="pref_default_display_name">Zufall</string>
-    <string name="pref_header_general">Allgemein</string>
+    <string name="pref_header_general">Profile Bearbeiten</string>
     <string name="pref_header_notifications">Benachrichtigungen</string>
     <string name="pref_ringtone_silent">Lautlos</string>
     <string name="pref_title_display_name">Profil Name</string>
     <string name="pref_title_stayOn">Bildschirm bleibt an</string>
     <string name="pref_title_ringtone">Klingelton</string>
-    <string name="tutorial_profile_description">Beim Klicken auf das aktuell ausgewählte Profils (\'Zufall\'), werden alle verfügbare Profile angezeigt.\n Sie können ein neues Profil durch das Klicken auf \'Neues Profil...\' erstellen.\n Die verfügbaren Profile können Sie in den Einstellungen ändern.</string>
+    <string name="tutorial_profile_description">Beim Klicken auf das aktuell ausgewählte Profils (\'Zufall\'), werden alle verfügbare Profile angezeigt.\n Sie können ein neues Profil durch das Klicken auf \'Neues Profil...\' erstellen.\n Die verfügbaren Profile können Sie in den Einstellungen ändern.\nAm Anfange existieren 3 voreingestellte Profile</string>
     <string name="tutorial_clock_description">Beim Klicken auf eins der beiden Symbole, startet die Uhr oder hält diese an</string>
     <string name="pref_title_timeLeft">Verbleibende Zeit</string>
     <string name="pref_title_vibrate">Vibration</string>
@@ -57,11 +57,11 @@
     <string name="privacy_friendly">Diese Applikation gehört der Privacy Friendly Apps.</string>
     <string name="save">Speichern</string>
     <string name="settings_break_summary">Derzeitiger Wert ist $1</string>
-    <string name="settings_dialog_message">Wählen Sie ihren Arbeitsintevall aus</string>
+    <string name="settings_dialog_message">Wählen Sie ihre Arbeitszeit aus</string>
     <string name="settings_break_title">Wählen Sie ihre Pausenzeit aus</string>
     <string name="settings_doubleName">Die Änderungen konnten nicht gespeichert werden, da das dieser Profilname bereits existiert!</string>
     <string name="settings_emptyName">Die Änderungen konnten nicht gespeichert werden, da das Feld für den Profilnamen leer ist! </string>
-    <string name="settings_title">Wählen Sie ihren Arbeitsintervall aus</string>
+    <string name="settings_title">Wählen Sie ihren Arbeitszeit aus</string>
     <string name="settings_summary">Derzeitiger Wert ist $1</string>
     <string name="settings_unit">Minuten</string>
     <string name="skip_the_break">Überspringen</string>
@@ -84,7 +84,22 @@
         <item>Becken</item>
         <item>Beine</item>
     </string-array>
+
+    <string-array name="help_overview_strings">
+        <item>Startbildschirm</item>
+        <item>Einstellungen - Übersicht</item>
+        <item>Einstellungen - Profile Settings</item>
+        <item>Einstellungen - Benachrichtigungen</item>
+        <item>Neues Profil Bildschirm</item>
+        <item>Pausenbildschirm</item>
+        <item>Haftungsausschluss</item>
+    </string-array>
+
     <string name="new_profile">Neues Profil...</string>
     <string name="statistics">Statistik</string>
     <string name="all_exercises">Arme.Beine.Kopf.Nacken.Becken.Wirbelsäule.Rumpf.</string>
+    <string name="about">Über</string>
+    <string name="tutorial_help">Hilfe öffnen</string>
+    <string name="dialog_positive">Okay</string>
+    <string name="new_profile_success">Übungen wurden erfolgreich erstellt!</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 6f3440f..7f97c5e 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -22,18 +22,18 @@
     <string name="help">Aide</string>
     <string name="help_break_screen_title">Écran: pause</string>
     <string name="information">Information</string>
-    <string name="interval">Intervalle</string>
+    <string name="interval">Temps de travail</string>
     <string name="more_info">Plus d\'informations peuvent être trouvées ici:</string>
     <string name="new_profile">Nouveau profil...</string>
     <string name="new_profile_break">Pause</string>
-    <string name="new_profile_continuously">Continuellement</string>
+    <string name="new_profile_continuously">Démarrer la pause automatiquement </string>
     <string name="new_profile_select">Sélectionner</string>
     <string name="new_profile_emptyName">S\'il vous plaît entrer un nom pour le profil!</string>
     <string name="new_profile_doubleName">Entrez un autre nom, il existe déjà un profil avec le même nom!</string>
     <string name="pref_current_exercises">Choisissez des exercices</string>
     <string name="pref_current_profile">Choisissez un profil</string>
     <string name="pref_default_display_name">Hasard</string>
-    <string name="pref_header_general">Général</string>
+    <string name="pref_header_general">Modifier les profils</string>
     <string name="pref_header_notifications">Notifications</string>
     <string name="pref_ringtone_silent">Silencieux</string>
     <string name="pref_title_display_name">Nom du profil</string>
@@ -46,11 +46,11 @@
     <string name="save">Sauvegarder</string>
     <string name="settings_break_summary">La valeur actuelle est $1</string>
     <string name="settings_break_title">Sélectionnez votre temps de pause</string>
-    <string name="settings_dialog_message">Sélectionnez votre intervalle de travail</string>
+    <string name="settings_dialog_message">Sélectionnez votre temps de travail</string>
     <string name="settings_doubleName">Les changements ne pouvaient être appliquées car il existe déjà un profil avec le même nom!</string>
     <string name="settings_emptyName">Les changements ne pouvaient être appliquées parce que le nom du profil était vide!</string>
     <string name="settings_summary">La valeur actuelle est de $1</string>
-    <string name="settings_title">Sélectionnez votre intervalle de travail</string>
+    <string name="settings_title">Sélectionnez votre temps de travail</string>
     <string name="settings_unit">Minutes</string>
     <string name="skip_the_break">Passer la pause</string>
     <string name="statistics">Statistiques</string>
@@ -59,7 +59,7 @@
     <string name="tutorial_clock">Démarrer/Arrêter l\'horloge</string>
     <string name="tutorial_clock_description">En appuyant sur l\'un d\'eux, l\'horloge démarre ou s\'arrête</string>
     <string name="tutorial_or">ou</string>
-    <string name="tutorial_profile_description">En cliquant sur le profil actuel (\'Hasard\'), vous pouvez voir tous les profils actuellement disponibles. \n Vous pouvez ajouter de nouveaux profils en cliquant sur \'Nouveaux profils ...\' et modifier les profils actuels dans les paramètres</string>
+    <string name="tutorial_profile_description">En cliquant sur le profil actuel (\'Hasard\'), vous pouvez voir tous les profils actuellement disponibles. \n Vous pouvez ajouter de nouveaux profils en cliquant sur \'Nouveaux profils ...\' et modifier les profils actuels dans les paramètres\nAu début, il y aura 3 profils prédéfinis</string>
     <string name="tutorial_profiles">Sélectionnez le profil</string>
     <string name="tutorial_reset">Réinitialiser l\'horloge</string>
     <string name="tutorial_reset_description">Appuyez sur le bouton pour réinitialiser l\'horloge</string>
@@ -77,15 +77,30 @@
         <item>Bassin</item>
         <item>Jambes</item>
     </string-array>
+
+    <string-array name="help_overview_strings">
+        <item>Ècran principal</item>
+        <item>Écran: paramètre - Aperçu</item>
+        <item>Écran: paramètre - Paramètres de profil</item>
+        <item>Écran: paramètre - Notification</item>
+        <item>Écran: Créer un nouveau profil</item>
+        <item>Écran: pause</item>
+        <item>Désistement</item>
+    </string-array>
+
     <string name="standard_profile">Hasard,90,5,false,Bras.Jambes.Tête.Nuque.Bassin.Colonne vertébrale.Torse.;HautDuCorps,90,15,true,Bras.Nuque.Tête.;Torse,30,5,true,Colonne vertébrale.Torse.;BasDuCorps,30,5,true,Jambes.Bassin.;</string>
     <string name="tutorial_description">Bienvenue au Privacy Friendly Break Reminder</string>
     <string name="all_exercises">Jambes.Bras.Bassin.Colonne vertébrale.Torse.Nuque.Tête.</string>
-    <string name="help_create_profile_screen">1. Choisissez le nom du profil\n2. Choisissez la valeur de votre intervalle de travail\n3. Choisissez le temps de la pause de ce profil\n4. Appuyez sur ‘sélectionner’, si vous voulez entrer dans l\'écran d\'exercice pour sélectionner les groupes musculaires pour l’entrainement de votre profil. Ignorer la touche, si vous ne voulez pas d’entrainement sur ce profil.\n5. Cocher la case si vous voulez prendre les pauses directement. Décochez là, si vous voulez choisir à chaque fois si vous voulez prendre la pause.</string>
+    <string name="help_create_profile_screen">1. Choisissez le nom du profil\n2. Choisissez la durée de votre travail\n3. Choisissez le temps de la pause de ce profil\n4. Appuyez sur ‘sélectionner’, si vous voulez entrer dans l\'écran d\'exercice pour sélectionner les groupes musculaires pour l’entrainement de votre profil. Ignorer la touche, si vous ne voulez pas d’entrainement sur ce profil.\n5. Cocher la case si vous voulez prendre les pauses directement. Décochez là, si vous voulez choisir à chaque fois si vous voulez prendre la pause.</string>
     <string name="help_create_profile_screen_title">Écran: Créer un nouveau profil</string>
     <string name="help_settings_screen_title">Écran: paramètre</string>
     <string name="help_settings_screen">1. Ouvrez le tiroir de navigation et sélectionnez ‘Paramètres’\n2. Sélectionnez ‘Général’ pour entrer les paramètres du profil. Là, vous pouvez modifier le nom, le temps et les exercices du profil. \n3. Sélectionnez \'Notifications\' pour activer ou désactiver les notifications.</string>
     <string name="help_settings_screen1">1. Choisissez le profil pour changer\n2. Entrez le nouveau nom \n3. Modifiez le temps de travail \n4. Modifiez le temps de pause \n5. Vous pouvez choisir d\'activer le bouton \'continuellement\'. Dans ce cas, vous êtes obligé de prendre la pause. Si non, vous aurez l\'option de prendrela pause ou de passer directement aux exercises suivants.\n6. Choisissez les groupes musculaires que vous souhaitez entrainer durant les pauses.</string>
     <string name="help_settings_screen2">1. Sélectionnez une sonnerie.\n2. Choisissez si votre mobile doit vibrer lorsque l’horloge arrive à zéro. \n3. Choisissez si vous souhaitez des notifications sous forme de messages.\n4. Si le bouton est activé, l\'écran reste allumé quand vous êtes sur l\'écran principal.</string>
     <string name="help_start_screen">1. Zone pour sélectionner le profil \n2. L\'horloge affiche l\'heure et est cliquable. Elle commence et peut arrêter le temps.\n3. Ce bouton démarre et arrête le temps. \n4. Ce Bouton remet le temps</string>
+    <string name="about">Sur</string>
+    <string name="tutorial_help">Voir l\'aide</string>
+    <string name="dialog_positive">D\'accord</string>
+    <string name="new_profile_success">Exercices créé avec succès!</string>
 
 </resources>
\ 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 098129c..369b2a8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -11,17 +11,17 @@
 
     <!-- General settings -->
     <!-- Strings for the Interval-Slider -->
-    <string name="settings_dialog_message">Select your work interval</string>
+    <string name="settings_dialog_message">Select your work time</string>
     <string name="settings_summary">Current value is $1</string>
     <string name="settings_unit">Minutes</string>
-    <string name="settings_title">Select your work interval</string>
+    <string name="settings_title">Select your work time</string>
 
     <!-- Strings for the Break-Slider -->
     <string name="settings_break_summary">Current value is $1</string>
     <string name="settings_break_title">Select your break time</string>
 
     <!-- Strings for Name -->
-    <string name="pref_header_general">General</string>
+    <string name="pref_header_general">Edit Profiles</string>
     <string name="pref_title_display_name">Profile name</string>
     <string name="pref_default_display_name">Random</string>
     <string name="pref_current_profile">Select profile</string>
@@ -50,7 +50,7 @@
     <string name="save">Save</string>
     <string name="cancel">Cancel</string>
     <string name="profile_name">Profile Name</string>
-    <string name="interval">Interval</string>
+    <string name="interval">Work-Time</string>
 
     <!-- settings for BreakDeciderActivity -->
     <string name="take_the_break">Take the Break</string>
@@ -64,14 +64,14 @@
     <!--settings for ProfileActivity -->
     <string name="new_profile_break">Break</string>
     <string name="new_profile_select">Select</string>
-    <string name="new_profile_continuously">Continuously</string>
+    <string name="new_profile_continuously">Start pause automatically</string>
     <string name="new_profile_emptyName">Please enter a name for the profile!</string>
     <string name="new_profile_doubleName">Enter another name, there is already a profile with the same name!</string>
     <string name="continuously">If checked, there will be no possibility to skip the break</string>
     <string name="exercise_description">Make sure to select some exercises! If nothing is selected, there will be no exercises in the break!</string>
 
     <!-- settings for AboutActivity -->
-    <string name="about" translatable="false">About</string>
+    <string name="about">About</string>
     <string name="app_name_long" translatable="false">Privacy Friendly Break Reminder</string>
     <string name="version_number" translatable="false">v1.0</string>
     <string name="about_author">Authors of the App:</string>
@@ -102,6 +102,16 @@
         <item>6</item>
     </string-array>
 
+    <string-array name="help_overview_strings">
+        <item>Main Screen</item>
+        <item>Settings Screen - Overview</item>
+        <item>Settings Screen - Profile Settings</item>
+        <item>Settings Screen - Notification</item>
+        <item>New Profile Screen</item>
+        <item>Break Screen</item>
+        <item>Disclaimer</item>
+    </string-array>
+
     <!-- settings for BreakActivity -->
     <string name="_10_00" translatable="false">10:00</string>
     <string name="break_next" translatable="false">Next</string>
@@ -121,7 +131,7 @@
     <string name="help_settings_screen2">1. Select a ringtone. \n2. Choose if the mobile phone should vibrate, when the countdown ends. \n3. Choose if you want message notifications.\n4. If the flag is set the screen will stay on, while on main screen.</string>
     <string name="help_settings_screen1">1. Choose the profile to change \n2. Enter the new name \n3. Alter the working time \n4. Alter the break time \n5. Choose if the \'Continuously\' flag is set or not. If it is, the break will start directly. If not, you can choose to take or to skip it. \n6. Choose the sections you want to train in the breaks.</string>
     <string name="help_settings_screen_title">Settings Screen</string>
-    <string name="help_create_profile_screen">1. Choose the name of the profile \n2. Choose the time of your work-interval \n3. Choose the break-time of this profile \n4. Press on \'Select\', if you want to enter the exercise screen to select the training region of your profile. Ignore it, if you don\'t want to train on this profile. \n5. Check it if you want to take the break directly. Uncheck it, if you want to decide every time if you\'ll take the break. </string>
+    <string name="help_create_profile_screen">1. Choose the name of the profile \n2. Choose your work-time\n3. Choose the break-time of this profile \n4. Press on \'Select\', if you want to enter the exercise screen to select the training region of your profile. Ignore it, if you don\'t want to train on this profile. \n5. Check it if you want to take the break directly. Uncheck it, if you want to decide every time if you\'ll take the break.</string>
     <string name="help_create_profile_screen_title">Create New Profile Screen</string>
     <string name="help_break_screen_title">Break Screen</string>
     <string name="help_break_screen">1. Body section for your current exercise. \n2. Clock shows remaining time for the break. If you click on it, it starts or stops.\n3. If it shows \'Break\', it means you have currently break between the exercises and you see the image for the next exercise. If it shows \'Side left or Side right\' then you have to perform the exercise as shown in the picture. If it shows \'Repetition\' then you just repeat current exercise.\n4. Explanation of how the exercise should be performed.\n5. Description of current exercise.</string>
@@ -136,12 +146,14 @@
     <string name="tutorial_reset">Reset the clock</string>
     <string name="tutorial_clock_description">By pressing one of them, the clock starts or stops</string>
     <string name="tutorial_or">or</string>
-    <string name="tutorial_profile_description">By clicking on the current profile (\'Random\'), you will see all the currently available profiles. \nYou can add new profiles by clicking on \'New Profiles...\' and edit the current ones in the settings</string>
+    <string name="tutorial_profile_description">By clicking on the current profile (\'Random\'), you will see all the currently available profiles. \nYou can add new profiles by clicking on \'New Profiles...\' and edit the current ones in the settings\nIn the beginning there will be 3 predefined profiles</string>
     <string name="tutorial_clock">Start/Stop the clock</string>
     <string name="tutorial_description">Welcome to the Privacy Friendly Break Reminder</string>
     <string name="pref_current_profile_value" translatable="false">0</string>
+    <string name="tutorial_help">View Help</string>
 
     <string name="all_exercises">Legs.Arms.Pelvis.Spinal Column.Torso.Neck.Head.</string>
-
+    <string name="dialog_positive">Okay</string>
+    <string name="new_profile_success">Exercises successfully created!</string>
 
 </resources>
diff --git a/app/src/main/res/xml/pref_general.xml b/app/src/main/res/xml/pref_general.xml
index 799dd38..95d499b 100644
--- a/app/src/main/res/xml/pref_general.xml
+++ b/app/src/main/res/xml/pref_general.xml
@@ -19,7 +19,8 @@
         android:maxLines="1"
         android:selectAllOnFocus="true"
         android:singleLine="true"
-        android:title="@string/pref_title_display_name" />
+        android:title="@string/pref_title_display_name"
+        android:positiveButtonText="@string/dialog_positive"/>
 
 
     <orgprivacy_friendly_apps.secuso.privacyfriendlybreakreminder.SeekBarPreference
@@ -49,7 +50,8 @@
         android:defaultValue="1"
         android:entries="@array/type_spinner"
         android:entryValues="@array/value_spinner"
-        android:title="@string/pref_current_exercises" />
+        android:title="@string/pref_current_exercises"
+        android:positiveButtonText="@string/dialog_positive"/>
 
 
 </PreferenceScreen><!--android:key="exercise"-->
diff --git a/app/src/main/res/xml/pref_notification.xml b/app/src/main/res/xml/pref_notification.xml
index d449fc4..f61bed4 100644
--- a/app/src/main/res/xml/pref_notification.xml
+++ b/app/src/main/res/xml/pref_notification.xml
@@ -23,7 +23,7 @@
 
 
     <SwitchPreference
-        android:defaultValue="false"
+        android:defaultValue="true"
         android:key="notifications_stayOn"
         android:title="@string/pref_title_stayOn" />