diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml
index 2a92b15..eb72ce0 100644
--- a/app/src/main/res/layout/fragment_login.xml
+++ b/app/src/main/res/layout/fragment_login.xml
@@ -12,16 +12,23 @@
         android:orientation="vertical"
         android:paddingStart="16dp"
         android:paddingEnd="16dp"
-        app:constraint_referenced_ids="text_welcome, input_username, input_password, login"
+        app:constraint_referenced_ids="log"
         app:flow_verticalGap="32dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
+    <LinearLayout
+        android:id="@+id/log"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
     <TextView
         android:id="@+id/text_welcome"
         style="@style/Theme.UiTemplate.TextH1"
         android:layout_width="wrap_content"
+        android:layout_marginBottom="50dp"
+        android:layout_gravity="center"
         android:layout_height="wrap_content"
         android:text="@string/login_welcome" />
     <com.google.android.material.textfield.TextInputLayout
@@ -46,11 +53,12 @@
     <com.google.android.material.textfield.TextInputLayout
         style="@style/Theme.UiTemplate.Input"
         android:id="@+id/input_password"
-        android:layout_marginTop="2dp"
+        android:layout_marginTop="15dp"
         android:layout_width="match_parent"
         app:layout_constraintWidth_max="400dp"
         app:layout_constraintWidth_percent="0.8"
-        android:layout_height="58dp">
+        android:layout_height="58dp"
+        tools:ignore="MissingConstraints">
 
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/password"
@@ -72,7 +80,10 @@
         android:layout_width="250dp"
         android:layout_height="wrap_content"
         style="@style/Theme.UiTemplate.Button"
+        android:layout_marginTop="45dp"
+        android:layout_gravity="center"
         android:text="@string/login_button" />
+    </LinearLayout>
 
     <ProgressBar
         android:id="@+id/loading"
diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml
index 0abc630..8c6ca3a 100644
--- a/app/src/main/res/layout/fragment_profile.xml
+++ b/app/src/main/res/layout/fragment_profile.xml
@@ -6,18 +6,18 @@
     android:layout_height="match_parent"
     android:padding="16dp">
 
-    <androidx.constraintlayout.widget.Group
-        android:id="@+id/showState"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:constraint_referenced_ids="logout,fullname,photo,position,lastEntry,scan" />
-
 
+<LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="16dp"
+    android:orientation="vertical">
     <TextView
         android:id="@+id/textView"
         style="@style/Theme.UiTemplate.TextH1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_gravity="center"
         android:text="@string/profile_main_textview"
         app:layout_constraintBottom_toBottomOf="@+id/logout"
         app:layout_constraintStart_toStartOf="parent"
@@ -32,18 +32,25 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
-
+<LinearLayout
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal">
     <ImageView
         android:id="@+id/photo"
-        android:layout_width="64dp"
-        android:layout_height="64dp"
+        android:layout_width="140dp"
+        android:layout_height="140dp"
         android:contentDescription="@null"
+        android:layout_marginTop="20dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:src="@tools:sample/avatars" />
-
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
     <TextView
         android:id="@+id/fullname"
         android:layout_width="0dp"
@@ -56,27 +63,27 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/photo"
         tools:text="@tools:sample/full_names" />
-
-    <TextView
-        android:id="@+id/position"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        app:layout_constraintEnd_toStartOf="@id/lastEntry"
-        app:layout_constraintStart_toEndOf="@id/photo"
-        app:layout_constraintTop_toBottomOf="@id/fullname"
-        tools:text="@tools:sample/cities" />
-
-    <TextView
-        android:id="@+id/lastEntry"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="16dp"
-        android:layout_marginTop="24dp"
-        app:layout_constraintEnd_toEndOf="@+id/fullname"
-        app:layout_constraintStart_toStartOf="@+id/fullname"
-        app:layout_constraintTop_toBottomOf="@+id/fullname"
-        tools:text="@tools:sample/date/hhmm" />
+        <TextView
+            android:id="@+id/position"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            app:layout_constraintEnd_toStartOf="@id/lastEntry"
+            app:layout_constraintStart_toEndOf="@id/photo"
+            app:layout_constraintTop_toBottomOf="@id/fullname"
+            tools:text="@tools:sample/cities" />
+        <TextView
+            android:id="@+id/lastEntry"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="16dp"
+            android:layout_marginTop="24dp"
+            app:layout_constraintEnd_toEndOf="@+id/fullname"
+            app:layout_constraintStart_toStartOf="@+id/fullname"
+            app:layout_constraintTop_toBottomOf="@+id/fullname"
+            tools:text="@tools:sample/date/hhmm" />
+    </LinearLayout>
+</LinearLayout>
 
     <TextView
         android:id="@+id/error"
@@ -123,6 +130,6 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:useCompatPadding="true" />
-
+</LinearLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file