diff --git a/wood/src/main/res/layout/wood_activity_leaf_details.xml b/wood/src/main/res/layout/wood_activity_leaf_details.xml
index e2a1e7d..a7b3eb2 100644
--- a/wood/src/main/res/layout/wood_activity_leaf_details.xml
+++ b/wood/src/main/res/layout/wood_activity_leaf_details.xml
@@ -5,6 +5,7 @@
     android:id="@+id/main_content"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     tools:context=".LeafDetailsActivity">
 
     <com.google.android.material.appbar.AppBarLayout
@@ -12,7 +13,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="?colorPrimary"
-        android:paddingTop="@dimen/wood_status_bar_padding"
+        android:fitsSystemWindows="true"
         android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
 
         <androidx.appcompat.widget.Toolbar
@@ -22,6 +23,7 @@
             app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
     </com.google.android.material.appbar.AppBarLayout>
 
+
     <FrameLayout
         android:id="@+id/fl_fragment_holder"
         android:layout_width="match_parent"
diff --git a/wood/src/main/res/layout/wood_activity_leaf_list.xml b/wood/src/main/res/layout/wood_activity_leaf_list.xml
index 34ecb20..2e54ea6 100644
--- a/wood/src/main/res/layout/wood_activity_leaf_list.xml
+++ b/wood/src/main/res/layout/wood_activity_leaf_list.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout 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:fitsSystemWindows="true"
     tools:context=".LeafListActivity">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/wood_appbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingTop="@dimen/wood_status_bar_padding"
+        android:fitsSystemWindows="true"
         android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
 
         <androidx.appcompat.widget.Toolbar
@@ -27,6 +27,7 @@
         android:id="@+id/wood_fragment"
         android:name="com.tonytangandroid.wood.LeavesCollectionFragment"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
-</LinearLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/wood/src/main/res/values-v19/dimens.xml b/wood/src/main/res/values-v19/dimens.xml
deleted file mode 100644
index 1ee266b..0000000
--- a/wood/src/main/res/values-v19/dimens.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <dimen name="wood_status_bar_padding">24dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/wood/src/main/res/values/dimens.xml b/wood/src/main/res/values/dimens.xml
index 8837df5..ca13520 100644
--- a/wood/src/main/res/values/dimens.xml
+++ b/wood/src/main/res/values/dimens.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="wood_status_bar_padding">0dp</dimen>
     <dimen name="wood_search_bar_height">48dp</dimen>
     <!--<dimen name="wood_navigation_bar_padding">0dp</dimen>-->
 </resources>
\ No newline at end of file