diff --git a/firestore/app/src/main/res/layout/activity_main.xml b/firestore/app/src/main/res/layout/activity_main.xml
index df38ded6f..5279edeec 100644
--- a/firestore/app/src/main/res/layout/activity_main.xml
+++ b/firestore/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"
@@ -12,6 +13,9 @@
         android:layout_height="wrap_content"
         android:background="@color/colorPrimary"
         android:theme="@style/AppTheme"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         app:logo="@drawable/ic_restaurant_white_24px"
         app:popupTheme="@style/Theme.AppCompat.Light.DarkActionBar"
         app:title="@string/app_name"
@@ -22,11 +26,13 @@
         android:id="@+id/filterBarContainer"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/toolbar"
         android:background="@color/colorPrimary"
-        android:paddingBottom="12dp"
         android:paddingLeft="12dp"
-        android:paddingRight="12dp">
+        android:paddingRight="12dp"
+        android:paddingBottom="12dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/toolbar">
 
         <androidx.cardview.widget.CardView
             android:id="@+id/filterBar"
@@ -36,61 +42,64 @@
             android:elevation="12dp"
             android:foreground="?attr/selectableItemBackground">
 
-            <RelativeLayout
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:gravity="center_vertical">
+                android:paddingTop="8dp"
+                android:paddingBottom="8dp">
 
                 <ImageView
                     android:id="@+id/buttonFilter"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
-                    android:padding="8dp"
-                    app:tint="@color/greySecondary"
-                    app:srcCompat="@drawable/ic_filter_list_white_24px" />
-
-                <LinearLayout
-                    android:id="@+id/textCurrentSearchContainer"
+                    android:layout_marginLeft="8dp"
+                    android:layout_marginRight="8dp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:srcCompat="@drawable/ic_filter_list_white_24px"
+                    app:tint="@color/greySecondary" />
+
+                <TextView
+                    android:id="@+id/textCurrentSearch"
+                    style="@style/AppTheme.Body1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:layout_marginLeft="8dp"
-                    android:layout_toRightOf="@+id/buttonFilter"
-                    android:orientation="vertical"
-                    android:paddingBottom="8dp"
-                    android:paddingTop="8dp">
-
-                    <TextView
-                        android:id="@+id/textCurrentSearch"
-                        style="@style/AppTheme.Body1"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/all_restaurants"
-                        android:textColor="@color/greySecondary"
-                        tools:text="Filter" />
-
-                    <TextView
-                        android:id="@+id/textCurrentSortBy"
-                        style="@style/AppTheme.Caption"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/sorted_by_rating"
-                        android:textColor="@color/greyDisabled" />
-
-                </LinearLayout>
+                    android:layout_marginStart="16dp"
+                    android:layout_marginLeft="16dp"
+                    android:text="@string/all_restaurants"
+                    android:textColor="@color/greySecondary"
+                    app:layout_constraintStart_toEndOf="@+id/buttonFilter"
+                    app:layout_constraintTop_toTopOf="parent"
+                    tools:text="Filter" />
+
+                <TextView
+                    android:id="@+id/textCurrentSortBy"
+                    style="@style/AppTheme.Caption"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/sorted_by_rating"
+                    android:textColor="@color/greyDisabled"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toStartOf="@+id/textCurrentSearch"
+                    app:layout_constraintTop_toBottomOf="@+id/textCurrentSearch" />
 
                 <ImageView
                     android:id="@+id/buttonClearFilter"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
+                    android:layout_marginEnd="8dp"
+                    android:layout_marginRight="8dp"
                     android:padding="8dp"
-                    app:tint="@color/greySecondary"
-                    app:srcCompat="@drawable/ic_close_white_24px" />
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:srcCompat="@drawable/ic_close_white_24px"
+                    app:tint="@color/greySecondary" />
 
-            </RelativeLayout>
+            </androidx.constraintlayout.widget.ConstraintLayout>
 
         </androidx.cardview.widget.CardView>
 
@@ -100,29 +109,35 @@
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyclerRestaurants"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/filterBarContainer"
+        android:layout_height="0dp"
         android:background="@android:color/white"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/filterBarContainer"
         tools:listitem="@layout/item_restaurant" />
 
     <!-- Shadow below toolbar -->
     <View
+        android:id="@+id/view"
         android:layout_width="match_parent"
         android:layout_height="4dp"
-        android:layout_below="@+id/filterBarContainer"
-        android:background="@drawable/bg_shadow" />
+        android:background="@drawable/bg_shadow"
+        app:layout_constraintTop_toBottomOf="@+id/filterBarContainer"
+        />
 
     <!-- Empty list (pizza guy) view -->
     <LinearLayout
         android:id="@+id/viewEmpty"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_below="@+id/toolbar"
-        android:layout_centerHorizontal="true"
-        android:gravity="center"
         android:orientation="vertical"
         android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/toolbar"
+        tools:ignore="UseCompoundDrawables"
         tools:visibility="gone">
 
         <ImageView
@@ -133,7 +148,6 @@
             style="@style/AppTheme.Body1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:gravity="center"
             android:text="@string/message_no_results"
             android:textColor="@color/greyDisabled" />
 
@@ -143,9 +157,12 @@
         android:id="@+id/progressLoading"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignBottom="@+id/recyclerRestaurants"
-        android:layout_alignTop="@+id/recyclerRestaurants"
         android:layout_centerHorizontal="true"
-        android:visibility="gone" />
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="@+id/recyclerRestaurants"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/recyclerRestaurants"
+        />
 
-</RelativeLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/firestore/app/src/main/res/layout/activity_restaurant_detail.xml b/firestore/app/src/main/res/layout/activity_restaurant_detail.xml
index 4b1b5cfbb..3dec0eae0 100644
--- a/firestore/app/src/main/res/layout/activity_restaurant_detail.xml
+++ b/firestore/app/src/main/res/layout/activity_restaurant_detail.xml
@@ -1,16 +1,21 @@
 <?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:background="#E0E0E0">
+    android:background="#E0E0E0"
+    tools:ignore="ContentDescription">
 
-    <RelativeLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/restaurant_top_card"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:elevation="4dp">
+        android:elevation="4dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
         <ImageView
             android:id="@+id/restaurantImage"
@@ -18,56 +23,70 @@
             android:layout_height="200dp"
             android:alpha="1.0"
             android:scaleType="centerCrop"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
             tools:src="@drawable/food_1" />
 
         <View
             android:layout_width="match_parent"
             android:layout_height="200dp"
-            android:background="@drawable/gradient_up" />
+            android:background="@drawable/gradient_up"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintBottom_toBottomOf="@+id/restaurantImage"
+            />
 
         <!-- Back button -->
         <ImageView
             android:id="@+id/restaurantButtonBack"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="?attr/selectableItemBackground"
-            android:layout_alignLeft="@+id/restaurantName"
             android:layout_marginTop="16dp"
-            app:srcCompat="@drawable/ic_close_white_24px" />
+            android:background="?attr/selectableItemBackground"
+            app:srcCompat="@drawable/ic_close_white_24px"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="@+id/restaurantName"
+            />
 
         <TextView
             android:id="@+id/restaurantName"
             style="@style/AppTheme.Title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_above="@+id/restaurantRating"
             android:layout_marginLeft="8dp"
-            android:layout_marginTop="8dp"
+            android:layout_marginStart="8dp"
             android:textColor="@android:color/white"
             android:textStyle="bold"
-            tools:text="Some Restaurant" />
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintBottom_toTopOf="@+id/restaurantRating"
+            tools:text="Some Restaurant"
+            />
 
         <me.zhanghai.android.materialratingbar.MaterialRatingBar
             android:id="@+id/restaurantRating"
             style="@style/Widget.MaterialRatingBar.RatingBar.Indicator"
-            android:layout_height="wrap_content"
             android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_above="@+id/restaurantCategory"
-            android:layout_alignLeft="@+id/restaurantName"
             app:mrb_progressTint="@android:color/white"
-            app:mrb_secondaryProgressTint="@android:color/white" />
+            app:mrb_secondaryProgressTint="@android:color/white"
+            app:layout_constraintBottom_toTopOf="@+id/restaurantCategory"
+            app:layout_constraintStart_toStartOf="@+id/restaurantName"
+            />
 
         <TextView
             android:id="@+id/restaurantNumRatings"
             style="@style/AppTheme.Body1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignBottom="@+id/restaurantRating"
-            android:layout_alignTop="@+id/restaurantRating"
             android:layout_marginLeft="4dp"
-            android:layout_toRightOf="@+id/restaurantRating"
-            android:gravity="center"
+            android:layout_marginStart="4dp"
             android:textColor="@android:color/white"
+            app:layout_constraintTop_toTopOf="@+id/restaurantRating"
+            app:layout_constraintBottom_toBottomOf="@+id/restaurantRating"
+            app:layout_constraintStart_toEndOf="@+id/restaurantRating"
             tools:text="(10)" />
 
         <TextView
@@ -75,86 +94,96 @@
             style="@style/AppTheme.Subheader"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignBottom="@+id/restaurantImage"
-            android:layout_alignLeft="@+id/restaurantName"
+            android:layout_marginStart="8dp"
+            android:layout_marginLeft="8dp"
             android:layout_marginBottom="8dp"
-            android:layout_marginTop="8dp"
             android:textColor="@android:color/white"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             tools:text="Italian" />
 
         <TextView
             android:id="@+id/restaurantCity_divider"
             style="@style/AppTheme.TextDivider"
-            android:layout_alignTop="@+id/restaurantCategory"
-            android:layout_toRightOf="@+id/restaurantCategory"
             android:text="@string/divider_bullet"
-            android:textColor="@android:color/white" />
+            android:textColor="@android:color/white"
+            app:layout_constraintTop_toTopOf="@+id/restaurantCategory"
+            app:layout_constraintStart_toEndOf="@+id/restaurantCategory"
+            />
 
         <TextView
             android:id="@+id/restaurantCity"
             style="@style/AppTheme.Subheader"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignTop="@+id/restaurantCategory"
-            android:layout_below="@+id/restaurantCategory"
-            android:layout_toRightOf="@+id/restaurantCity_divider"
             android:textColor="@android:color/white"
-            tools:text="San Francisco" />
+            tools:text="San Francisco"
+            app:layout_constraintTop_toTopOf="@+id/restaurantCategory"
+            app:layout_constraintStart_toEndOf="@+id/restaurantCategory"
+            />
 
         <TextView
             android:id="@+id/restaurantPrice"
             style="@style/AppTheme.Body1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_alignTop="@+id/restaurantName"
-            android:layout_marginRight="8dp"
             android:layout_marginTop="8dp"
+            android:layout_marginRight="8dp"
+            android:layout_marginEnd="8dp"
             android:textColor="@android:color/white"
             android:textStyle="bold"
-            tools:text="$$$" />
+            app:layout_constraintTop_toTopOf="@+id/restaurantName"
+            app:layout_constraintEnd_toEndOf="parent"
+            tools:text="$$$"
+            />
 
-    </RelativeLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fabShowRatingDialog"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignBottom="@+id/restaurant_top_card"
-        android:layout_alignParentRight="true"
-        android:layout_marginBottom="-28dp"
-        android:layout_marginRight="16dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginRight="8dp"
+        android:translationY="-28dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/restaurant_top_card"
         app:srcCompat="@drawable/ic_add_white_24px" />
 
     <!-- Ratings -->
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyclerRatings"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/restaurant_top_card"
+        android:layout_height="0dp"
         android:background="@android:color/transparent"
         android:clipToPadding="false"
-        android:paddingBottom="16dp"
         android:paddingTop="28dp"
+        android:paddingBottom="16dp"
         android:visibility="gone"
-        tools:listitem="@layout/item_rating" />
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/restaurant_top_card"
+        tools:listitem="@layout/item_rating"
+        tools:visibility="invisible" />
 
     <!-- View for empty ratings -->
     <LinearLayout
         android:id="@+id/viewEmptyRatings"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_below="@+id/restaurant_top_card"
         android:layout_centerHorizontal="true"
-        android:gravity="center"
         android:orientation="vertical"
         android:visibility="gone"
-        tools:visibility="visible">
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/restaurant_top_card"
+        tools:visibility="visible"
+        tools:ignore="UseCompoundDrawables">
 
         <ImageView
+            style="@style/AppTheme.PizzaGuy"
             android:src="@drawable/pizza_monster"
-            style="@style/AppTheme.PizzaGuy" />
+            tools:ignore="ContentDescription" />
 
         <TextView
             style="@style/AppTheme.Body1"
@@ -165,4 +194,4 @@
 
     </LinearLayout>
 
-</RelativeLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/firestore/app/src/main/res/layout/dialog_filters.xml b/firestore/app/src/main/res/layout/dialog_filters.xml
index 6c87bf720..870596650 100644
--- a/firestore/app/src/main/res/layout/dialog_filters.xml
+++ b/firestore/app/src/main/res/layout/dialog_filters.xml
@@ -1,133 +1,149 @@
 <?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:id="@+id/filters_form"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical"
     android:padding="16dp">
 
     <TextView
+        android:id="@+id/filterDialogTitle"
         style="@style/AppTheme.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="8dp"
-        android:text="@string/header_filters" />
+        android:text="@string/header_filters"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <!-- Food Type -->
-    <RelativeLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
-
-        <ImageView
-            android:id="@+id/icon_category"
-            style="@style/AppTheme.FilterIcon"
-            android:layout_centerVertical="true"
-            app:tint="@color/greySecondary"
-            app:srcCompat="@drawable/ic_fastfood_white_24dp" />
+    <ImageView
+        android:id="@+id/icon_category"
+        style="@style/AppTheme.FilterIcon"
+        android:layout_marginStart="8dp"
+        android:layout_marginLeft="8dp"
+        app:layout_constraintBottom_toBottomOf="@+id/spinnerCategory"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/spinnerCategory"
+        app:srcCompat="@drawable/ic_fastfood_white_24dp"
+        app:tint="@color/greySecondary" />
+
+    <Spinner
+        android:id="@+id/spinnerCategory"
+        style="@style/AppTheme.FilterSpinner"
+        android:layout_width="0dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginLeft="8dp"
+        android:layout_marginTop="8dp"
+        android:entries="@array/categories"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/icon_category"
+        app:layout_constraintTop_toBottomOf="@+id/filterDialogTitle" />
 
-        <Spinner
-            android:id="@+id/spinnerCategory"
-            style="@style/AppTheme.FilterSpinner"
-            android:layout_centerVertical="true"
-            android:layout_toRightOf="@+id/icon_category"
-            android:entries="@array/categories" />
-
-    </RelativeLayout>
 
     <!-- Location -->
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <ImageView
-            android:id="@+id/icon_city"
-            style="@style/AppTheme.FilterIcon"
-            android:layout_centerVertical="true"
-            app:tint="@color/greySecondary"
-            app:srcCompat="@drawable/ic_place_white_24px" />
-
-        <Spinner
-            android:id="@+id/spinnerCity"
-            style="@style/AppTheme.FilterSpinner"
-            android:layout_centerVertical="true"
-            android:layout_toRightOf="@+id/icon_city"
-            android:entries="@array/cities" />
-
-    </RelativeLayout>
+    <ImageView
+        android:id="@+id/icon_city"
+        style="@style/AppTheme.FilterIcon"
+        app:layout_constraintBottom_toBottomOf="@+id/spinnerCity"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/spinnerCity"
+        app:srcCompat="@drawable/ic_place_white_24px"
+        app:tint="@color/greySecondary" />
+
+    <Spinner
+        android:id="@+id/spinnerCity"
+        style="@style/AppTheme.FilterSpinner"
+        android:layout_width="0dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginLeft="8dp"
+        android:layout_marginTop="8dp"
+        android:entries="@array/cities"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/icon_city"
+        app:layout_constraintTop_toBottomOf="@+id/spinnerCategory" />
 
     <!-- Price -->
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <ImageView
-            android:id="@+id/icon_price"
-            style="@style/AppTheme.FilterIcon"
-            android:layout_centerVertical="true"
-            app:tint="@color/greySecondary"
-            app:srcCompat="@drawable/ic_monetization_on_white_24px" />
-
-        <Spinner
-            android:id="@+id/spinnerPrice"
-            style="@style/AppTheme.FilterSpinner"
-            android:layout_centerVertical="true"
-            android:layout_toRightOf="@+id/icon_price"
-            android:entries="@array/prices" />
-
-    </RelativeLayout>
-
-    <!-- Sort by -->
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <ImageView
-            android:id="@+id/icon_sort"
-            style="@style/AppTheme.FilterIcon"
-            android:layout_centerVertical="true"
-            app:tint="@color/greySecondary"
-            app:srcCompat="@drawable/ic_sort_white_24px" />
-
-        <Spinner
-            android:id="@+id/spinnerSort"
-            style="@style/AppTheme.FilterSpinner"
-            android:layout_centerVertical="true"
-            android:layout_toRightOf="@+id/icon_sort"
-            android:entries="@array/sort_by" />
-    </RelativeLayout>
+    <ImageView
+        android:id="@+id/icon_price"
+        style="@style/AppTheme.FilterIcon"
+        app:layout_constraintBottom_toBottomOf="@+id/spinnerPrice"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/spinnerPrice"
+        app:srcCompat="@drawable/ic_monetization_on_white_24px"
+        app:tint="@color/greySecondary" />
+
+    <Spinner
+        android:id="@+id/spinnerPrice"
+        style="@style/AppTheme.FilterSpinner"
+        android:layout_width="333dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginLeft="8dp"
+        android:layout_marginTop="8dp"
+        android:entries="@array/prices"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/icon_price"
+        app:layout_constraintTop_toBottomOf="@+id/spinnerCity" />
+
+    <!-- Sort By -->
+    <ImageView
+        android:id="@+id/icon_sort"
+        style="@style/AppTheme.FilterIcon"
+        app:layout_constraintBottom_toBottomOf="@+id/spinnerSort"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/spinnerSort"
+        app:srcCompat="@drawable/ic_sort_white_24px"
+        app:tint="@color/greySecondary" />
+
+    <Spinner
+        android:id="@+id/spinnerSort"
+        style="@style/AppTheme.FilterSpinner"
+        android:layout_width="333dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginLeft="8dp"
+        android:layout_marginTop="8dp"
+        android:entries="@array/sort_by"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/icon_sort"
+        app:layout_constraintTop_toBottomOf="@+id/spinnerPrice" />
 
     <!-- Cancel and apply buttons -->
-    <LinearLayout
-        android:layout_width="match_parent"
+    <View
+        android:id="@+id/view2"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:visibility="invisible"
+        app:layout_constraintBottom_toBottomOf="@+id/buttonCancel"
+        app:layout_constraintEnd_toStartOf="@+id/buttonCancel"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/buttonCancel" />
+
+    <Button
+        android:id="@+id/buttonCancel"
+        style="@style/Base.Widget.AppCompat.Button.Borderless"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:text="@string/cancel"
+        android:textColor="@color/greySecondary"
+        android:theme="@style/ThemeOverlay.FilterButton"
+        app:layout_constraintEnd_toStartOf="@+id/buttonSearch"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/view2"
+        app:layout_constraintTop_toTopOf="@+id/buttonSearch" />
+
+
+    <Button
+        android:id="@+id/buttonSearch"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:orientation="horizontal">
-
-        <View
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_weight="1" />
-
-        <Button
-            android:id="@+id/buttonCancel"
-            style="@style/Base.Widget.AppCompat.Button.Borderless"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/cancel"
-            android:textColor="@color/greySecondary"
-            android:theme="@style/ThemeOverlay.FilterButton" />
-
-
-        <Button
-            android:id="@+id/buttonSearch"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/apply"
-            android:theme="@style/ThemeOverlay.FilterButton" />
-
-    </LinearLayout>
-
-</LinearLayout>
+        android:layout_marginTop="8dp"
+        android:text="@string/apply"
+        android:theme="@style/ThemeOverlay.FilterButton"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/buttonCancel"
+        app:layout_constraintTop_toBottomOf="@+id/spinnerSort" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/firestore/app/src/main/res/layout/dialog_rating.xml b/firestore/app/src/main/res/layout/dialog_rating.xml
index 2467f7e57..00bcc2a6d 100644
--- a/firestore/app/src/main/res/layout/dialog_rating.xml
+++ b/firestore/app/src/main/res/layout/dialog_rating.xml
@@ -1,64 +1,78 @@
 <?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="wrap_content"
     android:orientation="vertical"
     android:padding="16dp">
 
     <TextView
+        android:id="@+id/textView"
         style="@style/AppTheme.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="8dp"
-        android:text="@string/filter_add_review" />
+        android:text="@string/filter_add_review"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <me.zhanghai.android.materialratingbar.MaterialRatingBar
         android:id="@+id/restaurantFormRating"
         style="@style/Widget.MaterialRatingBar.RatingBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginBottom="8dp"
         android:layout_marginTop="8dp"
         android:maxHeight="24dp"
-        android:minHeight="24dp" />
+        android:minHeight="24dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textView" />
 
     <EditText
         android:id="@+id/restaurantFormText"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
-        android:hint="@string/hint_review" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
+        android:layout_marginTop="8dp"
+        android:hint="@string/hint_review"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/restaurantFormRating" />
 
-        <View
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_weight="1" />
 
-        <Button
-            android:id="@+id/restaurantFormCancel"
-            style="@style/Base.Widget.AppCompat.Button.Borderless"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/cancel"
-            android:textColor="@color/greySecondary"
-            android:theme="@style/ThemeOverlay.FilterButton" />
+    <View
+        android:id="@+id/view3"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:visibility="invisible"
+        app:layout_constraintBottom_toBottomOf="@+id/restaurantFormCancel"
+        app:layout_constraintEnd_toStartOf="@+id/restaurantFormCancel"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/restaurantFormCancel" />
 
+    <Button
+        android:id="@+id/restaurantFormCancel"
+        style="@style/Base.Widget.AppCompat.Button.Borderless"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:text="@string/cancel"
+        android:textColor="@color/greySecondary"
+        android:theme="@style/ThemeOverlay.FilterButton"
+        app:layout_constraintEnd_toStartOf="@+id/restaurantFormButton"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/view3"
+        app:layout_constraintTop_toTopOf="@+id/restaurantFormButton" />
 
-        <Button
-            android:id="@+id/restaurantFormButton"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/submit"
-            android:theme="@style/ThemeOverlay.FilterButton" />
 
-    </LinearLayout>
+    <Button
+        android:id="@+id/restaurantFormButton"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:text="@string/submit"
+        android:theme="@style/ThemeOverlay.FilterButton"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/restaurantFormCancel"
+        app:layout_constraintTop_toBottomOf="@+id/restaurantFormText" />
 
-</LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/firestore/app/src/main/res/layout/item_rating.xml b/firestore/app/src/main/res/layout/item_rating.xml
index 4e764b560..d0c821b5a 100644
--- a/firestore/app/src/main/res/layout/item_rating.xml
+++ b/firestore/app/src/main/res/layout/item_rating.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="wrap_content"
@@ -12,11 +14,12 @@
         style="@style/AppTheme.Body1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textColor="@color/greySecondary"
-        android:maxLines="1"
         android:ellipsize="end"
         android:maxWidth="120dp"
-        android:layout_alignParentLeft="true"
+        android:maxLines="1"
+        android:textColor="@color/greySecondary"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         tools:text="John Doe" />
 
     <TextView
@@ -24,17 +27,24 @@
         style="@style/AppTheme.TextDivider"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_toRightOf="@+id/ratingItemName"
-        android:text="@string/divider_bullet" />
+        android:layout_marginStart="4dp"
+        android:layout_marginLeft="4dp"
+        android:text="@string/divider_bullet"
+        app:layout_constraintBottom_toBottomOf="@+id/ratingItemName"
+        app:layout_constraintStart_toEndOf="@+id/ratingItemName"
+        app:layout_constraintTop_toTopOf="@+id/ratingItemName" />
 
     <TextView
         android:id="@+id/ratingItemDate"
         style="@style/AppTheme.Body1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginStart="4dp"
+        android:layout_marginLeft="4dp"
         android:textColor="@color/greySecondary"
-        android:layout_toLeftOf="@+id/ratingItemRating"
-        android:layout_toRightOf="@+id/ratingItemDivider"
+        app:layout_constraintBottom_toBottomOf="@+id/ratingItemName"
+        app:layout_constraintStart_toEndOf="@+id/ratingItemDivider"
+        app:layout_constraintTop_toTopOf="@+id/ratingItemName"
         tools:text="9/27/2017" />
 
     <me.zhanghai.android.materialratingbar.MaterialRatingBar
@@ -42,22 +52,24 @@
         style="@style/Widget.MaterialRatingBar.RatingBar.Indicator.Small"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentRight="true" />
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@+id/ratingItemText"
         style="@style/AppTheme.Subheader"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/ratingItemName"
-        android:layout_marginBottom="4dp"
         android:layout_marginTop="4dp"
         android:textColor="@color/greyPrimary"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/ratingItemName"
         tools:text="I thought it was pretty great! And I really have a ton to say wow." />
 
     <View
+        android:id="@+id/view4"
         style="@style/AppTheme.Divider"
-        android:layout_below="@id/ratingItemText"
         android:layout_marginTop="16dp"
-        android:layout_marginBottom="8dp"/>
-</RelativeLayout>
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/ratingItemText" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/firestore/app/src/main/res/layout/item_restaurant.xml b/firestore/app/src/main/res/layout/item_restaurant.xml
index ea98ba3de..1f61142f2 100644
--- a/firestore/app/src/main/res/layout/item_restaurant.xml
+++ b/firestore/app/src/main/res/layout/item_restaurant.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="wrap_content"
@@ -13,21 +14,21 @@
         android:layout_height="60dp"
         android:background="#757575"
         android:scaleType="centerCrop"
-        android:src="@drawable/food_1" />
+        android:src="@drawable/food_1"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@+id/restaurantItemName"
         style="@style/AppTheme.Subheader"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignTop="@+id/restaurantItemImage"
-        android:layout_marginBottom="4dp"
+        android:layout_marginStart="8dp"
         android:layout_marginLeft="8dp"
-        android:layout_marginTop="-2dp"
-        android:layout_toLeftOf="@+id/restaurantItemPrice"
-        android:layout_toRightOf="@+id/restaurantItemImage"
         android:ellipsize="end"
         android:maxLines="1"
+        app:layout_constraintStart_toEndOf="@+id/restaurantItemImage"
+        app:layout_constraintTop_toTopOf="@+id/restaurantItemImage"
         tools:text="Foo's Bar" />
 
     <me.zhanghai.android.materialratingbar.MaterialRatingBar
@@ -35,21 +36,21 @@
         style="@style/Widget.MaterialRatingBar.RatingBar.Indicator.Small"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignLeft="@+id/restaurantItemName"
-        android:layout_below="@+id/restaurantItemName"
-        android:layout_marginBottom="4dp" />
+        android:layout_marginTop="4dp"
+        app:layout_constraintStart_toStartOf="@+id/restaurantItemName"
+        app:layout_constraintTop_toBottomOf="@+id/restaurantItemName" />
 
     <TextView
         android:id="@+id/restaurantItemNumRatings"
         style="@style/AppTheme.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignBottom="@+id/restaurantItemRating"
-        android:layout_alignTop="@+id/restaurantItemRating"
+        android:layout_marginStart="4dp"
         android:layout_marginLeft="4dp"
-        android:layout_toRightOf="@+id/restaurantItemRating"
-        android:gravity="center_vertical"
         android:textColor="@color/greyDisabled"
+        app:layout_constraintBottom_toBottomOf="@+id/restaurantItemRating"
+        app:layout_constraintStart_toEndOf="@+id/restaurantItemRating"
+        app:layout_constraintTop_toTopOf="@+id/restaurantItemRating"
         tools:text="(10)" />
 
     <TextView
@@ -57,26 +58,31 @@
         style="@style/AppTheme.Body1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignLeft="@+id/restaurantItemName"
-        android:layout_below="@+id/restaurantItemRating"
+        android:layout_marginTop="4dp"
         android:textColor="@color/greySecondary"
+        app:layout_constraintStart_toStartOf="@+id/restaurantItemRating"
+        app:layout_constraintTop_toBottomOf="@+id/restaurantItemRating"
         tools:text="Italian" />
 
     <TextView
         android:id="@+id/restaurantItemCityDivider"
         style="@style/AppTheme.TextDivider"
-        android:layout_alignTop="@+id/restaurantItemCategory"
-        android:layout_toRightOf="@+id/restaurantItemCategory"
-        android:text="@string/divider_bullet" />
+        android:layout_marginStart="4dp"
+        android:layout_marginLeft="4dp"
+        android:text="@string/divider_bullet"
+        app:layout_constraintStart_toEndOf="@+id/restaurantItemCategory"
+        app:layout_constraintTop_toTopOf="@+id/restaurantItemCategory" />
 
     <TextView
         android:id="@+id/restaurantItemCity"
         style="@style/AppTheme.Body1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignTop="@+id/restaurantItemCategory"
-        android:layout_toRightOf="@+id/restaurantItemCityDivider"
+        android:layout_marginStart="4dp"
+        android:layout_marginLeft="4dp"
         android:textColor="@color/greySecondary"
+        app:layout_constraintStart_toEndOf="@+id/restaurantItemCityDivider"
+        app:layout_constraintTop_toTopOf="@+id/restaurantItemCategory"
         tools:text="San Francisco" />
 
     <TextView
@@ -84,8 +90,9 @@
         style="@style/AppTheme.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
         android:textColor="@color/greySecondary"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/restaurantItemName"
         tools:text="$$$" />
 
-</RelativeLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>