diff --git a/ZPI1/AndroidManifest.xml b/ZPI1/AndroidManifest.xml
index 8ae35ff..e0bc73d 100644
--- a/ZPI1/AndroidManifest.xml
+++ b/ZPI1/AndroidManifest.xml
@@ -50,6 +50,11 @@
             android:configChanges="orientation"
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
+        <activity
+            android:name=".ActivityNoMapActivity"
+            android:configChanges="orientation"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait" />
         <activity
             android:name=".HistoryActivity"
             android:configChanges="orientation"
diff --git a/ZPI1/libs/libGoogleAnalyticsServices.jar b/ZPI1/libs/libGoogleAnalyticsServices.jar
new file mode 100644
index 0000000..b7aac9f
Binary files /dev/null and b/ZPI1/libs/libGoogleAnalyticsServices.jar differ
diff --git a/ZPI1/map_icon-web.png b/ZPI1/map_icon-web.png
new file mode 100644
index 0000000..e63b80c
Binary files /dev/null and b/ZPI1/map_icon-web.png differ
diff --git a/ZPI1/res/drawable-hdpi/map_icon.png b/ZPI1/res/drawable-hdpi/map_icon.png
new file mode 100644
index 0000000..fc1aec1
Binary files /dev/null and b/ZPI1/res/drawable-hdpi/map_icon.png differ
diff --git a/ZPI1/res/drawable-mdpi/map_icon.png b/ZPI1/res/drawable-mdpi/map_icon.png
new file mode 100644
index 0000000..0214e6d
Binary files /dev/null and b/ZPI1/res/drawable-mdpi/map_icon.png differ
diff --git a/ZPI1/res/drawable-xhdpi/map_icon.png b/ZPI1/res/drawable-xhdpi/map_icon.png
new file mode 100644
index 0000000..7a1228c
Binary files /dev/null and b/ZPI1/res/drawable-xhdpi/map_icon.png differ
diff --git a/ZPI1/res/drawable-xxhdpi/map_icon.png b/ZPI1/res/drawable-xxhdpi/map_icon.png
new file mode 100644
index 0000000..82be84e
Binary files /dev/null and b/ZPI1/res/drawable-xxhdpi/map_icon.png differ
diff --git a/ZPI1/res/layout/activity_activity_buttons_and_display.xml b/ZPI1/res/layout/activity_activity_buttons_and_display.xml
index d19ed4f..b05c96f 100644
--- a/ZPI1/res/layout/activity_activity_buttons_and_display.xml
+++ b/ZPI1/res/layout/activity_activity_buttons_and_display.xml
@@ -245,5 +245,13 @@
         android:layout_marginBottom="@dimen/very_small_margin"
         android:background="@color/activity_blue"
         android:src="@drawable/ic_gps_arrow" />
+
+	<ImageButton
+	    android:id="@+id/imageButtonGoToActivityNoMap"
+	    android:layout_width="wrap_content"
+	    android:layout_height="wrap_content"
+	    android:layout_alignParentRight="true"
+	    android:layout_centerVertical="true"
+	    android:src="@drawable/activity_button_background" />
      
 </RelativeLayout>
\ No newline at end of file
diff --git a/ZPI1/res/layout/activity_nomap_activity.xml b/ZPI1/res/layout/activity_nomap_activity.xml
new file mode 100644
index 0000000..ce82266
--- /dev/null
+++ b/ZPI1/res/layout/activity_nomap_activity.xml
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:gps="http://schemas.android.com/apk/res/com.pwr.zpi"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+
+    <ImageButton
+        android:id="@+id/imageButtonGoToActivityActivity"
+        android:layout_width="@dimen/activity_button_size"
+        android:layout_height="0dp"
+        android:layout_alignBottom="@+id/linearLayoutNoMapField3_4"
+        android:layout_alignParentLeft="true"
+        android:layout_alignTop="@+id/linearLayoutNoMapField3_4"
+        android:layout_margin="@dimen/very_small_margin"
+        android:background="@color/activity_blue"
+        android:src="@drawable/map_icon" />
+
+    <LinearLayout
+        android:id="@+id/linearLayoutNoMapField1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_above="@+id/linearLayoutNoMapField2" >
+
+        <include
+            android:id="@+id/layoutNoMapField1"
+            layout="@layout/big_data_field" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/linearLayoutNoMapField2"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_above="@id/linearLayoutNoMapField3_4" >
+
+        <include
+            android:id="@+id/layoutNoMapField2"
+            layout="@layout/big_data_field" />
+    </LinearLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+    </View>
+ <!-- Z jakiegoś powodu bez tego nie działa.... -->
+
+    <LinearLayout
+        android:id="@+id/linearLayoutNoMapField3_4"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_toRightOf="@id/imageButtonGoToActivityActivity"
+        android:orientation="vertical" >
+
+        <include
+            android:id="@+id/layoutNoMapField3"
+            layout="@layout/big_data_field" />
+
+        <include
+            android:id="@+id/layoutNoMapField4"
+            layout="@layout/big_data_field" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/linearLayoutGPSBar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_above="@+id/linearLayoutNoMapStartStop"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentRight="true"
+        android:background="@color/activity_blue"
+        android:paddingLeft="@dimen/buttons_padding" >
+
+        <TextView
+            android:id="@+id/TextViewGPSAccuracy"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/gps_accuracy"
+            android:textColor="@color/white" />
+
+        <com.pwr.zpi.views.GPSSignalDisplayer
+            android:id="@+id/gpsDisplayerNoMapActivity"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            gps:displayType="narrow" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/linearLayoutNoMapStartStop"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentRight="true"
+        android:layout_marginBottom="@dimen/activity_vertical_margin" >
+
+        <Button
+            android:id="@+id/buttonNoMapPause"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="@dimen/very_small_margin"
+            android:layout_marginTop="@dimen/small_margin"
+            android:layout_weight="1"
+            android:background="@color/activity_blue"
+            android:clickable="false"
+            android:padding="@dimen/buttons_padding"
+            android:text="@string/pause"
+            android:textColor="@color/white" />
+
+        <Button
+            android:id="@+id/buttonNoMapStop"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/very_small_margin"
+            android:layout_marginTop="@dimen/small_margin"
+            android:layout_weight="1"
+            android:background="@color/activity_blue"
+            android:clickable="false"
+            android:padding="@dimen/buttons_padding"
+            android:text="@string/stop"
+            android:textColor="@color/white" />
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/buttonNoMapResume"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_marginBottom="@dimen/activity_horizontal_margin"
+        android:layout_marginTop="@dimen/small_margin"
+        android:background="@color/activity_blue"
+        android:padding="@dimen/buttons_padding"
+        android:text="@string/resume"
+        android:textColor="@color/white"
+        android:visibility="gone" />
+
+    <TextView
+        android:id="@+id/textViewActivityNoMapCountDown"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_centerVertical="true"
+        android:textColor="@color/count_down_timer_color"
+        android:textSize="@dimen/count_down_timer_size" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/ZPI1/res/layout/big_data_field.xml b/ZPI1/res/layout/big_data_field.xml
new file mode 100644
index 0000000..8c0066b
--- /dev/null
+++ b/ZPI1/res/layout/big_data_field.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content" >
+
+    <RelativeLayout
+        android:id="@+id/relativeLayoutNoMapField1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/very_small_margin"
+        android:layout_marginLeft="@dimen/very_small_margin"
+        android:layout_marginRight="@dimen/very_small_margin"
+        android:layout_marginTop="@dimen/very_small_margin"
+        android:background="@color/activity_blue" >
+
+        <TextView
+            android:id="@+id/textViewNoMapField1Discription"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentTop="true"
+            android:layout_marginLeft="@dimen/buttons_padding"
+            android:text="@string/time"
+            android:textColor="@color/white"
+            android:textSize="@dimen/medium_text_size" />
+
+        <TextView
+            android:id="@+id/textViewNoMapField1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignLeft="@+id/textViewNoMapField1Discription"
+            android:layout_below="@+id/textViewNoMapField1Discription"
+            android:layout_toLeftOf="@+id/textViewNoMapField1Unit"
+            android:gravity="center"
+            android:text="00:00:00 "
+            android:textColor="@color/white"
+            android:textSize="@dimen/bigger_text_size" />
+
+        <TextView
+            android:id="@+id/textViewNoMapField1Unit"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignBottom="@+id/textViewNoMapField1"
+            android:layout_alignParentRight="true"
+            android:layout_alignTop="@+id/textViewNoMapField1"
+            android:gravity="bottom"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="@color/white" />
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_alignBottom="@+id/textViewNoMapField1Discription"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentTop="true"
+            android:layout_alignTop="@+id/textViewNoMapField1Discription"
+            android:scaleType="fitEnd"
+            android:src="@drawable/down_arrow" />
+    </RelativeLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/ZPI1/res/layout/change_name_dialog.xml b/ZPI1/res/layout/change_name_dialog.xml
new file mode 100644
index 0000000..5721648
--- /dev/null
+++ b/ZPI1/res/layout/change_name_dialog.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <EditText
+        android:id="@+id/editTextChangeNameEditText"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:ems="10" >
+
+        <requestFocus />
+    </EditText>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/activity_vertical_margin" >
+
+        <Button
+            android:id="@+id/buttonChangeNameDialogOkButton"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:background="@drawable/workouts_white_button_background"
+            android:padding="@dimen/buttons_bigger_padding"
+            android:text="@string/ok_caps"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:textColor="@color/main_color"
+            android:textSize="@dimen/large_text_size"
+            android:textStyle="bold" />
+
+        <Button
+            android:id="@+id/buttonChangeNameDialogCancelButton"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:background="@drawable/workouts_white_button_background"
+            android:padding="@dimen/buttons_bigger_padding"
+            android:text="@string/cancel_caps"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:textColor="@color/main_color"
+            android:textSize="@dimen/large_text_size"
+            android:textStyle="bold" />
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/ZPI1/res/layout/chart_activity.xml b/ZPI1/res/layout/chart_activity.xml
index bb00f77..3120378 100644
--- a/ZPI1/res/layout/chart_activity.xml
+++ b/ZPI1/res/layout/chart_activity.xml
@@ -42,8 +42,8 @@
             chartview:gridLineColor="#E5E5E5"
             chartview:gridLineWidth="1dp"
             chartview:gridLinesHorizontal="5"
-            chartview:gridLinesVertical="5"
-            chartview:leftLabelWidth="40dp" />
+            chartview:gridLinesVertical="4"
+            chartview:leftLabelWidth="50dp" />
 
         <RelativeLayout
             android:id="@+id/progressBarSpeed"
@@ -82,8 +82,8 @@
             chartview:gridLineColor="#E5E5E5"
             chartview:gridLineWidth="1dp"
             chartview:gridLinesHorizontal="5"
-            chartview:gridLinesVertical="5"
-            chartview:leftLabelWidth="40dp" />
+            chartview:gridLinesVertical="4"
+            chartview:leftLabelWidth="50dp" />
 
         <RelativeLayout
             android:id="@+id/progressBarAltitude"
diff --git a/ZPI1/res/layout/generate_repeats_dialog.xml b/ZPI1/res/layout/generate_repeats_dialog.xml
new file mode 100644
index 0000000..fac4dc0
--- /dev/null
+++ b/ZPI1/res/layout/generate_repeats_dialog.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res/com.pwr.zpi"
+    android:id="@+id/LinearLayout1"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/gray_background"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/activity_bigger_vertical_margin"
+        android:layout_marginLeft="@dimen/activity_bigger_vertical_margin"
+        android:layout_marginRight="@dimen/activity_bigger_vertical_margin" >
+
+        <TextView
+            android:id="@+id/textViewRepeatsDialogFirstAction"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@android:color/black"
+            android:text="@string/from_action"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <com.pwr.zpi.views.CustomPicker
+            android:id="@+id/customPickerRepeatsDialogFirstAction"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="right"
+            app:minValue="1"
+            app:orientation="horizontal" >
+        </com.pwr.zpi.views.CustomPicker>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/activity_bigger_vertical_margin"
+        android:layout_marginRight="@dimen/activity_bigger_vertical_margin" >
+
+        <TextView
+            android:id="@+id/textViewRepeatsDialogSecondAction"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/to_action"
+            android:textColor="@android:color/black"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <com.pwr.zpi.views.CustomPicker
+            android:id="@+id/customPickerRepeatsDialogSecondAction"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="right"
+            app:minValue="1"
+            app:orientation="horizontal" >
+        </com.pwr.zpi.views.CustomPicker>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/activity_bigger_vertical_margin"
+        android:layout_marginRight="@dimen/activity_bigger_vertical_margin" >
+
+        <TextView
+            android:id="@+id/textViewRepeatsDialogRepeats"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/how_many_times"
+            android:textColor="@android:color/black"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <com.pwr.zpi.views.CustomPicker
+            android:id="@+id/customPickerRepeatsDialogRepeats"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="right"
+            app:maxValue="99"
+            app:minValue="1"
+            app:orientation="horizontal" >
+        </com.pwr.zpi.views.CustomPicker>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/activity_vertical_margin" >
+
+        <Button
+            android:id="@+id/buttonRepeatsDialogOkButton"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:background="@drawable/workouts_white_button_background"
+            android:padding="@dimen/buttons_bigger_padding"
+            android:text="@string/ok_caps"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:textColor="@color/main_color"
+            android:textSize="@dimen/large_text_size"
+            android:textStyle="bold" />
+
+        <Button
+            android:id="@+id/buttonRepeatsDialogCancelButton"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:background="@drawable/workouts_white_button_background"
+            android:padding="@dimen/buttons_bigger_padding"
+            android:text="@string/cancel_caps"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:textColor="@color/main_color"
+            android:textSize="@dimen/large_text_size"
+            android:textStyle="bold" />
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/ZPI1/res/layout/new_workout_footer.xml b/ZPI1/res/layout/new_workout_footer.xml
index bfbc40c..a55e647 100644
--- a/ZPI1/res/layout/new_workout_footer.xml
+++ b/ZPI1/res/layout/new_workout_footer.xml
@@ -94,56 +94,27 @@
             android:layout_marginLeft="@dimen/activity_vertical_margin"
             android:background="@color/gray_background" />
 
-        <RelativeLayout
-            android:id="@+id/RelativeLayout1"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/white"
-            android:padding="@dimen/activity_vertical_margin" >
 
-            <TextView
-                android:id="@+id/TextViewWorkoutRepeatLabel"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_toLeftOf="@+id/customPickerRepeat"
-                android:layout_centerVertical="true"
-                android:text="@string/repeat"
-                android:textSize="@dimen/large_text_size"
-                android:textAppearance="?android:attr/textAppearanceLarge" />
-
-            <com.pwr.zpi.views.CustomPicker
-                android:id="@+id/customPickerRepeat"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:layout_alignParentRight="true"
-                app:editTextVisibility="gone"
-                app:maxValue="99"
-                app:minValue="1"
-                app:orientation="horizontal" >
-            </com.pwr.zpi.views.CustomPicker>
-
-            <TextView
-                android:id="@+id/TextViewNewWorkoutRepeatValue"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignBaseline="@+id/TextViewWorkoutRepeatLabel"
-                android:layout_toLeftOf="@+id/customPickerRepeat"
-                android:text="@string/times"
-                android:layout_marginRight="@dimen/small_margin"
-                android:textSize="@dimen/large_text_size"
-                android:textAppearance="?android:attr/textAppearanceLarge" />
-        </RelativeLayout>
     </LinearLayout>
 
     <Button
-        android:id="@+id/buttonWorkoutAdd"
+        android:id="@+id/buttonWorkoutGenerateRepeats"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/activity_bigger_vertical_margin"
         android:background="@drawable/workouts_white_button_background"
         android:padding="@dimen/buttons_bigger_padding"
+        android:text="@string/generate_repeats"
+        android:textSize="@dimen/large_text_size"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:textColor="@color/main_color"
+        android:textStyle="bold" />
+    <Button
+        android:id="@+id/buttonWorkoutAdd"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/workouts_white_button_background"
+        android:padding="@dimen/buttons_bigger_padding"
         android:text="@string/add_workout"
         android:textSize="@dimen/large_text_size"
         android:textAppearance="?android:attr/textAppearanceLarge"
diff --git a/ZPI1/res/layout/new_workout_header.xml b/ZPI1/res/layout/new_workout_header.xml
index 45fd35f..d5b563b 100644
--- a/ZPI1/res/layout/new_workout_header.xml
+++ b/ZPI1/res/layout/new_workout_header.xml
@@ -38,7 +38,6 @@
         android:paddingRight="@dimen/activity_vertical_margin"
         android:paddingTop="@dimen/buttons_padding" >
 
-        <requestFocus />
     </EditText>
 
     <TextView
diff --git a/ZPI1/res/layout/picker_control_horizontal.xml b/ZPI1/res/layout/picker_control_horizontal.xml
index edaea61..1ca8301 100644
--- a/ZPI1/res/layout/picker_control_horizontal.xml
+++ b/ZPI1/res/layout/picker_control_horizontal.xml
@@ -7,14 +7,9 @@
     android:gravity="center"
     android:orientation="horizontal" >
 
-    <Button
-        android:id="@+id/picker_plus"
-        android:layout_width="@dimen/picker_button_height"
-        android:layout_height="@dimen/picker_button_height"
-        android:layout_gravity="center"
-        android:background="@drawable/plus_sign_drawable" />
 
-    <EditText
+
+    <Button android:id="@+id/picker_minus" android:layout_width="@dimen/picker_button_height" android:layout_height="@dimen/picker_button_height" android:layout_gravity="center" android:background="@drawable/minus_sign_drawable" /><EditText
         android:id="@+id/picker_display"
         android:layout_width="@dimen/picker_edit_text_width"
         android:layout_height="@dimen/picker_edit_text_height"
@@ -23,12 +18,13 @@
         android:textSize="@dimen/medium_text_size"
         android:singleLine="true" >
     </EditText>
-
-    <Button
-        android:id="@+id/picker_minus"
+        <Button
+        android:id="@+id/picker_plus"
         android:layout_width="@dimen/picker_button_height"
         android:layout_height="@dimen/picker_button_height"
         android:layout_gravity="center"
-        android:background="@drawable/minus_sign_drawable" />
+        android:background="@drawable/plus_sign_drawable" />
+
+    
 
 </LinearLayout>
diff --git a/ZPI1/res/layout/workout_action_advanced_list_item.xml b/ZPI1/res/layout/workout_action_advanced_list_item.xml
index 4c1221e..7b02963 100644
--- a/ZPI1/res/layout/workout_action_advanced_list_item.xml
+++ b/ZPI1/res/layout/workout_action_advanced_list_item.xml
@@ -3,6 +3,15 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent" >
 
+    <TextView
+        android:id="@+id/textViewActionAdvancedPosition"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:gravity="center|top"
+        android:padding="@dimen/small_margin"
+        android:text="1."
+        android:textSize="@dimen/small_text_size" />
+    
     <ImageView
         android:id="@+id/imageViewWorkoutAction"
         android:layout_width="wrap_content"
@@ -11,6 +20,7 @@
         android:layout_centerVertical="true"
         android:src="@drawable/start"
         android:visibility="gone" />
+    
 
     <LinearLayout
         android:id="@+id/linearLayoutAdvancedActionData"
diff --git a/ZPI1/res/layout/workout_footer.xml b/ZPI1/res/layout/workout_footer.xml
index 40bfdf9..f29cfc7 100644
--- a/ZPI1/res/layout/workout_footer.xml
+++ b/ZPI1/res/layout/workout_footer.xml
@@ -50,26 +50,7 @@
             android:layout_marginLeft="@dimen/activity_vertical_margin"
             android:background="@color/gray_background" />
 
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" >
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:text="@string/repeat"
-                android:textSize="@dimen/large_text_size"
-                android:textAppearance="?android:attr/textAppearanceLarge" />
-
-            <TextView
-                android:id="@+id/textViewWrokoutActivityRepeat"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:textSize="@dimen/large_text_size"
-                android:textAppearance="?android:attr/textAppearanceLarge" />
-        </RelativeLayout>
     </LinearLayout>
 
     <Button
diff --git a/ZPI1/res/layout/workouts_action_simple_list_item.xml b/ZPI1/res/layout/workouts_action_simple_list_item.xml
index c0cd6b6..43a2eaa 100644
--- a/ZPI1/res/layout/workouts_action_simple_list_item.xml
+++ b/ZPI1/res/layout/workouts_action_simple_list_item.xml
@@ -12,14 +12,23 @@
         android:src="@drawable/start"
         android:visibility="gone" />
 
+    <TextView
+        android:id="@+id/textViewActionSimplePosition"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:gravity="center|top"
+        android:padding="@dimen/small_margin"
+        android:text="1."
+        android:textSize="@dimen/small_text_size" />
+
     <LinearLayout
         android:id="@+id/linearLayoutSimpleActionData"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
-        android:padding="@dimen/buttons_padding"
         android:layout_toRightOf="@+id/imageViewWorkoutAction"
-        android:baselineAligned="false" >
+        android:baselineAligned="false"
+        android:padding="@dimen/buttons_padding" >
 
         <TextView
             android:id="@+id/dataTextViewActionTimeOrDistance"
diff --git a/ZPI1/res/menu/single_run_menu.xml b/ZPI1/res/menu/single_run_menu.xml
index 7dee64c..1b66be0 100644
--- a/ZPI1/res/menu/single_run_menu.xml
+++ b/ZPI1/res/menu/single_run_menu.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
     <item android:id="@+id/menu_button_export" android:title="@string/export"></item>
+    <item android:id="@+id/menu_button_remove" android:title="@string/delete_action"></item>
+    <item android:id="@+id/menu_button_change_name" android:title="@string/change_name"></item>
     
 
 </menu>
diff --git a/ZPI1/res/values-hdpi/dimens.xml b/ZPI1/res/values-hdpi/dimens.xml
index 727c71d..248f999 100644
--- a/ZPI1/res/values-hdpi/dimens.xml
+++ b/ZPI1/res/values-hdpi/dimens.xml
@@ -45,6 +45,7 @@
     <dimen name="small_text_size">11sp</dimen>
     <dimen name="medium_text_size">17sp</dimen>
     <dimen name="big_text_size">32sp</dimen>
+    <dimen name="bigger_text_size">40sp</dimen>
     <dimen name="large_text_size">22sp</dimen>
 
 </resources>
\ No newline at end of file
diff --git a/ZPI1/res/values-ldpi/dimens.xml b/ZPI1/res/values-ldpi/dimens.xml
index ffa6815..c8b6f05 100644
--- a/ZPI1/res/values-ldpi/dimens.xml
+++ b/ZPI1/res/values-ldpi/dimens.xml
@@ -45,5 +45,6 @@
     <dimen name="small_text_size">10sp</dimen>
     <dimen name="medium_text_size">12sp</dimen>
     <dimen name="big_text_size">22sp</dimen>
+    <dimen name="bigger_text_size">32sp</dimen>
 	<dimen name="large_text_size">17sp</dimen>
 </resources>
\ No newline at end of file
diff --git a/ZPI1/res/values-mdpi/dimens.xml b/ZPI1/res/values-mdpi/dimens.xml
index 9b05638..5404a6c 100644
--- a/ZPI1/res/values-mdpi/dimens.xml
+++ b/ZPI1/res/values-mdpi/dimens.xml
@@ -45,6 +45,7 @@
     <dimen name="small_text_size">11sp</dimen>
     <dimen name="medium_text_size">17sp</dimen>
     <dimen name="big_text_size">32sp</dimen>
+    <dimen name="bigger_text_size">40sp</dimen>
     <dimen name="large_text_size">20sp</dimen>
 
 </resources>
\ No newline at end of file
diff --git a/ZPI1/res/values-pl/strings.xml b/ZPI1/res/values-pl/strings.xml
index c6713ce..ccfd295 100644
--- a/ZPI1/res/values-pl/strings.xml
+++ b/ZPI1/res/values-pl/strings.xml
@@ -93,7 +93,17 @@
     <string name="settings_caps">USTAWIENIA</string>
     <string name="actions_caps">AKCJE</string>
     <string name="name_caps">NAZWA</string>
+    <string name="generate_repeats">Generuj Powtórzenia</string>
+    <string name="no_actions">Brak akcji do powtórzenia</string>
+    <string name="no_pause">Przepraszamy, nie można jeszcze dać pauzy podczas rozgrzewki</string>
 
+     <!-- repeats dialog -->
+    <string name="repeats_dialog_title">Powtórz:</string>
+    <string name="from_action">Od Akcji:</string>
+    <string name="to_action">Do Akcji:</string>
+    <string name="how_many_times">Ile Razy:</string>
+    <string name="cancel_caps">ANULUJ</string>
+    
     <!--history -->
     <string name="Annotations">Znaczniki</string>
     <string name="history">Historia</string>
@@ -114,7 +124,11 @@
     <!-- context menu -->
     <string name="menu_ctx_actions">Akcje</string>
     <string name="delete_action">Usuń</string>
+    <string name="change_name">Zmień Nazwę</string>
 
+        <!-- change name dialog -->
+    <string name="new_name">Nowa Nazwa</string>
+    
     <!-- other -->
     <string name="empty_string"></string>
     <string name="no_history_info">Brak historii aktywności</string>
diff --git a/ZPI1/res/values/analytics.xml b/ZPI1/res/values/analytics.xml
new file mode 100644
index 0000000..216118a
--- /dev/null
+++ b/ZPI1/res/values/analytics.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<resources>
+  <!--Replace placeholder ID with your tracking ID-->
+  <string name="ga_trackingId">UA-47700655-1</string>
+
+  <!--Enable automatic activity tracking-->
+  <bool name="ga_autoActivityTracking">true</bool>
+
+  <!--Enable automatic exception tracking-->
+  <bool name="ga_reportUncaughtExceptions">true</bool>
+</resources>
\ No newline at end of file
diff --git a/ZPI1/res/values/dimens.xml b/ZPI1/res/values/dimens.xml
index 8505608..ad892f6 100644
--- a/ZPI1/res/values/dimens.xml
+++ b/ZPI1/res/values/dimens.xml
@@ -34,18 +34,19 @@
     <dimen name="history_button_margin">75dp</dimen>
     <dimen name="pull_view_top_marrgin">35dp</dimen>
     <dimen name="pull_name_right_margin">-15dp</dimen>
-	<dimen name="pull_right_margin">-5dp</dimen>
-	<dimen name="run_summary_margin">42dp</dimen>
-	<dimen name="map_change_size_margin">-5dp</dimen>
+    <dimen name="pull_right_margin">-5dp</dimen>
+    <dimen name="run_summary_margin">42dp</dimen>
+    <dimen name="map_change_size_margin">-5dp</dimen>
 
     <!-- paddings -->
     <dimen name="buttons_padding">8dp</dimen>
     <dimen name="buttons_bigger_padding">11dp</dimen>
-    
+
     <!-- text sizes -->
     <dimen name="small_text_size">11sp</dimen>
     <dimen name="medium_text_size">17sp</dimen>
     <dimen name="big_text_size">32sp</dimen>
+    <dimen name="bigger_text_size">40sp</dimen>
     <dimen name="large_text_size">22sp</dimen>
 
 </resources>
\ No newline at end of file
diff --git a/ZPI1/res/values/strings.xml b/ZPI1/res/values/strings.xml
index 7d9bd77..591b012 100644
--- a/ZPI1/res/values/strings.xml
+++ b/ZPI1/res/values/strings.xml
@@ -95,7 +95,17 @@
     <string name="settings_caps">SETTINGS</string>
     <string name="actions_caps">ACTIONS</string>
     <string name="name_caps">NAME</string>
+    <string name="generate_repeats">Generate Repeats</string>
+    <string name="no_actions">No actions to repeat</string>
+    <string name="no_pause">Sorry, pause is not available during worm up yet</string>
 
+    <!-- repeats dialog -->
+    <string name="repeats_dialog_title">Repeat:</string>
+    <string name="from_action">From Action:</string>
+    <string name="to_action">To Action</string>
+    <string name="how_many_times">How Many Times:</string>
+    <string name="ok_caps">OK</string>
+    <string name="cancel_caps">CANCEL</string>
     <!--history -->
     <string name="Annotations">Annotations</string>
     <string name="history">History</string>
@@ -116,6 +126,10 @@
     <!-- context menu -->
     <string name="menu_ctx_actions">Actions</string>
     <string name="delete_action">Delete</string>
+    <string name="change_name">Change Name</string>
+    
+    <!-- change name dialog -->
+    <string name="new_name">New Name</string>
 
     <!-- other -->
     <string name="empty_string"></string>
@@ -188,7 +202,7 @@
 
     <!-- about application -->
     <string name="version_title">Version</string>
-    <string name="version">Run 42K ver. 1.0</string>
+    <string name="version">Run 42K ver. 1.2</string>
     <string name="about_title">About</string>
     <string name="about">This application was developed by \n Jakub Skudlarski and Marek Kresnicki. \n Run safe and beat all records.</string>
 
diff --git a/ZPI1/src/com/pwr/zpi/AbstractActivityActivity.java b/ZPI1/src/com/pwr/zpi/AbstractActivityActivity.java
new file mode 100644
index 0000000..e725916
--- /dev/null
+++ b/ZPI1/src/com/pwr/zpi/AbstractActivityActivity.java
@@ -0,0 +1,208 @@
+package com.pwr.zpi;
+
+import com.pwr.zpi.database.entity.Workout;
+import com.pwr.zpi.dialogs.MyDialog;
+import com.pwr.zpi.utils.TimeFormatter;
+
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.location.Location;
+import android.os.RemoteException;
+import android.support.v4.app.FragmentActivity;
+import android.util.Log;
+import android.widget.TextView;
+
+public abstract class AbstractActivityActivity extends FragmentActivity {
+
+	public static final float MIN_SPEED_FOR_AUTO_PAUSE = 0.7f;
+	// measured values IDs
+	protected static final int distanceID = 0;
+	protected static final int paceID = 1;
+	protected static final int avgPaceID = 2;
+	protected static final int timeID = 3;
+	protected static final int lastKmPaceID = 4;
+	protected static final String TAG = null;
+
+	// views
+	protected TextView clickedContentTextView;
+	protected TextView clickedLabelTextView;
+	protected TextView clickedUnitTextView;
+
+	// diplay data changing
+	protected int dataTextView1Content;
+	protected int dataTextView2Content;
+	protected int clickedField;
+
+	protected boolean isPaused;
+	protected boolean pausedManually;
+
+	protected void showMeassuredValuesMenu(final double distance,
+			final long time, final double pace, final double avgPace) {
+		// chcia�em zrobi� tablice w stringach, ale potem zobaczy�em, �e
+		// ju� mam
+		// te wszystkie nazwy i teraz nie wiem czy tamto zmienia� w tablic�
+		// czy
+		// nie ma sensu
+		// kolejno�� w tablicy musi odpowiada� nr ID, tzn 0 - dystans itp.
+
+		final CharSequence[] items = { getMyString(R.string.distance),
+				getMyString(R.string.pace), getMyString(R.string.pace_avrage),
+				getMyString(R.string.time) };
+		DialogInterface.OnClickListener itemsHandler = new DialogInterface.OnClickListener() {
+			@Override
+			public void onClick(DialogInterface dialog, int item) {
+				updateLabels(item, clickedLabelTextView, clickedUnitTextView,
+						clickedContentTextView, distance, time, pace, avgPace);
+				if (clickedField == 1) {
+					dataTextView1Content = item;
+				} else {
+					dataTextView2Content = item;
+				}
+			}
+		};
+		MyDialog.showAlertDialog(this, R.string.dialog_choose_what_to_display,
+				R.string.empty_string, R.string.empty_string,
+				R.string.empty_string, null, null, items, itemsHandler);
+	}
+
+	protected String getMyString(int stringId) {
+		return getResources().getString(stringId);
+	}
+
+	protected void initLabels(TextView textViewInitialValue, TextView textView,
+			int meassuredValue) {
+		switch (meassuredValue) {
+		case distanceID:
+			textView.setText(R.string.distance);
+			textViewInitialValue.setText("0.000");
+			break;
+		case paceID:
+			textView.setText(R.string.pace);
+			textViewInitialValue.setText("0:00");
+			break;
+		case avgPaceID:
+			textView.setText(R.string.pace_avrage);
+			textViewInitialValue.setText("0:00");
+			break;
+		case timeID:
+			textView.setText(R.string.time);
+			textViewInitialValue.setText("00:00:00");
+			break;
+		}
+
+	}
+
+	private void updateLabels(int meassuredValue, TextView labelTextView,
+			TextView unitTextView, TextView contentTextView, double distance,
+			long time, double pace, double avgPace) {
+		switch (meassuredValue) {
+		case distanceID:
+			labelTextView.setText(R.string.distance);
+			unitTextView.setText(R.string.km);
+			contentTextView.setText(String.format("%.3f", distance / 1000));
+			break;
+		case paceID:
+			labelTextView.setText(R.string.pace);
+			unitTextView.setText(R.string.minutes_per_km);
+			if (pace < 30) {
+				contentTextView.setText(TimeFormatter
+						.formatTimeMMSSorHHMMSS(pace));
+			} else {
+				contentTextView.setText(getResources().getString(
+						R.string.dashes));
+			}
+			break;
+		case avgPaceID:
+			labelTextView.setText(R.string.pace_avrage);
+			unitTextView.setText(R.string.minutes_per_km);
+			if (avgPace < 30) {
+				contentTextView.setText(TimeFormatter
+						.formatTimeMMSSorHHMMSS(avgPace));
+			} else {
+				contentTextView.setText(getResources().getString(
+						R.string.dashes));
+			}
+			break;
+		case timeID:
+			labelTextView.setText(R.string.time);
+			unitTextView.setText(R.string.empty_string);
+			contentTextView.setText(TimeFormatter.formatTimeHHMMSS(time));
+			break;
+		}
+
+	}
+
+	// update display
+	protected void updateData(final TextView textBox, final int meassuredValue,
+			double distance, double pace, long time, double avgPace) {
+
+		switch (meassuredValue) {
+		case distanceID:
+			textBox.setText(String.format("%.3f", distance / 1000));
+			break;
+		case paceID:
+			if (pace < 30) {
+				textBox.setText(TimeFormatter.formatTimeMMSSorHHMMSS(pace));
+			} else {
+				textBox.setText(getResources().getString(R.string.dashes));
+			}
+			break;
+		case avgPaceID:
+			if (avgPace < 30) {
+				textBox.setText(TimeFormatter.formatTimeMMSSorHHMMSS(avgPace));
+			} else {
+				textBox.setText(getResources().getString(R.string.dashes));
+			}
+			break;
+		case timeID:
+			textBox.setText(TimeFormatter.formatTimeHHMMSS(time));
+			break;
+		}
+	}
+
+	protected abstract void pauseRun();
+
+	protected abstract void resumeRun();
+
+	protected abstract void updateGpsInfo(final Location newLocation);
+
+	protected abstract void handleTimeUpdates();
+
+	protected Workout getWorkoutData(Intent i) {
+
+		Workout workout;
+		workout = i.getParcelableExtra(Workout.TAG);
+		return workout;
+	}
+
+	protected void showAlertDialog(final boolean isServiceConnected,
+			final RunListenerApi api, final Context context,
+			final double distance, final long time, final int runNumber) {
+		DialogInterface.OnClickListener positiveButtonHandler = new DialogInterface.OnClickListener() {
+			@Override
+			public void onClick(DialogInterface dialog, int id) {
+
+				try {
+					if (isServiceConnected) {
+						api.setStoped();
+					}
+				} catch (RemoteException e) {
+					Log.e(TAG, "Failed to tell that activity is stoped", e);
+				}
+				Intent intent = new Intent(context, AfterActivityActivity.class);
+				intent.putExtra(ActivityActivity.DURATION_TAG, time);
+				intent.putExtra(ActivityActivity.DISTANCE_TAG, distance);
+				double pace = ((double) time / 60) / distance;
+				intent.putExtra(ActivityActivity.AVG_PACE_TAG, pace);
+				intent.putExtra(ActivityActivity.RUN_NUMBER_TAG, runNumber);
+
+				startActivityForResult(intent, ActivityActivity.MY_REQUEST_CODE);
+			}
+		};
+		MyDialog.showAlertDialog(this, R.string.dialog_message_on_stop,
+				R.string.empty_string, android.R.string.yes,
+				android.R.string.no, positiveButtonHandler, null);
+	}
+
+}
diff --git a/ZPI1/src/com/pwr/zpi/ActivityActivity.java b/ZPI1/src/com/pwr/zpi/ActivityActivity.java
index b7a6255..6ffd83d 100644
--- a/ZPI1/src/com/pwr/zpi/ActivityActivity.java
+++ b/ZPI1/src/com/pwr/zpi/ActivityActivity.java
@@ -5,11 +5,13 @@
 
 import android.app.ProgressDialog;
 import android.content.ComponentName;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.ServiceConnection;
 import android.graphics.Color;
 import android.location.Location;
+import android.media.AudioManager;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
@@ -32,7 +34,10 @@
 import android.widget.ListView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
+import android.widget.Toast;
 
+import com.google.analytics.tracking.android.EasyTracker;
+import com.google.android.gms.internal.av;
 import com.google.android.gms.maps.CameraUpdateFactory;
 import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.SupportMapFragment;
@@ -59,12 +64,12 @@
 import com.pwr.zpi.utils.TimeFormatter;
 import com.pwr.zpi.views.GPSSignalDisplayer;
 
-public class ActivityActivity extends FragmentActivity implements OnClickListener {
+public class ActivityActivity extends AbstractActivityActivity implements OnClickListener {
 	
 	private static final String TAG = ActivityActivity.class.getSimpleName();
 	
-	public static final float MIN_SPEED_FOR_AUTO_PAUSE = 0.7f;
-	private static final int MY_REQUEST_CODE = 1;
+	
+	public static final int MY_REQUEST_CODE = 1;
 	public static final String SAVE_TAG = "save";
 	public static final String DISTANCE_TAG = "distance";
 	public static final String AVG_SPEED_TAG = "avg_speed";
@@ -73,12 +78,7 @@ public class ActivityActivity extends FragmentActivity implements OnClickListene
 	public static final String RUN_NUMBER_TAG = "run_number";
 	public static final String NAME_TAG = "name_tag";
 	
-	// measured values IDs
-	private static final int distanceID = 0;
-	private static final int paceID = 1;
-	private static final int avgPaceID = 2;
-	private static final int timeID = 3;
-	private static final int lastKmPaceID = 4;
+
 	
 	//map options
 	public static final float TRACE_THICKNESS = 5;
@@ -93,14 +93,11 @@ public class ActivityActivity extends FragmentActivity implements OnClickListene
 	private ImageButton workoutDdrawerButton;
 	private TextView DataTextView1;
 	private TextView DataTextView2;
-	private TextView clickedContentTextView;
 	private TextView LabelTextView1;
 	private TextView LabelTextView2;
-	private TextView clickedLabelTextView;
 	private TextView unitTextView1;
 	private TextView unitTextView2;
-	private TextView clickedUnitTextView;
-	private TextView GPSAccuracy;
+	//private TextView GPSAccuracy;
 	private GPSSignalDisplayer gpsDisplayer;
 	private TextView countDownTextView;
 	private LinearLayout startStopLayout;
@@ -111,6 +108,7 @@ public class ActivityActivity extends FragmentActivity implements OnClickListene
 	private ImageButton zoomIn;
 	private ImageButton zoomOut;
 	private ImageButton mapCenter;
+	private ImageButton imageButtonGoToScreen2;
 	private FrameLayout frameLayoutViewOverMap;
 	
 	//map
@@ -127,13 +125,7 @@ public class ActivityActivity extends FragmentActivity implements OnClickListene
 	private int runNumber;
 	private ActualPaceCalculator actualPaceCalculator;
 	
-	//diplay data changing
-	private int dataTextView1Content;
-	private int dataTextView2Content;
-	private int clickedField;
-	
-	private boolean isPaused;
-	
+
 	// service data
 	boolean mIsBound;
 	boolean isServiceConnected;
@@ -163,15 +155,26 @@ protected void onCreate(Bundle savedInstanceState) {
 		
 		//	Debug.stopMethodTracing();
 	}
+	@Override
+	protected void onPostCreate(Bundle savedInstanceState) {
+		super.onPostCreate(savedInstanceState);
+		prepareServiceAndStart();
+	}
 	
-	private Workout getWorkoutData() {
-		Intent i = getIntent();
-		
-		Workout workout;
-		workout = i.getParcelableExtra(Workout.TAG);
-		return workout;
+	@Override
+	public void onStart() {
+		super.onStart();
+		EasyTracker.getInstance(this).activityStart(this);  // Add this method.
+	}
+	
+	@Override
+	public void onStop() {
+		super.onStop();
+		EasyTracker.getInstance(this).activityStop(this);  // Add this method.
 	}
 	
+
+	
 	private void initFields() {
 		stopButton = (Button) findViewById(R.id.stopButton);
 		pauseButton = (Button) findViewById(R.id.pauseButton);
@@ -180,13 +183,13 @@ private void initFields() {
 		workoutDdrawerButton = (ImageButton) findViewById(R.id.imageButtonWorkoutDrawerButton);
 		dataRelativeLayout1 = (RelativeLayout) findViewById(R.id.dataRelativeLayout1);
 		dataRelativeLayout2 = (RelativeLayout) findViewById(R.id.dataRelativeLayout2);
-		GPSAccuracy = (TextView) findViewById(R.id.TextViewGPSAccuracy);
 		gpsDisplayer = (GPSSignalDisplayer) findViewById(R.id.gpsDisplayerActivity);
 		countDownTextView = (TextView) findViewById(R.id.textViewCountDown);
 		startStopLayout = (LinearLayout) findViewById(R.id.startStopLinearLayout);
 		zoomIn = (ImageButton) findViewById(R.id.imageButtonMapZoomIn);
 		zoomOut = (ImageButton) findViewById(R.id.imageButtonMapZoomOut);
 		mapCenter = (ImageButton) findViewById(R.id.imageButtonMapCenter);
+		imageButtonGoToScreen2 =(ImageButton) findViewById(R.id.imageButtonGoToActivityNoMap);
 		frameLayoutViewOverMap = (FrameLayout) findViewById(R.id.frameLayoutViewOverMap);
 		SupportMapFragment mapFragment = (SupportMapFragment) getSupportFragmentManager().findFragmentById(R.id.map);
 		mMap = mapFragment.getMap();
@@ -220,6 +223,7 @@ private void initFields() {
 		dataTextView2Content = timeID;
 		
 		isPaused = false;
+		pausedManually = false;
 		progressDialogDisplayed = false;
 		
 		Intent intent = getIntent();
@@ -229,7 +233,7 @@ private void initFields() {
 		if (intent.hasExtra(Workout.TAG)) {
 			// drawer initialization
 			listView.addHeaderView(getLayoutInflater().inflate(R.layout.workout_drawer_list_header, null));
-			workout = getWorkoutData();
+			workout = getWorkoutData(getIntent());
 			workoutCopy = new Workout();
 			List<WorkoutAction> actions = new ArrayList<WorkoutAction>();
 			if (workout.isWarmUp()) {
@@ -238,9 +242,9 @@ private void initFields() {
 					this.getString(R.string.key_warm_up_time), "3"));
 				actions.add(new WorkoutActionWarmUp(warmUpMinutes));
 			}
-			for (int i = 0; i < workout.getRepeatCount(); i++) {
-				actions.addAll(workout.getActions());
-			}
+			
+			actions.addAll(workout.getActions());
+			
 			workoutCopy.setActions(actions);
 			drawerListAdapter = AdapterFactory.getAdapter(AdapterType.DrawerWorkoutsAdapter, this,
 				workoutCopy.getActions(), workoutCopy);
@@ -253,6 +257,7 @@ private void initFields() {
 			listView.setVisibility(View.GONE);
 		}
 		
+		setVolumeControlStream(AudioManager.STREAM_MUSIC);
 	}
 	
 	private void addListeners() {
@@ -270,6 +275,8 @@ private void addListeners() {
 		
 		mapCenter.setOnClickListener(this);
 		
+		imageButtonGoToScreen2.setOnClickListener(this); //TODO implement
+		
 		frameLayoutViewOverMap.setOnTouchListener(mapTrackingListener);
 		if (workout != null) {
 			workoutDdrawerButton.setOnClickListener(this);
@@ -319,11 +326,11 @@ private void addOnStateChangedListener()
 		zoomIn.setOnTouchListener(stateChangedListener);
 		zoomOut.setOnTouchListener(stateChangedListener);
 		mapCenter.setOnTouchListener(stateChangedListener);
+		imageButtonGoToScreen2.setOnTouchListener(stateChangedListener);
 		
 	}
 	
 	private void initDisplayedData() {
-		GPSAccuracy.setText(getMyString(R.string.gps_accuracy));
 		
 		initLabels(DataTextView1, LabelTextView1, dataTextView1Content);
 		initLabels(DataTextView2, LabelTextView2, dataTextView2Content);
@@ -337,89 +344,20 @@ private void prepareServiceAndStart() {
 	
 	@Override
 	protected void onDestroy() {
+		Log.i(TAG, "activityactiviy destroyed");
 		doUnbindService();
-		
 		super.onDestroy();
 	}
 	
-	private void initLabels(TextView textViewInitialValue, TextView textView, int meassuredValue) {
-		switch (meassuredValue) {
-			case distanceID:
-				textView.setText(R.string.distance);
-				textViewInitialValue.setText("0.000");
-				break;
-			case paceID:
-				textView.setText(R.string.pace);
-				textViewInitialValue.setText("0:00");
-				break;
-			case avgPaceID:
-				textView.setText(R.string.pace_avrage);
-				textViewInitialValue.setText("0:00");
-				break;
-			case timeID:
-				textView.setText(R.string.time);
-				textViewInitialValue.setText("00:00:00");
-				break;
-		}
-		
-	}
-	
-	private void updateLabels(int meassuredValue, TextView labelTextView, TextView unitTextView,
-		TextView contentTextView) {
-		switch (meassuredValue) {
-			case distanceID:
-				labelTextView.setText(R.string.distance);
-				unitTextView.setText(R.string.km);
-				break;
-			case paceID:
-				labelTextView.setText(R.string.pace);
-				unitTextView.setText(R.string.minutes_per_km);
-				break;
-			case avgPaceID:
-				labelTextView.setText(R.string.pace_avrage);
-				unitTextView.setText(R.string.minutes_per_km);
-				break;
-			case timeID:
-				labelTextView.setText(R.string.time);
-				unitTextView.setText(R.string.empty_string);
-				break;
-		}
-		
-		updateData(contentTextView, meassuredValue);
-	}
+
 	
 	@Override
 	public void onBackPressed() {
 		super.onBackPressed();
-		showAlertDialog();
+		showAlertDialog(isServiceConnected,api,this,distance,time,runNumber);
 	}
 	
-	private void showAlertDialog() {
-		DialogInterface.OnClickListener positiveButtonHandler = new DialogInterface.OnClickListener() {
-			@Override
-			public void onClick(DialogInterface dialog, int id) {
-				
-				try {
-					if (isServiceConnected) {
-						api.setStoped();
-					}
-				}
-				catch (RemoteException e) {
-					Log.e(TAG, "Failed to tell that activity is stoped", e);
-				}
-				Intent intent = new Intent(ActivityActivity.this, AfterActivityActivity.class);
-				intent.putExtra(DURATION_TAG, time);
-				intent.putExtra(DISTANCE_TAG, distance);
-				double pace = avgPace = ((double) time / 60) / distance;
-				intent.putExtra(AVG_PACE_TAG, pace);
-				intent.putExtra(RUN_NUMBER_TAG, runNumber);
-				
-				startActivityForResult(intent, MY_REQUEST_CODE);
-			}
-		};
-		MyDialog.showAlertDialog(this, R.string.dialog_message_on_stop, R.string.empty_string, android.R.string.yes,
-			android.R.string.no, positiveButtonHandler, null);
-	}
+
 	
 	@Override
 	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
@@ -461,7 +399,7 @@ public void run() {
 					progressDialogDisplayed = true;
 					
 					lostGPSDialog = ProgressDialog.show(ActivityActivity.this,
-						getResources().getString(R.string.dialog_message_on_lost_gpsp), null); // TODO strings
+						getResources().getString(R.string.dialog_message_on_lost_gpsp), null); 
 					lostGPSDialog.setCancelable(true);
 					
 				}
@@ -474,9 +412,10 @@ public void onClick(View v) {
 		
 		switch (v.getId()) {
 			case R.id.stopButton:
-				showAlertDialog();
+				showAlertDialog(isServiceConnected,api,this,distance,time,runNumber);
 				break;
 			case R.id.pauseButton:
+				pausedManually = true;
 				pauseRun();
 				break;
 			case R.id.resumeButton:
@@ -487,14 +426,14 @@ public void onClick(View v) {
 				clickedLabelTextView = LabelTextView1;
 				clickedUnitTextView = unitTextView1;
 				clickedField = 1;
-				showMeassuredValuesMenu();
+				showMeassuredValuesMenu(distance,time,pace,avgPace);
 				break;
 			case R.id.dataRelativeLayout2:
 				clickedContentTextView = DataTextView2;
 				clickedLabelTextView = LabelTextView2;
 				clickedUnitTextView = unitTextView2;
 				clickedField = 2;
-				showMeassuredValuesMenu();
+				showMeassuredValuesMenu(distance,time,pace,avgPace);
 				break;
 			case R.id.imageButtonWorkoutDrawerButton:
 				boolean isOpen = drawerLayout.isDrawerOpen(Gravity.LEFT);
@@ -527,16 +466,22 @@ public void onClick(View v) {
 					mapTrackingListener.setMapTracking(true);
 				}
 				break;
+			case R.id.imageButtonGoToActivityNoMap:
+				start2Screen();
 		}
 		
 	}
-	
-	private void pauseRun() {
+	@Override
+	protected void pauseRun() {
 		handlerForService.post(new Runnable() {
 			@Override
 			public void run() {
-				if (!isPaused) {
-					actualPaceCalculator.reset();
+				if (!isPaused
+					&& (!(workout != null && workout.isWarmUp() && workout.getCurrentAction() == 0)))// || pausedManually))
+				{
+					if (actualPaceCalculator != null) {
+						actualPaceCalculator.reset();
+					}
 					isPaused = true;
 					startStopLayout.setVisibility(View.INVISIBLE);
 					resumeButton.setVisibility(View.VISIBLE);
@@ -549,16 +494,22 @@ public void run() {
 						Log.e(TAG, "Failed to tell that activity is paused", e);
 					}
 				}
+				else if (!isPaused && pausedManually)
+				{
+					Toast.makeText(ActivityActivity.this, getResources().getString(R.string.no_pause),
+						Toast.LENGTH_LONG).show();
+				}
 			}
 		});
 	}
-	
-	private void resumeRun() {
+	@Override
+	protected void resumeRun() {
 		handlerForService.post(new Runnable() {
 			@Override
 			public void run() {
 				if (isPaused) {
 					isPaused = false;
+					pausedManually = false;
 					startStopLayout.setVisibility(View.VISIBLE);
 					resumeButton.setVisibility(View.GONE);
 					try {
@@ -574,66 +525,6 @@ public void run() {
 		});
 	}
 	
-	private String getMyString(int stringId) {
-		return getResources().getString(stringId);
-	}
-	
-	private void showMeassuredValuesMenu() {
-		// chcia�em zrobi� tablice w stringach, ale potem zobaczy�em, �e
-		// ju� mam
-		// te wszystkie nazwy i teraz nie wiem czy tamto zmienia� w tablic�
-		// czy
-		// nie ma sensu
-		// kolejno�� w tablicy musi odpowiada� nr ID, tzn 0 - dystans itp.
-		
-		final CharSequence[] items = { getMyString(R.string.distance), getMyString(R.string.pace),
-			getMyString(R.string.pace_avrage), getMyString(R.string.time) };
-		DialogInterface.OnClickListener itemsHandler = new DialogInterface.OnClickListener() {
-			@Override
-			public void onClick(DialogInterface dialog, int item) {
-				updateLabels(item, clickedLabelTextView, clickedUnitTextView, clickedContentTextView);
-				if (clickedField == 1) {
-					dataTextView1Content = item;
-				}
-				else {
-					dataTextView2Content = item;
-				}
-			}
-		};
-		MyDialog.showAlertDialog(this, R.string.dialog_choose_what_to_display, R.string.empty_string,
-			R.string.empty_string, R.string.empty_string, null, null, items, itemsHandler);
-	}
-	
-	// update display
-	protected void updateData(final TextView textBox, final int meassuredValue) {
-		
-		switch (meassuredValue) {
-			case distanceID:
-				textBox.setText(String.format("%.3f", distance / 1000));
-				break;
-			case paceID:
-				if (pace < 30) {
-					textBox.setText(TimeFormatter.formatTimeMMSSorHHMMSS(pace));
-				}
-				else {
-					textBox.setText(getResources().getString(R.string.dashes));
-				}
-				break;
-			case avgPaceID:
-				if (avgPace < 30) {
-					textBox.setText(TimeFormatter.formatTimeMMSSorHHMMSS(avgPace));
-				}
-				else {
-					textBox.setText(getResources().getString(R.string.dashes));
-				}
-				break;
-			case timeID:
-				textBox.setText(TimeFormatter.formatTimeHHMMSS(time));
-				break;
-		}
-		
-	}
-	
 	// count everything with 2 last location points
 	private void countData(final Location location, final Location lastLocation) {
 		
@@ -693,13 +584,14 @@ private void addMarker(Location location, int distance) {
 	}
 	
 	// this runs on every update
-	private void updateGpsInfo(final Location newLocation) {
+	@Override
+	protected void updateGpsInfo(final Location newLocation) {
 		autoPauseIfEnabled(newLocation);
 		handlerForService.post(new Runnable() {
 			
 			@Override
 			public void run() {
-				if (!isPaused && newLocation.getAccuracy() < LocationService.REQUIRED_ACCURACY) {
+				if (newLocation.getAccuracy() < LocationService.REQUIRED_ACCURACY) {
 					// not first point after start or resume
 					
 					if (lostGPSDialog != null) {
@@ -707,12 +599,15 @@ public void run() {
 						lostGPSDialog = null;
 						progressDialogDisplayed = false;
 					}
-					if (mLastLocation != null) {
-						countData(newLocation, mLastLocation);
+					if (!isPaused)
+					{
+						if (mLastLocation != null) {
+							countData(newLocation, mLastLocation);
+						}
+						
+						updateData(DataTextView1, dataTextView1Content,distance,pace,time,avgPace);
+						updateData(DataTextView2, dataTextView2Content,distance,pace,time,avgPace);
 					}
-					
-					updateData(DataTextView1, dataTextView1Content);
-					updateData(DataTextView2, dataTextView2Content);
 				}
 				else if (newLocation.getAccuracy() >= LocationService.REQUIRED_ACCURACY) {
 					//prevents displaying two progress Dialogs at once
@@ -724,21 +619,8 @@ else if (newLocation.getAccuracy() >= LocationService.REQUIRED_ACCURACY) {
 				mLastLocation = newLocation;
 			}
 		});
-		
 	}
 	
-	//	private void drawUserPosition(LatLng position)
-	//	{
-	//		Marker positionMarker = mMap.addMarker(new MarkerOptions()
-	//        .position(position)
-	//        .flat(true));
-	//
-	//		LatLng PERTH = new LatLng(-31.90, 115.86);
-	//		Marker perth = mMap.addMarker(new MarkerOptions()
-	//		                          .position(PERTH).
-	//		                          .flat(true));
-	//	}
-	
 	private void autoPauseIfEnabled(Location newLocation) {
 		if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean(getString(R.string.key_auto_pause), false)) {
 			if (newLocation.hasSpeed()) {
@@ -746,7 +628,7 @@ private void autoPauseIfEnabled(Location newLocation) {
 				if (newLocation.getSpeed() < MIN_SPEED_FOR_AUTO_PAUSE) {
 					pauseRun();
 				}
-				else {
+				else if (!pausedManually) {
 					resumeRun();
 				}
 			}
@@ -765,7 +647,7 @@ protected void onPause() {
 	@Override
 	public boolean onKeyDown(int keyCode, KeyEvent event) {
 		if ((keyCode == KeyEvent.KEYCODE_BACK)) {
-			showAlertDialog();
+			showAlertDialog(isServiceConnected,api,this,distance,time,runNumber);
 		}
 		return super.onKeyDown(keyCode, event);
 	}
@@ -780,11 +662,10 @@ private void doBindService() {
 		//intent.setFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
 		bindService(intent, serviceConnection, 0);
 		mIsBound = true;
-		
 	}
 	
 	private void doUnbindService() {
-		Log.i("Service_info", "Activity Unbinding");
+		Log.i("Service_info", "ActivityActivity Unbinding");
 		if (mIsBound) {
 			try {
 				api.removeListener(runListener);
@@ -874,8 +755,7 @@ public void handleLostGPS() throws RemoteException {
 				
 				@Override
 				public void run() {
-					gpsDisplayer.updateStrengthSignal(Double.MAX_VALUE);
-					
+					gpsDisplayer.updateStrengthSignal(Double.MAX_VALUE);					
 				}
 			});
 			
@@ -933,13 +813,13 @@ private void updateViewsAfterTimeChange() {
 			
 			@Override
 			public void run() {
-				updateData(DataTextView1, dataTextView1Content);
-				updateData(DataTextView2, dataTextView2Content);
+				updateData(DataTextView1, dataTextView1Content, distance, pace, time, avgPace);
+				updateData(DataTextView2, dataTextView2Content, distance, pace, time, avgPace);
 			}
 		});
 	}
-	
-	private void handleTimeUpdates() {
+	@Override
+	protected void handleTimeUpdates() {
 		try {
 			time = api.getTime();
 			updateViewsAfterTimeChange();
@@ -989,4 +869,14 @@ private void startSystemMusicPlayer() {
 		startActivity(i);
 	}
 	
+	private void start2Screen()
+	{
+		Intent i = new Intent(ActivityActivity.this, ActivityNoMapActivity.class);
+		if (workout!=null)
+			i.putExtra(Workout.TAG, workout);
+		i.putExtra(RUN_NUMBER_TAG, runNumber);
+		finish();
+		startActivity(i);
+		overridePendingTransition(R.anim.in_left_anim, R.anim.out_left_anim);
+	}
 }
diff --git a/ZPI1/src/com/pwr/zpi/ActivityNoMapActivity.java b/ZPI1/src/com/pwr/zpi/ActivityNoMapActivity.java
new file mode 100644
index 0000000..0203656
--- /dev/null
+++ b/ZPI1/src/com/pwr/zpi/ActivityNoMapActivity.java
@@ -0,0 +1,646 @@
+package com.pwr.zpi;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.google.android.gms.maps.CameraUpdateFactory;
+import com.google.android.gms.maps.model.CameraPosition;
+import com.google.android.gms.maps.model.LatLng;
+import com.google.android.gms.maps.model.PolylineOptions;
+import com.pwr.zpi.adapters.AdapterFactory;
+import com.pwr.zpi.adapters.AdapterFactory.AdapterType;
+import com.pwr.zpi.database.entity.Workout;
+import com.pwr.zpi.database.entity.WorkoutAction;
+import com.pwr.zpi.database.entity.WorkoutActionWarmUp;
+import com.pwr.zpi.listeners.ActityButtonStateChangeListener;
+import com.pwr.zpi.services.LocationService;
+import com.pwr.zpi.utils.ActualPaceCalculator;
+import com.pwr.zpi.views.GPSSignalDisplayer;
+
+import android.app.Activity;
+import android.app.ProgressDialog;
+import android.content.ComponentName;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.location.Location;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.IBinder;
+import android.os.RemoteException;
+import android.preference.PreferenceManager;
+import android.support.v4.widget.DrawerLayout;
+import android.util.Log;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.BaseAdapter;
+import android.widget.Button;
+import android.widget.ImageButton;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.ListView;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+import android.widget.Toast;
+
+public class ActivityNoMapActivity extends AbstractActivityActivity implements
+		OnClickListener {
+
+	public static final String TAG = ActivityNoMapActivity.class.getName();
+
+	// views
+	private Button buttonPause;
+	private Button buttonResume;
+	private Button buttonStop;
+	private GPSSignalDisplayer gpsDisplayer;
+	private BigDataField field1;
+	private BigDataField field2;
+	private BigDataField field3;
+	private BigDataField field4;
+	private ImageButton imageButtonGoToScreen1;
+	private LinearLayout startStopLayout;
+	private TextView textViewCountDown;
+
+	// service data
+	boolean mIsBound;
+	boolean isServiceConnected;
+	private RunListenerApi api;
+	private Handler handlerForService;
+
+	// measured values
+	private double pace;
+	private double avgPace;
+	private double distance;
+	private double lastDistance;
+	private Long time = 0L;
+	private int runNumber;
+	private ActualPaceCalculator actualPaceCalculator;
+
+	// workout fields
+	private Workout workout;
+	private Workout workoutCopy;
+
+	// progress dialog lost gps
+	private ProgressDialog lostGPSDialog;
+	private boolean progressDialogDisplayed;
+
+	// location data
+	private Location mLastLocation;
+	private Location mPreLastLocation;
+
+	@Override
+	protected void onCreate(Bundle arg0) {
+
+		super.onCreate(arg0);
+		setContentView(R.layout.activity_nomap_activity);
+		initFields();
+		addListeners();
+
+	}
+
+	@Override
+	protected void onPostCreate(Bundle savedInstanceState) {
+		super.onPostCreate(savedInstanceState);
+		prepareServiceAndStart();
+	}
+	
+	private void initFields() {
+		buttonPause = (Button) findViewById(R.id.buttonNoMapPause);
+		buttonResume = (Button) findViewById(R.id.buttonNoMapResume);
+		buttonStop = (Button) findViewById(R.id.buttonNoMapStop);
+		imageButtonGoToScreen1 = (ImageButton) findViewById(R.id.imageButtonGoToActivityActivity);
+		gpsDisplayer = (GPSSignalDisplayer) findViewById(R.id.gpsDisplayerNoMapActivity);
+		startStopLayout = (LinearLayout) findViewById(R.id.startStopLinearLayout);
+		textViewCountDown = (TextView) findViewById(R.id.textViewActivityNoMapCountDown);
+		field1 = new BigDataField();
+		field2 = new BigDataField();
+		field3 = new BigDataField();
+		field4 = new BigDataField();
+		initBigDataField(field1, findViewById(R.id.layoutNoMapField1));
+		initBigDataField(field2, findViewById(R.id.layoutNoMapField2));
+		initBigDataField(field3, findViewById(R.id.layoutNoMapField3));
+		initBigDataField(field4, findViewById(R.id.layoutNoMapField4));
+
+		initDisplayedData();
+		runNumber = getIntent().getIntExtra(ActivityActivity.RUN_NUMBER_TAG, 0);
+		initWorkoutData();
+		isPaused = false;
+		pausedManually = false;
+		progressDialogDisplayed = false;
+	}
+
+	private void initWorkoutData() {
+		Intent intent = this.getIntent();
+		if (intent.hasExtra(Workout.TAG)) {
+			// drawer initialization
+			workout = getWorkoutData(getIntent());
+			workoutCopy = new Workout();
+			List<WorkoutAction> actions = new ArrayList<WorkoutAction>();
+			if (workout.isWarmUp()) {
+				workoutCopy.setWarmUp(true);
+				int warmUpMinutes = Integer
+						.parseInt(PreferenceManager
+								.getDefaultSharedPreferences(this)
+								.getString(
+										this.getString(R.string.key_warm_up_time),
+										"3"));
+				actions.add(new WorkoutActionWarmUp(warmUpMinutes));
+			}
+
+			actions.addAll(workout.getActions());
+
+			workoutCopy.setActions(actions);
+		}
+	}
+
+	private void addListeners() {
+		buttonPause.setOnClickListener(this);
+		buttonResume.setOnClickListener(this);
+		buttonStop.setOnClickListener(this);
+		imageButtonGoToScreen1.setOnClickListener(this);
+		field1.container.setOnClickListener(this);
+		field2.container.setOnClickListener(this);
+		field3.container.setOnClickListener(this);
+		field4.container.setOnClickListener(this);
+		addOnStateChangedListener();
+	}
+
+	private void initBigDataField(BigDataField bigDataField, View parent) {
+		bigDataField.textView = (TextView) parent
+				.findViewById(R.id.textViewNoMapField1);
+		bigDataField.textViewDescription = (TextView) parent
+				.findViewById(R.id.textViewNoMapField1Discription);
+		bigDataField.textViewUnit = (TextView) parent
+				.findViewById(R.id.textViewNoMapField1Unit);
+		bigDataField.container = (RelativeLayout) parent
+				.findViewById(R.id.relativeLayoutNoMapField1);
+	}
+
+	// container for data field
+	private class BigDataField {
+		protected TextView textViewDescription;
+		protected TextView textView;
+		protected TextView textViewUnit;
+		protected RelativeLayout container;
+		protected int contentValue;
+	}
+
+	@Override
+	public void onClick(View v) {
+		switch (v.getId()) {
+		case R.id.buttonNoMapPause:
+			break;
+		case R.id.buttonNoMapResume:
+			break;
+		case R.id.buttonNoMapStop:
+			showAlertDialog(isServiceConnected,api,this,distance,time,runNumber);
+			break;
+		case R.id.imageButtonGoToActivityActivity:
+			start1Screen();
+			
+			break;
+		default:
+			if (v == field1.container) {
+
+			} else if (v == field2.container) {
+
+			} else if (v == field3.container) {
+
+			} else if (v == field4.container) {
+
+			}
+			break;
+		}
+
+	}
+
+	private void addOnStateChangedListener() {
+		ActityButtonStateChangeListener stateChangedListener = new ActityButtonStateChangeListener(
+				this);
+		buttonPause.setOnTouchListener(stateChangedListener);
+		buttonResume.setOnTouchListener(stateChangedListener);
+		buttonStop.setOnTouchListener(stateChangedListener);
+		imageButtonGoToScreen1.setOnTouchListener(stateChangedListener);
+		field1.container.setOnTouchListener(stateChangedListener);
+		field2.container.setOnTouchListener(stateChangedListener);
+		field3.container.setOnTouchListener(stateChangedListener);
+		field4.container.setOnTouchListener(stateChangedListener);
+
+	}
+
+	private void initDisplayedData() {
+		// TODO remember user data
+		field1.contentValue = distanceID;
+		field2.contentValue = timeID;
+		field3.contentValue = paceID;
+		field4.contentValue = avgPaceID;
+		initLabels(field1.textView, field1.textViewDescription, distanceID);
+		initLabels(field2.textView, field2.textViewDescription, timeID);
+		initLabels(field3.textView, field3.textViewDescription, paceID);
+		initLabels(field4.textView, field4.textViewDescription, avgPaceID);
+
+	}
+
+	private void prepareServiceAndStart() {
+		doBindService();
+
+		handlerForService = new Handler();
+	}
+
+	private void doBindService() {
+
+		Log.i("Service_info", "ActivityNoMapActivity Binding");
+		Intent intent = new Intent(LocationService.class.getName());
+		// intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+		// intent.setFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
+		bindService(intent, serviceConnection, 0);
+		mIsBound = true;
+	}
+
+	private void doUnbindService() {
+		Log.i("Service_info", "Activity Unbinding");
+		if (mIsBound) {
+			try {
+				api.removeListener(runListener);
+				unbindService(serviceConnection);
+			} catch (RemoteException e) {
+
+				e.printStackTrace();
+			}
+
+			mIsBound = false;
+
+		}
+	}
+
+	@Override
+	protected void onDestroy() {
+		doUnbindService();
+		super.onDestroy();
+	}
+	
+	@Override
+	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+		
+		if (requestCode == ActivityActivity.MY_REQUEST_CODE) {
+			
+			if (isServiceConnected && resultCode == RESULT_OK) {
+				try {
+					String name = data.getStringExtra(ActivityActivity.NAME_TAG);
+					api.doSaveRun(data.getBooleanExtra(ActivityActivity.SAVE_TAG, false), name);
+				}
+				catch (RemoteException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+			}
+			else if (isServiceConnected) {
+				try {
+					api.doSaveRun(false, "");
+				}
+				catch (RemoteException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+			}
+			setResult(RESULT_OK);	//dont know why its needed, but it is...
+			finish();
+			overridePendingTransition(R.anim.in_up_anim, R.anim.out_up_anim);
+			
+		}
+	}
+	
+	
+	private final ServiceConnection serviceConnection = new ServiceConnection() {
+
+		@Override
+		public void onServiceConnected(ComponentName name, IBinder service) {
+			Log.i(TAG, "Service connection established");
+			isServiceConnected = true;
+			// that's how we get the client side of the IPC connection
+			api = RunListenerApi.Stub.asInterface(service);
+			try {
+				api.addListener(runListener);
+
+				int countDownTime = Integer
+						.parseInt(PreferenceManager
+								.getDefaultSharedPreferences(
+										ActivityNoMapActivity.this)
+								.getString(
+										getString(R.string.key_countdown_before_start),
+										"0"));
+
+				api.setStarted(workoutCopy, countDownTime); // -,-' must be here
+															// because service
+															// has different
+															// preference
+															// context, so when
+															// user changes it
+															// in setting it
+															// doesn't work okay
+			} catch (RemoteException e) {
+				Log.e(TAG, "Failed to add listener", e);
+			}
+		}
+
+		@Override
+		public void onServiceDisconnected(ComponentName name) {
+			isServiceConnected = false;
+			Log.i(TAG, "Service connection closed");
+		}
+
+	};
+
+	private final RunListener.Stub runListener = new RunListener.Stub() {
+
+		@Override
+		public void handleLocationUpdate() throws RemoteException {
+			Location location = api.getLatestLocation();
+			lastDistance = distance;
+			distance = api.getDistance();
+			updateGpsInfo(location);
+		}
+
+		@Override
+		public void handleConnectionResult() throws RemoteException {
+		}
+
+		@Override
+		public void handleTimeChange() throws RemoteException {
+			handleTimeUpdates();
+		}
+
+		@Override
+		public void handleWorkoutChange(Workout workout, boolean firtTime)
+				throws RemoteException {
+			Log.i(TAG,
+					"workout data: " + workout.isWarmUp() + " "
+							+ workout.getCurrentAction() + " " + firtTime);
+
+			handleWorkoutUpdate(workout);
+		}
+
+		@Override
+		public void handleCountDownChange(int countDownNumber)
+				throws RemoteException {
+			handleCountDownUpdate(countDownNumber);
+		}
+
+		@Override
+		public void handleLostGPS() throws RemoteException {
+			if (!progressDialogDisplayed) {
+				showLostGpsSignalDialog();
+			}
+			handlerForService.post(new Runnable() {
+
+				@Override
+				public void run() {
+					gpsDisplayer.updateStrengthSignal(Double.MAX_VALUE);
+				}
+			});
+
+		}
+
+	};
+
+	@Override
+	protected void updateGpsInfo(final Location newLocation) {
+		autoPauseIfEnabled(newLocation);
+		handlerForService.post(new Runnable() {
+
+			@Override
+			public void run() {
+				if (newLocation.getAccuracy() < LocationService.REQUIRED_ACCURACY) {
+					// not first point after start or resume
+
+					if (lostGPSDialog != null) {
+						lostGPSDialog.dismiss();
+						lostGPSDialog = null;
+						progressDialogDisplayed = false;
+					}
+					if (!isPaused) {
+						if (mLastLocation != null) {
+							countData(newLocation, mLastLocation);
+						}
+
+						updateData(field1.textView, field1.contentValue,
+								distance, pace, time, avgPace);
+						updateData(field2.textView, field2.contentValue,
+								distance, pace, time, avgPace);
+						updateData(field3.textView, field3.contentValue,
+								distance, pace, time, avgPace);
+						updateData(field4.textView, field4.contentValue,
+								distance, pace, time, avgPace);
+					}
+				} else if (newLocation.getAccuracy() >= LocationService.REQUIRED_ACCURACY) {
+					// prevents displaying two progress Dialogs at once
+					if (!progressDialogDisplayed) {
+						showLostGpsSignalDialog();
+					}
+				}
+				mPreLastLocation = mLastLocation;
+				mLastLocation = newLocation;
+			}
+		});
+
+	}
+
+	@Override
+	protected void pauseRun() {
+		handlerForService.post(new Runnable() {
+			@Override
+			public void run() {
+				if (!isPaused
+						&& (!(workout != null && workout.isWarmUp() && workout
+								.getCurrentAction() == 0)))// ||
+															// pausedManually))
+				{
+					if (actualPaceCalculator != null) {
+						actualPaceCalculator.reset();
+					}
+					isPaused = true;
+					startStopLayout.setVisibility(View.INVISIBLE);
+					buttonResume.setVisibility(View.VISIBLE);
+					try {
+						if (isServiceConnected) {
+							api.setPaused();
+						}
+					} catch (RemoteException e) {
+						Log.e(TAG, "Failed to tell that activity is paused", e);
+					}
+				} else if (!isPaused && pausedManually) {
+					Toast.makeText(ActivityNoMapActivity.this,
+							getResources().getString(R.string.no_pause),
+							Toast.LENGTH_LONG).show();
+				}
+			}
+		});
+	}
+
+	@Override
+	protected void resumeRun() {
+		handlerForService.post(new Runnable() {
+			@Override
+			public void run() {
+				if (isPaused) {
+					isPaused = false;
+					pausedManually = false;
+					startStopLayout.setVisibility(View.VISIBLE);
+					buttonResume.setVisibility(View.GONE);
+					try {
+						if (isServiceConnected) {
+							api.setResumed();
+						}
+					} catch (RemoteException e) {
+						Log.e(TAG, "Failed to tell that activity is resumed", e);
+					}
+				}
+			}
+		});
+	}
+
+	@Override
+	protected void handleTimeUpdates() {
+		try {
+			time = api.getTime();
+			updateViewsAfterTimeChange();
+		} catch (RemoteException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+	}
+
+	private void updateViewsAfterTimeChange() {
+		handlerForService.post(new Runnable() {
+
+			@Override
+			public void run() {
+				updateData(field1.textView, field1.contentValue, distance,
+						pace, time, avgPace);
+				updateData(field2.textView, field2.contentValue, distance,
+						pace, time, avgPace);
+				updateData(field3.textView, field3.contentValue, distance,
+						pace, time, avgPace);
+				updateData(field4.textView, field4.contentValue, distance,
+						pace, time, avgPace);
+			}
+		});
+	}
+
+	private void autoPauseIfEnabled(Location newLocation) {
+		if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean(
+				getString(R.string.key_auto_pause), false)) {
+			if (newLocation.hasSpeed()) {
+				Log.e(TAG, "Speed:" + newLocation.getSpeed());
+				if (newLocation.getSpeed() < MIN_SPEED_FOR_AUTO_PAUSE) {
+					pauseRun();
+				} else if (!pausedManually) {
+					resumeRun();
+				}
+			} else {
+				Log.e(TAG, "No speed.. pausing anyway");
+				pauseRun();
+			}
+		}
+	}
+
+	private void handleWorkoutUpdate(final Workout newWorkout) {
+		handlerForService.post(new Runnable() {
+
+			@Override
+			public void run() {
+				ActivityNoMapActivity.this.workoutCopy
+						.updateWorkoutData(newWorkout);
+				// TODO show workout change
+			}
+		});
+	}
+
+	private void showLostGpsSignalDialog() {
+		handlerForService.post(new Runnable() {
+			@Override
+			public void run() {
+				if (isServiceConnected) {
+
+					progressDialogDisplayed = true;
+
+					lostGPSDialog = ProgressDialog
+							.show(ActivityNoMapActivity.this,
+									getResources()
+											.getString(
+													R.string.dialog_message_on_lost_gpsp),
+									null);
+					lostGPSDialog.setCancelable(true);
+
+				}
+			}
+		});
+	}
+
+	private void handleCountDownUpdate(final int countDownNumber) {
+		textViewCountDown.setVisibility(View.VISIBLE);
+		runOnUiThread(new Runnable() {
+
+			@Override
+			public void run() {
+				if (countDownNumber == -1) {
+					textViewCountDown.setVisibility(View.GONE);
+					reset();
+					// startRecording();
+				} else if (countDownNumber == 0) {
+					textViewCountDown.setText(ActivityNoMapActivity.this
+							.getString(R.string.go));
+				} else {
+					textViewCountDown.setText(countDownNumber + "");
+				}
+			}
+		});
+	}
+
+	private void reset() {
+		distance = 0;
+
+		time = 0L;
+	}
+
+	// count everything with 2 last location points
+	private void countData(final Location location, final Location lastLocation) {
+
+		Log.i("ActivityActivity", "countData: " + location);
+		handlerForService.post(new Runnable() {
+			@Override
+			public void run() {
+
+				gpsDisplayer.updateStrengthSignal(location.getAccuracy());
+
+				if (actualPaceCalculator == null) {
+					actualPaceCalculator = new ActualPaceCalculator();
+				}
+				pace = actualPaceCalculator.addPoint(location);// (double) 1 /
+																// (speed * 60 /
+																// 1000);
+
+				synchronized (time) {
+					avgPace = ((double) time / 60) / distance;
+				}
+			}
+		});
+	}
+
+	private void start1Screen() {
+		Intent i = new Intent(ActivityNoMapActivity.this,
+				ActivityActivity.class);
+		if (workout!=null)
+			i.putExtra(Workout.TAG, workout);
+		i.putExtra(ActivityActivity.RUN_NUMBER_TAG, runNumber);
+		finish();
+		startActivity(i);
+		overridePendingTransition(R.anim.in_right_anim, R.anim.out_right_anim);
+
+	}
+	
+	@Override
+	public void onBackPressed() {
+		super.onBackPressed();
+		showAlertDialog(isServiceConnected,api,this,distance,time,runNumber);
+	}
+}
diff --git a/ZPI1/src/com/pwr/zpi/AfterActivityActivity.java b/ZPI1/src/com/pwr/zpi/AfterActivityActivity.java
index 0f13796..cba88f4 100644
--- a/ZPI1/src/com/pwr/zpi/AfterActivityActivity.java
+++ b/ZPI1/src/com/pwr/zpi/AfterActivityActivity.java
@@ -16,6 +16,7 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.google.analytics.tracking.android.EasyTracker;
 import com.pwr.zpi.dialogs.MyDialog;
 import com.pwr.zpi.utils.Reminders;
 import com.pwr.zpi.utils.Time;
@@ -40,6 +41,18 @@ protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 	}
 	
+	@Override
+	public void onStart() {
+		super.onStart();
+		EasyTracker.getInstance(this).activityStart(this);  // Add this method.
+	}
+	
+	@Override
+	public void onStop() {
+		super.onStop();
+		EasyTracker.getInstance(this).activityStop(this);  // Add this method.
+	}
+	
 	private void initFields() {
 		buttonDiscard = (Button) findViewById(R.id.buttonAfterActivityDiscard);
 		buttonSave = (Button) findViewById(R.id.buttonAfterActivitySave);
diff --git a/ZPI1/src/com/pwr/zpi/ChartActivity.java b/ZPI1/src/com/pwr/zpi/ChartActivity.java
index ebe3d8b..aec67a2 100644
--- a/ZPI1/src/com/pwr/zpi/ChartActivity.java
+++ b/ZPI1/src/com/pwr/zpi/ChartActivity.java
@@ -10,6 +10,7 @@
 import com.fima.chartview.ChartView;
 import com.fima.chartview.LinearSeries;
 import com.fima.chartview.LinearSeries.LinearPoint;
+import com.google.analytics.tracking.android.EasyTracker;
 import com.pwr.zpi.adapters.ValueLabelAdapter;
 import com.pwr.zpi.adapters.ValueLabelAdapter.LabelOrientation;
 import com.pwr.zpi.utils.ChartDataHelperContainter;
@@ -40,6 +41,18 @@ protected void onCreate(Bundle savedInstanceState) {
 		
 	}
 	
+	@Override
+	public void onStart() {
+		super.onStart();
+		EasyTracker.getInstance(this).activityStart(this);  // Add this method.
+	}
+	
+	@Override
+	public void onStop() {
+		super.onStop();
+		EasyTracker.getInstance(this).activityStop(this);  // Add this method.
+	}
+	
 	private ChartDataHelperContainter getChartDataFromIntent() {
 		return getIntent().getParcelableExtra(CHART_DATA_KEY);
 	}
diff --git a/ZPI1/src/com/pwr/zpi/HistoryActivity.java b/ZPI1/src/com/pwr/zpi/HistoryActivity.java
index 2bba7ee..f5103a1 100644
--- a/ZPI1/src/com/pwr/zpi/HistoryActivity.java
+++ b/ZPI1/src/com/pwr/zpi/HistoryActivity.java
@@ -32,6 +32,7 @@
 import android.widget.TabHost.TabSpec;
 import android.widget.TextView;
 
+import com.google.analytics.tracking.android.EasyTracker;
 import com.pwr.zpi.adapters.AdapterFactory;
 import com.pwr.zpi.adapters.AdapterFactory.AdapterType;
 import com.pwr.zpi.adapters.GenericBaseAdapter;
@@ -96,7 +97,25 @@ protected void onCreate(Bundle savedInstanceState) {
 		initTabs();
 		initFields();
 		addListeners();
+		
+	}
+	
+	@Override
+	protected void onResume() {
 		new GetRunsFromDB().execute(null, null);
+		super.onResume();
+	}
+	
+	@Override
+	public void onStart() {
+		super.onStart();
+		EasyTracker.getInstance(this).activityStart(this);  // Add this method.
+	}
+	
+	@Override
+	public void onStop() {
+		super.onStop();
+		EasyTracker.getInstance(this).activityStop(this);  // Add this method.
 	}
 	
 	private void initTabs() {
diff --git a/ZPI1/src/com/pwr/zpi/MainScreenActivity.java b/ZPI1/src/com/pwr/zpi/MainScreenActivity.java
index 5986351..d0420fb 100644
--- a/ZPI1/src/com/pwr/zpi/MainScreenActivity.java
+++ b/ZPI1/src/com/pwr/zpi/MainScreenActivity.java
@@ -17,6 +17,7 @@
 import android.content.SharedPreferences;
 import android.graphics.Typeface;
 import android.location.Location;
+import android.media.AudioManager;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Handler;
@@ -37,6 +38,7 @@
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import com.google.analytics.tracking.android.EasyTracker;
 import com.google.android.gms.common.ConnectionResult;
 import com.google.android.gms.common.GooglePlayServicesUtil;
 import com.pwr.zpi.database.Database;
@@ -134,6 +136,18 @@ protected void onCreate(Bundle savedInstanceState) {
 		
 	}
 	
+	@Override
+	public void onStart() {
+		super.onStart();
+		EasyTracker.getInstance(this).activityStart(this);  // Add this method.
+	}
+	
+	@Override
+	public void onStop() {
+		super.onStop();
+		EasyTracker.getInstance(this).activityStop(this);  // Add this method.
+	}
+	
 	private void init() {
 		isServiceConnected = false;
 		
@@ -153,9 +167,11 @@ private void init() {
 		treningPlansLayout = (LinearLayout) findViewById(R.id.treningPlansBar);
 		
 		gpsStatus = GPSServiceStatus.NO_GPS_SIGNAL_INFO;
+		gpsDisplayer.updateStrengthSignal(Double.MAX_VALUE);
 		
 		setFont();
 		validateTreningPlan();
+		setVolumeControlStream(AudioManager.STREAM_MUSIC);
 	}
 	
 	private void setFont() {
@@ -454,7 +470,7 @@ public void onClick(DialogInterface arg0, int arg1) {
 		DialogFactory.getDialog(DialogsEnum.NoTTSData, this, positive, null).show();
 	}
 	
-	public void showGPSAccuracy(final double accuracy) {
+	private void showGPSAccuracy(final double accuracy) {
 		handler.post(new Runnable() {
 			@Override
 			public void run() {
diff --git a/ZPI1/src/com/pwr/zpi/NewWorkoutActionAdvancedActivity.java b/ZPI1/src/com/pwr/zpi/NewWorkoutActionAdvancedActivity.java
index 15a1463..ef20eac 100644
--- a/ZPI1/src/com/pwr/zpi/NewWorkoutActionAdvancedActivity.java
+++ b/ZPI1/src/com/pwr/zpi/NewWorkoutActionAdvancedActivity.java
@@ -15,6 +15,7 @@
 import android.widget.TabHost;
 import android.widget.TabHost.TabSpec;
 
+import com.google.analytics.tracking.android.EasyTracker;
 import com.pwr.zpi.database.entity.WorkoutAction;
 import com.pwr.zpi.database.entity.WorkoutActionAdvanced;
 import com.pwr.zpi.utils.TimeFormatter;
@@ -91,6 +92,18 @@ protected void onCreate(Bundle savedInstanceState) {
 		setDataIfEdit();
 	}
 	
+	@Override
+	public void onStart() {
+		super.onStart();
+		EasyTracker.getInstance(this).activityStart(this);  // Add this method.
+	}
+	
+	@Override
+	public void onStop() {
+		super.onStop();
+		EasyTracker.getInstance(this).activityStop(this);  // Add this method.
+	}
+	
 	private void initTabs()
 	{
 		tabHost = (TabHost) findViewById(R.id.tabhostActions);
diff --git a/ZPI1/src/com/pwr/zpi/NewWorkoutActionSimpleActivity.java b/ZPI1/src/com/pwr/zpi/NewWorkoutActionSimpleActivity.java
index 249f1e0..8b39f13 100644
--- a/ZPI1/src/com/pwr/zpi/NewWorkoutActionSimpleActivity.java
+++ b/ZPI1/src/com/pwr/zpi/NewWorkoutActionSimpleActivity.java
@@ -10,6 +10,7 @@
 import android.widget.RelativeLayout;
 import android.widget.TabHost;
 
+import com.google.analytics.tracking.android.EasyTracker;
 import com.pwr.zpi.database.entity.WorkoutAction;
 import com.pwr.zpi.database.entity.WorkoutActionSimple;
 import com.pwr.zpi.views.CustomPicker;
@@ -50,6 +51,18 @@ protected void onCreate(Bundle savedInstanceState) {
 		setDataIfEdit();
 	}
 	
+	@Override
+	public void onStart() {
+		super.onStart();
+		EasyTracker.getInstance(this).activityStart(this);  // Add this method.
+	}
+	
+	@Override
+	public void onStop() {
+		super.onStop();
+		EasyTracker.getInstance(this).activityStop(this);  // Add this method.
+	}
+	
 	private void initFields()
 	{
 		//interval action
diff --git a/ZPI1/src/com/pwr/zpi/NewWorkoutActivity.java b/ZPI1/src/com/pwr/zpi/NewWorkoutActivity.java
index d5345d2..475ef62 100644
--- a/ZPI1/src/com/pwr/zpi/NewWorkoutActivity.java
+++ b/ZPI1/src/com/pwr/zpi/NewWorkoutActivity.java
@@ -3,11 +3,10 @@
 import java.util.ArrayList;
 
 import android.app.Activity;
+import android.app.Dialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
-import android.text.Editable;
-import android.text.TextWatcher;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.view.MenuInflater;
@@ -23,8 +22,9 @@
 import android.widget.EditText;
 import android.widget.ListView;
 import android.widget.RelativeLayout;
-import android.widget.TextView;
+import android.widget.Toast;
 
+import com.google.analytics.tracking.android.EasyTracker;
 import com.pwr.zpi.adapters.AdapterFactory;
 import com.pwr.zpi.adapters.AdapterFactory.AdapterType;
 import com.pwr.zpi.adapters.GenericBaseAdapter;
@@ -32,11 +32,11 @@
 import com.pwr.zpi.database.Database;
 import com.pwr.zpi.database.entity.Workout;
 import com.pwr.zpi.database.entity.WorkoutAction;
+import com.pwr.zpi.dialogs.DialogFactory;
 import com.pwr.zpi.dialogs.MyDialog;
-import com.pwr.zpi.views.CustomPicker;
 import com.pwr.zpi.views.TopBar;
 
-public class NewWorkoutActivity extends Activity implements OnClickListener, OnItemClickListener, TextWatcher {
+public class NewWorkoutActivity extends Activity implements OnClickListener, OnItemClickListener {
 	
 	public static final int MY_REQUEST_CODE_ADD = 1;
 	public static final int MY_REQUEST_CODE_EDIT = 2;
@@ -45,17 +45,16 @@ public class NewWorkoutActivity extends Activity implements OnClickListener, OnI
 	private EditText workautNameEditText;
 	private CheckBox isWarmUpCheckBox;
 	private RelativeLayout warmUpLayout;
-	private CustomPicker repeatPicker;
 	private int editedPos;
 	private ArrayList<WorkoutAction> workoutsActionList;
 	private BaseAdapter workoutActionAdapter;
 	private ListView workoutsListView;
 	private AdapterContextMenuInfo info;
-	private TextView workoutsRepeatsTextView;
 	private Workout workout;
 	private EditText picerEditText;
 	private TopBar topBar;
 	private RelativeLayout topBarLeftButton;
+	private Button generateRepeats;
 	
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
@@ -64,13 +63,19 @@ protected void onCreate(Bundle savedInstanceState) {
 		initFields();
 		addListeners();
 		boolean isEdited = setDataIfEdit();
-		if (!isEdited) {
-			workautNameEditText.findFocus();
-			workautNameEditText.selectAll();
-		}
-		else {
-			//TODO remove focus from edit text, nie dziala mi google i nie moge sprawdzic jak to zrobic....
-		}
+		
+	}
+	
+	@Override
+	public void onStart() {
+		super.onStart();
+		EasyTracker.getInstance(this).activityStart(this);  // Add this method.
+	}
+	
+	@Override
+	public void onStop() {
+		super.onStop();
+		EasyTracker.getInstance(this).activityStop(this);  // Add this method.
 	}
 	
 	private void initFields() {
@@ -89,22 +94,18 @@ private void initFields() {
 		addActionButton = (RelativeLayout) footer.findViewById(R.id.buttonNewWorkoutAction);
 		addThisWorkoutButton = (Button) footer.findViewById(R.id.buttonWorkoutAdd);
 		workautNameEditText = (EditText) header.findViewById(R.id.editTextWorkoutName);
-		workoutsRepeatsTextView = (TextView) footer.findViewById(R.id.TextViewNewWorkoutRepeatValue);
 		warmUpLayout = (RelativeLayout) footer.findViewById(R.id.RelativeLayoutNewWokoutWarmUp);
+		generateRepeats = (Button) footer.findViewById(R.id.buttonWorkoutGenerateRepeats);
 		
 		int nr = getIntent().getIntExtra(PlaningActivity.WORKOUTS_NUMBER_TAG, 0);
 		workautNameEditText.setText(getResources().getString(R.string.workouts) + (nr + 1));
 		
-		repeatPicker = (CustomPicker) footer.findViewById(R.id.customPickerRepeat);
 		topBar = (TopBar) header.findViewById(R.id.topBarNewWorkout);
 		
 		topBarLeftButton = topBar.getLeftButton();
 		
-		workoutsRepeatsTextView.setText(repeatPicker.getValue() + " " + getResources().getString(R.string.times));
-		
 		isWarmUpCheckBox = (CheckBox) footer.findViewById(R.id.ToggleButtonWormUp);
 		
-		picerEditText = repeatPicker.getDisplayEditText();
 		registerForContextMenu(workoutsListView);
 	}
 	
@@ -112,9 +113,9 @@ private void addListeners() {
 		addActionButton.setOnClickListener(this);
 		addThisWorkoutButton.setOnClickListener(this);
 		workoutsListView.setOnItemClickListener(this);
-		picerEditText.addTextChangedListener(this);
 		topBarLeftButton.setOnClickListener(this);
 		warmUpLayout.setOnClickListener(this);
+		generateRepeats.setOnClickListener(this);
 	}
 	
 	private void showActionChooseDialog() {
@@ -157,7 +158,6 @@ else if (v == addThisWorkoutButton) {
 				workout = new Workout();
 			}
 			workout.setName(workautNameEditText.getText().toString());
-			workout.setRepeatCount(repeatPicker.getValue());
 			workout.setWarmUp(isWarmUpCheckBox.isChecked());
 			workout.setActions(workoutsActionList);
 			
@@ -171,6 +171,20 @@ else if (v == topBarLeftButton) {
 		else if (v == warmUpLayout) {
 			isWarmUpCheckBox.setChecked(!isWarmUpCheckBox.isChecked());
 		}
+		else if (v == generateRepeats) {
+			// custom dialog
+			if (!workoutsActionList.isEmpty())
+			{
+				Dialog dialog = DialogFactory.getRepeatsDialog(this, R.layout.generate_repeats_dialog,
+					workoutsActionList,
+					workoutActionAdapter);
+				dialog.show();
+			}
+			else
+			{
+				Toast.makeText(this, getResources().getString(R.string.no_actions), Toast.LENGTH_LONG).show();
+			}
+		}
 		
 	}
 	
@@ -281,7 +295,6 @@ private boolean setDataIfEdit() {
 			workout = intent.getParcelableExtra(Workout.TAG);
 			workautNameEditText.setText(workout.getName());
 			isWarmUpCheckBox.setChecked(workout.isWarmUp());
-			repeatPicker.setValue(workout.getRepeatCount());
 			workoutsActionList.addAll(workout.getActions());
 			workoutActionAdapter.notifyDataSetChanged();
 			addThisWorkoutButton.setText(R.string.edit_workout);
@@ -289,22 +302,4 @@ private boolean setDataIfEdit() {
 		}
 		return false;
 	}
-	
-	@Override
-	public void afterTextChanged(Editable s) {
-		workoutsRepeatsTextView.setText(s + " " + getResources().getString(R.string.times));
-		
-	}
-	
-	@Override
-	public void beforeTextChanged(CharSequence arg0, int arg1, int arg2, int arg3) {
-		// TODO Auto-generated method stub
-		
-	}
-	
-	@Override
-	public void onTextChanged(CharSequence arg0, int arg1, int arg2, int arg3) {
-		// TODO Auto-generated method stub
-		
-	}
 }
diff --git a/ZPI1/src/com/pwr/zpi/PlaningActivity.java b/ZPI1/src/com/pwr/zpi/PlaningActivity.java
index d49e83a..bf4343f 100644
--- a/ZPI1/src/com/pwr/zpi/PlaningActivity.java
+++ b/ZPI1/src/com/pwr/zpi/PlaningActivity.java
@@ -25,6 +25,7 @@
 import android.widget.TabHost;
 import android.widget.TabHost.TabSpec;
 
+import com.google.analytics.tracking.android.EasyTracker;
 import com.pwr.zpi.adapters.AdapterFactory;
 import com.pwr.zpi.adapters.AdapterFactory.AdapterType;
 import com.pwr.zpi.adapters.GenericBaseAdapter;
@@ -113,6 +114,18 @@ protected void onCreate(Bundle savedInstanceState) {
 		addListeners();
 	}
 	
+	@Override
+	public void onStart() {
+		super.onStart();
+		EasyTracker.getInstance(this).activityStart(this);  // Add this method.
+	}
+	
+	@Override
+	public void onStop() {
+		super.onStop();
+		EasyTracker.getInstance(this).activityStop(this);  // Add this method.
+	}
+	
 	private void disableTraningPlans()
 	{
 		if (!MainScreenActivity.TREANING_PLANS_ACTIVE) {
diff --git a/ZPI1/src/com/pwr/zpi/PlansActivity.java b/ZPI1/src/com/pwr/zpi/PlansActivity.java
index 2dc325c..1d6d979 100644
--- a/ZPI1/src/com/pwr/zpi/PlansActivity.java
+++ b/ZPI1/src/com/pwr/zpi/PlansActivity.java
@@ -22,6 +22,7 @@
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import com.google.analytics.tracking.android.EasyTracker;
 import com.pwr.zpi.adapters.AdapterFactory;
 import com.pwr.zpi.adapters.AdapterFactory.AdapterType;
 import com.pwr.zpi.database.entity.TreningPlan;
@@ -79,6 +80,18 @@ protected void onCreate(Bundle savedInstanceState) {
 		addListeners();
 	}
 	
+	@Override
+	public void onStart() {
+		super.onStart();
+		EasyTracker.getInstance(this).activityStart(this);  // Add this method.
+	}
+	
+	@Override
+	public void onStop() {
+		super.onStop();
+		EasyTracker.getInstance(this).activityStop(this);  // Add this method.
+	}
+	
 	private void addListeners() {
 		leftBarButton.setOnClickListener(this);
 		rightBarButton.setOnClickListener(this);
diff --git a/ZPI1/src/com/pwr/zpi/SettingsActivity.java b/ZPI1/src/com/pwr/zpi/SettingsActivity.java
index df78780..8e3062b 100644
--- a/ZPI1/src/com/pwr/zpi/SettingsActivity.java
+++ b/ZPI1/src/com/pwr/zpi/SettingsActivity.java
@@ -13,6 +13,7 @@
 import android.view.MotionEvent;
 import android.view.View;
 
+import com.google.analytics.tracking.android.EasyTracker;
 import com.pwr.zpi.listeners.GestureListener;
 import com.pwr.zpi.listeners.MyGestureDetector;
 import com.pwr.zpi.mock.TreningPlans;
@@ -37,6 +38,18 @@ protected void onCreate(Bundle savedInstanceState) {
 		disableReminderIfPlanSet();
 	}
 	
+	@Override
+	public void onStart() {
+		super.onStart();
+		EasyTracker.getInstance(this).activityStart(this);  // Add this method.
+	}
+	
+	@Override
+	public void onStop() {
+		super.onStop();
+		EasyTracker.getInstance(this).activityStop(this);  // Add this method.
+	}
+	
 	private void disableReminderIfPlanSet() {
 		SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
 		boolean isTreningPlan = prefs.getBoolean(TreningPlans.TRENING_PLANS_IS_ENABLED_KEY, false);
diff --git a/ZPI1/src/com/pwr/zpi/SingleRunHistoryActivity.java b/ZPI1/src/com/pwr/zpi/SingleRunHistoryActivity.java
index f1d5fba..3a313ef 100644
--- a/ZPI1/src/com/pwr/zpi/SingleRunHistoryActivity.java
+++ b/ZPI1/src/com/pwr/zpi/SingleRunHistoryActivity.java
@@ -2,7 +2,9 @@
 
 import java.util.LinkedList;
 
+import android.app.Dialog;
 import android.app.ProgressDialog;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.location.Location;
 import android.os.AsyncTask;
@@ -24,6 +26,7 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.google.analytics.tracking.android.EasyTracker;
 import com.google.android.gms.maps.CameraUpdateFactory;
 import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.GoogleMap.OnCameraChangeListener;
@@ -37,6 +40,8 @@
 import com.google.android.gms.maps.model.PolylineOptions;
 import com.pwr.zpi.database.Database;
 import com.pwr.zpi.database.entity.SingleRun;
+import com.pwr.zpi.dialogs.DialogFactory;
+import com.pwr.zpi.dialogs.MyDialog;
 import com.pwr.zpi.files.GPXParser;
 import com.pwr.zpi.utils.ChartDataHelperContainter;
 import com.pwr.zpi.utils.LineChartDataEvaluator;
@@ -92,8 +97,21 @@ protected void onCreate(Bundle savedInstanceState) {
 		new GetRunFromDB().execute(getIntent().getLongExtra(HistoryActivity.ID_TAG, 0));
 	}
 	
+	@Override
+	public void onStart() {
+		super.onStart();
+		EasyTracker.getInstance(this).activityStart(this);  // Add this method.
+	}
+	
+	@Override
+	public void onStop() {
+		super.onStop();
+		EasyTracker.getInstance(this).activityStop(this);  // Add this method.
+	}
+	
 	private void mapCenter() {
-		
+		if (mMap == null)
+			return;
 		LinkedList<LinkedList<Pair<Location, Long>>> traceWithTime = run.getTraceWithTime();
 		if (traceWithTime != null)
 		{
@@ -373,6 +391,29 @@ public boolean onOptionsItemSelected(MenuItem item)
 				}
 				
 				return true;
+			case R.id.menu_button_remove:
+				
+				DialogInterface.OnClickListener positiveButtonHandler = new DialogInterface.OnClickListener() {
+					
+					// romove
+					@Override
+					public void onClick(DialogInterface dialog, int id) {
+						
+						Database db = new Database(SingleRunHistoryActivity.this);
+						db.deleteRun(run.getRunID());
+						db.close();
+						finish();
+					}
+				};
+				MyDialog.showAlertDialog(this, R.string.dialog_message_romve, R.string.empty_string,
+					android.R.string.yes, android.R.string.no, positiveButtonHandler, null);
+				
+				return true;
+			case R.id.menu_button_change_name:
+				Dialog dialog = DialogFactory.getChangeNameDialog(this, R.layout.change_name_dialog,
+					runNameTextView, run.getRunID());
+				dialog.show();
+				return true;
 				
 			default:
 				return super.onOptionsItemSelected(item);
diff --git a/ZPI1/src/com/pwr/zpi/SplitsActivity.java b/ZPI1/src/com/pwr/zpi/SplitsActivity.java
index 45fd4ab..89b57e8 100644
--- a/ZPI1/src/com/pwr/zpi/SplitsActivity.java
+++ b/ZPI1/src/com/pwr/zpi/SplitsActivity.java
@@ -12,6 +12,7 @@
 import android.widget.ListView;
 import android.widget.RelativeLayout;
 
+import com.google.analytics.tracking.android.EasyTracker;
 import com.pwr.zpi.adapters.AdapterFactory;
 import com.pwr.zpi.adapters.AdapterFactory.AdapterType;
 import com.pwr.zpi.database.Database;
@@ -34,6 +35,18 @@ protected void onCreate(Bundle savedInstanceState) {
 		init();
 	}
 	
+	@Override
+	public void onStart() {
+		super.onStart();
+		EasyTracker.getInstance(this).activityStart(this);  // Add this method.
+	}
+	
+	@Override
+	public void onStop() {
+		super.onStop();
+		EasyTracker.getInstance(this).activityStop(this);  // Add this method.
+	}
+	
 	private void init() {
 		singleRun = getSingleRunFromIntent();
 		splitsListView = (ListView) findViewById(R.id.listViewSplits);
diff --git a/ZPI1/src/com/pwr/zpi/WorkoutActivity.java b/ZPI1/src/com/pwr/zpi/WorkoutActivity.java
index 824621f..fd1c3e9 100644
--- a/ZPI1/src/com/pwr/zpi/WorkoutActivity.java
+++ b/ZPI1/src/com/pwr/zpi/WorkoutActivity.java
@@ -21,6 +21,7 @@
 import android.widget.ListView;
 import android.widget.TextView;
 
+import com.google.analytics.tracking.android.EasyTracker;
 import com.pwr.zpi.adapters.AdapterFactory;
 import com.pwr.zpi.adapters.AdapterFactory.AdapterType;
 import com.pwr.zpi.adapters.GenericBaseAdapter;
@@ -45,7 +46,6 @@ public class WorkoutActivity extends Activity implements GestureListener, OnItem
 	private Button editThisWorkoutButton;
 	private TextView workoutNameTextView;
 	private AdapterContextMenuInfo info;
-	private TextView repeatsTextView;
 	private TextView warmUpTextView;
 	private ArrayList<WorkoutAction> actions;
 	private static final int MY_REQUEST_CODE_EDIT = 1;
@@ -59,6 +59,18 @@ protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 	}
 	
+	@Override
+	public void onStart() {
+		super.onStart();
+		EasyTracker.getInstance(this).activityStart(this);  // Add this method.
+	}
+	
+	@Override
+	public void onStop() {
+		super.onStop();
+		EasyTracker.getInstance(this).activityStop(this);  // Add this method.
+	}
+	
 	private void initFields() {
 		actionsListView = (ListView) findViewById(R.id.listViewWokoutActions);
 		long ID = getIntent().getLongExtra(PlaningActivity.ID_TAG, -1);
@@ -75,12 +87,10 @@ private void initFields() {
 		
 		addThisWorkoutButton = (Button) header.findViewById(R.id.ButtonChooseWorkout);
 		workoutNameTextView = (TextView) header.findViewById(R.id.textViewWorkoutName);
-		repeatsTextView = (TextView) footer.findViewById(R.id.textViewWrokoutActivityRepeat);
 		warmUpTextView = (TextView) footer.findViewById(R.id.textViewWorkoutActivityWarmUp);
 		editThisWorkoutButton = (Button) footer.findViewById(R.id.buttonWorkoutEdit);
 		
 		workoutNameTextView.setText(workout.getName());
-		repeatsTextView.setText(workout.getRepeatCount() + "");
 		warmUpTextView.setText(workout.isWarmUp() ? R.string.yes : R.string.no);
 		
 		registerForContextMenu(actionsListView);
@@ -191,7 +201,6 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
 					actions.clear();
 					actions.addAll(workout.getActions());
 					actionsAdapter.notifyDataSetChanged();
-					repeatsTextView.setText(workout.getRepeatCount() + "");
 					warmUpTextView.setText(workout.isWarmUp() ? R.string.yes : R.string.no);
 					Database db = new Database(this);
 					db.updateWorkout(workout);
diff --git a/ZPI1/src/com/pwr/zpi/adapters/DrawerWorkoutsRowBuilder.java b/ZPI1/src/com/pwr/zpi/adapters/DrawerWorkoutsRowBuilder.java
index fed730b..a9614bc 100644
--- a/ZPI1/src/com/pwr/zpi/adapters/DrawerWorkoutsRowBuilder.java
+++ b/ZPI1/src/com/pwr/zpi/adapters/DrawerWorkoutsRowBuilder.java
@@ -113,7 +113,9 @@ else if (position == workout.getCurrentAction()) {
 			}
 			else {
 				rowHolder.actionTextAdvanced.setText(workout.getHowMuchLeftCurrentActionStringWithUnits());
-				rowHolder.actionTextAdvanced.setBackgroundColor(context.getResources().getColor(textColor));
+				if (action.isAdvanced()) {
+					rowHolder.actionTextAdvanced.setBackgroundColor(context.getResources().getColor(textColor));
+				}
 			}
 		}
 		else {
diff --git a/ZPI1/src/com/pwr/zpi/adapters/WorkoutActionsRowBuilder.java b/ZPI1/src/com/pwr/zpi/adapters/WorkoutActionsRowBuilder.java
index e8f27a4..e863e83 100644
--- a/ZPI1/src/com/pwr/zpi/adapters/WorkoutActionsRowBuilder.java
+++ b/ZPI1/src/com/pwr/zpi/adapters/WorkoutActionsRowBuilder.java
@@ -50,13 +50,14 @@ public AbstractRowHolder buildRowHolder(View row, WorkoutAction item) {
 			case SIMPLE:
 				holder.speedString = (TextView) row.findViewById(R.id.dataTextViewActionSpeedString);
 				holder.timeOrDistance = (TextView) row.findViewById(R.id.dataTextViewActionTimeOrDistance);
-				
+				holder.actionNumber = (TextView) row.findViewById(R.id.textViewActionSimplePosition);
 				break;
 			
 			case ADVANCED:
 				holder.pace = (TextView) row.findViewById(R.id.dataTextViewActionPace);
 				holder.distance = (TextView) row.findViewById(R.id.dataTextViewActionDistance);
 				holder.time = (TextView) row.findViewById(R.id.dataTextViewActionTime);
+				holder.actionNumber = (TextView) row.findViewById(R.id.textViewActionAdvancedPosition);
 				break;
 		}
 		holder.image = (ImageView) row.findViewById(R.id.imageViewWorkoutAction);
@@ -67,6 +68,7 @@ public AbstractRowHolder buildRowHolder(View row, WorkoutAction item) {
 	public void fillRowDataToHolder(AbstractRowHolder holder, WorkoutAction item, int position, int[] layoutResourcesIDs) {
 		WorkoutActionHolder rowHolder = (WorkoutActionHolder) holder;
 		int type = getItemViewType(item);
+		rowHolder.actionNumber.setText((position + 1) + ".");
 		switch (type) {
 			case SIMPLE:
 				//TODO set image here
@@ -121,5 +123,6 @@ static class WorkoutActionHolder extends AbstractRowHolder {
 		
 		TextView speedString;
 		TextView timeOrDistance;
+		TextView actionNumber;
 	}
 }
diff --git a/ZPI1/src/com/pwr/zpi/database/Database.java b/ZPI1/src/com/pwr/zpi/database/Database.java
index ad7e02a..8c196fe 100644
--- a/ZPI1/src/com/pwr/zpi/database/Database.java
+++ b/ZPI1/src/com/pwr/zpi/database/Database.java
@@ -22,7 +22,7 @@
 
 public class Database extends SQLiteOpenHelper {
 	
-	private static final int DATABASE_VERSION = 2;
+	private static final int DATABASE_VERSION = 4;
 	private static final String DATABASE_NAME = "Historia_biegacza";
 	
 	// Tables names
@@ -52,7 +52,6 @@ public class Database extends SQLiteOpenHelper {
 	// workouts
 	private static final String WORKOUTS_ID = "workouts_id";
 	private static final String WORKOUTS_NAME = "workouts_name";
-	private static final String WORKOUTS_REPEATS = "workouts_repeats";
 	private static final String WORKOUTS_WARM_UP = "workouts_warm_up";
 	// workouts actions
 	private static final String WA_ID = "wa_id";
@@ -74,16 +73,17 @@ public class Database extends SQLiteOpenHelper {
 	private static final String AA_ORDER_NUMBER = "aa_order_number";
 	
 	// Tables creation schemas
-	private static final String CREATE_TABLE_DATES = "CREATE TABLE " + DATES + "(" + DATES_RUN_NUMBER
+	private static final String CREATE_TABLE_DATES = "CREATE TABLE IF NOT EXISTS " + DATES + "(" + DATES_RUN_NUMBER
 		+ " INTEGER PRIMARY KEY AUTOINCREMENT, " + DATES_START_HOUR + " INTEGER, " + DATES_END_HOUR + " INTEGER ,"
 		+ DATES_RUN_DISTANCE + " INTEGER, " + DATES_RUN_TIME + " INTEGER, " + DATES_RUN_NAME + " TEXT" + ")";
-	private static final String CREATE_TABLE_POINTS_WITH_TIME = "CREATE TABLE " + POINTS_WITH_TIME + "(" + PWT_ID
+	private static final String CREATE_TABLE_POINTS_WITH_TIME = "CREATE TABLE IF NOT EXISTS " + POINTS_WITH_TIME + "("
+		+ PWT_ID
 		+ " INTEGER PRIMARY KEY AUTOINCREMENT, " + PWT_RUN_NUMBER + " INTEGER, " + PWT_SUB_RUN_NUMBER + " INTEGER, "
 		+ PWT_LONGITUDE + " DOUBLE, " + PWT_LATITUDE + " DOUBLE, " + PWT_ALTITUDE + " DOUBLE, " + PWT_TIME_FROM_START
 		+ " INTEGER, " + "FOREIGN KEY (" + PWT_RUN_NUMBER + ")" + " REFERENCES " + DATES + " (" + DATES_RUN_NUMBER
 		+ ")" + ")";
 	private static final String CREATE_TABLE_WORKOUTS = "CREATE TABLE " + WORKOUTS + "(" + WORKOUTS_ID
-		+ " INTEGER PRIMARY KEY AUTOINCREMENT, " + WORKOUTS_NAME + " TEXT, " + WORKOUTS_REPEATS + " INTEGER, "
+		+ " INTEGER PRIMARY KEY AUTOINCREMENT, " + WORKOUTS_NAME + " TEXT, "
 		+ WORKOUTS_WARM_UP + " INTEGER" + ")";
 	private static final String CREATE_TABLE_WORKOUTS_ACTIONS = "CREATE TABLE " + WORKOUTS_ACTIONS + "(" + WA_ID
 		+ " INTEGER PRIMARY KEY AUTOINCREMENT, " + WA_WORKOUT_ID + " INTEGER, " + WA_ACTION_ID + " INTEGER, "
@@ -111,13 +111,30 @@ public void onCreate(SQLiteDatabase db) {
 	
 	@Override
 	public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-		db.execSQL("DROP TABLE IF EXISTS " + ACTIONS_ADVANCED);
-		db.execSQL("DROP TABLE IF EXISTS " + ACTIONS_SIMPLE);
-		db.execSQL("DROP TABLE IF EXISTS " + WORKOUTS_ACTIONS);
-		db.execSQL("DROP TABLE IF EXISTS " + WORKOUTS);
-		db.execSQL("DROP TABLE IF EXISTS " + POINTS_WITH_TIME);
-		db.execSQL("DROP TABLE IF EXISTS " + DATES);
-		onCreate(db);
+		if (oldVersion == 2 && newVersion == 3)
+		{
+			//do nothing
+		}
+		else if (newVersion == 4 || newVersion == 5)
+		{
+			
+			db.execSQL("DROP TABLE IF EXISTS " + ACTIONS_ADVANCED);
+			db.execSQL("DROP TABLE IF EXISTS " + ACTIONS_SIMPLE);
+			db.execSQL("DROP TABLE IF EXISTS " + WORKOUTS_ACTIONS);
+			db.execSQL("DROP TABLE IF EXISTS " + WORKOUTS);
+			onCreate(db);
+			
+		}
+		else
+		{
+			db.execSQL("DROP TABLE IF EXISTS " + ACTIONS_ADVANCED);
+			db.execSQL("DROP TABLE IF EXISTS " + ACTIONS_SIMPLE);
+			db.execSQL("DROP TABLE IF EXISTS " + WORKOUTS_ACTIONS);
+			db.execSQL("DROP TABLE IF EXISTS " + WORKOUTS);
+			db.execSQL("DROP TABLE IF EXISTS " + POINTS_WITH_TIME);
+			db.execSQL("DROP TABLE IF EXISTS " + DATES);
+			onCreate(db);
+		}
 	}
 	
 	public boolean insertSingleRun(SingleRun singleRun) {
@@ -345,7 +362,6 @@ private long insertWorkoutPart(SQLiteDatabase db, Workout workout) {
 	private ContentValues workoutToContentValues(Workout workout) {
 		ContentValues cv = new ContentValues();
 		cv.put(WORKOUTS_NAME, workout.getName());
-		cv.put(WORKOUTS_REPEATS, workout.getRepeatCount());
 		cv.put(WORKOUTS_WARM_UP, booleanToInt(workout.isWarmUp()));
 		return cv;
 	}
@@ -389,6 +405,13 @@ private ContentValues advancedWorkoutActionToContentValues(WorkoutActionAdvanced
 		return cv;
 	}
 	
+	private ContentValues runNameToContentValues(String name) {
+		ContentValues cv = new ContentValues();
+		cv.put(DATES_RUN_NAME, name);
+		
+		return cv;
+	}
+	
 	private boolean insertWorkoutIDActionID(SQLiteDatabase db, long workoutID, long actionID, int workoutType) {
 		ContentValues cv = new ContentValues();
 		cv.put(WA_WORKOUT_ID, workoutID);
@@ -400,7 +423,7 @@ private boolean insertWorkoutIDActionID(SQLiteDatabase db, long workoutID, long
 	
 	public List<Workout> getAllWorkoutNames() {
 		SQLiteDatabase db = getReadableDatabase();
-		String[] columns = new String[] { WORKOUTS_ID, WORKOUTS_NAME, WORKOUTS_REPEATS, WORKOUTS_WARM_UP };
+		String[] columns = new String[] { WORKOUTS_ID, WORKOUTS_NAME, WORKOUTS_WARM_UP };
 		Cursor cursor = db.query(WORKOUTS, columns, null, null, null, null, null);
 		
 		List<Workout> result = null;
@@ -422,14 +445,13 @@ private Workout getWorkoutFromCursor(Cursor cursor) {
 		Workout workout = new Workout();
 		workout.setID(cursor.getLong(0));
 		workout.setName(cursor.getString(1));
-		workout.setRepeatCount(cursor.getInt(2));
-		workout.setWarmUp(intToBoolean(cursor.getInt(3)));
+		workout.setWarmUp(intToBoolean(cursor.getInt(2)));
 		return workout;
 	}
 	
 	public Workout getWholeSingleWorkout(long workoutID) {
 		SQLiteDatabase db = getReadableDatabase();
-		String[] columns = new String[] { WORKOUTS_ID, WORKOUTS_NAME, WORKOUTS_REPEATS, WORKOUTS_WARM_UP };
+		String[] columns = new String[] { WORKOUTS_ID, WORKOUTS_NAME, WORKOUTS_WARM_UP };
 		Cursor cursor = db.query(WORKOUTS, columns, WORKOUTS_ID + "=?", new String[] { workoutID + "" }, null, null,
 			null);
 		Workout workout = null;
@@ -597,6 +619,13 @@ private boolean updateWorkoutActions(SQLiteDatabase db, Workout workout) {
 		return isOK;
 	}
 	
+	public boolean updateSingleRunName(long runId, String newName)
+	{
+		SQLiteDatabase db = getWritableDatabase();
+		ContentValues cv = runNameToContentValues(newName);
+		return db.update(DATES, cv, DATES_RUN_NUMBER + "=?", new String[] { runId + "" }) != 0;
+	}
+	
 	private boolean updateWorkoutAction(SQLiteDatabase db, long workoutId, WorkoutAction action, int index) {
 		boolean isOK;
 		switch (action.getActionType()) {
diff --git a/ZPI1/src/com/pwr/zpi/database/entity/Workout.java b/ZPI1/src/com/pwr/zpi/database/entity/Workout.java
index 62b9bb8..e846ae0 100644
--- a/ZPI1/src/com/pwr/zpi/database/entity/Workout.java
+++ b/ZPI1/src/com/pwr/zpi/database/entity/Workout.java
@@ -16,7 +16,7 @@ public class Workout implements Parcelable {
 	private String name;
 	private List<WorkoutAction> actions;
 	private boolean isWarmUp;
-	private int repeatCount;
+	//	private int repeatCount;
 	private IOnNextActionListener onNextActionListener;
 	
 	// progressing workout fields
@@ -31,6 +31,7 @@ public Workout() {
 		this.lastActionDistance = 0;
 		this.lastActionTime = 0;
 		this.howMuchLeft = 0;
+		//		this.repeatCount = 1;
 		this.ID = -1;
 	}
 	
@@ -99,14 +100,6 @@ public void setWarmUp(boolean isWarmUp) {
 		this.isWarmUp = isWarmUp;
 	}
 	
-	public int getRepeatCount() {
-		return repeatCount;
-	}
-	
-	public void setRepeatCount(int repeatCount) {
-		this.repeatCount = repeatCount;
-	}
-	
 	// progressing actions methods
 	public void progressWorkout(double distance, Long time) {
 		double currentDistance = distance - lastActionDistance;
@@ -305,7 +298,6 @@ public void writeToParcel(Parcel out, int flag) {
 		out.writeString(name);
 		out.writeList(actions);
 		out.writeByte((byte) (isWarmUp ? 1 : 0));
-		out.writeInt(repeatCount);
 		out.writeParcelable(onNextActionListener, flag);
 		out.writeInt(currentAction);
 		out.writeDouble(howMuchLeft);
@@ -346,7 +338,6 @@ public void readFromParcel(Parcel in) {
 		name = in.readString();
 		actions = in.readArrayList(WorkoutAction.class.getClassLoader());
 		isWarmUp = in.readByte() == 1;
-		repeatCount = in.readInt();
 		onNextActionListener = in.readParcelable(IOnNextActionListener.class.getClassLoader());
 		currentAction = in.readInt();
 		howMuchLeft = in.readDouble();
diff --git a/ZPI1/src/com/pwr/zpi/dialogs/DialogFactory.java b/ZPI1/src/com/pwr/zpi/dialogs/DialogFactory.java
index acf102a..714abba 100644
--- a/ZPI1/src/com/pwr/zpi/dialogs/DialogFactory.java
+++ b/ZPI1/src/com/pwr/zpi/dialogs/DialogFactory.java
@@ -1,13 +1,117 @@
 package com.pwr.zpi.dialogs;
 
+import java.util.ArrayList;
+import java.util.LinkedList;
+
 import android.app.AlertDialog;
+import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface.OnClickListener;
+import android.view.View;
+import android.widget.BaseAdapter;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.TextView;
 
 import com.pwr.zpi.R;
+import com.pwr.zpi.database.Database;
+import com.pwr.zpi.database.entity.WorkoutAction;
+import com.pwr.zpi.views.CustomPicker;
 
 public class DialogFactory {
 	
+	public static Dialog getRepeatsDialog(Context context, int layoutID,
+		final ArrayList<WorkoutAction> workoutsActionList, final BaseAdapter workoutActionAdapter) //nie mam pomyslu jak to inaczej zrobic :/
+	{
+		
+		final Dialog dialog = new Dialog(context);
+		dialog.setContentView(layoutID);
+		dialog.setTitle(context.getResources().getString(R.string.repeats_dialog_title));
+		// set the custom dialog components - text, image and button
+		final CustomPicker fromAction = (CustomPicker) dialog
+			.findViewById(R.id.customPickerRepeatsDialogFirstAction);
+		final CustomPicker toAction = (CustomPicker) dialog
+			.findViewById(R.id.customPickerRepeatsDialogSecondAction);
+		final CustomPicker repeatTimes = (CustomPicker) dialog.findViewById(R.id.customPickerRepeatsDialogRepeats);
+		int maxSize = workoutsActionList.size();
+		fromAction.setMax(maxSize);
+		toAction.setMax(maxSize);
+		Button dialogOkButton = (Button) dialog.findViewById(R.id.buttonRepeatsDialogOkButton);
+		Button dialogCancelButton = (Button) dialog.findViewById(R.id.buttonRepeatsDialogCancelButton);
+		
+		// if button is clicked, close the custom dialog
+		dialogCancelButton.setOnClickListener(new android.view.View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				dialog.dismiss();
+			}
+		});
+		dialogOkButton.setOnClickListener(new android.view.View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				int from = fromAction.getValue();
+				int to = toAction.getValue();
+				int howMany = repeatTimes.getValue();
+				
+				//zalorzy³em, ze lepiej wstawiac w srodek linked listy
+				LinkedList<WorkoutAction> linkedList = new LinkedList<WorkoutAction>();
+				linkedList.addAll(workoutsActionList);
+				int index = to;
+				for (int i = 0; i < howMany - 1; i++)
+				{
+					for (int j = from - 1; j < to; j++)
+					{
+						WorkoutAction action = workoutsActionList.get(j);
+						linkedList.add(index, action);
+						index++;
+					}
+				}
+				workoutsActionList.clear();
+				workoutsActionList.addAll(linkedList);
+				workoutActionAdapter.notifyDataSetChanged();
+				dialog.dismiss();
+			}
+		});
+		return dialog;
+	}
+	
+	public static Dialog getChangeNameDialog(final Context context, int layoutID, final TextView oldName,
+		final long runId)
+	{
+		
+		final Dialog dialog = new Dialog(context);
+		dialog.setContentView(layoutID);
+		dialog.setTitle(context.getResources().getString(R.string.new_name));
+		// set the custom dialog components - text, image and button
+		final EditText name = (EditText) dialog.findViewById(R.id.editTextChangeNameEditText);
+		name.setText(oldName.getText());
+		name.findFocus();
+		name.selectAll();
+		
+		Button dialogOkButton = (Button) dialog.findViewById(R.id.buttonChangeNameDialogOkButton);
+		Button dialogCancelButton = (Button) dialog.findViewById(R.id.buttonChangeNameDialogCancelButton);
+		
+		// if button is clicked, close the custom dialog
+		dialogCancelButton.setOnClickListener(new android.view.View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				dialog.dismiss();
+			}
+		});
+		dialogOkButton.setOnClickListener(new android.view.View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				//TODO change name in database
+				oldName.setText(name.getText());
+				Database db = new Database(context);
+				db.updateSingleRunName(runId, name.getText().toString());
+				
+				dialog.dismiss();
+			}
+		});
+		return dialog;
+	}
+	
 	private static AlertDialog getDialog(DialogsEnum dialogType, Context context, OnClickListener positiveListener,
 		OnClickListener negativeListener, OnClickListener itemsListener) {
 		
diff --git a/ZPI1/src/com/pwr/zpi/listeners/OnNextActionListener.java b/ZPI1/src/com/pwr/zpi/listeners/OnNextActionListener.java
index 60851be..28805fd 100644
--- a/ZPI1/src/com/pwr/zpi/listeners/OnNextActionListener.java
+++ b/ZPI1/src/com/pwr/zpi/listeners/OnNextActionListener.java
@@ -21,6 +21,7 @@ public class OnNextActionListener implements IOnNextActionListener {
 	private SpeechSynthezator speechSynthezator;
 	
 	public OnNextActionListener(Parcel in) {}
+	
 	public OnNextActionListener() {}
 	
 	@Override
@@ -30,7 +31,7 @@ public void setConext(Context context) {
 	
 	@Override
 	public void onNextActionSimple(WorkoutActionSimple simple) {
-		Log.i(TAG, "simple action");
+		Log.i(TAG, "simple action speechSyntezator is null:" + (speechSynthezator == null));
 		if (context != null && speechSynthezator != null) {
 			StringBuilder builder = new StringBuilder();
 			builder.append(context.getString(R.string.action));
@@ -74,6 +75,7 @@ private String toMinutes(double value) {
 		minutes /= 60;
 		return minutes + "";
 	}
+	
 	@Override
 	public void onNextActionAdvanced(WorkoutActionAdvanced advanced) {
 		Log.i(TAG, "advanced action");
@@ -92,7 +94,8 @@ public void onNextActionAdvanced(WorkoutActionAdvanced advanced) {
 			if (splitedPace.length == 3) {
 				minutes = Integer.valueOf(splitedPace[0]) * 60 + Integer.valueOf(splitedPace[1]);
 				seconds = Integer.valueOf(splitedPace[2]);
-			} else {
+			}
+			else {
 				minutes = Integer.valueOf(splitedPace[0]);
 				seconds = Integer.valueOf(splitedPace[1]);
 			}
diff --git a/ZPI1/src/com/pwr/zpi/mock/TreningPlans.java b/ZPI1/src/com/pwr/zpi/mock/TreningPlans.java
index 4611564..33cc5fd 100644
--- a/ZPI1/src/com/pwr/zpi/mock/TreningPlans.java
+++ b/ZPI1/src/com/pwr/zpi/mock/TreningPlans.java
@@ -206,7 +206,6 @@ private static List<WorkoutAction> getActions(Pair<Integer, Long>... pairs) {
 	private static Workout getWorkoutForActions(List<WorkoutAction> actions, int repeats) {
 		Workout workout = new Workout();
 		workout.setActions(actions);
-		workout.setRepeatCount(repeats);
 		return workout;
 	}
 	
diff --git a/ZPI1/src/com/pwr/zpi/services/LocationService.java b/ZPI1/src/com/pwr/zpi/services/LocationService.java
index e33e7a9..6945079 100644
--- a/ZPI1/src/com/pwr/zpi/services/LocationService.java
+++ b/ZPI1/src/com/pwr/zpi/services/LocationService.java
@@ -142,8 +142,10 @@ public void setStarted(Workout workout, int countDownTime) throws RemoteExceptio
 		
 		@Override
 		public void setPaused() throws RemoteException {
+			
 			info.setPauseStartTime(System.currentTimeMillis());
 			info.setState(State.PAUSED);
+			
 		}
 		
 		@Override
@@ -183,6 +185,7 @@ public int getGPSStatus() throws RemoteException {
 		@Override
 		public void prepareTextToSpeech() throws RemoteException {
 			speechSynthezator = new SpeechSynthezator(getApplicationContext());
+			info.setSpeechSynthezator(speechSynthezator);
 		}
 		
 		@Override
diff --git a/ZPI1/src/com/pwr/zpi/services/location/RunInfo.java b/ZPI1/src/com/pwr/zpi/services/location/RunInfo.java
index 463e987..7466546 100644
--- a/ZPI1/src/com/pwr/zpi/services/location/RunInfo.java
+++ b/ZPI1/src/com/pwr/zpi/services/location/RunInfo.java
@@ -22,7 +22,7 @@ public class RunInfo {
 	
 	private ArrayList<Location> locationList;
 	private LinkedList<LinkedList<Pair<Location, Long>>> traceWithTime;
-	private final SpeechSynthezator speechSynthezator;
+	private SpeechSynthezator speechSynthezator;
 	private SingleRun singleRun;
 	private Calendar calendar;
 	private final Context context;
@@ -242,4 +242,9 @@ public void processWorkout() {
 			workout.progressWorkout(getDistance(), getTime());
 		}
 	}
+	
+	public void setSpeechSynthezator(SpeechSynthezator speechSynthezator)
+	{
+		this.speechSynthezator = speechSynthezator;
+	}
 }
diff --git a/ZPI1/src/com/pwr/zpi/services/location/TimeHandlers.java b/ZPI1/src/com/pwr/zpi/services/location/TimeHandlers.java
index 4ac4fd8..eba039e 100644
--- a/ZPI1/src/com/pwr/zpi/services/location/TimeHandlers.java
+++ b/ZPI1/src/com/pwr/zpi/services/location/TimeHandlers.java
@@ -120,25 +120,28 @@ public void onCountDownUpadte(int counterID, int howMuchLeft) {
 				soundsPlayer.play();
 				break;
 			case COUNTER_WARM_UP:
-				info.processWorkout();
-				Iterator<RunListener> it = listeners.iterator();
-				info.updateTime();
-				while (it.hasNext()) {
-					RunListener listener = it.next();
-					try {
-						listener.handleTimeChange();
-						listener.handleWorkoutChange(info.getWorkout(), info.isFirstTime());
-						handler.post(new Runnable() {
-							
-							@Override
-							public void run() {
-								info.setIsFirstTime(false);
-							}
-						});
-						Log.i(TAG, listeners.size() + "");
-					}
-					catch (RemoteException e) {
-						Log.w(TAG, "Failed to tell listener about workout update", e);
+				if (!info.isStatePaused())
+				{
+					info.processWorkout();
+					Iterator<RunListener> it = listeners.iterator();
+					info.updateTime();
+					while (it.hasNext()) {
+						RunListener listener = it.next();
+						try {
+							listener.handleTimeChange();
+							listener.handleWorkoutChange(info.getWorkout(), info.isFirstTime());
+							handler.post(new Runnable() {
+								
+								@Override
+								public void run() {
+									info.setIsFirstTime(false);
+								}
+							});
+							Log.i(TAG, listeners.size() + "");
+						}
+						catch (RemoteException e) {
+							Log.w(TAG, "Failed to tell listener about workout update", e);
+						}
 					}
 				}
 				break;
diff --git a/ZPI1/src/com/pwr/zpi/utils/CounterRunnable.java b/ZPI1/src/com/pwr/zpi/utils/CounterRunnable.java
index 9c2b489..2784d1e 100644
--- a/ZPI1/src/com/pwr/zpi/utils/CounterRunnable.java
+++ b/ZPI1/src/com/pwr/zpi/utils/CounterRunnable.java
@@ -18,7 +18,8 @@ public CounterRunnable(int counterID, int x, ICountDownListner listener) {
 	public void run() {
 		if (x == -1) {
 			listener.onCountDownPostAction(counterID, x);
-		} else if (x == 0) {
+		}
+		else if (x == 0) {
 			listener.onCountDownDone(counterID, x);
 		}
 		else {
diff --git a/ZPI1/src/com/pwr/zpi/utils/SpeechSynthezator.java b/ZPI1/src/com/pwr/zpi/utils/SpeechSynthezator.java
index b9f9dd5..1b552bb 100644
--- a/ZPI1/src/com/pwr/zpi/utils/SpeechSynthezator.java
+++ b/ZPI1/src/com/pwr/zpi/utils/SpeechSynthezator.java
@@ -9,6 +9,7 @@
 import android.util.Log;
 
 import com.pwr.zpi.R;
+import com.pwr.zpi.utils.AssetsPlayer.AssetsMp3Files;
 
 /**
  * this class should be initializated only once and then referenced by static
@@ -22,9 +23,10 @@ public class SpeechSynthezator implements OnInitListener {
 	public TextToSpeech mTts;
 	private boolean initialized = false;
 	private boolean canSpeak = true;
+	private final Context context;
 	
 	public SpeechSynthezator(Context context) {
-		
+		this.context = context;
 		canSpeak = PreferenceManager.getDefaultSharedPreferences(context).getBoolean(
 			context.getResources().getString(R.string.key_aplication_sound), false);
 		mTts = new TextToSpeech(context, this);
@@ -53,10 +55,17 @@ public void onInit(int status) {
 	
 	public void say(String textToSay) {
 		Log.i(TAG, "realy almost there to say");
+		
 		if (canSpeak()) {
 			Log.i(TAG, "Should say now!");
 			mTts.speak(textToSay, TextToSpeech.QUEUE_ADD, null);
 		}
+		else
+		{
+			//play beep for people without speach syntezator
+			AssetsPlayer beepPlayer = new AssetsPlayer(context, AssetsMp3Files.Beep);
+			beepPlayer.play();
+		}
 	}
 	
 	public boolean isInitialized() {
diff --git a/ZPI1/src/com/pwr/zpi/views/CustomPicker.java b/ZPI1/src/com/pwr/zpi/views/CustomPicker.java
index 16f4614..0ee588f 100644
--- a/ZPI1/src/com/pwr/zpi/views/CustomPicker.java
+++ b/ZPI1/src/com/pwr/zpi/views/CustomPicker.java
@@ -137,6 +137,11 @@ private void sendToDisplay() {
 		displayEditText.setText(String.format("%0" + digitsNumber + "d", value));
 	}
 	
+	public void setMax(int max)
+	{
+		this.max = max;
+	}
+	
 	public int getValue() {
 		return value;
 	}
diff --git a/ZPI1Test/src/com/pwr/zpi/database/test/DatabaseTest.java b/ZPI1Test/src/com/pwr/zpi/database/test/DatabaseTest.java
index 99b061f..58765a1 100644
--- a/ZPI1Test/src/com/pwr/zpi/database/test/DatabaseTest.java
+++ b/ZPI1Test/src/com/pwr/zpi/database/test/DatabaseTest.java
@@ -66,7 +66,6 @@ private LinkedList<LinkedList<Pair<Location, Long>>> prepareTraceWithTime(int nu
 	private Workout prepareWorkout(int number) {
 		Workout workout = new Workout();
 		workout.setName("Workout " + number);
-		workout.setRepeatCount(number);
 		workout.setWarmUp(number % 2 == 0);
 		workout.setActions(prepareActions(number));
 		return workout;
@@ -150,7 +149,6 @@ private void insertWorkouts(int TESTS_NUMBER_ITEMS) {
 	
 	private void checkSimpleWorkout(Workout w, int i) {
 		assertEquals("Workout " + i, w.getName());
-		assertEquals(i, w.getRepeatCount());
 		assertEquals(i % 2 == 0, w.isWarmUp());
 	}
 	
@@ -162,7 +160,7 @@ public void testGetWholeSingleWorkout() {
 		
 		for (Workout workout : workouts) {
 			Workout w = db.getWholeSingleWorkout(workout.getID());
-			int creationI = w.getRepeatCount();// repeat count points the
+			int creationI = 1;// repeat count points the
 			// creation i number
 			checkSimpleWorkout(w, creationI);
 			checkActions(w.getActions(), creationI);