diff --git a/TodoListManager/bin/TodoListManager.apk b/TodoListManager/bin/TodoListManager.apk
index 2b8e080..95bb67d 100644
Binary files a/TodoListManager/bin/TodoListManager.apk and b/TodoListManager/bin/TodoListManager.apk differ
diff --git a/TodoListManager/bin/classes.dex b/TodoListManager/bin/classes.dex
index 50bb751..bf84f76 100644
Binary files a/TodoListManager/bin/classes.dex and b/TodoListManager/bin/classes.dex differ
diff --git a/TodoListManager/bin/classes/il/ac/huji/todolist/ActionTaskDialog$1.class b/TodoListManager/bin/classes/il/ac/huji/todolist/ActionTaskDialog$1.class
index 1a0ea05..887dc74 100644
Binary files a/TodoListManager/bin/classes/il/ac/huji/todolist/ActionTaskDialog$1.class and b/TodoListManager/bin/classes/il/ac/huji/todolist/ActionTaskDialog$1.class differ
diff --git a/TodoListManager/bin/classes/il/ac/huji/todolist/ActionTaskDialog$2.class b/TodoListManager/bin/classes/il/ac/huji/todolist/ActionTaskDialog$2.class
index 9cea9ed..dfd6eaa 100644
Binary files a/TodoListManager/bin/classes/il/ac/huji/todolist/ActionTaskDialog$2.class and b/TodoListManager/bin/classes/il/ac/huji/todolist/ActionTaskDialog$2.class differ
diff --git a/TodoListManager/bin/classes/il/ac/huji/todolist/ActionTaskDialog.class b/TodoListManager/bin/classes/il/ac/huji/todolist/ActionTaskDialog.class
index ea0d579..9583531 100644
Binary files a/TodoListManager/bin/classes/il/ac/huji/todolist/ActionTaskDialog.class and b/TodoListManager/bin/classes/il/ac/huji/todolist/ActionTaskDialog.class differ
diff --git a/TodoListManager/bin/classes/il/ac/huji/todolist/TodoListManagerActivity$1.class b/TodoListManager/bin/classes/il/ac/huji/todolist/TodoListManagerActivity$1.class
index a73c67b..0e00f82 100644
Binary files a/TodoListManager/bin/classes/il/ac/huji/todolist/TodoListManagerActivity$1.class and b/TodoListManager/bin/classes/il/ac/huji/todolist/TodoListManagerActivity$1.class differ
diff --git a/TodoListManager/bin/classes/il/ac/huji/todolist/TodoListManagerActivity.class b/TodoListManager/bin/classes/il/ac/huji/todolist/TodoListManagerActivity.class
index 5840f6e..6a2cf27 100644
Binary files a/TodoListManager/bin/classes/il/ac/huji/todolist/TodoListManagerActivity.class and b/TodoListManager/bin/classes/il/ac/huji/todolist/TodoListManagerActivity.class differ
diff --git a/TodoListManager/bin/resources.ap_ b/TodoListManager/bin/resources.ap_
index afded24..cc0bf49 100644
Binary files a/TodoListManager/bin/resources.ap_ and b/TodoListManager/bin/resources.ap_ differ
diff --git a/TodoListManager/res/layout/activity_add_new_todo_item.xml b/TodoListManager/res/layout/activity_add_new_todo_item.xml
index 93a029b..0a57e8d 100644
--- a/TodoListManager/res/layout/activity_add_new_todo_item.xml
+++ b/TodoListManager/res/layout/activity_add_new_todo_item.xml
@@ -22,7 +22,7 @@
         android:layout_marginBottom="@dimen/activity_vertical_margin"
         android:layout_marginLeft="@dimen/activity_horizontal_margin"
         android:layout_marginRight="@dimen/activity_horizontal_margin" />
-    
+
     <View
         android:layout_width="fill_parent"
         android:layout_height="1dp"
@@ -43,7 +43,7 @@
             android:id="@+id/btnCancel"
             style="?android:attr/buttonBarButtonStyle"
             android:layout_width="0dip"
-            android:layout_height="wrap_content"
+            android:layout_height="fill_parent"
             android:layout_weight="1"
             android:onClick="cancel"
             android:text="@string/dialog_cancel_button" />
@@ -52,7 +52,7 @@
             android:id="@+id/btnOK"
             style="?android:attr/buttonBarButtonStyle"
             android:layout_width="0dip"
-            android:layout_height="wrap_content"
+            android:layout_height="fill_parent"
             android:layout_weight="1"
             android:onClick="add"
             android:text="@string/action_add_todo_task" />
diff --git a/TodoListManager/src/il/ac/huji/todolist/ActionTaskDialog.java b/TodoListManager/src/il/ac/huji/todolist/ActionTaskDialog.java
index 6a28fbd..d5c1c8d 100644
--- a/TodoListManager/src/il/ac/huji/todolist/ActionTaskDialog.java
+++ b/TodoListManager/src/il/ac/huji/todolist/ActionTaskDialog.java
@@ -11,7 +11,6 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.util.Log;
 import android.widget.ListAdapter;
 
 /**
@@ -33,6 +32,8 @@ public ActionTaskDialog(int pos, String task) {
 		super();
 		_pos = pos;
 		_task = task;
+		
+		setRetainInstance(true);
 	}
 
 	public int getPos() {
@@ -106,6 +107,13 @@ public void onClick(DialogInterface dialog, int id) {
 		// Create the AlertDialog object and return it
 		return builder.create();
 	}
+
+	@Override
+	public void onDestroyView() {
+		if (getDialog() != null && getRetainInstance())
+			getDialog().setDismissMessage(null);
+		super.onDestroyView();
+	}
 }
 
 
diff --git a/TodoListManager/src/il/ac/huji/todolist/TodoListManagerActivity.java b/TodoListManager/src/il/ac/huji/todolist/TodoListManagerActivity.java
index a23970a..95c45bd 100644
--- a/TodoListManager/src/il/ac/huji/todolist/TodoListManagerActivity.java
+++ b/TodoListManager/src/il/ac/huji/todolist/TodoListManagerActivity.java
@@ -30,10 +30,10 @@
 public class TodoListManagerActivity extends Activity implements DeleteTaskDialogListener {
 
 	private RetainedFragment<ArrayList<Pair<String, Long>>> _dataFragment;
-
-	ArrayAdapter<Pair<String, Long>> _adapter;
-	ArrayList<Pair<String, Long>> _listItems;//= new ArrayList<Pair<String, Long>>();
-
+	private ArrayAdapter<Pair<String, Long>> _adapter;
+	private ArrayList<Pair<String, Long>> _listItems;
+	
+	private ActionTaskDialog _actionTaskDialog;
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
@@ -66,8 +66,8 @@ protected void onCreate(Bundle savedInstanceState) {
 			@TargetApi(Build.VERSION_CODES.HONEYCOMB)
 			@SuppressLint("NewApi")
 			public boolean onItemLongClick(AdapterView<?> parent, View child, int pos, long id) {
-				ActionTaskDialog actionTaskDialog = new ActionTaskDialog(pos, _listItems.get(pos).first);
-				actionTaskDialog.show(getFragmentManager(), "actionTask");
+				_actionTaskDialog = new ActionTaskDialog(pos, _listItems.get(pos).first);
+				_actionTaskDialog.show(getFragmentManager(), "actionTask");
 				return true;
 			}
 		});