diff --git a/DoNExt/.idea/gradle.xml b/DoNExt/.idea/gradle.xml
index fe72da5..0e23f8e 100644
--- a/DoNExt/.idea/gradle.xml
+++ b/DoNExt/.idea/gradle.xml
@@ -5,7 +5,7 @@
       <GradleProjectSettings>
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="C:\Program Files\Android\Android Studio\gradle\gradle-2.14.1" />
+        <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/DoNExt/.idea/misc.xml b/DoNExt/.idea/misc.xml
index 5d19981..fbb6828 100644
--- a/DoNExt/.idea/misc.xml
+++ b/DoNExt/.idea/misc.xml
@@ -37,7 +37,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/DoNExt/app/app-release.apk b/DoNExt/app/app-release.apk
index ed7707d..2fa9284 100644
Binary files a/DoNExt/app/app-release.apk and b/DoNExt/app/app-release.apk differ
diff --git a/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/fragments/TaskDialogFragment.java b/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/fragments/TaskDialogFragment.java
index 8184f4c..fae8e17 100644
--- a/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/fragments/TaskDialogFragment.java
+++ b/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/fragments/TaskDialogFragment.java
@@ -214,12 +214,11 @@ public class TaskDialogFragment extends DialogFragment {
         int id = item.getItemId();
 
         if (id == R.id.menu_new_task_save) {
-            EditText titleText = (EditText) getDialog().findViewById(R.id.new_task_name);
+            EditText titleText = (EditText) getView().findViewById(R.id.new_task_name);
             // handle confirmation button click hereEditText titleText = (EditText) d.findViewById(R.id.new_task_name);
             if (titleText.getText().toString().matches(""))
                 titleText.setError(getResources().getString(R.string.new_task_name_error));
-            else
-            {
+            else {
                 // Send the positive button event back to the host activity
                 mListener.onNewTaskDialogPositiveClick(TaskDialogFragment.this);
                 dismiss();
diff --git a/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/fragments/TasksFragment.java b/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/fragments/TasksFragment.java
index 082da55..4951a8a 100644
--- a/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/fragments/TasksFragment.java
+++ b/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/fragments/TasksFragment.java
@@ -1,6 +1,5 @@
 package com.wismna.geoffroy.donext.fragments;
 
-import android.app.Dialog;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.res.Resources;
@@ -143,12 +142,11 @@ public class TasksFragment extends Fragment implements
                         taskDialogFragment.setArguments(args);
 
                         // Open the fragment as a dialog or as full-screen depending on screen size
-                        FragmentManager fragmentManager = getFragmentManager();
                         if (mIsLargeLayout)
                             taskDialogFragment.show(manager, getResources().getString(R.string.action_edit_task));
                         else {
                             // The device is smaller, so show the fragment fullscreen
-                            FragmentTransaction transaction = fragmentManager.beginTransaction();
+                            FragmentTransaction transaction = manager.beginTransaction();
                             // For a little polish, specify a transition animation
                             transaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN);
                             // To make it fullscreen, use the 'content' root view as the container
@@ -319,7 +317,8 @@ public class TasksFragment extends Fragment implements
     @Override
     public void onNewTaskDialogPositiveClick(DialogFragment dialog) {
         // Get the dialog fragment
-        Dialog dialogView = dialog.getDialog();
+        View dialogView = dialog.getView();
+        if (dialogView == null) return;
         long id = 0;
         Task task = ((TaskDialogFragment)dialog).getTask();
         if (task != null) id = task.getId();