diff --git a/app/src/main/res/layout/activity_directions.xml b/app/src/main/res/layout/activity_directions.xml
index d331120f..10281f03 100644
--- a/app/src/main/res/layout/activity_directions.xml
+++ b/app/src/main/res/layout/activity_directions.xml
@@ -1,40 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout
-	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/coordinatorLayout"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	android:fitsSystemWindows="true">
+	android:fitsSystemWindows="false">
 
 	<com.google.android.material.appbar.AppBarLayout
 		android:id="@+id/appBarLayout"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content">
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent">
 
 		<com.google.android.material.appbar.CollapsingToolbarLayout
 			android:layout_width="match_parent"
-			android:layout_height="match_parent"
+			android:layout_height="wrap_content"
 			android:fitsSystemWindows="true"
 			app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
 
 			<fragment
 				android:id="@+id/directionsForm"
+				android:name="de.grobox.transportr.trips.search.DirectionsFragment"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:name="de.grobox.transportr.trips.search.DirectionsFragment"
-				tools:layout="@layout/fragment_directions_form"/>
-
+				tools:layout="@layout/fragment_directions_form" />
 		</com.google.android.material.appbar.CollapsingToolbarLayout>
 
 	</com.google.android.material.appbar.AppBarLayout>
 
 	<FrameLayout
 		android:id="@+id/fragmentContainer"
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
+		android:layout_width="0dp"
+		android:layout_height="0dp"
 		android:focusable="true"
 		android:focusableInTouchMode="true"
-		app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
+		android:paddingStart="4dp"
+		android:paddingEnd="4dp"
+		app:layout_behavior="@string/appbar_scrolling_view_behavior"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/appBarLayout" />
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>