diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 1c8e84f..c5ea249 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -4,49 +4,18 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".cactusClient.MainActivity">
-
-    <TextView
-        android:id="@+id/textView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="8dp"
-        android:layout_marginEnd="33dp"
-        android:layout_marginLeft="25dp"
-        android:layout_marginRight="33dp"
-        android:layout_marginStart="25dp"
-        android:text="MainActivity"
-        android:textSize="36sp"
-        app:layout_constraintBottom_toTopOf="@+id/fragment_place"
-        app:layout_constraintEnd_toStartOf="@+id/loginButton"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <Button
-        android:id="@+id/loginButton"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="16dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="16dp"
-        android:text="login"
-        app:layout_constraintBottom_toTopOf="@+id/fragment_place"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/textView"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:ignore="MissingConstraints" />
+    tools:context=".cactusClient.MainActivity"
+    tools:layout_editor_absoluteY="73dp">
 
     <fragment
         android:id="@+id/fragment_place"
         android:name="org.ntlab.radishforandroidstudio.cactusClient.LoginFragment"
-        android:layout_width="394dp"
+        android:layout_width="0dp"
         android:layout_height="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/loginButton"
-        tools:ignore="MissingConstraints" />
+        app:layout_constraintTop_toTopOf="parent" />
+
 
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/login.xml b/app/src/main/res/layout/login.xml
index 27d4a10..17221f5 100644
--- a/app/src/main/res/layout/login.xml
+++ b/app/src/main/res/layout/login.xml
@@ -6,21 +6,13 @@
     android:layout_height="match_parent"
     tools:context=".cactusClient.LoginFragment">
 
-    <fragment
-        android:id="@+id/fragment_place"
-        android:name="org.ntlab.radishforandroidstudio.cactusClient.LoginFragment"
-        android:layout_width="398dp"
-        android:layout_height="539dp"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentTop="true" />
-
     <Button
         android:id="@+id/signUp"
         android:layout_width="300dp"
         android:layout_height="40dp"
-        android:layout_below="@+id/login"
+        android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
-        android:layout_marginTop="-193dp"
+        android:layout_marginBottom="42dp"
         android:text="Sign up" />
 
     <Button
@@ -29,16 +21,15 @@
         android:layout_height="40dp"
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
-        android:layout_marginBottom="193dp"
+        android:layout_marginBottom="90dp"
         android:text="Login" />
 
     <EditText
         android:id="@+id/inputEmailAdress"
         android:layout_width="300dp"
         android:layout_height="40dp"
-        android:layout_alignParentTop="true"
+        android:layout_below="@+id/EmailAddress"
         android:layout_centerHorizontal="true"
-        android:layout_marginTop="72dp"
         android:ems="10"
         android:inputType="textEmailAddress"
         android:text="Email. address@email.com" />
@@ -47,8 +38,7 @@
         android:id="@+id/inputPassword"
         android:layout_width="300dp"
         android:layout_height="40dp"
-        android:layout_below="@+id/password"
-        android:layout_centerHorizontal="true"
+        android:layout_centerInParent="true"
         android:ems="10"
         android:inputType="textPassword" />
 
@@ -56,18 +46,17 @@
         android:id="@+id/EmailAddress"
         android:layout_width="wrap_content"
         android:layout_height="20dp"
-        android:layout_above="@+id/inputEmailAdress"
+        android:layout_alignParentTop="true"
         android:layout_alignStart="@+id/signUp"
-        android:layout_marginBottom="-72dp"
+        android:layout_marginTop="41dp"
         android:text="Email address" />
 
     <TextView
         android:id="@+id/password"
         android:layout_width="wrap_content"
         android:layout_height="20dp"
-        android:layout_alignParentTop="true"
+        android:layout_above="@+id/inputPassword"
         android:layout_alignStart="@+id/signUp"
-        android:layout_marginTop="140dp"
         android:text="Password" />
 
 </RelativeLayout>
\ No newline at end of file