diff --git a/auth/app/src/main/java/com/google/firebase/quickstart/auth/java/MultiFactorActivity.java b/auth/app/src/main/java/com/google/firebase/quickstart/auth/java/MultiFactorActivity.java
index 1f1b4ae41..f50b6c231 100644
--- a/auth/app/src/main/java/com/google/firebase/quickstart/auth/java/MultiFactorActivity.java
+++ b/auth/app/src/main/java/com/google/firebase/quickstart/auth/java/MultiFactorActivity.java
@@ -175,7 +175,7 @@ private void updateUI(FirebaseUser user) {
                 mBinding.mfaInfo.setText(sb.toString());
             }
 
-            mBinding.emailPasswordButtons.setVisibility(View.GONE);
+            mBinding.emailSignInButton.setVisibility(View.GONE);
             mBinding.signedInButtons.setVisibility(View.VISIBLE);
 
             int reloadVisibility = secondFactors.isEmpty() ? View.VISIBLE : View.GONE;
@@ -193,7 +193,7 @@ private void updateUI(FirebaseUser user) {
             mBinding.detail.setText(null);
             mBinding.mfaInfo.setText(null);
 
-            mBinding.emailPasswordButtons.setVisibility(View.VISIBLE);
+            mBinding.emailSignInButton.setVisibility(View.VISIBLE);
             mBinding.signedInButtons.setVisibility(View.GONE);
         }
     }
diff --git a/auth/app/src/main/java/com/google/firebase/quickstart/auth/java/PasswordlessActivity.java b/auth/app/src/main/java/com/google/firebase/quickstart/auth/java/PasswordlessActivity.java
index 431c1bb4a..76d1b3bb4 100644
--- a/auth/app/src/main/java/com/google/firebase/quickstart/auth/java/PasswordlessActivity.java
+++ b/auth/app/src/main/java/com/google/firebase/quickstart/auth/java/PasswordlessActivity.java
@@ -219,13 +219,13 @@ private void updateUI(@Nullable FirebaseUser user) {
             mBinding.status.setText(getString(R.string.passwordless_status_fmt,
                     user.getEmail(), user.isEmailVerified()));
 
-            mBinding.passwordlessFields.setVisibility(View.GONE);
+            mBinding.fieldEmail.setVisibility(View.GONE);
             mBinding.passwordlessButtons.setVisibility(View.GONE);
-            mBinding.signedInButtons.setVisibility(View.VISIBLE);
+            mBinding.signOutButton.setVisibility(View.VISIBLE);
         } else {
-            mBinding.passwordlessFields.setVisibility(View.VISIBLE);
+            mBinding.fieldEmail.setVisibility(View.VISIBLE);
             mBinding.passwordlessButtons.setVisibility(View.VISIBLE);
-            mBinding.signedInButtons.setVisibility(View.GONE);
+            mBinding.signOutButton.setVisibility(View.GONE);
         }
     }
 
diff --git a/auth/app/src/main/java/com/google/firebase/quickstart/auth/java/PhoneAuthActivity.java b/auth/app/src/main/java/com/google/firebase/quickstart/auth/java/PhoneAuthActivity.java
index 14058ac4d..ee154a4c1 100644
--- a/auth/app/src/main/java/com/google/firebase/quickstart/auth/java/PhoneAuthActivity.java
+++ b/auth/app/src/main/java/com/google/firebase/quickstart/auth/java/PhoneAuthActivity.java
@@ -317,13 +317,13 @@ private void updateUI(int uiState, FirebaseUser user, PhoneAuthCredential cred)
         if (user == null) {
             // Signed out
             mBinding.phoneAuthFields.setVisibility(View.VISIBLE);
-            mBinding.signedInButtons.setVisibility(View.GONE);
+            mBinding.signOutButton.setVisibility(View.GONE);
 
             mBinding.status.setText(R.string.signed_out);
         } else {
             // Signed in
             mBinding.phoneAuthFields.setVisibility(View.GONE);
-            mBinding.signedInButtons.setVisibility(View.VISIBLE);
+            mBinding.signOutButton.setVisibility(View.VISIBLE);
 
             enableViews(mBinding.fieldPhoneNumber, mBinding.fieldVerificationCode);
             mBinding.fieldPhoneNumber.setText(null);
diff --git a/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/MultiFactorActivity.kt b/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/MultiFactorActivity.kt
index f7f6aa240..eabeb5784 100644
--- a/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/MultiFactorActivity.kt
+++ b/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/MultiFactorActivity.kt
@@ -128,7 +128,7 @@ class MultiFactorActivity : BaseActivity(), View.OnClickListener {
                 sb.setLength(sb.length - delimiter.length)
                 binding.mfaInfo.text = sb.toString()
             }
-            findViewById<View>(R.id.emailPasswordButtons).visibility = View.GONE
+            findViewById<View>(R.id.emailSignInButton).visibility = View.GONE
             findViewById<View>(R.id.signedInButtons).visibility = View.VISIBLE
             val reloadVisibility = if (secondFactors.isEmpty()) View.VISIBLE else View.GONE
             findViewById<View>(R.id.reloadButton).visibility = reloadVisibility
@@ -143,7 +143,7 @@ class MultiFactorActivity : BaseActivity(), View.OnClickListener {
             binding.status.setText(R.string.multi_factor_signed_out)
             binding.detail.text = null
             binding.mfaInfo.text = null
-            findViewById<View>(R.id.emailPasswordButtons).visibility = View.VISIBLE
+            findViewById<View>(R.id.emailSignInButton).visibility = View.VISIBLE
             findViewById<View>(R.id.signedInButtons).visibility = View.GONE
         }
     }
diff --git a/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/PasswordlessActivity.kt b/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/PasswordlessActivity.kt
index e8a640251..f42122bcb 100644
--- a/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/PasswordlessActivity.kt
+++ b/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/PasswordlessActivity.kt
@@ -195,14 +195,11 @@ class PasswordlessActivity : BaseActivity(), View.OnClickListener {
         if (user != null) {
             binding.status.text = getString(R.string.passwordless_status_fmt,
                     user.email, user.isEmailVerified)
-
-            binding.passwordlessFields.visibility = View.GONE
             binding.passwordlessButtons.visibility = View.GONE
-            binding.signedInButtons.visibility = View.VISIBLE
+            binding.signOutButton.visibility = View.VISIBLE
         } else {
-            binding.passwordlessFields.visibility = View.VISIBLE
             binding.passwordlessButtons.visibility = View.VISIBLE
-            binding.signedInButtons.visibility = View.GONE
+            binding.signOutButton.visibility = View.GONE
         }
     }
 
diff --git a/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/PhoneAuthActivity.kt b/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/PhoneAuthActivity.kt
index 818f1b709..5507a1b8e 100644
--- a/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/PhoneAuthActivity.kt
+++ b/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/PhoneAuthActivity.kt
@@ -287,13 +287,13 @@ class PhoneAuthActivity : AppCompatActivity(), View.OnClickListener {
         if (user == null) {
             // Signed out
             binding.phoneAuthFields.visibility = View.VISIBLE
-            binding.signedInButtons.visibility = View.GONE
+            binding.signOutButton.visibility = View.GONE
 
             binding.status.setText(R.string.signed_out)
         } else {
             // Signed in
             binding.phoneAuthFields.visibility = View.GONE
-            binding.signedInButtons.visibility = View.VISIBLE
+            binding.signOutButton.visibility = View.VISIBLE
 
             enableViews(binding.fieldPhoneNumber, binding.fieldVerificationCode)
             binding.fieldPhoneNumber.text = null
diff --git a/auth/app/src/main/res/layout/activity_anonymous_auth.xml b/auth/app/src/main/res/layout/activity_anonymous_auth.xml
index 104d86498..be50cdb7c 100644
--- a/auth/app/src/main/res/layout/activity_anonymous_auth.xml
+++ b/auth/app/src/main/res/layout/activity_anonymous_auth.xml
@@ -1,30 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout 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://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
     tools:context="com.google.firebase.quickstart.auth.java.AnonymousAuthActivity">
 
     <ProgressBar
         android:id="@+id/progressBar"
-        android:indeterminate="true"
-        android:layout_width="match_parent"
+        style="?android:attr/progressBarStyleHorizontal"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:indeterminate="true"
         android:visibility="invisible"
-        style="?android:attr/progressBarStyleHorizontal"/>
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <ImageView
         android:id="@+id/icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
         android:layout_below="@+id/progressBar"
         android:contentDescription="@string/desc_firebase_lockup"
-        android:src="@drawable/firebase_lockup_400" />
+        android:src="@drawable/firebase_lockup_400"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/progressBar" />
 
     <TextView
         android:id="@+id/titleAnonymous"
@@ -32,8 +34,11 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@+id/icon"
-        android:layout_marginBottom="8dp"
-        android:text="Anonymous Sign In" />
+        android:layout_marginStart="16dp"
+        android:layout_marginLeft="16dp"
+        android:text="Anonymous Sign In"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/icon" />
 
     <TextView
         android:id="@+id/anonymousStatusId"
@@ -42,14 +47,18 @@
         android:layout_below="@+id/titleAnonymous"
         android:ellipsize="end"
         android:maxLines="1"
-        android:text="@string/signed_out" />
+        android:layout_marginTop="8dp"
+        android:text="@string/signed_out"
+        app:layout_constraintStart_toStartOf="@+id/titleAnonymous"
+        app:layout_constraintTop_toBottomOf="@+id/titleAnonymous" />
 
     <TextView
         android:id="@+id/anonymousStatusEmail"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@+id/anonymousStatusId"
-        android:layout_marginBottom="8dp"
+        app:layout_constraintStart_toStartOf="@+id/anonymousStatusId"
+        app:layout_constraintTop_toBottomOf="@+id/anonymousStatusId"
         tools:text="Email: none" />
 
     <Button
@@ -59,7 +68,10 @@
         android:layout_width="@dimen/field_width_standard"
         android:layout_height="wrap_content"
         android:layout_below="@+id/anonymousStatusEmail"
-        android:text="@string/sign_in" />
+        android:text="@string/sign_in"
+        android:layout_marginTop="8dp"
+        app:layout_constraintStart_toStartOf="@+id/anonymousStatusEmail"
+        app:layout_constraintTop_toBottomOf="@+id/anonymousStatusEmail" />
 
     <Button
         android:id="@+id/buttonAnonymousSignOut"
@@ -68,10 +80,13 @@
         android:layout_width="@dimen/field_width_standard"
         android:layout_height="wrap_content"
         android:layout_alignTop="@+id/buttonAnonymousSignIn"
+        android:layout_toEndOf="@+id/buttonAnonymousSignIn"
         android:layout_toRightOf="@+id/buttonAnonymousSignIn"
         android:enabled="false"
         android:text="@string/sign_out"
-        android:layout_toEndOf="@+id/buttonAnonymousSignIn" />
+        app:layout_constraintBottom_toBottomOf="@+id/buttonAnonymousSignIn"
+        app:layout_constraintStart_toEndOf="@+id/buttonAnonymousSignIn"
+        app:layout_constraintTop_toTopOf="@+id/buttonAnonymousSignIn" />
 
     <TextView
         android:id="@+id/titleLinking"
@@ -79,9 +94,10 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@+id/buttonAnonymousSignIn"
-        android:layout_marginBottom="8dp"
         android:layout_marginTop="24dp"
-        android:text="Account Linking" />
+        android:text="Account Linking"
+        app:layout_constraintStart_toStartOf="@+id/buttonAnonymousSignIn"
+        app:layout_constraintTop_toBottomOf="@+id/buttonAnonymousSignIn" />
 
     <EditText
         android:id="@+id/fieldEmail"
@@ -89,7 +105,10 @@
         android:layout_height="wrap_content"
         android:layout_below="@+id/titleLinking"
         android:hint="@string/hint_email"
-        android:inputType="textEmailAddress" />
+        android:layout_marginTop="8dp"
+        android:inputType="textEmailAddress"
+        app:layout_constraintStart_toStartOf="@+id/titleLinking"
+        app:layout_constraintTop_toBottomOf="@+id/titleLinking" />
 
     <EditText
         android:id="@+id/fieldPassword"
@@ -98,7 +117,10 @@
         android:layout_alignTop="@+id/fieldEmail"
         android:layout_toRightOf="@+id/fieldEmail"
         android:hint="@string/hint_password"
-        android:inputType="textPassword" />
+        android:inputType="textPassword"
+        app:layout_constraintBottom_toBottomOf="@+id/fieldEmail"
+        app:layout_constraintStart_toEndOf="@+id/fieldEmail"
+        app:layout_constraintTop_toTopOf="@+id/fieldEmail" />
 
     <Button
         android:id="@+id/buttonLinkAccount"
@@ -108,8 +130,8 @@
         android:layout_height="wrap_content"
         android:layout_below="@+id/fieldEmail"
         android:enabled="false"
-        android:text="Link Account" />
-
-
+        android:text="Link Account"
+        app:layout_constraintStart_toStartOf="@+id/fieldEmail"
+        app:layout_constraintTop_toBottomOf="@+id/fieldEmail" />
 
-</RelativeLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/auth/app/src/main/res/layout/activity_emailpassword.xml b/auth/app/src/main/res/layout/activity_emailpassword.xml
index aada45f20..ade750b03 100644
--- a/auth/app/src/main/res/layout/activity_emailpassword.xml
+++ b/auth/app/src/main/res/layout/activity_emailpassword.xml
@@ -1,5 +1,6 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/main_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -49,108 +50,125 @@
             tools:text="Firebase User ID: 123456789abc" />
     </LinearLayout>
 
-    <RelativeLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
+        android:paddingTop="16dp"
         android:background="@color/grey_300"
         android:gravity="center_vertical">
 
-        <LinearLayout
+        <androidx.constraintlayout.widget.Guideline
+            android:id="@+id/guideline"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            app:layout_constraintGuide_percent="0.5" />
+
+        <EditText
+            android:id="@+id/fieldEmail"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginLeft="16dp"
+            android:hint="@string/hint_email"
+            android:inputType="textEmailAddress"
+            app:layout_constraintEnd_toStartOf="@+id/guideline"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <EditText
+            android:id="@+id/fieldPassword"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="16dp"
+            android:layout_marginRight="16dp"
+            android:hint="@string/hint_password"
+            android:inputType="textPassword"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="@+id/guideline"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <androidx.constraintlayout.widget.Group
             android:id="@+id/emailPasswordFields"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="visible"
+            app:constraint_referenced_ids="fieldEmail, fieldPassword"/>
+
+        <Button
+            android:id="@+id/emailSignInButton"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginLeft="16dp"
+            android:layout_marginEnd="@dimen/button_horizontal_margin"
+            android:layout_marginRight="@dimen/button_horizontal_margin"
+            android:text="@string/sign_in"
+            android:theme="@style/ThemeOverlay.MyDarkButton"
+            app:layout_constraintEnd_toStartOf="@+id/guideline"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/fieldEmail" />
+
+        <Button
+            android:id="@+id/emailCreateAccountButton"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp">
-
-            <EditText
-                android:id="@+id/fieldEmail"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:hint="@string/hint_email"
-                android:inputType="textEmailAddress" />
-
-            <EditText
-                android:id="@+id/fieldPassword"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:hint="@string/hint_password"
-                android:inputType="textPassword" />
-        </LinearLayout>
-
-        <LinearLayout
+            android:layout_marginStart="@dimen/button_horizontal_margin"
+            android:layout_marginLeft="@dimen/button_horizontal_margin"
+            android:layout_marginEnd="16dp"
+            android:layout_marginRight="16dp"
+            android:text="@string/create_account"
+            android:theme="@style/ThemeOverlay.MyDarkButton"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="@+id/guideline"
+            app:layout_constraintTop_toBottomOf="@+id/fieldPassword" />
+
+        <androidx.constraintlayout.widget.Group
             android:id="@+id/emailPasswordButtons"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/emailPasswordFields"
-            android:orientation="horizontal"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp">
-
-            <Button
-                android:id="@+id/emailSignInButton"
-                android:layout_marginStart="@dimen/button_horizontal_margin"
-                android:layout_marginEnd="@dimen/button_horizontal_margin"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/sign_in"
-                android:theme="@style/ThemeOverlay.MyDarkButton" />
-
-            <Button
-                android:id="@+id/emailCreateAccountButton"
-                android:layout_marginStart="@dimen/button_horizontal_margin"
-                android:layout_marginEnd="@dimen/button_horizontal_margin"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/create_account"
-                android:theme="@style/ThemeOverlay.MyDarkButton" />
-        </LinearLayout>
-
-        <LinearLayout
+            android:visibility="visible"
+            app:constraint_referenced_ids="emailCreateAccountButton, emailSignInButton" />
+
+        <Button
+            android:id="@+id/signOutButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/sign_out"
+            android:theme="@style/ThemeOverlay.MyDarkButton"
+            app:layout_constraintBottom_toBottomOf="@+id/verifyEmailButton"
+            app:layout_constraintEnd_toStartOf="@+id/verifyEmailButton"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/verifyEmailButton" />
+
+        <Button
+            android:id="@+id/verifyEmailButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/verify_email"
+            android:theme="@style/ThemeOverlay.MyDarkButton"
+            app:layout_constraintEnd_toStartOf="@+id/guideline"
+            app:layout_constraintStart_toStartOf="@+id/guideline"
+            app:layout_constraintTop_toBottomOf="@+id/emailSignInButton" />
+
+        <Button
+            android:id="@+id/reloadButton"
+            style="@style/Widget.AppCompat.Button.Colored"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/reload"
+            android:theme="@style/ThemeOverlay.MyDarkButton"
+            app:layout_constraintBottom_toBottomOf="@+id/verifyEmailButton"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/verifyEmailButton"
+            app:layout_constraintTop_toTopOf="@+id/verifyEmailButton" />
+
+        <androidx.constraintlayout.widget.Group
             android:id="@+id/signedInButtons"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:orientation="horizontal"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp"
-            android:visibility="gone">
-
-            <Button
-                android:id="@+id/signOutButton"
-                android:layout_marginStart="@dimen/button_horizontal_margin"
-                android:layout_marginEnd="@dimen/button_horizontal_margin"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/sign_out"
-                android:theme="@style/ThemeOverlay.MyDarkButton" />
-
-            <Button
-                android:id="@+id/verifyEmailButton"
-                android:layout_marginStart="@dimen/button_horizontal_margin"
-                android:layout_marginEnd="@dimen/button_horizontal_margin"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/verify_email"
-                android:theme="@style/ThemeOverlay.MyDarkButton" />
-
-            <Button
-                android:id="@+id/reloadButton"
-                style="@style/Widget.AppCompat.Button.Colored"
-                android:layout_marginStart="@dimen/button_horizontal_margin"
-                android:layout_marginEnd="@dimen/button_horizontal_margin"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/reload"
-                android:theme="@style/ThemeOverlay.MyDarkButton" />
-        </LinearLayout>
-    </RelativeLayout>
+            android:visibility="gone"
+            app:constraint_referenced_ids="signOutButton, verifyEmailButton, reloadButton" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </LinearLayout>
diff --git a/auth/app/src/main/res/layout/activity_facebook.xml b/auth/app/src/main/res/layout/activity_facebook.xml
index ee964e0a0..937812223 100644
--- a/auth/app/src/main/res/layout/activity_facebook.xml
+++ b/auth/app/src/main/res/layout/activity_facebook.xml
@@ -51,7 +51,7 @@
 
     </LinearLayout>
 
-    <RelativeLayout
+    <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
@@ -61,17 +61,17 @@
             android:id="@+id/buttonFacebookLogin"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_centerInParent="true" />
+            android:layout_gravity="center"/>
 
         <Button
             android:id="@+id/buttonFacebookSignout"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
+            android:layout_gravity="center"
             android:text="@string/sign_out"
             android:theme="@style/ThemeOverlay.MyDarkButton"
             android:visibility="gone"/>
 
-    </RelativeLayout>
+    </FrameLayout>
 
 </LinearLayout>
diff --git a/auth/app/src/main/res/layout/activity_firebase_ui.xml b/auth/app/src/main/res/layout/activity_firebase_ui.xml
index efb54b80d..148e3d38e 100644
--- a/auth/app/src/main/res/layout/activity_firebase_ui.xml
+++ b/auth/app/src/main/res/layout/activity_firebase_ui.xml
@@ -43,7 +43,7 @@
     </LinearLayout>
 
 
-    <RelativeLayout
+    <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
@@ -54,7 +54,7 @@
             android:id="@+id/signInButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
+            android:layout_gravity="center"
             android:text="@string/sign_in"
             android:theme="@style/ThemeOverlay.MyDarkButton"
             android:visibility="visible" />
@@ -63,11 +63,11 @@
             android:id="@+id/signOutButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
+            android:layout_gravity="center"
             android:text="@string/sign_out"
             android:theme="@style/ThemeOverlay.MyDarkButton"
             android:visibility="gone" />
 
-    </RelativeLayout>
+    </FrameLayout>
 
 </LinearLayout>
diff --git a/auth/app/src/main/res/layout/activity_generic_idp.xml b/auth/app/src/main/res/layout/activity_generic_idp.xml
index 0055e9b5f..8018d0712 100644
--- a/auth/app/src/main/res/layout/activity_generic_idp.xml
+++ b/auth/app/src/main/res/layout/activity_generic_idp.xml
@@ -68,7 +68,7 @@
 
     </LinearLayout>
 
-    <RelativeLayout
+    <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
@@ -80,6 +80,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/sign_in"
+            android:layout_gravity="center"
             android:layout_margin="16dp"
             android:theme="@style/ThemeOverlay.MyDarkButton" />
 
@@ -88,10 +89,11 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/sign_out"
+            android:layout_gravity="center"
             android:layout_margin="16dp"
             android:theme="@style/ThemeOverlay.MyDarkButton"
             android:visibility="gone" />
 
-    </RelativeLayout>
+    </FrameLayout>
 
 </LinearLayout>
diff --git a/auth/app/src/main/res/layout/activity_google.xml b/auth/app/src/main/res/layout/activity_google.xml
index a0ffb15de..10f32f984 100644
--- a/auth/app/src/main/res/layout/activity_google.xml
+++ b/auth/app/src/main/res/layout/activity_google.xml
@@ -1,4 +1,5 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/main_layout"
     android:layout_width="match_parent"
@@ -50,52 +51,67 @@
 
     </LinearLayout>
 
-    <RelativeLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
+        android:paddingTop="16dp"
         android:background="@color/grey_300">
 
+        <androidx.constraintlayout.widget.Guideline
+            android:id="@+id/guideline"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            app:layout_constraintGuide_percent="0.5" />
+
         <com.google.android.gms.common.SignInButton
             android:id="@+id/signInButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
             android:visibility="visible"
-            tools:visibility="gone" />
+            tools:visibility="gone"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
-        <LinearLayout
-            android:id="@+id/signOutAndDisconnect"
-            android:layout_width="match_parent"
+        <Button
+            android:id="@+id/signOutButton"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:orientation="horizontal"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp"
-            android:visibility="gone"
-            tools:visibility="visible">
+            android:text="@string/sign_out"
+            android:theme="@style/ThemeOverlay.MyDarkButton"
+            android:layout_marginStart="16dp"
+            android:layout_marginLeft="16dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginRight="8dp"
+            app:layout_constraintEnd_toStartOf="@+id/guideline"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/signInButton" />
 
-            <Button
-                android:id="@+id/signOutButton"
-                android:layout_marginStart="@dimen/button_horizontal_margin"
-                android:layout_marginEnd="@dimen/button_horizontal_margin"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/sign_out"
-                android:theme="@style/ThemeOverlay.MyDarkButton" />
+        <Button
+            android:id="@+id/disconnectButton"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginRight="16dp"
+            android:text="@string/disconnect"
+            android:theme="@style/ThemeOverlay.MyDarkButton"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="@+id/guideline"
+            app:layout_constraintTop_toBottomOf="@+id/signInButton" />
 
-            <Button
-                android:id="@+id/disconnectButton"
-                android:layout_marginStart="@dimen/button_horizontal_margin"
-                android:layout_marginEnd="@dimen/button_horizontal_margin"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/disconnect"
-                android:theme="@style/ThemeOverlay.MyDarkButton" />
-        </LinearLayout>
+        <androidx.constraintlayout.widget.Group
+            android:id="@+id/signOutAndDisconnect"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            tools:visibility="visible"
+            app:constraint_referenced_ids="disconnectButton, signOutButton"/>
 
-    </RelativeLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
 </LinearLayout>
diff --git a/auth/app/src/main/res/layout/activity_multi_factor.xml b/auth/app/src/main/res/layout/activity_multi_factor.xml
index 5e3072a0f..5d7772fdd 100644
--- a/auth/app/src/main/res/layout/activity_multi_factor.xml
+++ b/auth/app/src/main/res/layout/activity_multi_factor.xml
@@ -54,95 +54,110 @@
             tools:text="Second factors: " />
     </LinearLayout>
 
-    <RelativeLayout
+    <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
-        android:background="@color/grey_300"
-        android:gravity="center_vertical">
+        android:paddingTop="16dp"
+        android:background="@color/grey_300">
 
-        <LinearLayout
-            android:id="@+id/emailPasswordButtons"
-            android:layout_width="match_parent"
+        <Button
+            android:id="@+id/emailSignInButton"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp">
-
-            <Button
-                android:id="@+id/emailSignInButton"
-                android:layout_marginStart="@dimen/button_horizontal_margin"
-                android:layout_marginEnd="@dimen/button_horizontal_margin"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/sign_in"
-                android:theme="@style/ThemeOverlay.MyDarkButton" />
-
-        </LinearLayout>
-
-        <LinearLayout
+            android:layout_marginStart="16dp"
+            android:layout_marginLeft="16dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginRight="16dp"
+            android:text="@string/sign_in"
+            android:theme="@style/ThemeOverlay.MyDarkButton"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <androidx.constraintlayout.widget.Guideline
+            android:id="@+id/guideline"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            app:layout_constraintGuide_percent="0.5" />
+
+        <Button
+            android:id="@+id/verifyEmailButton"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginLeft="16dp"
+            android:layout_marginEnd="4dp"
+            android:layout_marginRight="4dp"
+            android:text="@string/verify_email"
+            android:theme="@style/ThemeOverlay.MyDarkButton"
+            app:layout_constraintEnd_toStartOf="@+id/guideline"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/emailSignInButton" />
+
+        <Button
+            android:id="@+id/reloadButton"
+            style="@style/Widget.AppCompat.Button.Colored"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="4dp"
+            android:layout_marginLeft="4dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginRight="16dp"
+            android:text="@string/reload"
+            android:theme="@style/ThemeOverlay.MyDarkButton"
+            app:layout_constraintBottom_toBottomOf="@+id/verifyEmailButton"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="@+id/guideline"
+            app:layout_constraintTop_toTopOf="@+id/verifyEmailButton" />
+
+        <Button
+            android:id="@+id/enrollMfa"
+            style="@style/Widget.AppCompat.Button.Colored"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="4dp"
+            android:layout_marginRight="4dp"
+            android:text="@string/enroll_mfa"
+            android:theme="@style/ThemeOverlay.MyDarkButton"
+            app:layout_constraintEnd_toStartOf="@+id/guideline"
+            app:layout_constraintStart_toStartOf="@+id/verifyEmailButton"
+            app:layout_constraintTop_toBottomOf="@+id/verifyEmailButton" />
+
+        <Button
+            android:id="@+id/unenrollMfa"
+            style="@style/Widget.AppCompat.Button.Colored"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="4dp"
+            android:layout_marginLeft="4dp"
+            android:layout_weight="1"
+            android:text="@string/unenroll_mfa"
+            android:theme="@style/ThemeOverlay.MyDarkButton"
+            app:layout_constraintBottom_toBottomOf="@+id/enrollMfa"
+            app:layout_constraintEnd_toEndOf="@+id/reloadButton"
+            app:layout_constraintStart_toStartOf="@+id/guideline"
+            app:layout_constraintTop_toBottomOf="@+id/reloadButton" />
+
+        <Button
+            android:id="@+id/signOutButton"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/sign_out"
+            android:theme="@style/ThemeOverlay.MyDarkButton"
+            app:layout_constraintEnd_toEndOf="@+id/unenrollMfa"
+            app:layout_constraintStart_toStartOf="@+id/enrollMfa"
+            app:layout_constraintTop_toBottomOf="@+id/unenrollMfa" />
+
+        <androidx.constraintlayout.widget.Group
             android:id="@+id/signedInButtons"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:orientation="horizontal"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp"
-            android:visibility="gone">
-
-            <Button
-                android:id="@+id/signOutButton"
-                android:layout_marginStart="@dimen/button_horizontal_margin"
-                android:layout_marginEnd="@dimen/button_horizontal_margin"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/sign_out"
-                android:theme="@style/ThemeOverlay.MyDarkButton" />
-
-            <Button
-                android:id="@+id/verifyEmailButton"
-                android:layout_marginStart="@dimen/button_horizontal_margin"
-                android:layout_marginEnd="@dimen/button_horizontal_margin"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/verify_email"
-                android:theme="@style/ThemeOverlay.MyDarkButton" />
-
-            <Button
-                android:id="@+id/reloadButton"
-                style="@style/Widget.AppCompat.Button.Colored"
-                android:layout_marginStart="@dimen/button_horizontal_margin"
-                android:layout_marginEnd="@dimen/button_horizontal_margin"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/reload"
-                android:theme="@style/ThemeOverlay.MyDarkButton" />
-
-            <Button
-                android:id="@+id/enrollMfa"
-                style="@style/Widget.AppCompat.Button.Colored"
-                android:layout_marginStart="@dimen/button_horizontal_margin"
-                android:layout_marginEnd="@dimen/button_horizontal_margin"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/enroll_mfa"
-                android:theme="@style/ThemeOverlay.MyDarkButton" />
-
-            <Button
-                android:id="@+id/unenrollMfa"
-                style="@style/Widget.AppCompat.Button.Colored"
-                android:layout_marginStart="@dimen/button_horizontal_margin"
-                android:layout_marginEnd="@dimen/button_horizontal_margin"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/unenroll_mfa"
-                android:theme="@style/ThemeOverlay.MyDarkButton" />
-        </LinearLayout>
-    </RelativeLayout>
+            android:visibility="gone"
+            app:constraint_referenced_ids="verifyEmailButton, reloadButton, enrollMfa, unenrollMfa, signOutButton" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </LinearLayout>
diff --git a/auth/app/src/main/res/layout/activity_passwordless.xml b/auth/app/src/main/res/layout/activity_passwordless.xml
index e9325999c..4a0225941 100644
--- a/auth/app/src/main/res/layout/activity_passwordless.xml
+++ b/auth/app/src/main/res/layout/activity_passwordless.xml
@@ -1,4 +1,5 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/main_layout"
     android:layout_width="match_parent"
@@ -50,85 +51,81 @@
 
     </LinearLayout>
 
-    <RelativeLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
+        android:paddingTop="16dp"
         android:background="@color/grey_300"
         android:gravity="center_vertical">
 
-        <LinearLayout
-            android:id="@+id/passwordlessFields"
-            android:layout_width="match_parent"
+        <Button
+            android:id="@+id/passwordlessSendEmailButton"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp">
-
-            <EditText
-                android:id="@+id/fieldEmail"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:hint="@string/hint_email"
-                android:inputType="textEmailAddress"
-                android:autofillHints="emailAddress" />
-
-        </LinearLayout>
-
-        <LinearLayout
+            android:layout_marginEnd="8dp"
+            android:layout_marginRight="8dp"
+            android:text="@string/send_link"
+            android:theme="@style/ThemeOverlay.MyDarkButton"
+            app:layout_constraintEnd_toStartOf="@+id/guideline"
+            app:layout_constraintStart_toStartOf="@+id/fieldEmail"
+            app:layout_constraintTop_toBottomOf="@+id/fieldEmail" />
+
+        <Button
+            android:id="@+id/passwordlessSignInButton"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginLeft="8dp"
+            android:text="@string/sign_in"
+            android:theme="@style/ThemeOverlay.MyDarkButton"
+            app:layout_constraintBottom_toBottomOf="@+id/passwordlessSendEmailButton"
+            app:layout_constraintEnd_toEndOf="@+id/fieldEmail"
+            app:layout_constraintStart_toStartOf="@+id/guideline"
+            app:layout_constraintTop_toTopOf="@+id/passwordlessSendEmailButton"
+            tools:enabled="false" />
+
+        <Button
+            android:id="@+id/signOutButton"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginLeft="16dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginRight="16dp"
+            android:text="@string/sign_out"
+            android:theme="@style/ThemeOverlay.MyDarkButton"
+            android:visibility="gone"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/passwordlessSendEmailButton" />
+
+        <EditText
+            android:id="@+id/fieldEmail"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:autofillHints="emailAddress"
+            android:hint="@string/hint_email"
+            android:inputType="textEmailAddress"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"/>
+
+        <androidx.constraintlayout.widget.Group
             android:id="@+id/passwordlessButtons"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/passwordlessFields"
-            android:orientation="horizontal"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp">
-
-            <Button
-                android:id="@+id/passwordlessSendEmailButton"
-                android:layout_marginStart="@dimen/button_horizontal_margin"
-                android:layout_marginEnd="@dimen/button_horizontal_margin"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/send_link"
-                android:theme="@style/ThemeOverlay.MyDarkButton" />
-
-            <Button
-                android:id="@+id/passwordlessSignInButton"
-                android:layout_marginStart="@dimen/button_horizontal_margin"
-                android:layout_marginEnd="@dimen/button_horizontal_margin"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/sign_in"
-                android:theme="@style/ThemeOverlay.MyDarkButton"
-                tools:enabled="false" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/signedInButtons"
-            android:layout_width="match_parent"
+            app:constraint_referenced_ids="passwordlessSignInButton, passwordlessSendEmailButton, fieldEmail"/>
+
+        <androidx.constraintlayout.widget.Guideline
+            android:id="@+id/guideline"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:orientation="horizontal"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp"
-            android:visibility="gone">
-
-            <Button
-                android:id="@+id/signOutButton"
-                android:layout_marginStart="@dimen/button_horizontal_margin"
-                android:layout_marginEnd="@dimen/button_horizontal_margin"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1.0"
-                android:text="@string/sign_out"
-                android:theme="@style/ThemeOverlay.MyDarkButton" />
-
-        </LinearLayout>
-
-    </RelativeLayout>
+            android:orientation="vertical"
+            app:layout_constraintGuide_percent="0.5" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
 </LinearLayout>
diff --git a/auth/app/src/main/res/layout/activity_phone_auth.xml b/auth/app/src/main/res/layout/activity_phone_auth.xml
index d8d5e93cf..8bee117d6 100644
--- a/auth/app/src/main/res/layout/activity_phone_auth.xml
+++ b/auth/app/src/main/res/layout/activity_phone_auth.xml
@@ -43,103 +43,101 @@
     </LinearLayout>
 
 
-    <RelativeLayout
+    <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
-        android:background="@color/grey_300"
-        android:gravity="center_vertical">
+        android:paddingTop="16dp"
+        android:background="@color/grey_300">
 
-        <LinearLayout
-            android:id="@+id/phoneAuthFields"
-            android:layout_width="match_parent"
+        <androidx.constraintlayout.widget.Guideline
+            android:id="@+id/guideline"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:weightSum="2.0">
-
-                <EditText
-                    android:id="@+id/fieldPhoneNumber"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/hint_phone_number"
-                    android:layout_weight="1.0"
-                    android:inputType="phone"/>
-
-                <EditText
-                    android:id="@+id/fieldVerificationCode"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/hint_verification_code"
-                    android:layout_weight="1.0"
-                    android:inputType="number"/>
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:weightSum="3.0">
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/buttonStartVerification"
-                    android:layout_marginStart="@dimen/button_horizontal_margin"
-                    android:layout_marginEnd="@dimen/button_horizontal_margin"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1.0"
-                    android:text="@string/start_phone_auth"/>
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/buttonVerifyPhone"
-                    android:layout_marginStart="@dimen/button_horizontal_margin"
-                    android:layout_marginEnd="@dimen/button_horizontal_margin"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1.0"
-                    android:text="@string/verify_phone_auth"/>
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/buttonResend"
-                    android:layout_marginStart="@dimen/button_horizontal_margin"
-                    android:layout_marginEnd="@dimen/button_horizontal_margin"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1.0"
-                    android:text="@string/resend_phone_auth"/>
-            </LinearLayout>
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/signedInButtons"
-            android:layout_width="match_parent"
+            app:layout_constraintGuide_percent="0.5" />
+
+        <EditText
+            android:id="@+id/fieldPhoneNumber"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:orientation="horizontal"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp"
-            android:visibility="gone"
-            android:weightSum="1.0">
+            android:layout_marginStart="16dp"
+            android:layout_marginLeft="16dp"
+            android:layout_marginEnd="4dp"
+            android:layout_marginRight="4dp"
+            android:hint="@string/hint_phone_number"
+            android:inputType="phone"
+            app:layout_constraintEnd_toStartOf="@+id/guideline"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <EditText
+            android:id="@+id/fieldVerificationCode"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="4dp"
+            android:layout_marginLeft="4dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginRight="16dp"
+            android:layout_weight="1.0"
+            android:hint="@string/hint_verification_code"
+            android:inputType="number"
+            app:layout_constraintBottom_toBottomOf="@+id/fieldPhoneNumber"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="@+id/guideline"
+            app:layout_constraintTop_toTopOf="@+id/fieldPhoneNumber" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/buttonStartVerification"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="16dp"
+            android:layout_marginRight="16dp"
+            android:text="@string/start_phone_auth"
+            app:layout_constraintBottom_toBottomOf="@+id/buttonVerifyPhone"
+            app:layout_constraintEnd_toStartOf="@+id/buttonVerifyPhone"
+            app:layout_constraintTop_toTopOf="@+id/buttonVerifyPhone" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/buttonVerifyPhone"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/verify_phone_auth"
+            app:layout_constraintEnd_toStartOf="@+id/guideline"
+            app:layout_constraintStart_toStartOf="@+id/guideline"
+            app:layout_constraintTop_toBottomOf="@+id/fieldVerificationCode" />
 
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/signOutButton"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1.0"
-                android:text="@string/sign_out"
-                android:theme="@style/ThemeOverlay.MyDarkButton" />
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/buttonResend"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginLeft="16dp"
+            android:layout_weight="1.0"
+            android:text="@string/resend_phone_auth"
+            app:layout_constraintBottom_toBottomOf="@+id/buttonVerifyPhone"
+            app:layout_constraintStart_toEndOf="@+id/buttonVerifyPhone"
+            app:layout_constraintTop_toTopOf="@+id/buttonVerifyPhone" />
+
+        <androidx.constraintlayout.widget.Group
+            android:id="@+id/phoneAuthFields"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:constraint_referenced_ids="fieldPhoneNumber, fieldVerificationCode, buttonResend, buttonStartVerification, buttonVerifyPhone" />
 
-        </LinearLayout>
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/signOutButton"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:text="@string/sign_out"
+            android:theme="@style/ThemeOverlay.MyDarkButton"
+            android:visibility="gone"
+            app:layout_constraintEnd_toEndOf="@+id/fieldVerificationCode"
+            app:layout_constraintStart_toStartOf="@+id/fieldPhoneNumber"
+            app:layout_constraintTop_toBottomOf="@+id/buttonVerifyPhone" />
 
-    </RelativeLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
 </LinearLayout>