diff --git a/android/uhabits-android/build.gradle b/android/uhabits-android/build.gradle
index 521f4f19a..39affba4e 100644
--- a/android/uhabits-android/build.gradle
+++ b/android/uhabits-android/build.gradle
@@ -87,6 +87,7 @@ dependencies {
     implementation "com.google.code.gson:gson:2.8.5"
     implementation "com.google.code.findbugs:jsr305:3.0.2"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$KOTLIN_VERSION"
+    implementation "androidx.constraintlayout:constraintlayout:2.0.0-beta4"
 
     compileOnly "javax.annotation:jsr250-api:1.0"
     compileOnly "com.google.auto.factory:auto-factory:$AUTO_FACTORY_VERSION"
diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/CommonSteps.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/CommonSteps.java
index 967a6b70d..216e6e075 100644
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/CommonSteps.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/CommonSteps.java
@@ -23,7 +23,6 @@ import androidx.annotation.StringRes;
 import androidx.test.espresso.*;
 import androidx.test.espresso.contrib.*;
 import androidx.test.uiautomator.*;
-import androidx.appcompat.widget.*;
 
 import androidx.recyclerview.widget.RecyclerView;
 
@@ -167,7 +166,7 @@ public class CommonSteps extends BaseUserInterfaceTest
                 break;
 
             case EDIT_HABIT:
-                onView(withId(R.id.tvDescription)).check(matches(isDisplayed()));
+                onView(withId(R.id.tvQuestion)).check(matches(isDisplayed()));
                 break;
         }
     }
diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/EditHabitSteps.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/EditHabitSteps.java
index 90293cc24..90d0596b7 100644
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/EditHabitSteps.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/EditHabitSteps.java
@@ -55,7 +55,7 @@ public class EditHabitSteps
 
     public static void typeQuestion(String name)
     {
-        typeTextWithId(R.id.tvDescription, name);
+        typeTextWithId(R.id.tvQuestion, name);
     }
 
     public static void setReminder()
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/NameDescriptionPanel.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/NameDescriptionPanel.java
index 5eb73a5e1..ca30a631c 100644
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/NameDescriptionPanel.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/NameDescriptionPanel.java
@@ -42,6 +42,9 @@ public class NameDescriptionPanel extends FrameLayout
     @BindView(R.id.tvName)
     EditText tvName;
 
+    @BindView(R.id.tvQuestion)
+    ExampleEditText tvQuestion;
+
     @BindView(R.id.tvDescription)
     ExampleEditText tvDescription;
 
@@ -76,7 +79,7 @@ public class NameDescriptionPanel extends FrameLayout
     @NonNull
     public String getDescription()
     {
-        return tvDescription.getRealText().trim();
+        return tvQuestion.getRealText().trim();
     }
 
     @NonNull
@@ -90,13 +93,13 @@ public class NameDescriptionPanel extends FrameLayout
         Resources res = getResources();
 
         if(habit.isNumerical())
-            tvDescription.setExample(res.getString(R.string.example_question_numerical));
+            tvQuestion.setExample(res.getString(R.string.example_question_numerical));
         else
-            tvDescription.setExample(res.getString(R.string.example_question_boolean));
+            tvQuestion.setExample(res.getString(R.string.example_question_boolean));
 
         setColor(habit.getColor());
         tvName.setText(habit.getName());
-        tvDescription.setRealText(habit.getDescription());
+        tvQuestion.setRealText(habit.getDescription());
     }
 
     public boolean validate()
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/notifications/AndroidNotificationTray.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/notifications/AndroidNotificationTray.kt
index 2b9036993..76a6132a5 100644
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/notifications/AndroidNotificationTray.kt
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/notifications/AndroidNotificationTray.kt
@@ -115,7 +115,7 @@ class AndroidNotificationTray
         val builder = NotificationCompat.Builder(context, REMINDERS_CHANNEL_ID)
                 .setSmallIcon(R.drawable.ic_notification)
                 .setContentTitle(habit.name)
-                .setContentText(if(habit.description.isBlank()) defaultText else habit.description)
+                .setContentText(if(habit.description.isNullOrBlank()) defaultText else habit.description)
                 .setContentIntent(pendingIntents.showHabit(habit))
                 .setDeleteIntent(pendingIntents.dismissNotification(habit))
                 .addAction(addRepetitionAction)
diff --git a/android/uhabits-android/src/main/res/layout/edit_habit_name.xml b/android/uhabits-android/src/main/res/layout/edit_habit_name.xml
index 70a8137b7..cb0c660cf 100644
--- a/android/uhabits-android/src/main/res/layout/edit_habit_name.xml
+++ b/android/uhabits-android/src/main/res/layout/edit_habit_name.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
   ~
   ~ This file is part of Loop Habit Tracker.
@@ -18,53 +17,83 @@
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://isoron.org/android"
+    xmlns:app1="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:layout_height="wrap_content"
+    android:minWidth="300dp">
 
-    <LinearLayout
-        style="@style/dialogFormRow">
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/tilName"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app1:layout_constraintEnd_toStartOf="@+id/buttonPickColor"
+        app1:layout_constraintHorizontal_weight="6"
+        app1:layout_constraintStart_toStartOf="parent"
+        app1:layout_constraintTop_toTopOf="parent">
 
-        <com.google.android.material.textfield.TextInputLayout
-            android:id="@+id/tilName"
-            android:layout_width="0dp"
+        <EditText
+            android:id="@+id/tvName"
+            style="@style/dialogFormInput"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="6">
+            android:ellipsize="start"
+            android:gravity="center_vertical"
+            android:hint="@string/name">
 
-            <EditText
-                android:id="@+id/tvName"
-                style="@style/dialogFormInput"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:hint="@string/name">
+            <requestFocus />
+        </EditText>
+    </com.google.android.material.textfield.TextInputLayout>
 
-                <requestFocus/>
-            </EditText>
-        </com.google.android.material.textfield.TextInputLayout>
+    <ImageButton
+        android:id="@+id/buttonPickColor"
+        style="@style/dialogFormInputColor"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/color_picker_default_title"
+        android:src="?dialogIconChangeColor"
+        app1:layout_constraintBottom_toBottomOf="@id/tilName"
+        app1:layout_constraintEnd_toEndOf="parent"
+        app1:layout_constraintHorizontal_weight="1"
+        app1:layout_constraintStart_toEndOf="@+id/tilName"
+        app1:layout_constraintTop_toTopOf="@id/tilName" />
 
-        <ImageButton
-            android:id="@+id/buttonPickColor"
-            style="@style/dialogFormInputColor"
-            android:layout_weight="1"
-            android:contentDescription="@string/color_picker_default_title"
-            android:src="?dialogIconChangeColor"/>
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/tilQuestion"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:hint="@string/question"
+        app1:layout_constraintEnd_toEndOf="parent"
+        app1:layout_constraintStart_toStartOf="parent"
+        app1:layout_constraintTop_toBottomOf="@id/tilName">
 
-    </LinearLayout>
+        <org.isoron.uhabits.activities.habits.edit.views.ExampleEditText
+            android:id="@+id/tvQuestion"
+            style="@style/dialogFormInputMultiline"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:example="@string/example_question_numerical" />
+    </com.google.android.material.textfield.TextInputLayout>
 
     <com.google.android.material.textfield.TextInputLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:hint="@string/notes"
+        app1:layout_constraintBottom_toBottomOf="parent"
+        app1:layout_constraintEnd_toEndOf="parent"
+        app1:layout_constraintStart_toStartOf="parent"
+        app1:layout_constraintTop_toBottomOf="@id/tilQuestion">
 
         <org.isoron.uhabits.activities.habits.edit.views.ExampleEditText
             android:id="@+id/tvDescription"
-            style="@style/dialogFormInputMultiline"
+            style="@style/dialogFormInput"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:hint="@string/question"
-            app:example="@string/example_question_numerical"/>
+            android:layout_height="match_parent"
+            android:gravity="top"
+            android:minHeight="300dp"
+            app:example="@string/example_notes" />
     </com.google.android.material.textfield.TextInputLayout>
 
-</LinearLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/android/uhabits-android/src/main/res/values/strings.xml b/android/uhabits-android/src/main/res/values/strings.xml
index af088952a..d2273b13b 100644
--- a/android/uhabits-android/src/main/res/values/strings.xml
+++ b/android/uhabits-android/src/main/res/values/strings.xml
@@ -244,5 +244,7 @@
     <string name="widget_opacity_description">Makes widgets more transparent or more opaque in your home screen.</string>
     <string name="first_day_of_the_week">First day of the week</string>
     <string name="default_reminder_question">Have you completed this habit today?</string>
+    <string name="notes">Notes</string>
+    <string name="example_notes">You can put whatever you want here!</string>
 
 </resources>
\ No newline at end of file