diff --git a/Corona-Warn-App/src/main/res/layout/contact_diary_edit_locations_fragment.xml b/Corona-Warn-App/src/main/res/layout/contact_diary_edit_locations_fragment.xml
index bed59ef6f3d6d45baa64e32ecd228223bf9c17d2..6b4dfda9f11e6a6428e6f83e2796b8f76f2f0fac 100644
--- a/Corona-Warn-App/src/main/res/layout/contact_diary_edit_locations_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/contact_diary_edit_locations_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/content_container"
@@ -9,14 +10,14 @@
 
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
+            style="@style/CWAToolbar.Close"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:contentDescription="@string/contact_diary_edit_locations_title"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            style="@style/CWAToolbar.Close"
-            app:title="@string/contact_diary_edit_locations_title"
-            android:contentDescription="@string/contact_diary_edit_locations_title"/>
+            app:title="@string/contact_diary_edit_locations_title" />
 
         <androidx.constraintlayout.widget.Group
             android:id="@+id/contact_diary_location_list_no_items_group"
@@ -62,7 +63,8 @@
             app:layout_constraintBottom_toTopOf="@id/delete_button"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/toolbar" />
+            app:layout_constraintTop_toBottomOf="@id/toolbar"
+            tools:listitem="@layout/contact_diary_edit_list_item" />
 
         <android.widget.Button
             android:id="@+id/delete_button"
diff --git a/Corona-Warn-App/src/main/res/layout/contact_diary_overview_list_item.xml b/Corona-Warn-App/src/main/res/layout/contact_diary_overview_list_item.xml
index ee92e9c05860e7877f5bf1a9ccdfc6ffeff0dba3..eb730acfbfe14ee89383c591c9f77bb44bbe8e64 100644
--- a/Corona-Warn-App/src/main/res/layout/contact_diary_overview_list_item.xml
+++ b/Corona-Warn-App/src/main/res/layout/contact_diary_overview_list_item.xml
@@ -75,7 +75,9 @@
                 android:paddingVertical="@dimen/spacing_tiny"
                 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/contact_diary_overview_element_divider" />
+                app:layout_constraintTop_toBottomOf="@id/contact_diary_overview_element_divider"
+                tools:itemCount="2"
+                tools:listitem="@layout/contact_diary_person_list_item" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/Corona-Warn-App/src/main/res/navigation/contact_diary_nav_graph.xml b/Corona-Warn-App/src/main/res/navigation/contact_diary_nav_graph.xml
index 4cbc14018db60eceeb7dccc85f946bd59a705f13..06e81152ec917051b4cd2c76330b5ea1afe75444 100644
--- a/Corona-Warn-App/src/main/res/navigation/contact_diary_nav_graph.xml
+++ b/Corona-Warn-App/src/main/res/navigation/contact_diary_nav_graph.xml
@@ -7,7 +7,8 @@
     <fragment
         android:id="@+id/contactDiaryDayFragment"
         android:name="de.rki.coronawarnapp.contactdiary.ui.day.ContactDiaryDayFragment"
-        android:label="ContactDiaryDayFragment">
+        android:label="ContactDiaryDayFragment"
+        tools:layout="@layout/contact_diary_day_fragment">
         <argument
             android:name="selectedDay"
             android:defaultValue="2020-03-25"
@@ -40,7 +41,8 @@
     <dialog
         android:id="@+id/contactDiaryPersonBottomSheetDialogFragment"
         android:name="de.rki.coronawarnapp.contactdiary.ui.sheets.person.ContactDiaryPersonBottomSheetDialogFragment"
-        android:label="ContactDiaryPersonBottomSheetDialogFragment">
+        android:label="ContactDiaryPersonBottomSheetDialogFragment"
+        tools:layout="@layout/contact_diary_person_bottom_sheet_fragment">
         <argument
             android:name="selectedPerson"
             android:defaultValue="@null"
@@ -55,7 +57,8 @@
     <dialog
         android:id="@+id/contactDiaryLocationBottomSheetDialogFragment"
         android:name="de.rki.coronawarnapp.contactdiary.ui.sheets.location.ContactDiaryLocationBottomSheetDialogFragment"
-        android:label="ContactDiaryLocationBottomSheetDialogFragment">
+        android:label="ContactDiaryLocationBottomSheetDialogFragment"
+        tools:layout="@layout/contact_diary_location_bottom_sheet_fragment">
         <argument
             android:name="selectedLocation"
             android:defaultValue="@null"
@@ -107,7 +110,8 @@
     <fragment
         android:id="@+id/contactDiaryEditLocationsFragment"
         android:name="de.rki.coronawarnapp.contactdiary.ui.edit.ContactDiaryEditLocationsFragment"
-        android:label="ContactDiaryEditLocationsFragment">
+        android:label="ContactDiaryEditLocationsFragment"
+        tools:layout="@layout/contact_diary_edit_locations_fragment">
         <action
             android:id="@+id/action_contactDiaryEditLocationsFragment_to_contactDiaryLocationBottomSheetDialogFragment"
             app:destination="@id/contactDiaryLocationBottomSheetDialogFragment" />