diff --git a/app/src/main/java/com/example/citrusclient/views/CreateTodoFragment.java b/app/src/main/java/com/example/citrusclient/views/CreateTodoFragment.java
index 8840973..e63dc14 100644
--- a/app/src/main/java/com/example/citrusclient/views/CreateTodoFragment.java
+++ b/app/src/main/java/com/example/citrusclient/views/CreateTodoFragment.java
@@ -161,7 +161,7 @@
 
         Button cancelButton = view.findViewById(R.id.todo_cancel_button);
         cancelButton.setOnClickListener(v->{
-            ((MainActivity)getActivity()).backFragment();
+            ((MainActivity)getActivity()).showFragment(new HomeFragment());
         });
 
         Button createButton = view.findViewById(R.id.todo_create_button);
@@ -180,7 +180,7 @@
                 return;
             }
             todosViewModel.createTodo(accountId,spinner.getSelectedItemPosition(),year,month,day,title,token);
-            ((MainActivity)getActivity()).backFragment();
+            ((MainActivity)getActivity()).showFragment(new HomeFragment());
         });
     }
 
diff --git a/app/src/main/res/layout/fragment_create_todo.xml b/app/src/main/res/layout/fragment_create_todo.xml
index 4ecaa63..605204b 100644
--- a/app/src/main/res/layout/fragment_create_todo.xml
+++ b/app/src/main/res/layout/fragment_create_todo.xml
@@ -96,71 +96,72 @@
         <View
             android:id="@+id/gray_rectangle"
             android:layout_width="0dp"
-            android:layout_height="30dp"
+            android:layout_height="50dp"
             android:layout_marginStart="32dp"
-            android:layout_marginTop="4dp"
             android:layout_marginEnd="32dp"
             android:layout_marginBottom="4dp"
             android:background="@drawable/rounded_gray_rectangle"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintHorizontal_bias="1.0"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/divider"
-            app:layout_constraintVertical_bias="0.132" />
-
-        <NumberPicker
-            android:id="@+id/numberPickerYear"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="32dp"
-            android:layout_marginEnd="8dp"
-            android:background="@android:color/transparent"
-            android:dividerHeight="0dp"
-            app:layout_constraintBottom_toTopOf="@id/divider"
-            app:layout_constraintEnd_toStartOf="@id/numberPickerMonth"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/gray_rectangle"
-            app:layout_constraintVertical_bias="0.357" />
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.255" />
 
         <NumberPicker
             android:id="@+id/numberPickerMonth"
-            android:layout_width="0dp"
+            android:layout_width="106dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginEnd="8dp"
             android:background="@android:color/transparent"
             android:dividerHeight="0dp"
-            app:layout_constraintBottom_toTopOf="@id/divider"
-            app:layout_constraintEnd_toStartOf="@id/numberPickerDay"
-            app:layout_constraintStart_toEndOf="@id/numberPickerYear"
-            app:layout_constraintTop_toBottomOf="@id/gray_rectangle"
-            app:layout_constraintVertical_bias="0.357" />
+            android:selectionDividerHeight="0dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.527"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.199" />
 
         <NumberPicker
             android:id="@+id/numberPickerDay"
-            android:layout_width="0dp"
+            android:layout_width="106dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginEnd="32dp"
+            android:layout_marginTop="8dp"
             android:background="@android:color/transparent"
             android:dividerHeight="0dp"
-            app:layout_constraintBottom_toTopOf="@id/divider"
+            android:selectionDividerHeight="0dp"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/numberPickerMonth"
-            app:layout_constraintTop_toBottomOf="@id/gray_rectangle"
-            app:layout_constraintVertical_bias="0.357" />
+            app:layout_constraintHorizontal_bias="0.875"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.187" />
+
+        <NumberPicker
+            android:id="@+id/numberPickerYear"
+            android:layout_width="106dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:background="@android:color/transparent"
+            android:dividerHeight="0dp"
+            android:selectionDividerHeight="0dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.177"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.187" />
 
         <View
             android:id="@+id/divider2"
             android:layout_width="0dp"
             android:layout_height="1dp"
-            android:layout_marginTop="88dp"
             android:background="#72000000"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.0"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/gray_rectangle" />
+            app:layout_constraintTop_toTopOf="parent" />
 
         <Spinner
             android:id="@+id/select_todo_spinner"
@@ -179,10 +180,11 @@
             android:layout_height="1dp"
             android:layout_marginTop="172dp"
             android:background="#72000000"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.0"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/gray_rectangle" />
+            app:layout_constraintTop_toTopOf="parent" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </FrameLayout>
\ No newline at end of file