diff --git a/ui/src/main/res/layout/activity_login.xml b/ui/src/main/res/layout/activity_login.xml
index 5814d2a..2b80e67 100644
--- a/ui/src/main/res/layout/activity_login.xml
+++ b/ui/src/main/res/layout/activity_login.xml
@@ -36,7 +36,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/margin_start_and_end"
-            android:layout_marginTop="@dimen/top_bubble_image_marginTop"
+            android:layout_marginTop="24dp"
             android:layout_marginEnd="@dimen/margin_start_and_end"
             android:src="@drawable/bubble_top"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -53,7 +53,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/margin_start_and_end"
-        android:layout_marginTop="@dimen/signIn_title_marginTop"
+        android:layout_marginTop="50dp"
         android:layout_marginEnd="@dimen/margin_start_and_end"
         android:fontFamily="@font/josefin_sans_bold"
         android:text="@string/sign_in"
@@ -63,58 +63,12 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/imageConstraint" />
 
-    <TextView
-        android:id="@+id/bubbleNameTitle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/margin_start_and_end"
-        android:layout_marginTop="40dp"
-        android:layout_marginEnd="@dimen/margin_start_and_end"
-        android:fontFamily="@font/lato"
-        android:text="@string/bubble_name"
-        android:textColor="@color/black"
-        android:textSize="@dimen/text_title"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/signIn" />
-
-    <EditText
-        android:id="@+id/bubbleName"
-        android:layout_width="@dimen/edit_text_width"
-        android:layout_height="@dimen/edit_text_height"
-        android:layout_marginStart="@dimen/margin_start_and_end"
-        android:layout_marginTop="@dimen/margin_top"
-        android:layout_marginEnd="@dimen/margin_start_and_end"
-        android:background="@drawable/rectangle"
-        android:hint="@string/enter_your_bubble_name"
-        android:textAlignment="center"
-        android:textColor="@color/black"
-        android:textSize="@dimen/text_title"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/bubbleNameTitle" />
-
-    <TextView
-        android:id="@+id/findBubble"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/margin_start_and_end"
-        android:layout_marginTop="@dimen/margin_top"
-        android:layout_marginEnd="@dimen/margin_start_and_end"
-        android:fontFamily="@font/lato"
-        android:text="@string/you_can_find_your_bubble_name_in_your_email"
-        android:textColor="@color/gray"
-        android:textSize="@dimen/text_title"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/bubbleName" />
-
     <TextView
         android:id="@+id/emailTitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/margin_start_and_end"
-        android:layout_marginTop="@dimen/margin_top"
+        android:layout_marginTop="40dp"
         android:layout_marginEnd="@dimen/margin_start_and_end"
         android:fontFamily="@font/lato"
         android:text="@string/email"
@@ -122,7 +76,7 @@
         android:textSize="@dimen/text_title"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/findBubble" />
+        app:layout_constraintTop_toBottomOf="@+id/signIn" />
 
     <EditText
         android:id="@+id/userName"
@@ -145,7 +99,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/margin_start_and_end"
-        android:layout_marginTop="@dimen/margin_start_and_end"
+        android:layout_marginTop="24dp"
         android:layout_marginEnd="@dimen/margin_start_and_end"
         android:fontFamily="@font/lato"
         android:text="@string/password"
@@ -163,7 +117,6 @@
         android:layout_marginTop="@dimen/margin_top"
         android:layout_marginEnd="@dimen/margin_start_and_end"
         android:background="@drawable/rectangle"
-        android:inputType="textPassword"
         android:hint="@string/your_password"
         android:textAlignment="center"
         android:textColor="@color/black"
@@ -177,12 +130,10 @@
         android:layout_width="@dimen/edit_text_width"
         android:layout_height="@dimen/edit_text_height"
         android:layout_marginStart="@dimen/margin_start_and_end"
-        android:layout_marginTop="10dp"
+        android:layout_marginTop="50dp"
         android:layout_marginEnd="@dimen/margin_start_and_end"
-        android:layout_marginBottom="24dp"
         android:background="@color/white"
         android:orientation="vertical"
-        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/password">