diff --git a/app/src/main/java/com/aws/amazonlocation/ui/main/MainActivity.kt b/app/src/main/java/com/aws/amazonlocation/ui/main/MainActivity.kt
index b937fab7..0cdc8306 100644
--- a/app/src/main/java/com/aws/amazonlocation/ui/main/MainActivity.kt
+++ b/app/src/main/java/com/aws/amazonlocation/ui/main/MainActivity.kt
@@ -309,6 +309,10 @@ class MainActivity : BaseActivity(), CrashListener {
         mBinding.bottomNavigationMain.selectedItemId = R.id.menu_geofence
     }
 
+    fun getBottomNavHeight(): Int {
+        return mBinding.bottomNavigationMain.height
+    }
+
     private fun initObserver() {
         lifecycleScope.launchWhenStarted {
             mSignInViewModel.mSignInResponse.collect { handleResult ->
diff --git a/app/src/main/java/com/aws/amazonlocation/ui/main/geofence/GeofenceUtils.kt b/app/src/main/java/com/aws/amazonlocation/ui/main/geofence/GeofenceUtils.kt
index 6e6a3fa0..81cc5ebf 100644
--- a/app/src/main/java/com/aws/amazonlocation/ui/main/geofence/GeofenceUtils.kt
+++ b/app/src/main/java/com/aws/amazonlocation/ui/main/geofence/GeofenceUtils.kt
@@ -38,14 +38,14 @@ import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.mapbox.mapboxsdk.geometry.LatLng
 import com.mapbox.mapboxsdk.maps.MapboxMap
 import com.mapbox.mapboxsdk.plugins.annotation.OnSymbolDragListener
+import java.text.DecimalFormat
+import java.util.regex.Pattern
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
-import java.text.DecimalFormat
-import java.util.regex.Pattern
 
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 
@@ -566,7 +566,27 @@ class GeofenceUtils {
         mBottomSheetGeofenceListBehavior?.isHideable = false
         mBottomSheetGeofenceListBehavior?.isDraggable = true
         mBottomSheetGeofenceListBehavior?.isFitToContents = false
-        mBottomSheetGeofenceListBehavior?.halfExpandedRatio = 0.58f
+        mBindingGeofenceList?.clGeofenceList?.post {
+            val clEmptyGeofenceListInnerHeight =
+                mBindingGeofenceList?.clEmptyGeofenceListInner?.height ?: 0
+            val clEmptyGeofenceListHeight =
+                mBindingGeofenceList?.clGeofenceListMain?.height ?: 0
+            val clGeofenceListHeight =
+                mBindingGeofenceList?.clGeofenceList?.height ?: 0
+
+            val topLogoMargin = clEmptyGeofenceListHeight - clGeofenceListHeight
+            val screenHeight = (mActivity as MainActivity).resources.displayMetrics.heightPixels
+            val isTablet = (mActivity as MainActivity).isTablet
+            val bottomNavHeight = if (isTablet) (mActivity as MainActivity).getBottomNavHeight().toFloat() else 0f
+            val topLogoHeight = if (isTablet) 0f else topLogoMargin.toFloat()
+
+            val halfExpandedRatio = if (screenHeight.toFloat() != 0.toFloat()) {
+                ((clEmptyGeofenceListInnerHeight.toFloat() + bottomNavHeight + topLogoHeight)) / screenHeight
+            } else {
+                0.55f
+            }
+            mBottomSheetGeofenceListBehavior?.halfExpandedRatio = halfExpandedRatio
+        }
         mBindingGeofenceList?.clGeofenceList?.context?.let {
             if ((mActivity as MainActivity).isTablet) {
                 mBottomSheetGeofenceListBehavior?.peekHeight = it.resources.getDimensionPixelSize(R.dimen.dp_150)
diff --git a/app/src/main/java/com/aws/amazonlocation/ui/main/tracking/TrackingUtils.kt b/app/src/main/java/com/aws/amazonlocation/ui/main/tracking/TrackingUtils.kt
index 0cf358eb..ecdc1516 100644
--- a/app/src/main/java/com/aws/amazonlocation/ui/main/tracking/TrackingUtils.kt
+++ b/app/src/main/java/com/aws/amazonlocation/ui/main/tracking/TrackingUtils.kt
@@ -121,7 +121,27 @@ class TrackingUtils(
             TrackingEnum.ENABLE_TRACKING -> {
                 mBottomSheetTrackingBehavior?.isDraggable = true
                 mBottomSheetTrackingBehavior?.isFitToContents = false
-                mBottomSheetTrackingBehavior?.halfExpandedRatio = 0.58f
+                mBindingTracking?.clTracking?.post {
+                    val clEnableTrackingInnerHeight =
+                        mBindingTracking?.clEnableTrackingInner?.height ?: 0
+                    val clPersistentBottomSheetHeight =
+                        mBindingTracking?.clPersistentBottomSheet?.height ?: 0
+                    val clTrackingHeight =
+                        mBindingTracking?.clTracking?.height ?: 0
+
+                    val topLogoMargin = clPersistentBottomSheetHeight - clTrackingHeight
+                    val screenHeight = (mActivity as MainActivity).resources.displayMetrics.heightPixels
+                    val isTablet = (mActivity as MainActivity).isTablet
+                    val bottomNavHeight = if (isTablet) (mActivity as MainActivity).getBottomNavHeight().toFloat() else 0f
+                    val topLogoHeight = if (isTablet) 0f else topLogoMargin.toFloat()
+
+                    val halfExpandedRatio = if (screenHeight.toFloat() != 0.toFloat()) {
+                        ((clEnableTrackingInnerHeight.toFloat() + bottomNavHeight + topLogoHeight)) / screenHeight
+                    } else {
+                        0.55f
+                    }
+                    mBottomSheetTrackingBehavior?.halfExpandedRatio = halfExpandedRatio
+                }
                 mBindingTracking?.clEnableTracking?.context?.let {
                     if ((activity as MainActivity).isTablet) {
                         mBottomSheetTrackingBehavior?.peekHeight = it.resources.getDimensionPixelSize(R.dimen.dp_150)
@@ -162,11 +182,19 @@ class TrackingUtils(
             trackingHistoryData.clear()
             getCurrentDateData()
 
+            val clTracking = mBindingTracking?.clTracking?.height ?: 0
+            val clPersistentBottomSheetHeight = mBindingTracking?.clPersistentBottomSheet?.height ?: 0
+            val clTrackingInnerHeight = mBindingTracking?.clTrackingInner?.height ?: 0
+            val totalHeight = (clPersistentBottomSheetHeight - clTracking) + clTrackingInnerHeight
+            mBottomSheetTrackingBehavior?.peekHeight = totalHeight
+
             mBottomSheetTrackingBehavior?.isDraggable = true
             if ((activity as MainActivity).isTablet) {
-                mBottomSheetTrackingBehavior?.peekHeight = clTracking.context.resources.getDimensionPixelSize(R.dimen.dp_150)
+                mBottomSheetTrackingBehavior?.peekHeight =
+                    totalHeight
             } else {
-                mBottomSheetTrackingBehavior?.peekHeight = clTracking.context.resources.getDimensionPixelSize(R.dimen.dp_127)
+                mBottomSheetTrackingBehavior?.peekHeight =
+                    totalHeight
             }
             mBottomSheetTrackingBehavior?.state = BottomSheetBehavior.STATE_HALF_EXPANDED
         }
diff --git a/app/src/main/res/layout-sw600dp-land/bottom_sheet_tracking.xml b/app/src/main/res/layout-sw600dp-land/bottom_sheet_tracking.xml
index ae31eb74..87aefc90 100644
--- a/app/src/main/res/layout-sw600dp-land/bottom_sheet_tracking.xml
+++ b/app/src/main/res/layout-sw600dp-land/bottom_sheet_tracking.xml
@@ -24,94 +24,102 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <View
-            android:id="@+id/view_tracking"
-            android:layout_width="@dimen/dp_36"
-            android:layout_height="@dimen/dp_5"
-            android:layout_gravity="bottom|center"
-            android:layout_marginTop="@dimen/dp_7"
-            android:background="@drawable/bottom_sheet_view"
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/cl_tracking_inner"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingBottom="@dimen/dp_16"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent">
 
 
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tv_tracking_history"
-            style="@style/SP14BoldBlackTextStyle"
-            android:layout_width="@dimen/dp_0"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_16"
-            android:layout_marginTop="@dimen/dp_20"
-            android:gravity="start"
-            android:textDirection="locale"
-            android:text="@string/label_tracking_history"
-            android:textColor="@color/color_medium_black"
-            android:textSize="@dimen/sp_20"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/card_start_tracking"
-            app:layout_constraintTop_toBottomOf="@id/view_tracking" />
-
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tv_tracking_your_activity"
-            style="@style/LogoutMessageStyle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_16"
-            android:layout_marginEnd="@dimen/dp_14"
-            android:gravity="start"
-            android:text="@string/label_not_tracking_your_activity"
-            android:textColor="@color/color_hint_text"
-            android:lines="2"
-            android:textDirection="locale"
-            android:textSize="@dimen/sp_13"
-            app:layout_constraintEnd_toStartOf="@+id/card_start_tracking"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/tv_tracking_history" />
+            <View
+                android:id="@+id/view_tracking"
+                android:layout_width="@dimen/dp_36"
+                android:layout_height="@dimen/dp_5"
+                android:layout_gravity="bottom|center"
+                android:layout_marginTop="@dimen/dp_7"
+                android:background="@drawable/bottom_sheet_view"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
-        <com.google.android.material.card.MaterialCardView
-            android:id="@+id/card_start_tracking"
-            android:layout_width="@dimen/dp_110"
-            android:layout_height="@dimen/dp_40"
-            android:layout_marginTop="@dimen/dp_20"
-            android:layout_marginEnd="@dimen/dp_16"
-            app:cardBackgroundColor="@color/color_primary_green"
-            app:cardCornerRadius="@dimen/dp_8"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/view_tracking">
 
             <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/tv_stop_tracking"
+                android:id="@+id/tv_tracking_history"
                 style="@style/SP14BoldBlackTextStyle"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:gravity="center"
+                android:layout_width="@dimen/dp_0"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/dp_16"
+                android:layout_marginTop="@dimen/dp_20"
+                android:gravity="start"
+                android:text="@string/label_tracking_history"
+                android:textColor="@color/color_medium_black"
                 android:textDirection="locale"
-                android:text="@string/label_start_tracking"
-                android:textColor="@color/white" />
+                android:textSize="@dimen/sp_20"
+                app:layout_constraintEnd_toStartOf="@+id/card_start_tracking"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/view_tracking" />
 
-            <ProgressBar
-                android:id="@+id/view_loader"
-                android:layout_width="wrap_content"
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/tv_tracking_your_activity"
+                style="@style/LogoutMessageStyle"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_margin="@dimen/dp_8"
-                android:progressBackgroundTint="@color/white"
-                android:progressTint="@color/white"
-                android:visibility="gone" />
-        </com.google.android.material.card.MaterialCardView>
+                android:layout_marginStart="@dimen/dp_16"
+                android:layout_marginEnd="@dimen/dp_14"
+                android:gravity="start"
+                android:text="@string/label_not_tracking_your_activity"
+                android:textColor="@color/color_hint_text"
+                android:textDirection="locale"
+                android:textSize="@dimen/sp_13"
+                app:layout_constraintEnd_toStartOf="@+id/card_start_tracking"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tv_tracking_history" />
+
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/card_start_tracking"
+                android:layout_width="@dimen/dp_120"
+                android:layout_height="@dimen/dp_40"
+                android:layout_marginTop="@dimen/dp_20"
+                android:layout_marginEnd="@dimen/dp_16"
+                app:cardBackgroundColor="@color/color_primary_green"
+                app:cardCornerRadius="@dimen/dp_8"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/view_tracking">
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/tv_stop_tracking"
+                    style="@style/SP14BoldBlackTextStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:gravity="center"
+                    android:text="@string/label_start_tracking"
+                    android:textColor="@color/white" />
+
+                <ProgressBar
+                    android:id="@+id/view_loader"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_margin="@dimen/dp_8"
+                    android:progressBackgroundTint="@color/white"
+                    android:progressTint="@color/white"
+                    android:visibility="gone" />
+            </com.google.android.material.card.MaterialCardView>
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
         <com.google.android.material.card.MaterialCardView
             android:id="@+id/card_tracker_geofence_simulation"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_56"
-            android:layout_marginTop="@dimen/dp_16"
             app:cardBackgroundColor="@color/white"
             app:cardCornerRadius="@dimen/dp_8"
             android:layout_marginHorizontal="@dimen/dp_16"
             app:cardUseCompatPadding="false"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tv_tracking_your_activity">
+            app:layout_constraintTop_toBottomOf="@id/cl_tracking_inner">
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
@@ -372,140 +380,150 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <View
-            android:id="@+id/view_sheet_tracking"
-            android:layout_width="@dimen/dp_36"
-            android:layout_height="@dimen/dp_5"
-            android:layout_gravity="bottom|center"
-            android:layout_marginTop="@dimen/dp_10"
-            android:background="@drawable/bottom_sheet_view"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <com.google.android.material.card.MaterialCardView
-            android:id="@+id/sheet_tracking_card_geo_fence"
-            android:layout_width="@dimen/dp_96"
-            android:layout_height="@dimen/dp_96"
-            android:layout_marginTop="@dimen/dp_36"
-            app:cardBackgroundColor="@color/white"
-            app:cardCornerRadius="@dimen/dp_100"
-            app:cardElevation="@dimen/dp_0"
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/cl_enable_tracking_inner"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingBottom="@dimen/dp_24"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/view_sheet_tracking">
+            app:layout_constraintTop_toTopOf="parent">
 
-            <androidx.appcompat.widget.AppCompatImageView
+            <View
+                android:id="@+id/view_sheet_tracking"
                 android:layout_width="@dimen/dp_36"
-                android:layout_height="@dimen/dp_36"
-                android:layout_gravity="center"
-                android:tint="@color/color_medium_black_1"
-                android:src="@drawable/ic_tracking" />
+                android:layout_height="@dimen/dp_5"
+                android:layout_gravity="bottom|center"
+                android:layout_marginTop="@dimen/dp_10"
+                android:background="@drawable/bottom_sheet_view"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
-        </com.google.android.material.card.MaterialCardView>
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/sheet_tracking_card_geo_fence"
+                android:layout_width="@dimen/dp_96"
+                android:layout_height="@dimen/dp_96"
+                android:layout_marginTop="@dimen/dp_36"
+                app:cardBackgroundColor="@color/white"
+                app:cardCornerRadius="@dimen/dp_100"
+                app:cardElevation="@dimen/dp_0"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/view_sheet_tracking">
 
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tv_add_geofence_empty"
-            style="@style/SP20InterRegularMediumBlack1TextStyle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp_16"
-            android:gravity="center"
-            android:fontFamily="@font/inter_semi_bold"
-            android:text="@string/menu_tracking"
-            android:textDirection="locale"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/sheet_tracking_card_geo_fence" />
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:layout_width="@dimen/dp_36"
+                    android:layout_height="@dimen/dp_36"
+                    android:layout_gravity="center"
+                    android:src="@drawable/ic_tracking"
+                    android:tint="@color/color_medium_black_1" />
 
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tv_add_geofence_description"
-            style="@style/SP13HintRegularTextStyle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="@dimen/dp_24"
-            android:layout_marginTop="@dimen/dp_16"
-            android:gravity="center"
-            android:textDirection="locale"
-            android:text="@string/label_enable_tracking_detail"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tv_add_geofence_empty" />
+            </com.google.android.material.card.MaterialCardView>
 
-        <com.google.android.material.card.MaterialCardView
-            android:id="@+id/btn_try_tracker"
-            android:layout_width="@dimen/dp_0"
-            android:layout_height="@dimen/dp_48"
-            android:layout_marginHorizontal="@dimen/dp_16"
-            android:layout_marginTop="@dimen/dp_16"
-            android:paddingHorizontal="@dimen/dp_16"
-            app:cardBackgroundColor="@color/color_primary_green"
-            app:cardCornerRadius="@dimen/dp_8"
-            app:cardUseCompatPadding="false"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tv_add_geofence_description">
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/tv_add_geofence_empty"
+                style="@style/SP20InterRegularMediumBlack1TextStyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp_16"
+                android:fontFamily="@font/inter_semi_bold"
+                android:gravity="center"
+                android:text="@string/menu_tracking"
+                android:textDirection="locale"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/sheet_tracking_card_geo_fence" />
 
             <androidx.appcompat.widget.AppCompatTextView
-                style="@style/SP16BoldMediumBlackTextStyle"
-                android:layout_width="wrap_content"
+                android:id="@+id/tv_add_geofence_description"
+                style="@style/SP13HintRegularTextStyle"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="@string/label_try_trackers_amp_geofences_simulation"
-                android:textAllCaps="false"
+                android:layout_marginHorizontal="@dimen/dp_24"
+                android:layout_marginTop="@dimen/dp_16"
                 android:gravity="center"
-                android:textColor="@color/white"
-                app:layout_constraintBottom_toBottomOf="parent"
+                android:text="@string/label_enable_tracking_detail"
+                android:textDirection="locale"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@id/iv_direction"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/tv_add_geofence_empty" />
 
-        </com.google.android.material.card.MaterialCardView>
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/btn_try_tracker"
+                android:layout_width="@dimen/dp_0"
+                android:layout_height="@dimen/dp_48"
+                android:layout_marginHorizontal="@dimen/dp_16"
+                android:layout_marginTop="@dimen/dp_16"
+                android:paddingHorizontal="@dimen/dp_16"
+                app:cardBackgroundColor="@color/color_primary_green"
+                app:cardCornerRadius="@dimen/dp_8"
+                app:cardUseCompatPadding="false"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/tv_add_geofence_description">
 
-        <com.google.android.material.card.MaterialCardView
-            android:id="@+id/btn_enable_tracking"
-            android:layout_width="@dimen/dp_0"
-            android:layout_height="@dimen/dp_48"
-            android:layout_marginHorizontal="@dimen/dp_16"
-            android:layout_marginTop="@dimen/dp_8"
-            android:paddingHorizontal="@dimen/dp_16"
-            app:cardBackgroundColor="@color/white"
-            app:cardCornerRadius="@dimen/dp_8"
-            app:cardElevation="@dimen/dp_0"
-            app:cardUseCompatPadding="false"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btn_try_tracker">
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/SP16BoldMediumBlackTextStyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:gravity="center"
+                    android:text="@string/label_try_trackers_amp_geofences_simulation"
+                    android:textAllCaps="false"
+                    android:textColor="@color/white"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@id/iv_direction"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+            </com.google.android.material.card.MaterialCardView>
+
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/btn_enable_tracking"
+                android:layout_width="@dimen/dp_0"
+                android:layout_height="@dimen/dp_48"
+                android:layout_marginHorizontal="@dimen/dp_16"
+                android:layout_marginTop="@dimen/dp_8"
+                android:paddingHorizontal="@dimen/dp_16"
+                app:cardBackgroundColor="@color/white"
+                app:cardCornerRadius="@dimen/dp_8"
+                app:cardElevation="@dimen/dp_0"
+                app:cardUseCompatPadding="false"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/btn_try_tracker">
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/SP16BoldMediumBlackTextStyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:gravity="center"
+                    android:text="@string/label_enable_tracking"
+                    android:textAllCaps="false"
+                    android:textColor="@color/color_medium_black"
+                    android:textDirection="locale"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@id/iv_direction"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+            </com.google.android.material.card.MaterialCardView>
 
             <androidx.appcompat.widget.AppCompatTextView
-                style="@style/SP16BoldMediumBlackTextStyle"
-                android:layout_width="wrap_content"
+                android:id="@+id/tv_require_connection"
+                style="@style/SP13HintRegularTextStyle"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="@string/label_enable_tracking"
-                android:textDirection="locale"
-                android:textAllCaps="false"
+                android:layout_marginHorizontal="@dimen/dp_24"
+                android:layout_marginTop="@dimen/dp_4"
                 android:gravity="center"
-                android:textColor="@color/color_medium_black"
-                app:layout_constraintBottom_toBottomOf="parent"
+                android:text="@string/label_requires_connection_to_aws_cloudformation"
+                android:textSize="@dimen/sp_10"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@id/iv_direction"
-                app:layout_constraintTop_toTopOf="parent" />
-
-        </com.google.android.material.card.MaterialCardView>
-
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tv_require_connection"
-            style="@style/SP13HintRegularTextStyle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="@dimen/dp_24"
-            android:layout_marginTop="@dimen/dp_4"
-            android:gravity="center"
-            android:textSize="@dimen/sp_10"
-            android:text="@string/label_requires_connection_to_aws_cloudformation"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btn_enable_tracking" />
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/btn_enable_tracking" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-sw600dp/bottom_sheet_geofence_list.xml b/app/src/main/res/layout-sw600dp/bottom_sheet_geofence_list.xml
index 08ca6c87..f1c6bc7b 100644
--- a/app/src/main/res/layout-sw600dp/bottom_sheet_geofence_list.xml
+++ b/app/src/main/res/layout-sw600dp/bottom_sheet_geofence_list.xml
@@ -18,7 +18,6 @@
         android:background="@drawable/bottom_sheet_top_corner_curved_geofence"
         android:clickable="true"
         android:focusable="true"
-        android:layout_marginTop="@dimen/dp_20"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -251,149 +250,158 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <View
-            android:id="@+id/view_sheet_geofence_list"
-            android:layout_width="@dimen/dp_36"
-            android:layout_height="@dimen/dp_5"
-            android:layout_gravity="bottom|center"
-            android:layout_marginTop="@dimen/dp_10"
-            android:background="@drawable/bottom_sheet_view"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <com.google.android.material.card.MaterialCardView
-            android:id="@+id/sheet_geofence_list_card_geo_fence"
-            android:layout_width="@dimen/dp_96"
-            android:layout_height="@dimen/dp_96"
-            android:layout_marginTop="@dimen/dp_36"
-            app:cardBackgroundColor="@color/white"
-            app:cardCornerRadius="@dimen/dp_100"
-            app:cardElevation="@dimen/dp_0"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/view_sheet_geofence_list">
-
-            <androidx.appcompat.widget.AppCompatImageView
-                android:layout_width="@dimen/dp_36"
-                android:layout_height="@dimen/dp_36"
-                android:layout_gravity="center"
-                android:src="@drawable/ic_geofence" />
-
-        </com.google.android.material.card.MaterialCardView>
-
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tv_add_geofence_empty_geofence_list"
-            style="@style/SP20InterRegularMediumBlack1TextStyle"
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/cl_empty_geofence_list_inner"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp_16"
-            android:fontFamily="@font/inter_semi_bold"
-            android:gravity="center"
-            android:textDirection="locale"
-            android:text="@string/menu_geofence"
+            android:paddingBottom="@dimen/dp_24"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/sheet_geofence_list_card_geo_fence" />
+            app:layout_constraintTop_toTopOf="parent">
 
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/sheet_geofence_list_tv_add_geofence_description"
-            style="@style/SP13HintRegularTextStyle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="@dimen/dp_24"
-            android:layout_marginTop="@dimen/dp_8"
-            android:gravity="center"
-            android:textDirection="locale"
-            app:layout_constraintBottom_toTopOf="@+id/btn_try_geofence"
-            android:text="@string/add_geo_fence_1"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tv_add_geofence_empty_geofence_list" />
+            <View
+                android:id="@+id/view_sheet_geofence_list"
+                android:layout_width="@dimen/dp_36"
+                android:layout_height="@dimen/dp_5"
+                android:layout_gravity="bottom|center"
+                android:layout_marginTop="@dimen/dp_10"
+                android:background="@drawable/bottom_sheet_view"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
-        <View
-            android:id="@+id/view_space"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_16"
-            app:layout_constraintTop_toBottomOf="@id/sheet_geofence_list_tv_add_geofence_description"/>
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/sheet_geofence_list_card_geo_fence"
+                android:layout_width="@dimen/dp_96"
+                android:layout_height="@dimen/dp_96"
+                android:layout_marginTop="@dimen/dp_36"
+                app:cardBackgroundColor="@color/white"
+                app:cardCornerRadius="@dimen/dp_100"
+                app:cardElevation="@dimen/dp_0"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/view_sheet_geofence_list">
 
-        <com.google.android.material.card.MaterialCardView
-            android:id="@+id/btn_try_geofence"
-            android:layout_width="@dimen/dp_0"
-            android:layout_height="@dimen/dp_48"
-            android:layout_marginHorizontal="@dimen/dp_16"
-            android:paddingHorizontal="@dimen/dp_16"
-            app:cardBackgroundColor="@color/color_primary_green"
-            app:cardCornerRadius="@dimen/dp_8"
-            app:cardUseCompatPadding="false"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/view_space">
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:layout_width="@dimen/dp_36"
+                    android:layout_height="@dimen/dp_36"
+                    android:layout_gravity="center"
+                    android:src="@drawable/ic_geofence" />
+
+            </com.google.android.material.card.MaterialCardView>
 
             <androidx.appcompat.widget.AppCompatTextView
-                style="@style/SP16BoldMediumBlackTextStyle"
-                android:layout_width="wrap_content"
+                android:id="@+id/tv_add_geofence_empty_geofence_list"
+                style="@style/SP20InterRegularMediumBlack1TextStyle"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="@string/label_try_trackers_amp_geofences_simulation"
-                android:textAllCaps="false"
+                android:layout_marginTop="@dimen/dp_16"
+                android:fontFamily="@font/inter_semi_bold"
                 android:gravity="center"
-                android:textColor="@color/white"
+                android:text="@string/menu_geofence"
                 android:textDirection="locale"
-                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@id/iv_direction"
-                app:layout_constraintTop_toTopOf="parent" />
-
-        </com.google.android.material.card.MaterialCardView>
-
-        <com.google.android.material.card.MaterialCardView
-            android:id="@+id/btn_add_geofence"
-            android:layout_width="@dimen/dp_0"
-            android:layout_height="@dimen/dp_48"
-            android:layout_marginHorizontal="@dimen/dp_16"
-            android:layout_marginTop="@dimen/dp_8"
-            android:paddingHorizontal="@dimen/dp_16"
-            app:cardBackgroundColor="@color/white"
-            app:cardCornerRadius="@dimen/dp_8"
-            app:cardElevation="@dimen/dp_0"
-            app:cardUseCompatPadding="false"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btn_try_geofence">
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/sheet_geofence_list_card_geo_fence" />
 
             <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/tv_enable_geofence"
-                style="@style/SP16BoldMediumBlackTextStyle"
-                android:layout_width="wrap_content"
+                android:id="@+id/sheet_geofence_list_tv_add_geofence_description"
+                style="@style/SP13HintRegularTextStyle"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="@string/label_enable_live_geofences"
-                android:textAllCaps="false"
+                android:layout_marginHorizontal="@dimen/dp_24"
+                android:layout_marginTop="@dimen/dp_8"
                 android:gravity="center"
-                android:textColor="@color/color_medium_black"
-                app:layout_constraintBottom_toBottomOf="parent"
+                android:text="@string/add_geo_fence_1"
+                android:textDirection="locale"
+                app:layout_constraintBottom_toTopOf="@+id/btn_try_geofence"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@id/iv_direction_sheet_geofence_list"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/tv_add_geofence_empty_geofence_list" />
 
-        </com.google.android.material.card.MaterialCardView>
+            <View
+                android:id="@+id/view_space"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_16"
+                app:layout_constraintTop_toBottomOf="@id/sheet_geofence_list_tv_add_geofence_description"/>
+
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/btn_try_geofence"
+                android:layout_width="@dimen/dp_0"
+                android:layout_height="@dimen/dp_48"
+                android:layout_marginHorizontal="@dimen/dp_16"
+                android:paddingHorizontal="@dimen/dp_16"
+                app:cardBackgroundColor="@color/color_primary_green"
+                app:cardCornerRadius="@dimen/dp_8"
+                app:cardUseCompatPadding="false"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/view_space">
 
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tv_require_connection"
-            style="@style/SP13HintRegularTextStyle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="@dimen/dp_24"
-            android:layout_marginTop="@dimen/dp_4"
-            android:gravity="center"
-            android:text="@string/label_requires_connection_to_aws_cloudformation"
-            android:textSize="@dimen/sp_10"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btn_add_geofence" />
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/SP16BoldMediumBlackTextStyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:gravity="center"
+                    android:text="@string/label_try_trackers_amp_geofences_simulation"
+                    android:textAllCaps="false"
+                    android:textColor="@color/white"
+                    android:textDirection="locale"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@id/iv_direction"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+            </com.google.android.material.card.MaterialCardView>
+
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/btn_add_geofence"
+                android:layout_width="@dimen/dp_0"
+                android:layout_height="@dimen/dp_48"
+                android:layout_marginHorizontal="@dimen/dp_16"
+                android:layout_marginTop="@dimen/dp_8"
+                android:paddingHorizontal="@dimen/dp_16"
+                app:cardBackgroundColor="@color/white"
+                app:cardCornerRadius="@dimen/dp_8"
+                app:cardElevation="@dimen/dp_0"
+                app:cardUseCompatPadding="false"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/btn_try_geofence">
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/tv_enable_geofence"
+                    style="@style/SP16BoldMediumBlackTextStyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:gravity="center"
+                    android:text="@string/label_enable_live_geofences"
+                    android:textAllCaps="false"
+                    android:textColor="@color/color_medium_black"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@id/iv_direction_sheet_geofence_list"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+            </com.google.android.material.card.MaterialCardView>
 
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/tv_require_connection"
+                style="@style/SP13HintRegularTextStyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_24"
+                android:layout_marginTop="@dimen/dp_4"
+                android:gravity="center"
+                android:text="@string/label_requires_connection_to_aws_cloudformation"
+                android:textSize="@dimen/sp_10"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/btn_add_geofence" />
 
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw600dp/bottom_sheet_tracking.xml b/app/src/main/res/layout-sw600dp/bottom_sheet_tracking.xml
index 1fb257ec..f3e48f76 100644
--- a/app/src/main/res/layout-sw600dp/bottom_sheet_tracking.xml
+++ b/app/src/main/res/layout-sw600dp/bottom_sheet_tracking.xml
@@ -24,94 +24,103 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <View
-            android:id="@+id/view_tracking"
-            android:layout_width="@dimen/dp_36"
-            android:layout_height="@dimen/dp_5"
-            android:layout_gravity="bottom|center"
-            android:layout_marginTop="@dimen/dp_7"
-            android:background="@drawable/bottom_sheet_view"
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/cl_tracking_inner"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingBottom="@dimen/dp_16"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent">
 
 
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tv_tracking_history"
-            style="@style/SP14BoldBlackTextStyle"
-            android:layout_width="@dimen/dp_0"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_16"
-            android:layout_marginTop="@dimen/dp_20"
-            android:gravity="start"
-            android:textDirection="locale"
-            android:text="@string/label_tracking_history"
-            android:textColor="@color/color_medium_black"
-            android:textSize="@dimen/sp_20"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/card_start_tracking"
-            app:layout_constraintTop_toBottomOf="@id/view_tracking" />
-
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tv_tracking_your_activity"
-            style="@style/LogoutMessageStyle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_16"
-            android:layout_marginEnd="@dimen/dp_14"
-            android:gravity="start"
-            android:text="@string/label_not_tracking_your_activity"
-            android:textColor="@color/color_hint_text"
-            android:lines="2"
-            android:textDirection="locale"
-            android:textSize="@dimen/sp_13"
-            app:layout_constraintEnd_toStartOf="@+id/card_start_tracking"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/tv_tracking_history" />
+            <View
+                android:id="@+id/view_tracking"
+                android:layout_width="@dimen/dp_36"
+                android:layout_height="@dimen/dp_5"
+                android:layout_gravity="bottom|center"
+                android:layout_marginTop="@dimen/dp_7"
+                android:background="@drawable/bottom_sheet_view"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
-        <com.google.android.material.card.MaterialCardView
-            android:id="@+id/card_start_tracking"
-            android:layout_width="@dimen/dp_110"
-            android:layout_height="@dimen/dp_40"
-            android:layout_marginTop="@dimen/dp_20"
-            android:layout_marginEnd="@dimen/dp_16"
-            app:cardBackgroundColor="@color/color_primary_green"
-            app:cardCornerRadius="@dimen/dp_8"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/view_tracking">
 
             <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/tv_stop_tracking"
+                android:id="@+id/tv_tracking_history"
                 style="@style/SP14BoldBlackTextStyle"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:gravity="center"
+                android:layout_width="@dimen/dp_0"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/dp_16"
+                android:layout_marginTop="@dimen/dp_20"
+                android:gravity="start"
+                android:text="@string/label_tracking_history"
+                android:textColor="@color/color_medium_black"
                 android:textDirection="locale"
-                android:text="@string/label_start_tracking"
-                android:textColor="@color/white" />
+                android:textSize="@dimen/sp_20"
+                app:layout_constraintEnd_toStartOf="@+id/card_start_tracking"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/view_tracking" />
 
-            <ProgressBar
-                android:id="@+id/view_loader"
-                android:layout_width="wrap_content"
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/tv_tracking_your_activity"
+                style="@style/LogoutMessageStyle"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_margin="@dimen/dp_8"
-                android:progressBackgroundTint="@color/white"
-                android:progressTint="@color/white"
-                android:visibility="gone" />
-        </com.google.android.material.card.MaterialCardView>
+                android:layout_marginStart="@dimen/dp_16"
+                android:layout_marginEnd="@dimen/dp_14"
+                android:gravity="start"
+                android:text="@string/label_not_tracking_your_activity"
+                android:textColor="@color/color_hint_text"
+                android:textDirection="locale"
+                android:textSize="@dimen/sp_13"
+                app:layout_constraintEnd_toStartOf="@+id/card_start_tracking"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tv_tracking_history" />
+
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/card_start_tracking"
+                android:layout_width="@dimen/dp_110"
+                android:layout_height="@dimen/dp_40"
+                android:layout_marginTop="@dimen/dp_20"
+                android:layout_marginEnd="@dimen/dp_16"
+                app:cardBackgroundColor="@color/color_primary_green"
+                app:cardCornerRadius="@dimen/dp_8"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/view_tracking">
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/tv_stop_tracking"
+                    style="@style/SP14BoldBlackTextStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:gravity="center"
+                    android:text="@string/label_start_tracking"
+                    android:textColor="@color/white"
+                    android:textDirection="locale" />
+
+                <ProgressBar
+                    android:id="@+id/view_loader"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_margin="@dimen/dp_8"
+                    android:progressBackgroundTint="@color/white"
+                    android:progressTint="@color/white"
+                    android:visibility="gone" />
+            </com.google.android.material.card.MaterialCardView>
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
         <com.google.android.material.card.MaterialCardView
             android:id="@+id/card_tracker_geofence_simulation"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_80"
-            android:layout_marginTop="@dimen/dp_16"
             app:cardBackgroundColor="@color/white"
             app:cardCornerRadius="@dimen/dp_8"
             android:layout_marginHorizontal="@dimen/dp_16"
             app:cardUseCompatPadding="false"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tv_tracking_your_activity">
+            app:layout_constraintTop_toBottomOf="@id/cl_tracking_inner">
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
@@ -374,140 +383,150 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <View
-            android:id="@+id/view_sheet_tracking"
-            android:layout_width="@dimen/dp_36"
-            android:layout_height="@dimen/dp_5"
-            android:layout_gravity="bottom|center"
-            android:layout_marginTop="@dimen/dp_10"
-            android:background="@drawable/bottom_sheet_view"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <com.google.android.material.card.MaterialCardView
-            android:id="@+id/sheet_tracking_card_geo_fence"
-            android:layout_width="@dimen/dp_96"
-            android:layout_height="@dimen/dp_96"
-            android:layout_marginTop="@dimen/dp_36"
-            app:cardBackgroundColor="@color/white"
-            app:cardCornerRadius="@dimen/dp_100"
-            app:cardElevation="@dimen/dp_0"
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/cl_enable_tracking_inner"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingBottom="@dimen/dp_24"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/view_sheet_tracking">
+            app:layout_constraintTop_toTopOf="parent">
 
-            <androidx.appcompat.widget.AppCompatImageView
+            <View
+                android:id="@+id/view_sheet_tracking"
                 android:layout_width="@dimen/dp_36"
-                android:layout_height="@dimen/dp_36"
-                android:layout_gravity="center"
-                android:tint="@color/color_medium_black_1"
-                android:src="@drawable/ic_tracking" />
-
-        </com.google.android.material.card.MaterialCardView>
+                android:layout_height="@dimen/dp_5"
+                android:layout_gravity="bottom|center"
+                android:layout_marginTop="@dimen/dp_10"
+                android:background="@drawable/bottom_sheet_view"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tv_add_geofence_empty"
-            style="@style/SP20InterRegularMediumBlack1TextStyle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp_16"
-            android:gravity="center"
-            android:fontFamily="@font/inter_semi_bold"
-            android:text="@string/menu_tracking"
-            android:textDirection="locale"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/sheet_tracking_card_geo_fence" />
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/sheet_tracking_card_geo_fence"
+                android:layout_width="@dimen/dp_96"
+                android:layout_height="@dimen/dp_96"
+                android:layout_marginTop="@dimen/dp_36"
+                app:cardBackgroundColor="@color/white"
+                app:cardCornerRadius="@dimen/dp_100"
+                app:cardElevation="@dimen/dp_0"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/view_sheet_tracking">
 
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tv_add_geofence_description"
-            style="@style/SP13HintRegularTextStyle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="@dimen/dp_24"
-            android:layout_marginTop="@dimen/dp_16"
-            android:gravity="center"
-            android:textDirection="locale"
-            android:text="@string/label_enable_tracking_detail"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tv_add_geofence_empty" />
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:layout_width="@dimen/dp_36"
+                    android:layout_height="@dimen/dp_36"
+                    android:layout_gravity="center"
+                    android:src="@drawable/ic_tracking"
+                    android:tint="@color/color_medium_black_1" />
 
-        <com.google.android.material.card.MaterialCardView
-            android:id="@+id/btn_try_tracker"
-            android:layout_width="@dimen/dp_0"
-            android:layout_height="@dimen/dp_48"
-            android:layout_marginHorizontal="@dimen/dp_16"
-            android:layout_marginTop="@dimen/dp_16"
-            android:paddingHorizontal="@dimen/dp_16"
-            app:cardBackgroundColor="@color/color_primary_green"
-            app:cardCornerRadius="@dimen/dp_8"
-            app:cardUseCompatPadding="false"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tv_add_geofence_description">
+            </com.google.android.material.card.MaterialCardView>
 
             <androidx.appcompat.widget.AppCompatTextView
-                style="@style/SP16BoldMediumBlackTextStyle"
-                android:layout_width="wrap_content"
+                android:id="@+id/tv_add_geofence_empty"
+                style="@style/SP20InterRegularMediumBlack1TextStyle"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="@string/label_try_trackers_amp_geofences_simulation"
+                android:layout_marginTop="@dimen/dp_16"
+                android:fontFamily="@font/inter_semi_bold"
+                android:gravity="center"
+                android:text="@string/menu_tracking"
                 android:textDirection="locale"
-                android:textAllCaps="false"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/sheet_tracking_card_geo_fence" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/tv_add_geofence_description"
+                style="@style/SP13HintRegularTextStyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_24"
+                android:layout_marginTop="@dimen/dp_16"
                 android:gravity="center"
-                android:textColor="@color/white"
-                app:layout_constraintBottom_toBottomOf="parent"
+                android:text="@string/label_enable_tracking_detail"
+                android:textDirection="locale"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@id/iv_direction"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/tv_add_geofence_empty" />
 
-        </com.google.android.material.card.MaterialCardView>
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/btn_try_tracker"
+                android:layout_width="@dimen/dp_0"
+                android:layout_height="@dimen/dp_48"
+                android:layout_marginHorizontal="@dimen/dp_16"
+                android:layout_marginTop="@dimen/dp_16"
+                android:paddingHorizontal="@dimen/dp_16"
+                app:cardBackgroundColor="@color/color_primary_green"
+                app:cardCornerRadius="@dimen/dp_8"
+                app:cardUseCompatPadding="false"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/tv_add_geofence_description">
 
-        <com.google.android.material.card.MaterialCardView
-            android:id="@+id/btn_enable_tracking"
-            android:layout_width="@dimen/dp_0"
-            android:layout_height="@dimen/dp_48"
-            android:layout_marginHorizontal="@dimen/dp_16"
-            android:layout_marginTop="@dimen/dp_8"
-            android:paddingHorizontal="@dimen/dp_16"
-            app:cardBackgroundColor="@color/white"
-            app:cardCornerRadius="@dimen/dp_8"
-            app:cardElevation="@dimen/dp_0"
-            app:cardUseCompatPadding="false"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btn_try_tracker">
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/SP16BoldMediumBlackTextStyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:gravity="center"
+                    android:text="@string/label_try_trackers_amp_geofences_simulation"
+                    android:textAllCaps="false"
+                    android:textColor="@color/white"
+                    android:textDirection="locale"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@id/iv_direction"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+            </com.google.android.material.card.MaterialCardView>
+
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/btn_enable_tracking"
+                android:layout_width="@dimen/dp_0"
+                android:layout_height="@dimen/dp_48"
+                android:layout_marginHorizontal="@dimen/dp_16"
+                android:layout_marginTop="@dimen/dp_8"
+                android:paddingHorizontal="@dimen/dp_16"
+                app:cardBackgroundColor="@color/white"
+                app:cardCornerRadius="@dimen/dp_8"
+                app:cardElevation="@dimen/dp_0"
+                app:cardUseCompatPadding="false"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/btn_try_tracker">
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/SP16BoldMediumBlackTextStyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:gravity="center"
+                    android:text="@string/label_enable_tracking"
+                    android:textAllCaps="false"
+                    android:textColor="@color/color_medium_black"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@id/iv_direction"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+            </com.google.android.material.card.MaterialCardView>
 
             <androidx.appcompat.widget.AppCompatTextView
-                style="@style/SP16BoldMediumBlackTextStyle"
-                android:layout_width="wrap_content"
+                android:id="@+id/tv_require_connection"
+                style="@style/SP13HintRegularTextStyle"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="@string/label_enable_tracking"
-                android:textAllCaps="false"
+                android:layout_marginHorizontal="@dimen/dp_24"
+                android:layout_marginTop="@dimen/dp_4"
                 android:gravity="center"
-                android:textColor="@color/color_medium_black"
-                app:layout_constraintBottom_toBottomOf="parent"
+                android:text="@string/label_requires_connection_to_aws_cloudformation"
+                android:textSize="@dimen/sp_10"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@id/iv_direction"
-                app:layout_constraintTop_toTopOf="parent" />
-
-        </com.google.android.material.card.MaterialCardView>
-
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tv_require_connection"
-            style="@style/SP13HintRegularTextStyle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="@dimen/dp_24"
-            android:layout_marginTop="@dimen/dp_4"
-            android:gravity="center"
-            android:textSize="@dimen/sp_10"
-            android:text="@string/label_requires_connection_to_aws_cloudformation"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btn_enable_tracking" />
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/btn_enable_tracking" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-sw720dp-land/bottom_sheet_tracking.xml b/app/src/main/res/layout-sw720dp-land/bottom_sheet_tracking.xml
index cd83aff8..87aefc90 100644
--- a/app/src/main/res/layout-sw720dp-land/bottom_sheet_tracking.xml
+++ b/app/src/main/res/layout-sw720dp-land/bottom_sheet_tracking.xml
@@ -24,93 +24,102 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <View
-            android:id="@+id/view_tracking"
-            android:layout_width="@dimen/dp_36"
-            android:layout_height="@dimen/dp_5"
-            android:layout_gravity="bottom|center"
-            android:layout_marginTop="@dimen/dp_7"
-            android:background="@drawable/bottom_sheet_view"
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/cl_tracking_inner"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingBottom="@dimen/dp_16"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent">
 
 
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tv_tracking_history"
-            style="@style/SP14BoldBlackTextStyle"
-            android:layout_width="@dimen/dp_0"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_16"
-            android:layout_marginTop="@dimen/dp_20"
-            android:gravity="start"
-            android:textDirection="locale"
-            android:text="@string/label_tracking_history"
-            android:textColor="@color/color_medium_black"
-            android:textSize="@dimen/sp_20"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/card_start_tracking"
-            app:layout_constraintTop_toBottomOf="@id/view_tracking" />
-
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tv_tracking_your_activity"
-            style="@style/LogoutMessageStyle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_16"
-            android:layout_marginEnd="@dimen/dp_14"
-            android:gravity="start"
-            android:textDirection="locale"
-            android:text="@string/label_not_tracking_your_activity"
-            android:textColor="@color/color_hint_text"
-            android:textSize="@dimen/sp_13"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/card_start_tracking"
-            app:layout_constraintTop_toBottomOf="@+id/tv_tracking_history" />
+            <View
+                android:id="@+id/view_tracking"
+                android:layout_width="@dimen/dp_36"
+                android:layout_height="@dimen/dp_5"
+                android:layout_gravity="bottom|center"
+                android:layout_marginTop="@dimen/dp_7"
+                android:background="@drawable/bottom_sheet_view"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
-        <com.google.android.material.card.MaterialCardView
-            android:id="@+id/card_start_tracking"
-            android:layout_width="@dimen/dp_120"
-            android:layout_height="@dimen/dp_40"
-            android:layout_marginTop="@dimen/dp_20"
-            android:layout_marginEnd="@dimen/dp_16"
-            app:cardBackgroundColor="@color/color_primary_green"
-            app:cardCornerRadius="@dimen/dp_8"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/view_tracking">
 
             <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/tv_stop_tracking"
+                android:id="@+id/tv_tracking_history"
                 style="@style/SP14BoldBlackTextStyle"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:gravity="center"
+                android:layout_width="@dimen/dp_0"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/dp_16"
+                android:layout_marginTop="@dimen/dp_20"
+                android:gravity="start"
+                android:text="@string/label_tracking_history"
+                android:textColor="@color/color_medium_black"
                 android:textDirection="locale"
-                android:text="@string/label_start_tracking"
-                android:textColor="@color/white" />
+                android:textSize="@dimen/sp_20"
+                app:layout_constraintEnd_toStartOf="@+id/card_start_tracking"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/view_tracking" />
 
-            <ProgressBar
-                android:id="@+id/view_loader"
-                android:layout_width="wrap_content"
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/tv_tracking_your_activity"
+                style="@style/LogoutMessageStyle"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_margin="@dimen/dp_8"
-                android:progressBackgroundTint="@color/white"
-                android:progressTint="@color/white"
-                android:visibility="gone" />
-        </com.google.android.material.card.MaterialCardView>
+                android:layout_marginStart="@dimen/dp_16"
+                android:layout_marginEnd="@dimen/dp_14"
+                android:gravity="start"
+                android:text="@string/label_not_tracking_your_activity"
+                android:textColor="@color/color_hint_text"
+                android:textDirection="locale"
+                android:textSize="@dimen/sp_13"
+                app:layout_constraintEnd_toStartOf="@+id/card_start_tracking"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tv_tracking_history" />
+
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/card_start_tracking"
+                android:layout_width="@dimen/dp_120"
+                android:layout_height="@dimen/dp_40"
+                android:layout_marginTop="@dimen/dp_20"
+                android:layout_marginEnd="@dimen/dp_16"
+                app:cardBackgroundColor="@color/color_primary_green"
+                app:cardCornerRadius="@dimen/dp_8"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/view_tracking">
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/tv_stop_tracking"
+                    style="@style/SP14BoldBlackTextStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:gravity="center"
+                    android:text="@string/label_start_tracking"
+                    android:textColor="@color/white" />
+
+                <ProgressBar
+                    android:id="@+id/view_loader"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_margin="@dimen/dp_8"
+                    android:progressBackgroundTint="@color/white"
+                    android:progressTint="@color/white"
+                    android:visibility="gone" />
+            </com.google.android.material.card.MaterialCardView>
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
         <com.google.android.material.card.MaterialCardView
             android:id="@+id/card_tracker_geofence_simulation"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_56"
-            android:layout_marginTop="@dimen/dp_16"
             app:cardBackgroundColor="@color/white"
             app:cardCornerRadius="@dimen/dp_8"
             android:layout_marginHorizontal="@dimen/dp_16"
             app:cardUseCompatPadding="false"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tv_tracking_your_activity">
+            app:layout_constraintTop_toBottomOf="@id/cl_tracking_inner">
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
@@ -371,140 +380,150 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <View
-            android:id="@+id/view_sheet_tracking"
-            android:layout_width="@dimen/dp_36"
-            android:layout_height="@dimen/dp_5"
-            android:layout_gravity="bottom|center"
-            android:layout_marginTop="@dimen/dp_10"
-            android:background="@drawable/bottom_sheet_view"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <com.google.android.material.card.MaterialCardView
-            android:id="@+id/sheet_tracking_card_geo_fence"
-            android:layout_width="@dimen/dp_96"
-            android:layout_height="@dimen/dp_96"
-            android:layout_marginTop="@dimen/dp_36"
-            app:cardBackgroundColor="@color/white"
-            app:cardCornerRadius="@dimen/dp_100"
-            app:cardElevation="@dimen/dp_0"
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/cl_enable_tracking_inner"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingBottom="@dimen/dp_24"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/view_sheet_tracking">
+            app:layout_constraintTop_toTopOf="parent">
 
-            <androidx.appcompat.widget.AppCompatImageView
+            <View
+                android:id="@+id/view_sheet_tracking"
                 android:layout_width="@dimen/dp_36"
-                android:layout_height="@dimen/dp_36"
-                android:layout_gravity="center"
-                android:tint="@color/color_medium_black_1"
-                android:src="@drawable/ic_tracking" />
+                android:layout_height="@dimen/dp_5"
+                android:layout_gravity="bottom|center"
+                android:layout_marginTop="@dimen/dp_10"
+                android:background="@drawable/bottom_sheet_view"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
-        </com.google.android.material.card.MaterialCardView>
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/sheet_tracking_card_geo_fence"
+                android:layout_width="@dimen/dp_96"
+                android:layout_height="@dimen/dp_96"
+                android:layout_marginTop="@dimen/dp_36"
+                app:cardBackgroundColor="@color/white"
+                app:cardCornerRadius="@dimen/dp_100"
+                app:cardElevation="@dimen/dp_0"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/view_sheet_tracking">
 
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tv_add_geofence_empty"
-            style="@style/SP20InterRegularMediumBlack1TextStyle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp_16"
-            android:gravity="center"
-            android:fontFamily="@font/inter_semi_bold"
-            android:text="@string/menu_tracking"
-            android:textDirection="locale"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/sheet_tracking_card_geo_fence" />
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:layout_width="@dimen/dp_36"
+                    android:layout_height="@dimen/dp_36"
+                    android:layout_gravity="center"
+                    android:src="@drawable/ic_tracking"
+                    android:tint="@color/color_medium_black_1" />
 
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tv_add_geofence_description"
-            style="@style/SP13HintRegularTextStyle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="@dimen/dp_24"
-            android:layout_marginTop="@dimen/dp_16"
-            android:gravity="center"
-            android:textDirection="locale"
-            android:text="@string/label_enable_tracking_detail"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tv_add_geofence_empty" />
+            </com.google.android.material.card.MaterialCardView>
 
-        <com.google.android.material.card.MaterialCardView
-            android:id="@+id/btn_try_tracker"
-            android:layout_width="@dimen/dp_0"
-            android:layout_height="@dimen/dp_48"
-            android:layout_marginHorizontal="@dimen/dp_16"
-            android:layout_marginTop="@dimen/dp_16"
-            android:paddingHorizontal="@dimen/dp_16"
-            app:cardBackgroundColor="@color/color_primary_green"
-            app:cardCornerRadius="@dimen/dp_8"
-            app:cardUseCompatPadding="false"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tv_add_geofence_description">
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/tv_add_geofence_empty"
+                style="@style/SP20InterRegularMediumBlack1TextStyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp_16"
+                android:fontFamily="@font/inter_semi_bold"
+                android:gravity="center"
+                android:text="@string/menu_tracking"
+                android:textDirection="locale"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/sheet_tracking_card_geo_fence" />
 
             <androidx.appcompat.widget.AppCompatTextView
-                style="@style/SP16BoldMediumBlackTextStyle"
-                android:layout_width="wrap_content"
+                android:id="@+id/tv_add_geofence_description"
+                style="@style/SP13HintRegularTextStyle"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="@string/label_try_trackers_amp_geofences_simulation"
-                android:textAllCaps="false"
+                android:layout_marginHorizontal="@dimen/dp_24"
+                android:layout_marginTop="@dimen/dp_16"
                 android:gravity="center"
-                android:textColor="@color/white"
-                app:layout_constraintBottom_toBottomOf="parent"
+                android:text="@string/label_enable_tracking_detail"
+                android:textDirection="locale"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@id/iv_direction"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/tv_add_geofence_empty" />
 
-        </com.google.android.material.card.MaterialCardView>
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/btn_try_tracker"
+                android:layout_width="@dimen/dp_0"
+                android:layout_height="@dimen/dp_48"
+                android:layout_marginHorizontal="@dimen/dp_16"
+                android:layout_marginTop="@dimen/dp_16"
+                android:paddingHorizontal="@dimen/dp_16"
+                app:cardBackgroundColor="@color/color_primary_green"
+                app:cardCornerRadius="@dimen/dp_8"
+                app:cardUseCompatPadding="false"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/tv_add_geofence_description">
 
-        <com.google.android.material.card.MaterialCardView
-            android:id="@+id/btn_enable_tracking"
-            android:layout_width="@dimen/dp_0"
-            android:layout_height="@dimen/dp_48"
-            android:layout_marginHorizontal="@dimen/dp_16"
-            android:layout_marginTop="@dimen/dp_8"
-            android:paddingHorizontal="@dimen/dp_16"
-            app:cardBackgroundColor="@color/white"
-            app:cardCornerRadius="@dimen/dp_8"
-            app:cardElevation="@dimen/dp_0"
-            app:cardUseCompatPadding="false"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btn_try_tracker">
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/SP16BoldMediumBlackTextStyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:gravity="center"
+                    android:text="@string/label_try_trackers_amp_geofences_simulation"
+                    android:textAllCaps="false"
+                    android:textColor="@color/white"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@id/iv_direction"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+            </com.google.android.material.card.MaterialCardView>
+
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/btn_enable_tracking"
+                android:layout_width="@dimen/dp_0"
+                android:layout_height="@dimen/dp_48"
+                android:layout_marginHorizontal="@dimen/dp_16"
+                android:layout_marginTop="@dimen/dp_8"
+                android:paddingHorizontal="@dimen/dp_16"
+                app:cardBackgroundColor="@color/white"
+                app:cardCornerRadius="@dimen/dp_8"
+                app:cardElevation="@dimen/dp_0"
+                app:cardUseCompatPadding="false"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/btn_try_tracker">
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/SP16BoldMediumBlackTextStyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:gravity="center"
+                    android:text="@string/label_enable_tracking"
+                    android:textAllCaps="false"
+                    android:textColor="@color/color_medium_black"
+                    android:textDirection="locale"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@id/iv_direction"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+            </com.google.android.material.card.MaterialCardView>
 
             <androidx.appcompat.widget.AppCompatTextView
-                style="@style/SP16BoldMediumBlackTextStyle"
-                android:layout_width="wrap_content"
+                android:id="@+id/tv_require_connection"
+                style="@style/SP13HintRegularTextStyle"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="@string/label_enable_tracking"
-                android:textDirection="locale"
-                android:textAllCaps="false"
+                android:layout_marginHorizontal="@dimen/dp_24"
+                android:layout_marginTop="@dimen/dp_4"
                 android:gravity="center"
-                android:textColor="@color/color_medium_black"
-                app:layout_constraintBottom_toBottomOf="parent"
+                android:text="@string/label_requires_connection_to_aws_cloudformation"
+                android:textSize="@dimen/sp_10"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@id/iv_direction"
-                app:layout_constraintTop_toTopOf="parent" />
-
-        </com.google.android.material.card.MaterialCardView>
-
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tv_require_connection"
-            style="@style/SP13HintRegularTextStyle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="@dimen/dp_24"
-            android:layout_marginTop="@dimen/dp_4"
-            android:gravity="center"
-            android:textSize="@dimen/sp_10"
-            android:text="@string/label_requires_connection_to_aws_cloudformation"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btn_enable_tracking" />
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/btn_enable_tracking" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-sw720dp/bottom_sheet_geofence_list.xml b/app/src/main/res/layout-sw720dp/bottom_sheet_geofence_list.xml
index 171d11f9..01a47244 100644
--- a/app/src/main/res/layout-sw720dp/bottom_sheet_geofence_list.xml
+++ b/app/src/main/res/layout-sw720dp/bottom_sheet_geofence_list.xml
@@ -18,7 +18,6 @@
         android:background="@drawable/bottom_sheet_top_corner_curved_geofence"
         android:clickable="true"
         android:focusable="true"
-        android:layout_marginTop="@dimen/dp_20"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -250,148 +249,157 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <View
-            android:id="@+id/view_sheet_geofence_list"
-            android:layout_width="@dimen/dp_36"
-            android:layout_height="@dimen/dp_5"
-            android:layout_gravity="bottom|center"
-            android:layout_marginTop="@dimen/dp_10"
-            android:background="@drawable/bottom_sheet_view"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <com.google.android.material.card.MaterialCardView
-            android:id="@+id/sheet_geofence_list_card_geo_fence"
-            android:layout_width="@dimen/dp_96"
-            android:layout_height="@dimen/dp_96"
-            android:layout_marginTop="@dimen/dp_36"
-            app:cardBackgroundColor="@color/white"
-            app:cardCornerRadius="@dimen/dp_100"
-            app:cardElevation="@dimen/dp_0"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/view_sheet_geofence_list">
-
-            <androidx.appcompat.widget.AppCompatImageView
-                android:layout_width="@dimen/dp_36"
-                android:layout_height="@dimen/dp_36"
-                android:layout_gravity="center"
-                android:src="@drawable/ic_geofence" />
-
-        </com.google.android.material.card.MaterialCardView>
-
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tv_add_geofence_empty_geofence_list"
-            style="@style/SP20InterRegularMediumBlack1TextStyle"
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/cl_empty_geofence_list_inner"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp_16"
-            android:fontFamily="@font/inter_semi_bold"
-            android:gravity="center"
-            android:textDirection="locale"
-            android:text="@string/menu_geofence"
+            android:paddingBottom="@dimen/dp_24"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/sheet_geofence_list_card_geo_fence" />
+            app:layout_constraintTop_toTopOf="parent">
 
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/sheet_geofence_list_tv_add_geofence_description"
-            style="@style/SP13HintRegularTextStyle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="@dimen/dp_24"
-            android:layout_marginTop="@dimen/dp_8"
-            android:gravity="center"
-            android:textDirection="locale"
-            app:layout_constraintBottom_toTopOf="@+id/btn_try_geofence"
-            android:text="@string/add_geo_fence_1"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tv_add_geofence_empty_geofence_list" />
+            <View
+                android:id="@+id/view_sheet_geofence_list"
+                android:layout_width="@dimen/dp_36"
+                android:layout_height="@dimen/dp_5"
+                android:layout_gravity="bottom|center"
+                android:layout_marginTop="@dimen/dp_10"
+                android:background="@drawable/bottom_sheet_view"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
-        <View
-            android:id="@+id/view_space"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_16"
-            app:layout_constraintTop_toBottomOf="@id/sheet_geofence_list_tv_add_geofence_description"/>
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/sheet_geofence_list_card_geo_fence"
+                android:layout_width="@dimen/dp_96"
+                android:layout_height="@dimen/dp_96"
+                android:layout_marginTop="@dimen/dp_36"
+                app:cardBackgroundColor="@color/white"
+                app:cardCornerRadius="@dimen/dp_100"
+                app:cardElevation="@dimen/dp_0"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/view_sheet_geofence_list">
 
-        <com.google.android.material.card.MaterialCardView
-            android:id="@+id/btn_try_geofence"
-            android:layout_width="@dimen/dp_0"
-            android:layout_height="@dimen/dp_48"
-            android:layout_marginHorizontal="@dimen/dp_16"
-            android:paddingHorizontal="@dimen/dp_16"
-            app:cardBackgroundColor="@color/color_primary_green"
-            app:cardCornerRadius="@dimen/dp_8"
-            app:cardUseCompatPadding="false"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/view_space">
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:layout_width="@dimen/dp_36"
+                    android:layout_height="@dimen/dp_36"
+                    android:layout_gravity="center"
+                    android:src="@drawable/ic_geofence" />
+
+            </com.google.android.material.card.MaterialCardView>
 
             <androidx.appcompat.widget.AppCompatTextView
-                style="@style/SP16BoldMediumBlackTextStyle"
-                android:layout_width="wrap_content"
+                android:id="@+id/tv_add_geofence_empty_geofence_list"
+                style="@style/SP20InterRegularMediumBlack1TextStyle"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="@string/label_try_trackers_amp_geofences_simulation"
-                android:textAllCaps="false"
+                android:layout_marginTop="@dimen/dp_16"
+                android:fontFamily="@font/inter_semi_bold"
                 android:gravity="center"
-                android:textColor="@color/white"
+                android:text="@string/menu_geofence"
                 android:textDirection="locale"
-                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@id/iv_direction"
-                app:layout_constraintTop_toTopOf="parent" />
-
-        </com.google.android.material.card.MaterialCardView>
-
-        <com.google.android.material.card.MaterialCardView
-            android:id="@+id/btn_add_geofence"
-            android:layout_width="@dimen/dp_0"
-            android:layout_height="@dimen/dp_48"
-            android:layout_marginHorizontal="@dimen/dp_16"
-            android:layout_marginTop="@dimen/dp_8"
-            app:cardBackgroundColor="@color/white"
-            android:paddingHorizontal="@dimen/dp_16"
-            app:cardCornerRadius="@dimen/dp_8"
-            app:cardElevation="@dimen/dp_0"
-            app:cardUseCompatPadding="false"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btn_try_geofence">
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/sheet_geofence_list_card_geo_fence" />
 
             <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/tv_enable_geofence"
-                style="@style/SP16BoldMediumBlackTextStyle"
-                android:layout_width="wrap_content"
+                android:id="@+id/sheet_geofence_list_tv_add_geofence_description"
+                style="@style/SP13HintRegularTextStyle"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="@string/label_enable_live_geofences"
-                android:textAllCaps="false"
+                android:layout_marginHorizontal="@dimen/dp_24"
+                android:layout_marginTop="@dimen/dp_8"
                 android:gravity="center"
-                android:textColor="@color/color_medium_black"
-                app:layout_constraintBottom_toBottomOf="parent"
+                android:text="@string/add_geo_fence_1"
+                android:textDirection="locale"
+                app:layout_constraintBottom_toTopOf="@+id/btn_try_geofence"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@id/iv_direction_sheet_geofence_list"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/tv_add_geofence_empty_geofence_list" />
 
-        </com.google.android.material.card.MaterialCardView>
+            <View
+                android:id="@+id/view_space"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_16"
+                app:layout_constraintTop_toBottomOf="@id/sheet_geofence_list_tv_add_geofence_description"/>
+
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/btn_try_geofence"
+                android:layout_width="@dimen/dp_0"
+                android:layout_height="@dimen/dp_48"
+                android:layout_marginHorizontal="@dimen/dp_16"
+                android:paddingHorizontal="@dimen/dp_16"
+                app:cardBackgroundColor="@color/color_primary_green"
+                app:cardCornerRadius="@dimen/dp_8"
+                app:cardUseCompatPadding="false"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/view_space">
 
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tv_require_connection"
-            style="@style/SP13HintRegularTextStyle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="@dimen/dp_24"
-            android:layout_marginTop="@dimen/dp_4"
-            android:gravity="center"
-            android:text="@string/label_requires_connection_to_aws_cloudformation"
-            android:textSize="@dimen/sp_10"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btn_add_geofence" />
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/SP16BoldMediumBlackTextStyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:gravity="center"
+                    android:text="@string/label_try_trackers_amp_geofences_simulation"
+                    android:textAllCaps="false"
+                    android:textColor="@color/white"
+                    android:textDirection="locale"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@id/iv_direction"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+            </com.google.android.material.card.MaterialCardView>
+
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/btn_add_geofence"
+                android:layout_width="@dimen/dp_0"
+                android:layout_height="@dimen/dp_48"
+                android:layout_marginHorizontal="@dimen/dp_16"
+                android:layout_marginTop="@dimen/dp_8"
+                android:paddingHorizontal="@dimen/dp_16"
+                app:cardBackgroundColor="@color/white"
+                app:cardCornerRadius="@dimen/dp_8"
+                app:cardElevation="@dimen/dp_0"
+                app:cardUseCompatPadding="false"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/btn_try_geofence">
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/tv_enable_geofence"
+                    style="@style/SP16BoldMediumBlackTextStyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:gravity="center"
+                    android:text="@string/label_enable_live_geofences"
+                    android:textAllCaps="false"
+                    android:textColor="@color/color_medium_black"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@id/iv_direction_sheet_geofence_list"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+            </com.google.android.material.card.MaterialCardView>
 
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/tv_require_connection"
+                style="@style/SP13HintRegularTextStyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_24"
+                android:layout_marginTop="@dimen/dp_4"
+                android:gravity="center"
+                android:text="@string/label_requires_connection_to_aws_cloudformation"
+                android:textSize="@dimen/sp_10"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/btn_add_geofence" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout-sw720dp/bottom_sheet_tracking.xml b/app/src/main/res/layout-sw720dp/bottom_sheet_tracking.xml
index cd83aff8..87aefc90 100644
--- a/app/src/main/res/layout-sw720dp/bottom_sheet_tracking.xml
+++ b/app/src/main/res/layout-sw720dp/bottom_sheet_tracking.xml
@@ -24,93 +24,102 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <View
-            android:id="@+id/view_tracking"
-            android:layout_width="@dimen/dp_36"
-            android:layout_height="@dimen/dp_5"
-            android:layout_gravity="bottom|center"
-            android:layout_marginTop="@dimen/dp_7"
-            android:background="@drawable/bottom_sheet_view"
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/cl_tracking_inner"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingBottom="@dimen/dp_16"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent">
 
 
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tv_tracking_history"
-            style="@style/SP14BoldBlackTextStyle"
-            android:layout_width="@dimen/dp_0"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_16"
-            android:layout_marginTop="@dimen/dp_20"
-            android:gravity="start"
-            android:textDirection="locale"
-            android:text="@string/label_tracking_history"
-            android:textColor="@color/color_medium_black"
-            android:textSize="@dimen/sp_20"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/card_start_tracking"
-            app:layout_constraintTop_toBottomOf="@id/view_tracking" />
-
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tv_tracking_your_activity"
-            style="@style/LogoutMessageStyle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_16"
-            android:layout_marginEnd="@dimen/dp_14"
-            android:gravity="start"
-            android:textDirection="locale"
-            android:text="@string/label_not_tracking_your_activity"
-            android:textColor="@color/color_hint_text"
-            android:textSize="@dimen/sp_13"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/card_start_tracking"
-            app:layout_constraintTop_toBottomOf="@+id/tv_tracking_history" />
+            <View
+                android:id="@+id/view_tracking"
+                android:layout_width="@dimen/dp_36"
+                android:layout_height="@dimen/dp_5"
+                android:layout_gravity="bottom|center"
+                android:layout_marginTop="@dimen/dp_7"
+                android:background="@drawable/bottom_sheet_view"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
-        <com.google.android.material.card.MaterialCardView
-            android:id="@+id/card_start_tracking"
-            android:layout_width="@dimen/dp_120"
-            android:layout_height="@dimen/dp_40"
-            android:layout_marginTop="@dimen/dp_20"
-            android:layout_marginEnd="@dimen/dp_16"
-            app:cardBackgroundColor="@color/color_primary_green"
-            app:cardCornerRadius="@dimen/dp_8"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/view_tracking">
 
             <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/tv_stop_tracking"
+                android:id="@+id/tv_tracking_history"
                 style="@style/SP14BoldBlackTextStyle"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:gravity="center"
+                android:layout_width="@dimen/dp_0"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/dp_16"
+                android:layout_marginTop="@dimen/dp_20"
+                android:gravity="start"
+                android:text="@string/label_tracking_history"
+                android:textColor="@color/color_medium_black"
                 android:textDirection="locale"
-                android:text="@string/label_start_tracking"
-                android:textColor="@color/white" />
+                android:textSize="@dimen/sp_20"
+                app:layout_constraintEnd_toStartOf="@+id/card_start_tracking"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/view_tracking" />
 
-            <ProgressBar
-                android:id="@+id/view_loader"
-                android:layout_width="wrap_content"
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/tv_tracking_your_activity"
+                style="@style/LogoutMessageStyle"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_margin="@dimen/dp_8"
-                android:progressBackgroundTint="@color/white"
-                android:progressTint="@color/white"
-                android:visibility="gone" />
-        </com.google.android.material.card.MaterialCardView>
+                android:layout_marginStart="@dimen/dp_16"
+                android:layout_marginEnd="@dimen/dp_14"
+                android:gravity="start"
+                android:text="@string/label_not_tracking_your_activity"
+                android:textColor="@color/color_hint_text"
+                android:textDirection="locale"
+                android:textSize="@dimen/sp_13"
+                app:layout_constraintEnd_toStartOf="@+id/card_start_tracking"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tv_tracking_history" />
+
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/card_start_tracking"
+                android:layout_width="@dimen/dp_120"
+                android:layout_height="@dimen/dp_40"
+                android:layout_marginTop="@dimen/dp_20"
+                android:layout_marginEnd="@dimen/dp_16"
+                app:cardBackgroundColor="@color/color_primary_green"
+                app:cardCornerRadius="@dimen/dp_8"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/view_tracking">
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/tv_stop_tracking"
+                    style="@style/SP14BoldBlackTextStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:gravity="center"
+                    android:text="@string/label_start_tracking"
+                    android:textColor="@color/white" />
+
+                <ProgressBar
+                    android:id="@+id/view_loader"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_margin="@dimen/dp_8"
+                    android:progressBackgroundTint="@color/white"
+                    android:progressTint="@color/white"
+                    android:visibility="gone" />
+            </com.google.android.material.card.MaterialCardView>
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
         <com.google.android.material.card.MaterialCardView
             android:id="@+id/card_tracker_geofence_simulation"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_56"
-            android:layout_marginTop="@dimen/dp_16"
             app:cardBackgroundColor="@color/white"
             app:cardCornerRadius="@dimen/dp_8"
             android:layout_marginHorizontal="@dimen/dp_16"
             app:cardUseCompatPadding="false"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tv_tracking_your_activity">
+            app:layout_constraintTop_toBottomOf="@id/cl_tracking_inner">
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
@@ -371,140 +380,150 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <View
-            android:id="@+id/view_sheet_tracking"
-            android:layout_width="@dimen/dp_36"
-            android:layout_height="@dimen/dp_5"
-            android:layout_gravity="bottom|center"
-            android:layout_marginTop="@dimen/dp_10"
-            android:background="@drawable/bottom_sheet_view"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <com.google.android.material.card.MaterialCardView
-            android:id="@+id/sheet_tracking_card_geo_fence"
-            android:layout_width="@dimen/dp_96"
-            android:layout_height="@dimen/dp_96"
-            android:layout_marginTop="@dimen/dp_36"
-            app:cardBackgroundColor="@color/white"
-            app:cardCornerRadius="@dimen/dp_100"
-            app:cardElevation="@dimen/dp_0"
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/cl_enable_tracking_inner"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingBottom="@dimen/dp_24"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/view_sheet_tracking">
+            app:layout_constraintTop_toTopOf="parent">
 
-            <androidx.appcompat.widget.AppCompatImageView
+            <View
+                android:id="@+id/view_sheet_tracking"
                 android:layout_width="@dimen/dp_36"
-                android:layout_height="@dimen/dp_36"
-                android:layout_gravity="center"
-                android:tint="@color/color_medium_black_1"
-                android:src="@drawable/ic_tracking" />
+                android:layout_height="@dimen/dp_5"
+                android:layout_gravity="bottom|center"
+                android:layout_marginTop="@dimen/dp_10"
+                android:background="@drawable/bottom_sheet_view"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
-        </com.google.android.material.card.MaterialCardView>
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/sheet_tracking_card_geo_fence"
+                android:layout_width="@dimen/dp_96"
+                android:layout_height="@dimen/dp_96"
+                android:layout_marginTop="@dimen/dp_36"
+                app:cardBackgroundColor="@color/white"
+                app:cardCornerRadius="@dimen/dp_100"
+                app:cardElevation="@dimen/dp_0"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/view_sheet_tracking">
 
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tv_add_geofence_empty"
-            style="@style/SP20InterRegularMediumBlack1TextStyle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp_16"
-            android:gravity="center"
-            android:fontFamily="@font/inter_semi_bold"
-            android:text="@string/menu_tracking"
-            android:textDirection="locale"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/sheet_tracking_card_geo_fence" />
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:layout_width="@dimen/dp_36"
+                    android:layout_height="@dimen/dp_36"
+                    android:layout_gravity="center"
+                    android:src="@drawable/ic_tracking"
+                    android:tint="@color/color_medium_black_1" />
 
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tv_add_geofence_description"
-            style="@style/SP13HintRegularTextStyle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="@dimen/dp_24"
-            android:layout_marginTop="@dimen/dp_16"
-            android:gravity="center"
-            android:textDirection="locale"
-            android:text="@string/label_enable_tracking_detail"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tv_add_geofence_empty" />
+            </com.google.android.material.card.MaterialCardView>
 
-        <com.google.android.material.card.MaterialCardView
-            android:id="@+id/btn_try_tracker"
-            android:layout_width="@dimen/dp_0"
-            android:layout_height="@dimen/dp_48"
-            android:layout_marginHorizontal="@dimen/dp_16"
-            android:layout_marginTop="@dimen/dp_16"
-            android:paddingHorizontal="@dimen/dp_16"
-            app:cardBackgroundColor="@color/color_primary_green"
-            app:cardCornerRadius="@dimen/dp_8"
-            app:cardUseCompatPadding="false"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tv_add_geofence_description">
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/tv_add_geofence_empty"
+                style="@style/SP20InterRegularMediumBlack1TextStyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp_16"
+                android:fontFamily="@font/inter_semi_bold"
+                android:gravity="center"
+                android:text="@string/menu_tracking"
+                android:textDirection="locale"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/sheet_tracking_card_geo_fence" />
 
             <androidx.appcompat.widget.AppCompatTextView
-                style="@style/SP16BoldMediumBlackTextStyle"
-                android:layout_width="wrap_content"
+                android:id="@+id/tv_add_geofence_description"
+                style="@style/SP13HintRegularTextStyle"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="@string/label_try_trackers_amp_geofences_simulation"
-                android:textAllCaps="false"
+                android:layout_marginHorizontal="@dimen/dp_24"
+                android:layout_marginTop="@dimen/dp_16"
                 android:gravity="center"
-                android:textColor="@color/white"
-                app:layout_constraintBottom_toBottomOf="parent"
+                android:text="@string/label_enable_tracking_detail"
+                android:textDirection="locale"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@id/iv_direction"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/tv_add_geofence_empty" />
 
-        </com.google.android.material.card.MaterialCardView>
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/btn_try_tracker"
+                android:layout_width="@dimen/dp_0"
+                android:layout_height="@dimen/dp_48"
+                android:layout_marginHorizontal="@dimen/dp_16"
+                android:layout_marginTop="@dimen/dp_16"
+                android:paddingHorizontal="@dimen/dp_16"
+                app:cardBackgroundColor="@color/color_primary_green"
+                app:cardCornerRadius="@dimen/dp_8"
+                app:cardUseCompatPadding="false"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/tv_add_geofence_description">
 
-        <com.google.android.material.card.MaterialCardView
-            android:id="@+id/btn_enable_tracking"
-            android:layout_width="@dimen/dp_0"
-            android:layout_height="@dimen/dp_48"
-            android:layout_marginHorizontal="@dimen/dp_16"
-            android:layout_marginTop="@dimen/dp_8"
-            android:paddingHorizontal="@dimen/dp_16"
-            app:cardBackgroundColor="@color/white"
-            app:cardCornerRadius="@dimen/dp_8"
-            app:cardElevation="@dimen/dp_0"
-            app:cardUseCompatPadding="false"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btn_try_tracker">
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/SP16BoldMediumBlackTextStyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:gravity="center"
+                    android:text="@string/label_try_trackers_amp_geofences_simulation"
+                    android:textAllCaps="false"
+                    android:textColor="@color/white"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@id/iv_direction"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+            </com.google.android.material.card.MaterialCardView>
+
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/btn_enable_tracking"
+                android:layout_width="@dimen/dp_0"
+                android:layout_height="@dimen/dp_48"
+                android:layout_marginHorizontal="@dimen/dp_16"
+                android:layout_marginTop="@dimen/dp_8"
+                android:paddingHorizontal="@dimen/dp_16"
+                app:cardBackgroundColor="@color/white"
+                app:cardCornerRadius="@dimen/dp_8"
+                app:cardElevation="@dimen/dp_0"
+                app:cardUseCompatPadding="false"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/btn_try_tracker">
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/SP16BoldMediumBlackTextStyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:gravity="center"
+                    android:text="@string/label_enable_tracking"
+                    android:textAllCaps="false"
+                    android:textColor="@color/color_medium_black"
+                    android:textDirection="locale"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@id/iv_direction"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+            </com.google.android.material.card.MaterialCardView>
 
             <androidx.appcompat.widget.AppCompatTextView
-                style="@style/SP16BoldMediumBlackTextStyle"
-                android:layout_width="wrap_content"
+                android:id="@+id/tv_require_connection"
+                style="@style/SP13HintRegularTextStyle"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="@string/label_enable_tracking"
-                android:textDirection="locale"
-                android:textAllCaps="false"
+                android:layout_marginHorizontal="@dimen/dp_24"
+                android:layout_marginTop="@dimen/dp_4"
                 android:gravity="center"
-                android:textColor="@color/color_medium_black"
-                app:layout_constraintBottom_toBottomOf="parent"
+                android:text="@string/label_requires_connection_to_aws_cloudformation"
+                android:textSize="@dimen/sp_10"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@id/iv_direction"
-                app:layout_constraintTop_toTopOf="parent" />
-
-        </com.google.android.material.card.MaterialCardView>
-
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tv_require_connection"
-            style="@style/SP13HintRegularTextStyle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="@dimen/dp_24"
-            android:layout_marginTop="@dimen/dp_4"
-            android:gravity="center"
-            android:textSize="@dimen/sp_10"
-            android:text="@string/label_requires_connection_to_aws_cloudformation"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btn_enable_tracking" />
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/btn_enable_tracking" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/bottom_sheet_geofence_list.xml b/app/src/main/res/layout/bottom_sheet_geofence_list.xml
index 07d45d60..fd19f294 100644
--- a/app/src/main/res/layout/bottom_sheet_geofence_list.xml
+++ b/app/src/main/res/layout/bottom_sheet_geofence_list.xml
@@ -270,147 +270,158 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintTop_toBottomOf="@id/img_amazon_logo_geofence_list">
 
-        <View
-            android:id="@+id/view_sheet_geofence_list"
-            android:layout_width="@dimen/dp_36"
-            android:layout_height="@dimen/dp_5"
-            android:layout_gravity="bottom|center"
-            android:layout_marginTop="@dimen/dp_10"
-            android:background="@drawable/bottom_sheet_view"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <com.google.android.material.card.MaterialCardView
-            android:id="@+id/sheet_geofence_list_card_geo_fence"
-            android:layout_width="@dimen/dp_96"
-            android:layout_height="@dimen/dp_96"
-            android:layout_marginTop="@dimen/dp_36"
-            app:cardBackgroundColor="@color/white"
-            app:cardCornerRadius="@dimen/dp_100"
-            app:cardElevation="@dimen/dp_0"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/view_sheet_geofence_list">
-
-            <androidx.appcompat.widget.AppCompatImageView
-                android:layout_width="@dimen/dp_36"
-                android:layout_height="@dimen/dp_36"
-                android:layout_gravity="center"
-                android:src="@drawable/ic_geofence" />
-
-        </com.google.android.material.card.MaterialCardView>
-
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tv_add_geofence_empty_geofence_list"
-            style="@style/SP20InterRegularMediumBlack1TextStyle"
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/cl_empty_geofence_list_inner"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp_16"
-            android:fontFamily="@font/inter_semi_bold"
-            android:gravity="center"
-            android:textDirection="locale"
-            android:text="@string/menu_geofence"
+            android:paddingBottom="@dimen/dp_24"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/sheet_geofence_list_card_geo_fence" />
+            app:layout_constraintTop_toTopOf="parent">
 
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/sheet_geofence_list_tv_add_geofence_description"
-            style="@style/SP13HintRegularTextStyle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="@dimen/dp_24"
-            android:layout_marginTop="@dimen/dp_8"
-            android:gravity="center"
-            android:textDirection="locale"
-            app:layout_constraintBottom_toTopOf="@+id/btn_try_geofence"
-            android:text="@string/add_geo_fence_1"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tv_add_geofence_empty_geofence_list" />
+            <View
+                android:id="@+id/view_sheet_geofence_list"
+                android:layout_width="@dimen/dp_36"
+                android:layout_height="@dimen/dp_5"
+                android:layout_gravity="bottom|center"
+                android:layout_marginTop="@dimen/dp_10"
+                android:background="@drawable/bottom_sheet_view"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
-        <View
-            android:id="@+id/view_space"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_16"
-            app:layout_constraintTop_toBottomOf="@id/sheet_geofence_list_tv_add_geofence_description"/>
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/sheet_geofence_list_card_geo_fence"
+                android:layout_width="@dimen/dp_96"
+                android:layout_height="@dimen/dp_96"
+                android:layout_marginTop="@dimen/dp_36"
+                app:cardBackgroundColor="@color/white"
+                app:cardCornerRadius="@dimen/dp_100"
+                app:cardElevation="@dimen/dp_0"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/view_sheet_geofence_list">
 
-        <com.google.android.material.card.MaterialCardView
-            android:id="@+id/btn_try_geofence"
-            android:layout_width="@dimen/dp_0"
-            android:layout_height="@dimen/dp_48"
-            android:layout_marginHorizontal="@dimen/dp_16"
-            android:paddingHorizontal="@dimen/dp_16"
-            app:cardBackgroundColor="@color/color_primary_green"
-            app:cardCornerRadius="@dimen/dp_8"
-            app:cardUseCompatPadding="false"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/view_space">
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:layout_width="@dimen/dp_36"
+                    android:layout_height="@dimen/dp_36"
+                    android:layout_gravity="center"
+                    android:src="@drawable/ic_geofence" />
+
+            </com.google.android.material.card.MaterialCardView>
 
             <androidx.appcompat.widget.AppCompatTextView
-                style="@style/SP16BoldMediumBlackTextStyle"
-                android:layout_width="wrap_content"
+                android:id="@+id/tv_add_geofence_empty_geofence_list"
+                style="@style/SP20InterRegularMediumBlack1TextStyle"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="@string/label_try_trackers_amp_geofences_simulation"
-                android:textAllCaps="false"
+                android:layout_marginTop="@dimen/dp_16"
+                android:fontFamily="@font/inter_semi_bold"
+                android:gravity="center"
                 android:textDirection="locale"
+                android:text="@string/menu_geofence"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/sheet_geofence_list_card_geo_fence" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/sheet_geofence_list_tv_add_geofence_description"
+                style="@style/SP13HintRegularTextStyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_24"
+                android:layout_marginTop="@dimen/dp_8"
                 android:gravity="center"
-                android:textColor="@color/white"
-                app:layout_constraintBottom_toBottomOf="parent"
+                android:textDirection="locale"
+                app:layout_constraintBottom_toTopOf="@+id/btn_try_geofence"
+                android:text="@string/add_geo_fence_1"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@id/iv_direction"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/tv_add_geofence_empty_geofence_list" />
 
-        </com.google.android.material.card.MaterialCardView>
+            <View
+                android:id="@+id/view_space"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_16"
+                app:layout_constraintTop_toBottomOf="@id/sheet_geofence_list_tv_add_geofence_description"/>
+
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/btn_try_geofence"
+                android:layout_width="@dimen/dp_0"
+                android:layout_height="@dimen/dp_48"
+                android:layout_marginHorizontal="@dimen/dp_16"
+                android:paddingHorizontal="@dimen/dp_16"
+                app:cardBackgroundColor="@color/color_primary_green"
+                app:cardCornerRadius="@dimen/dp_8"
+                app:cardUseCompatPadding="false"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/view_space">
 
-        <com.google.android.material.card.MaterialCardView
-            android:id="@+id/btn_add_geofence"
-            android:layout_width="@dimen/dp_0"
-            android:layout_height="@dimen/dp_48"
-            android:layout_marginHorizontal="@dimen/dp_16"
-            android:layout_marginTop="@dimen/dp_8"
-            app:cardBackgroundColor="@color/white"
-            app:cardCornerRadius="@dimen/dp_8"
-            android:paddingHorizontal="@dimen/dp_16"
-            app:cardElevation="@dimen/dp_0"
-            app:cardUseCompatPadding="false"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btn_try_geofence">
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/SP16BoldMediumBlackTextStyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:text="@string/label_try_trackers_amp_geofences_simulation"
+                    android:textAllCaps="false"
+                    android:textDirection="locale"
+                    android:gravity="center"
+                    android:textColor="@color/white"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@id/iv_direction"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+            </com.google.android.material.card.MaterialCardView>
+
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/btn_add_geofence"
+                android:layout_width="@dimen/dp_0"
+                android:layout_height="@dimen/dp_48"
+                android:layout_marginHorizontal="@dimen/dp_16"
+                android:layout_marginTop="@dimen/dp_8"
+                app:cardBackgroundColor="@color/white"
+                app:cardCornerRadius="@dimen/dp_8"
+                android:paddingHorizontal="@dimen/dp_16"
+                app:cardElevation="@dimen/dp_0"
+                app:cardUseCompatPadding="false"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/btn_try_geofence">
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/tv_enable_geofence"
+                    style="@style/SP16BoldMediumBlackTextStyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:text="@string/label_enable_live_geofences"
+                    android:textAllCaps="false"
+                    android:gravity="center"
+                    android:textColor="@color/color_medium_black"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@id/iv_direction_sheet_geofence_list"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+            </com.google.android.material.card.MaterialCardView>
 
             <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/tv_enable_geofence"
-                style="@style/SP16BoldMediumBlackTextStyle"
-                android:layout_width="wrap_content"
+                android:id="@+id/tv_require_connection"
+                style="@style/SP13HintRegularTextStyle"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="@string/label_enable_live_geofences"
-                android:textAllCaps="false"
+                android:layout_marginHorizontal="@dimen/dp_24"
+                android:layout_marginTop="@dimen/dp_4"
                 android:gravity="center"
-                android:textColor="@color/color_medium_black"
-                app:layout_constraintBottom_toBottomOf="parent"
+                android:text="@string/label_requires_connection_to_aws_cloudformation"
+                android:textSize="@dimen/sp_10"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@id/iv_direction_sheet_geofence_list"
-                app:layout_constraintTop_toTopOf="parent" />
-
-        </com.google.android.material.card.MaterialCardView>
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/btn_add_geofence" />
 
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tv_require_connection"
-            style="@style/SP13HintRegularTextStyle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="@dimen/dp_24"
-            android:layout_marginTop="@dimen/dp_4"
-            android:gravity="center"
-            android:text="@string/label_requires_connection_to_aws_cloudformation"
-            android:textSize="@dimen/sp_10"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btn_add_geofence" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/bottom_sheet_tracking.xml b/app/src/main/res/layout/bottom_sheet_tracking.xml
index b414df84..73df6af4 100644
--- a/app/src/main/res/layout/bottom_sheet_tracking.xml
+++ b/app/src/main/res/layout/bottom_sheet_tracking.xml
@@ -45,92 +45,102 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/img_amazon_logo_tracking_sheet">
 
-        <View
-            android:id="@+id/view_tracking"
-            android:layout_width="@dimen/dp_36"
-            android:layout_height="@dimen/dp_5"
-            android:layout_gravity="bottom|center"
-            android:layout_marginTop="@dimen/dp_7"
-            android:background="@drawable/bottom_sheet_view"
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/cl_tracking_inner"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingBottom="@dimen/dp_16"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent">
 
 
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tv_tracking_history"
-            style="@style/SP14BoldBlackTextStyle"
-            android:layout_width="@dimen/dp_0"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_16"
-            android:layout_marginTop="@dimen/dp_20"
-            android:gravity="start"
-            android:textDirection="locale"
-            android:text="@string/label_tracking_history"
-            android:textColor="@color/color_medium_black"
-            android:textSize="@dimen/sp_20"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/card_start_tracking"
-            app:layout_constraintTop_toBottomOf="@id/view_tracking" />
-
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tv_tracking_your_activity"
-            style="@style/LogoutMessageStyle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_16"
-            android:layout_marginEnd="@dimen/dp_14"
-            android:gravity="start"
-            android:textDirection="locale"
-            android:text="@string/label_not_tracking_your_activity"
-            android:textColor="@color/color_hint_text"
-            android:textSize="@dimen/sp_13"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/card_start_tracking"
-            app:layout_constraintTop_toBottomOf="@+id/tv_tracking_history" />
+            <View
+                android:id="@+id/view_tracking"
+                android:layout_width="@dimen/dp_36"
+                android:layout_height="@dimen/dp_5"
+                android:layout_gravity="bottom|center"
+                android:layout_marginTop="@dimen/dp_7"
+                android:background="@drawable/bottom_sheet_view"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
-        <com.google.android.material.card.MaterialCardView
-            android:id="@+id/card_start_tracking"
-            android:layout_width="@dimen/dp_120"
-            android:layout_height="@dimen/dp_40"
-            android:layout_marginTop="@dimen/dp_20"
-            android:layout_marginEnd="@dimen/dp_16"
-            app:cardBackgroundColor="@color/color_primary_green"
-            app:cardCornerRadius="@dimen/dp_8"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/view_tracking">
 
             <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/tv_stop_tracking"
+                android:id="@+id/tv_tracking_history"
                 style="@style/SP14BoldBlackTextStyle"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:gravity="center"
-                android:text="@string/label_start_tracking"
-                android:textColor="@color/white" />
+                android:layout_width="@dimen/dp_0"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/dp_16"
+                android:layout_marginTop="@dimen/dp_20"
+                android:gravity="start"
+                android:text="@string/label_tracking_history"
+                android:textColor="@color/color_medium_black"
+                android:textDirection="locale"
+                android:textSize="@dimen/sp_20"
+                app:layout_constraintEnd_toStartOf="@+id/card_start_tracking"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/view_tracking" />
 
-            <ProgressBar
-                android:id="@+id/view_loader"
-                android:layout_width="wrap_content"
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/tv_tracking_your_activity"
+                style="@style/LogoutMessageStyle"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_margin="@dimen/dp_8"
-                android:progressBackgroundTint="@color/white"
-                android:progressTint="@color/white"
-                android:visibility="gone" />
-        </com.google.android.material.card.MaterialCardView>
+                android:layout_marginStart="@dimen/dp_16"
+                android:layout_marginEnd="@dimen/dp_14"
+                android:gravity="start"
+                android:text="@string/label_not_tracking_your_activity"
+                android:textColor="@color/color_hint_text"
+                android:textDirection="locale"
+                android:textSize="@dimen/sp_13"
+                app:layout_constraintEnd_toStartOf="@+id/card_start_tracking"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tv_tracking_history" />
+
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/card_start_tracking"
+                android:layout_width="@dimen/dp_120"
+                android:layout_height="@dimen/dp_40"
+                android:layout_marginTop="@dimen/dp_20"
+                android:layout_marginEnd="@dimen/dp_16"
+                app:cardBackgroundColor="@color/color_primary_green"
+                app:cardCornerRadius="@dimen/dp_8"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/view_tracking">
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/tv_stop_tracking"
+                    style="@style/SP14BoldBlackTextStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:gravity="center"
+                    android:text="@string/label_start_tracking"
+                    android:textColor="@color/white" />
+
+                <ProgressBar
+                    android:id="@+id/view_loader"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_margin="@dimen/dp_8"
+                    android:progressBackgroundTint="@color/white"
+                    android:progressTint="@color/white"
+                    android:visibility="gone" />
+            </com.google.android.material.card.MaterialCardView>
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
         <com.google.android.material.card.MaterialCardView
             android:id="@+id/card_tracker_geofence_simulation"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_56"
-            android:layout_marginTop="@dimen/dp_16"
             app:cardBackgroundColor="@color/white"
             app:cardCornerRadius="@dimen/dp_8"
             android:layout_marginHorizontal="@dimen/dp_16"
             app:cardUseCompatPadding="false"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tv_tracking_your_activity">
+            app:layout_constraintTop_toBottomOf="@id/cl_tracking_inner">
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
@@ -391,140 +401,150 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintTop_toBottomOf="@id/img_amazon_logo_tracking_sheet">
 
-        <View
-            android:id="@+id/view_sheet_tracking"
-            android:layout_width="@dimen/dp_36"
-            android:layout_height="@dimen/dp_5"
-            android:layout_gravity="bottom|center"
-            android:layout_marginTop="@dimen/dp_10"
-            android:background="@drawable/bottom_sheet_view"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <com.google.android.material.card.MaterialCardView
-            android:id="@+id/sheet_tracking_card_geo_fence"
-            android:layout_width="@dimen/dp_96"
-            android:layout_height="@dimen/dp_96"
-            android:layout_marginTop="@dimen/dp_36"
-            app:cardBackgroundColor="@color/white"
-            app:cardCornerRadius="@dimen/dp_100"
-            app:cardElevation="@dimen/dp_0"
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/cl_enable_tracking_inner"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingBottom="@dimen/dp_24"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/view_sheet_tracking">
+            app:layout_constraintTop_toTopOf="parent">
 
-            <androidx.appcompat.widget.AppCompatImageView
+            <View
+                android:id="@+id/view_sheet_tracking"
                 android:layout_width="@dimen/dp_36"
-                android:layout_height="@dimen/dp_36"
-                android:layout_gravity="center"
-                android:tint="@color/color_medium_black_1"
-                android:src="@drawable/ic_tracking" />
+                android:layout_height="@dimen/dp_5"
+                android:layout_gravity="bottom|center"
+                android:layout_marginTop="@dimen/dp_10"
+                android:background="@drawable/bottom_sheet_view"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
-        </com.google.android.material.card.MaterialCardView>
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/sheet_tracking_card_geo_fence"
+                android:layout_width="@dimen/dp_96"
+                android:layout_height="@dimen/dp_96"
+                android:layout_marginTop="@dimen/dp_36"
+                app:cardBackgroundColor="@color/white"
+                app:cardCornerRadius="@dimen/dp_100"
+                app:cardElevation="@dimen/dp_0"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/view_sheet_tracking">
 
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tv_add_geofence_empty"
-            style="@style/SP20InterRegularMediumBlack1TextStyle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp_16"
-            android:gravity="center"
-            android:textDirection="locale"
-            android:fontFamily="@font/inter_semi_bold"
-            android:text="@string/menu_tracking"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/sheet_tracking_card_geo_fence" />
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:layout_width="@dimen/dp_36"
+                    android:layout_height="@dimen/dp_36"
+                    android:layout_gravity="center"
+                    android:src="@drawable/ic_tracking"
+                    android:tint="@color/color_medium_black_1" />
 
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tv_add_geofence_description"
-            style="@style/SP13HintRegularTextStyle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="@dimen/dp_24"
-            android:layout_marginTop="@dimen/dp_8"
-            android:gravity="center"
-            android:textDirection="locale"
-            android:text="@string/label_enable_tracking_detail"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tv_add_geofence_empty" />
+            </com.google.android.material.card.MaterialCardView>
 
-        <com.google.android.material.card.MaterialCardView
-            android:id="@+id/btn_try_tracker"
-            android:layout_width="@dimen/dp_0"
-            android:layout_height="@dimen/dp_48"
-            android:layout_marginHorizontal="@dimen/dp_16"
-            android:paddingHorizontal="@dimen/dp_16"
-            android:layout_marginTop="@dimen/dp_16"
-            app:cardBackgroundColor="@color/color_primary_green"
-            app:cardCornerRadius="@dimen/dp_8"
-            app:cardUseCompatPadding="false"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tv_add_geofence_description">
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/tv_add_geofence_empty"
+                style="@style/SP20InterRegularMediumBlack1TextStyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp_16"
+                android:fontFamily="@font/inter_semi_bold"
+                android:gravity="center"
+                android:text="@string/menu_tracking"
+                android:textDirection="locale"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/sheet_tracking_card_geo_fence" />
 
             <androidx.appcompat.widget.AppCompatTextView
-                style="@style/SP16BoldMediumBlackTextStyle"
-                android:layout_width="wrap_content"
+                android:id="@+id/tv_add_geofence_description"
+                style="@style/SP13HintRegularTextStyle"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="@string/label_try_trackers_amp_geofences_simulation"
-                android:textAllCaps="false"
+                android:layout_marginHorizontal="@dimen/dp_24"
+                android:layout_marginTop="@dimen/dp_8"
                 android:gravity="center"
-                android:textColor="@color/white"
-                app:layout_constraintBottom_toBottomOf="parent"
+                android:text="@string/label_enable_tracking_detail"
+                android:textDirection="locale"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@id/iv_direction"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/tv_add_geofence_empty" />
 
-        </com.google.android.material.card.MaterialCardView>
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/btn_try_tracker"
+                android:layout_width="@dimen/dp_0"
+                android:layout_height="@dimen/dp_48"
+                android:layout_marginHorizontal="@dimen/dp_16"
+                android:layout_marginTop="@dimen/dp_16"
+                android:paddingHorizontal="@dimen/dp_16"
+                app:cardBackgroundColor="@color/color_primary_green"
+                app:cardCornerRadius="@dimen/dp_8"
+                app:cardUseCompatPadding="false"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/tv_add_geofence_description">
 
-        <com.google.android.material.card.MaterialCardView
-            android:id="@+id/btn_enable_tracking"
-            android:layout_width="@dimen/dp_0"
-            android:layout_height="@dimen/dp_48"
-            android:layout_marginHorizontal="@dimen/dp_16"
-            android:layout_marginTop="@dimen/dp_8"
-            android:paddingHorizontal="@dimen/dp_16"
-            app:cardBackgroundColor="@color/white"
-            app:cardCornerRadius="@dimen/dp_8"
-            app:cardElevation="@dimen/dp_0"
-            app:cardUseCompatPadding="false"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btn_try_tracker">
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/SP16BoldMediumBlackTextStyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:gravity="center"
+                    android:text="@string/label_try_trackers_amp_geofences_simulation"
+                    android:textAllCaps="false"
+                    android:textColor="@color/white"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@id/iv_direction"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+            </com.google.android.material.card.MaterialCardView>
+
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/btn_enable_tracking"
+                android:layout_width="@dimen/dp_0"
+                android:layout_height="@dimen/dp_48"
+                android:layout_marginHorizontal="@dimen/dp_16"
+                android:layout_marginTop="@dimen/dp_8"
+                android:paddingHorizontal="@dimen/dp_16"
+                app:cardBackgroundColor="@color/white"
+                app:cardCornerRadius="@dimen/dp_8"
+                app:cardElevation="@dimen/dp_0"
+                app:cardUseCompatPadding="false"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/btn_try_tracker">
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/SP16BoldMediumBlackTextStyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:gravity="center"
+                    android:text="@string/label_enable_tracking"
+                    android:textAllCaps="false"
+                    android:textColor="@color/color_medium_black"
+                    android:textDirection="locale"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@id/iv_direction"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+            </com.google.android.material.card.MaterialCardView>
 
             <androidx.appcompat.widget.AppCompatTextView
-                style="@style/SP16BoldMediumBlackTextStyle"
-                android:layout_width="wrap_content"
+                android:id="@+id/tv_require_connection"
+                style="@style/SP13HintRegularTextStyle"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="@string/label_enable_tracking"
-                android:textDirection="locale"
-                android:textAllCaps="false"
+                android:layout_marginHorizontal="@dimen/dp_24"
+                android:layout_marginTop="@dimen/dp_4"
                 android:gravity="center"
-                android:textColor="@color/color_medium_black"
-                app:layout_constraintBottom_toBottomOf="parent"
+                android:text="@string/label_requires_connection_to_aws_cloudformation"
+                android:textSize="@dimen/sp_10"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@id/iv_direction"
-                app:layout_constraintTop_toTopOf="parent" />
-
-        </com.google.android.material.card.MaterialCardView>
-
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tv_require_connection"
-            style="@style/SP13HintRegularTextStyle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="@dimen/dp_24"
-            android:layout_marginTop="@dimen/dp_4"
-            android:gravity="center"
-            android:textSize="@dimen/sp_10"
-            android:text="@string/label_requires_connection_to_aws_cloudformation"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btn_enable_tracking" />
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/btn_enable_tracking" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>