diff --git a/library/src/main/java/com/rtchagas/pingplacepicker/ui/PlacePickerActivity.kt b/library/src/main/java/com/rtchagas/pingplacepicker/ui/PlacePickerActivity.kt
index 8e0f230..6e9d4fc 100644
--- a/library/src/main/java/com/rtchagas/pingplacepicker/ui/PlacePickerActivity.kt
+++ b/library/src/main/java/com/rtchagas/pingplacepicker/ui/PlacePickerActivity.kt
@@ -14,6 +14,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.content.res.ResourcesCompat
 import androidx.core.graphics.drawable.DrawableCompat
+import androidx.core.view.doOnLayout
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProviders
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -345,16 +346,22 @@ class PlacePickerActivity : AppCompatActivity(), OnMapReadyCallback,
         // Disable vertical scrolling on appBarLayout (it messes with the map...)
 
         // Set default behavior
-        val params = appBarLayout.layoutParams as CoordinatorLayout.LayoutParams
-        params.behavior = AppBarLayout.Behavior()
+        val appBarLayoutParams = appBarLayout.layoutParams as CoordinatorLayout.LayoutParams
+        appBarLayoutParams.behavior = AppBarLayout.Behavior()
 
         // Disable the drag
-        val behavior = params.behavior as AppBarLayout.Behavior
+        val behavior = appBarLayoutParams.behavior as AppBarLayout.Behavior
         behavior.setDragCallback(object : AppBarLayout.Behavior.DragCallback() {
             override fun canDrag(appBarLayout: AppBarLayout): Boolean {
                 return false
             }
         })
+
+        // Set the size of AppBarLayout to 68% of the total height
+        coordinator.doOnLayout {
+            val size : Int = (it.height * 68) / 100
+            appBarLayoutParams.height = size
+        }
     }
 
     private fun initMap() {
diff --git a/library/src/main/res/layout/activity_place_picker.xml b/library/src/main/res/layout/activity_place_picker.xml
index cc511a1..e56f916 100644
--- a/library/src/main/res/layout/activity_place_picker.xml
+++ b/library/src/main/res/layout/activity_place_picker.xml
@@ -2,7 +2,7 @@
 <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:id="@+id/root"
+    android:id="@+id/coordinator"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true">
@@ -17,7 +17,7 @@
         <com.google.android.material.appbar.CollapsingToolbarLayout
             android:id="@+id/collapsingToolbarLayout"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/tall_toolbar_height"
+            android:layout_height="match_parent"
             app:contentScrim="?attr/colorPrimary"
             app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
             app:titleEnabled="false">
diff --git a/library/src/main/res/layout/item_place.xml b/library/src/main/res/layout/item_place.xml
index 2b88914..8e7fdf5 100644
--- a/library/src/main/res/layout/item_place.xml
+++ b/library/src/main/res/layout/item_place.xml
@@ -48,7 +48,7 @@
             android:id="@+id/tvPlaceName"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
+            android:layout_marginTop="@dimen/default_margin"
             android:ellipsize="end"
             android:maxLines="1"
             android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
@@ -61,7 +61,7 @@
             android:id="@+id/tvPlaceAddress"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="16dp"
+            android:layout_marginBottom="@dimen/default_margin"
             android:ellipsize="end"
             android:maxLines="1"
             android:textAppearance="@style/TextAppearance.MaterialComponents.Body2"
diff --git a/library/src/main/res/values-w600dp/dimens.xml b/library/src/main/res/values-w600dp/dimens.xml
deleted file mode 100644
index ba4cb96..0000000
--- a/library/src/main/res/values-w600dp/dimens.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <dimen name="tall_toolbar_height">300dp</dimen>
-
-</resources>
\ No newline at end of file
diff --git a/library/src/main/res/values/dimens.xml b/library/src/main/res/values/dimens.xml
index 5a80f07..66742c0 100644
--- a/library/src/main/res/values/dimens.xml
+++ b/library/src/main/res/values/dimens.xml
@@ -2,7 +2,6 @@
 
     <dimen name="icon_size_small">24dp</dimen>
     <dimen name="icon_size_medium">32dp</dimen>
-    <dimen name="tall_toolbar_height">580dp</dimen>
     <dimen name="button_my_location_size">48dp</dimen>
     <dimen name="place_confirm_images_height">140dp</dimen>