diff --git a/database/app/src/androidTest/java/com/google/firebase/quickstart/database/NewPostTest.java b/database/app/src/androidTest/java/com/google/firebase/quickstart/database/NewPostTest.java
index 6d6e97661..8913c54a1 100644
--- a/database/app/src/androidTest/java/com/google/firebase/quickstart/database/NewPostTest.java
+++ b/database/app/src/androidTest/java/com/google/firebase/quickstart/database/NewPostTest.java
@@ -48,30 +48,22 @@ public void newPostTest() {
 
         // Select email field
         ViewInteraction appCompatEditText = onView(
-                allOf(withId(R.id.fieldEmail),
-                        withParent(withId(R.id.layoutEmailPassword)),
-                        isDisplayed()));
+                allOf(withId(R.id.fieldEmail), isDisplayed()));
         appCompatEditText.perform(click());
 
         // Enter email address
         ViewInteraction appCompatEditText2 = onView(
-                allOf(withId(R.id.fieldEmail),
-                        withParent(withId(R.id.layoutEmailPassword)),
-                        isDisplayed()));
+                allOf(withId(R.id.fieldEmail), isDisplayed()));
         appCompatEditText2.perform(replaceText(email));
 
         // Enter password
         ViewInteraction appCompatEditText3 = onView(
-                allOf(withId(R.id.fieldPassword),
-                        withParent(withId(R.id.layoutEmailPassword)),
-                        isDisplayed()));
+                allOf(withId(R.id.fieldPassword), isDisplayed()));
         appCompatEditText3.perform(replaceText(password));
 
         // Click sign up
         ViewInteraction appCompatButton = onView(
-                allOf(withId(R.id.buttonSignUp), withText(R.string.sign_up),
-                        withParent(withId(R.id.layoutButtons)),
-                        isDisplayed()));
+                allOf(withId(R.id.buttonSignUp), withText(R.string.sign_up), isDisplayed()));
         appCompatButton.perform(click());
 
         // Click new post button
@@ -111,9 +103,7 @@ public void newPostTest() {
 
         // Check that it has zero stars
         ViewInteraction textView3 = onView(
-                allOf(withId(R.id.postNumStars), withText("0"),
-                        withParent(withId(R.id.starLayout)),
-                        isDisplayed()));
+                allOf(withId(R.id.postNumStars), withText("0"), isDisplayed()));
         textView3.check(matches(withText("0")));
 
     }
diff --git a/database/app/src/main/res/layout/activity_main.xml b/database/app/src/main/res/layout/activity_main.xml
index bb54067cc..eca31e389 100644
--- a/database/app/src/main/res/layout/activity_main.xml
+++ b/database/app/src/main/res/layout/activity_main.xml
@@ -1,5 +1,6 @@
 <?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">
@@ -7,21 +8,27 @@
     <com.google.android.material.tabs.TabLayout
         android:id="@+id/tabs"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent"
+        />
 
     <androidx.viewpager.widget.ViewPager
         android:id="@+id/container"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_below="@+id/tabs" />
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tabs" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fabNewPost"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
+        android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_marginBottom="16dp"
         android:src="@drawable/ic_image_edit"
-        android:layout_margin="16dp"/>
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        />
 
-</RelativeLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/database/app/src/main/res/layout/activity_new_post.xml b/database/app/src/main/res/layout/activity_new_post.xml
index 56ee40aa7..2cb1c34f4 100644
--- a/database/app/src/main/res/layout/activity_new_post.xml
+++ b/database/app/src/main/res/layout/activity_new_post.xml
@@ -1,5 +1,7 @@
 <?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">
@@ -8,34 +10,45 @@
         android:id="@+id/fieldTitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="5dp"
+        android:layout_marginStart="16dp"
         android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
         android:layout_marginTop="16dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
         android:hint="Title"
-        android:maxLines="1" />
+        android:maxLines="1"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        />
 
     <EditText
         android:id="@+id/fieldBody"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/fieldTitle"
-        android:layout_marginBottom="5dp"
+        android:layout_marginStart="16dp"
         android:layout_marginLeft="16dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="16dp"
         android:layout_marginRight="16dp"
-        android:layout_marginTop="5dp"
         android:hint="Write your post..."
         android:inputType="textMultiLine"
         android:maxLines="10"
-        android:scrollHorizontally="false" />
+        android:scrollHorizontally="false"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/fieldTitle"
+        />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fabSubmitPost"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
-        android:layout_margin="16dp"
-        android:src="@drawable/ic_navigation_check_24"/>
+        android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_marginBottom="16dp"
+        android:src="@drawable/ic_navigation_check_24"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
 
-</RelativeLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/database/app/src/main/res/layout/activity_post_detail.xml b/database/app/src/main/res/layout/activity_post_detail.xml
index 7b7c0319d..420dfe57f 100644
--- a/database/app/src/main/res/layout/activity_post_detail.xml
+++ b/database/app/src/main/res/layout/activity_post_detail.xml
@@ -1,62 +1,66 @@
 <?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:paddingTop="@dimen/activity_vertical_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin">
+    android:paddingBottom="@dimen/activity_vertical_margin">
 
     <include
         android:id="@+id/postAuthorLayout"
         layout="@layout/include_post_author"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <include
         android:id="@+id/postTextLayout"
         layout="@layout/include_post_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_below="@+id/postAuthorLayout"
-        android:layout_marginLeft="5dp"
-        android:layout_marginTop="10dp" />
+        android:layout_marginStart="8dp"
+        android:layout_marginLeft="8dp"
+        android:layout_marginTop="8dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/postAuthorLayout" />
 
-    <LinearLayout
-        android:id="@+id/commentForm"
-        android:layout_width="match_parent"
+    <EditText
+        android:id="@+id/fieldCommentText"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:layout_below="@+id/postTextLayout"
-        android:layout_marginTop="20dp"
-        android:weightSum="1.0">
+        android:layout_marginTop="16dp"
+        android:hint="Write a comment..."
+        android:maxLines="1"
+        app:layout_constraintEnd_toStartOf="@+id/buttonPostComment"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintHorizontal_weight="8"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/postTextLayout" />
 
-        <EditText
-            android:id="@+id/fieldCommentText"
-            android:layout_width="0dp"
-            android:layout_weight="0.8"
-            android:layout_height="wrap_content"
-            android:maxLines="1"
-            android:hint="Write a comment..."/>
-
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/buttonPostComment"
-            style="@style/Widget.MaterialComponents.Button.TextButton"
-            android:layout_width="0dp"
-            android:layout_weight="0.2"
-            android:layout_height="wrap_content"
-            android:text="Post"/>
-
-    </LinearLayout>
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/buttonPostComment"
+        style="@style/Widget.MaterialComponents.Button.TextButton"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:text="Post"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintHorizontal_weight="2"
+        app:layout_constraintStart_toEndOf="@+id/fieldCommentText"
+        app:layout_constraintTop_toTopOf="@+id/fieldCommentText" />
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyclerPostComments"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_below="@+id/commentForm"
+        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/buttonPostComment"
         tools:listitem="@layout/item_comment" />
 
-</RelativeLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/database/app/src/main/res/layout/activity_sign_in.xml b/database/app/src/main/res/layout/activity_sign_in.xml
index 952051219..04cfd110f 100644
--- a/database/app/src/main/res/layout/activity_sign_in.xml
+++ b/database/app/src/main/res/layout/activity_sign_in.xml
@@ -1,86 +1,83 @@
 <?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:paddingTop="@dimen/activity_vertical_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin">
+    android:paddingBottom="@dimen/activity_vertical_margin">
 
     <ProgressBar
         android:id="@+id/progressBar"
-        android:indeterminate="true"
+        style="?android:attr/progressBarStyleHorizontal"
         android:layout_width="match_parent"
         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_marginBottom="@dimen/activity_vertical_margin"
-        android:layout_below="@+id/progressBar"
-        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" />
 
-    <LinearLayout
-        android:id="@+id/layoutEmailPassword"
-        android:layout_width="wrap_content"
+    <EditText
+        android:id="@+id/fieldEmail"
+        android:layout_width="150dp"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/icon"
-        android:layout_centerHorizontal="true"
-        android:orientation="horizontal">
-
-        <EditText
-            android:id="@+id/fieldEmail"
-            android:layout_width="150dp"
-            android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:gravity="center_horizontal"
-            android:hint="@string/hint_email"
-            android:inputType="textEmailAddress"
-            android:maxLines="1" />
-
-        <EditText
-            android:id="@+id/fieldPassword"
-            android:layout_width="150dp"
-            android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:gravity="center_horizontal"
-            android:hint="@string/hint_password"
-            android:inputType="textPassword"
-            android:maxLines="1" />
-
-    </LinearLayout>
+        android:layout_marginTop="16dp"
+        android:ellipsize="end"
+        android:hint="@string/hint_email"
+        android:inputType="textEmailAddress"
+        android:maxLines="1"
+        app:layout_constraintHorizontal_chainStyle="packed"
+        app:layout_constraintEnd_toStartOf="@+id/fieldPassword"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/icon" />
 
-    <LinearLayout
-        android:id="@+id/layoutButtons"
-        android:layout_width="wrap_content"
+    <EditText
+        android:id="@+id/fieldPassword"
+        android:layout_width="150dp"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/layoutEmailPassword"
-        android:layout_centerHorizontal="true"
-        android:orientation="horizontal">
-
-        <Button
-            android:id="@+id/buttonSignIn"
-            android:layout_marginStart="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_width="150dp"
-            android:layout_height="wrap_content"
-            android:text="@string/sign_in" />
-
+        android:ellipsize="end"
+        android:hint="@string/hint_password"
+        android:inputType="textPassword"
+        android:maxLines="1"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/fieldEmail"
+        app:layout_constraintTop_toTopOf="@+id/fieldEmail" />
 
-        <Button
-            android:id="@+id/buttonSignUp"
-            android:layout_marginStart="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_width="150dp"
-            android:layout_height="wrap_content"
-            android:text="@string/sign_up" />
-
-    </LinearLayout>
+    <Button
+        android:id="@+id/buttonSignIn"
+        android:layout_width="150dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:text="@string/sign_in"
+        app:layout_constraintHorizontal_chainStyle="packed"
+        app:layout_constraintEnd_toStartOf="@+id/buttonSignUp"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/fieldEmail" />
 
+    <Button
+        android:id="@+id/buttonSignUp"
+        android:layout_width="150dp"
+        android:layout_height="wrap_content"
+        android:text="@string/sign_up"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/buttonSignIn"
+        app:layout_constraintTop_toTopOf="@+id/buttonSignIn" />
 
-</RelativeLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/database/app/src/main/res/layout/fragment_all_posts.xml b/database/app/src/main/res/layout/fragment_all_posts.xml
index f80294b51..32921ad34 100644
--- a/database/app/src/main/res/layout/fragment_all_posts.xml
+++ b/database/app/src/main/res/layout/fragment_all_posts.xml
@@ -9,7 +9,6 @@
         android:id="@+id/messagesList"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_alignParentTop="true"
         android:clipToPadding="false"
         android:padding="5dp"
         android:scrollbars="vertical"
diff --git a/database/app/src/main/res/layout/include_post_author.xml b/database/app/src/main/res/layout/include_post_author.xml
index abd70eafc..279582324 100644
--- a/database/app/src/main/res/layout/include_post_author.xml
+++ b/database/app/src/main/res/layout/include_post_author.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout 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="wrap_content"
     android:layout_height="wrap_content"
@@ -10,15 +12,21 @@
         android:id="@+id/postAuthorPhoto"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@drawable/ic_action_account_circle_40" />
+        android:src="@drawable/ic_action_account_circle_40"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@+id/postAuthor"
         style="@style/Base.TextAppearance.AppCompat.Small"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="10dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginLeft="8dp"
         android:gravity="center_vertical"
+        app:layout_constraintBottom_toBottomOf="@+id/postAuthorPhoto"
+        app:layout_constraintStart_toEndOf="@+id/postAuthorPhoto"
+        app:layout_constraintTop_toTopOf="@+id/postAuthorPhoto"
         tools:text="someauthor@email.com" />
 
-</LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/database/app/src/main/res/layout/include_post_text.xml b/database/app/src/main/res/layout/include_post_text.xml
index f0de32ab7..a85e7f7a7 100644
--- a/database/app/src/main/res/layout/include_post_text.xml
+++ b/database/app/src/main/res/layout/include_post_text.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout 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:orientation="vertical">
+    android:layout_height="match_parent">
 
     <TextView
         android:id="@+id/postTitle"
@@ -13,13 +13,17 @@
         android:ellipsize="end"
         android:maxLines="1"
         android:textStyle="bold"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         tools:text="My First Post" />
 
     <TextView
         android:id="@+id/postBody"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="5dp"
+        android:layout_marginTop="8dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/postTitle"
         tools:text="@string/lorem" />
 
-</LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/database/app/src/main/res/layout/item_comment.xml b/database/app/src/main/res/layout/item_comment.xml
index 9bcea90ae..bfb3a41fb 100644
--- a/database/app/src/main/res/layout/item_comment.xml
+++ b/database/app/src/main/res/layout/item_comment.xml
@@ -1,8 +1,11 @@
 <?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="wrap_content"
-    xmlns:tools="http://schemas.android.com/tools"
+    android:paddingTop="8dp"
+    android:paddingBottom="8dp"
     tools:viewBindingIgnore="true">
 
     <ImageView
@@ -10,30 +13,29 @@
         android:layout_width="32dp"
         android:layout_height="32dp"
         android:layout_centerVertical="true"
-        android:src="@drawable/ic_action_account_circle_40"/>
+        android:src="@drawable/ic_action_account_circle_40"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
-    <LinearLayout
-        android:layout_width="match_parent"
+    <TextView
+        android:id="@+id/commentAuthor"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:layout_marginLeft="10dp"
-        android:padding="5dp"
-        android:layout_toRightOf="@+id/commentPhoto">
-
-        <TextView
-            android:id="@+id/commentAuthor"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textStyle="bold"
-            tools:text="John Doe" />
+        android:layout_marginStart="8dp"
+        android:layout_marginLeft="8dp"
+        android:textStyle="bold"
+        app:layout_constraintStart_toEndOf="@+id/commentPhoto"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="John Doe" />
 
-        <TextView
-            android:id="@+id/commentBody"
-            style="@style/TextAppearance.AppCompat.Small"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            tools:text="This is the comment text.."/>
-
-    </LinearLayout>
+    <TextView
+        android:id="@+id/commentBody"
+        style="@style/TextAppearance.AppCompat.Small"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toStartOf="@+id/commentAuthor"
+        app:layout_constraintTop_toBottomOf="@+id/commentAuthor"
+        tools:text="This is the comment text.." />
 
-</RelativeLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/database/app/src/main/res/layout/item_post.xml b/database/app/src/main/res/layout/item_post.xml
index 0bbc92e48..52ff742a0 100644
--- a/database/app/src/main/res/layout/item_post.xml
+++ b/database/app/src/main/res/layout/item_post.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.google.android.material.card.MaterialCardView 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="wrap_content"
     android:layout_margin="5dp"
     tools:viewBindingIgnore="true">
 
-    <RelativeLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:padding="10dp">
@@ -16,44 +17,38 @@
             layout="@layout/include_post_author"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true" />
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
-        <LinearLayout
-            android:id="@+id/starLayout"
+        <ImageView
+            android:id="@+id/star"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignBottom="@+id/postAuthorLayout"
-            android:layout_alignParentRight="true"
-            android:layout_alignTop="@+id/postAuthorLayout"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:id="@+id/star"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="5dp"
-                android:background="?attr/selectableItemBackground"
-                android:src="@drawable/ic_toggle_star_outline_24" />
-
-            <TextView
-                android:id="@+id/postNumStars"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                tools:text="7" />
-
-        </LinearLayout>
+            android:background="?attr/selectableItemBackground"
+            android:src="@drawable/ic_toggle_star_outline_24"
+            app:layout_constraintBottom_toBottomOf="@+id/postAuthorLayout"
+            app:layout_constraintEnd_toStartOf="@+id/postNumStars"
+            app:layout_constraintTop_toTopOf="@+id/postAuthorLayout" />
+
+        <TextView
+            android:id="@+id/postNumStars"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintBottom_toBottomOf="@+id/star"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/star"
+            tools:text="7" />
 
-        <include layout="@layout/include_post_text"
+        <include
+            layout="@layout/include_post_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
-            android:layout_below="@+id/postAuthorLayout"
-            android:layout_marginLeft="5dp"
-            android:layout_marginTop="10dp" />
+            android:layout_marginStart="8dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginTop="16dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/postAuthorLayout" />
 
-    </RelativeLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
 </com.google.android.material.card.MaterialCardView>