diff --git a/app/src/main/res/drawable/background_img_small.png b/app/src/main/res/drawable/background_img_small.png
new file mode 100644
index 0000000..183d649
Binary files /dev/null and b/app/src/main/res/drawable/background_img_small.png differ
diff --git a/app/src/main/res/layout/fragment_community.xml b/app/src/main/res/layout/fragment_community.xml
index 3f0083f..212740f 100644
--- a/app/src/main/res/layout/fragment_community.xml
+++ b/app/src/main/res/layout/fragment_community.xml
@@ -6,60 +6,56 @@
     android:layout_height="match_parent"
     tools:context=".ui.fragment.CommunityFragment">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/backgroundColor"
-        android:orientation="vertical">
-
-        <ImageView
-            android:id="@+id/bg_image"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@drawable/background_img"
-            android:importantForAccessibility="no"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+        android:layout_height="match_parent">
 
         <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/appBarLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:fitsSystemWindows="true"
             android:outlineAmbientShadowColor="@color/dark_green"
-            android:outlineSpotShadowColor="@color/dark_green"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
+            android:outlineSpotShadowColor="@color/dark_green">
 
             <com.google.android.material.appbar.MaterialToolbar
                 android:id="@+id/toolbarDashboard"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="@color/dark_green"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
+                app:layout_scrollFlags="scroll|enterAlways|snap"
                 app:title="Community" />
         </com.google.android.material.appbar.AppBarLayout>
 
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/rv_community_name"
+        <ImageView
+            android:id="@+id/bg_image"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/appBarLayout" />
+            android:background="@drawable/background_img_small"
+            android:importantForAccessibility="no"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/rv_community_member"
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:clipToPadding="false"
-            android:paddingTop="32dp"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/rv_community_name"
-            tools:listitem="@layout/user_community_member_list" />
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/rv_community_name"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingTop="8dp"
+                android:paddingBottom="16dp" />
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/rv_community_member"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginTop="24dp"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                tools:listitem="@layout/user_community_member_list" />
+        </LinearLayout>
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:id="@+id/fab"
@@ -73,5 +69,5 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:tint="@color/white" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_health.xml b/app/src/main/res/layout/fragment_health.xml
index ddff6f1..1b501d3 100644
--- a/app/src/main/res/layout/fragment_health.xml
+++ b/app/src/main/res/layout/fragment_health.xml
@@ -5,301 +5,302 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <LinearLayout
-        android:id="@+id/llHealth"
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
-        android:layout_height="200dp"
-        android:background="@drawable/background_img"
-        android:gravity="center"
-        android:orientation="vertical">
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Track Your Performance"
-            android:textColor="@color/white"
-            android:textSize="20sp"
-            android:textStyle="bold" />
-
-    </LinearLayout>
+        android:layout_height="match_parent">
 
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/appBarLayout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:outlineAmbientShadowColor="@color/dark_green"
-        android:outlineSpotShadowColor="@color/dark_green"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/toolbarHealth"
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/appBarLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@color/dark_green"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:title="Health" />
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scrollbars="none"
-        android:clipToPadding="false"
-        android:paddingTop="200dp"
-        tools:context=".ui.fragment.HealthFragment">
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:fitsSystemWindows="true"
+            android:outlineAmbientShadowColor="@color/dark_green"
+            android:outlineSpotShadowColor="@color/dark_green">
 
-            <androidx.viewpager2.widget.ViewPager2
-                android:id="@+id/viewPager"
-                android:layout_width="match_parent"
-                android:layout_height="200dp"
-                android:layout_marginStart="10dp"
-                android:layout_marginTop="10dp"
-                android:layout_marginEnd="10dp"
-                android:layout_marginBottom="10dp" />
-
-            <!--        <LinearLayout-->
-            <!--            android:id="@+id/llTabs"-->
-            <!--            android:layout_width="match_parent"-->
-            <!--            android:layout_height="wrap_content"-->
-            <!--            android:orientation="horizontal"-->
-            <!--            android:layout_below="@+id/vpChart"-->
-            <!--            android:gravity="center"-->
-            <!--            >-->
-            <!--            <com.google.android.material.button.MaterialButton-->
-            <!--                android:id="@+id/kcal"-->
-            <!--                android:layout_width="wrap_content"-->
-            <!--                android:layout_height="wrap_content"-->
-            <!--                android:text="Kcal"-->
-            <!--                android:backgroundTint="#40E0D0"-->
-            <!--                android:layout_marginRight="20dp"-->
-            <!--                android:layout_marginLeft="20dp"-->
-            <!--                app:cornerRadius="10dp"/>-->
-            <!--            <com.google.android.material.button.MaterialButton-->
-            <!--                android:id="@+id/time"-->
-            <!--                android:layout_width="wrap_content"-->
-            <!--                android:layout_height="wrap_content"-->
-            <!--                android:text="Time"-->
-            <!--                android:layout_marginRight="20dp"-->
-            <!--                android:layout_marginLeft="20dp"-->
-            <!--                android:backgroundTint="#40E0D0"-->
-            <!--                app:cornerRadius="10dp"/>-->
-            <!--            <com.google.android.material.button.MaterialButton-->
-            <!--                android:id="@+id/distance"-->
-            <!--                android:layout_width="wrap_content"-->
-            <!--                android:layout_height="wrap_content"-->
-            <!--                android:text="Distance"-->
-            <!--                android:backgroundTint="#40E0D0"-->
-            <!--                android:layout_marginRight="20dp"-->
-            <!--                android:layout_marginLeft="20dp"-->
-            <!--                app:cornerRadius="10dp"/>-->
-
-            <!--        </LinearLayout>-->
-
-            <com.google.android.material.tabs.TabLayout
-                android:id="@+id/tabs"
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/toolbarHealth"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_below="@id/viewPager"
-                android:background="@color/backgroundColor"
-                app:tabIndicatorColor="@color/dark_green"
-                app:tabSelectedTextColor="@color/dark_green"
-                app:tabTextColor="@color/textColor">
-
-                <com.google.android.material.tabs.TabItem
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="Kcal" />
+                android:background="@color/dark_green"
+                app:layout_scrollFlags="scroll|enterAlways|snap"
+                app:title="Health" />
+        </com.google.android.material.appbar.AppBarLayout>
 
-                <com.google.android.material.tabs.TabItem
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="Time" />
+        <FrameLayout
+            android:id="@+id/llHealth"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/background_img_small"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-                <com.google.android.material.tabs.TabItem
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="Distance" />
-            </com.google.android.material.tabs.TabLayout>
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:text="Track Your Performance"
+                android:textColor="@color/white"
+                android:textSize="20sp"
+                android:textStyle="bold" />
+        </FrameLayout>
+
+        <androidx.core.widget.NestedScrollView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:clipToPadding="false"
+            android:paddingTop="160dp"
+            android:scrollbars="none"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior"
+            tools:context=".ui.fragment.HealthFragment">
 
             <RelativeLayout
-                android:id="@+id/cardViewRL"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/tabs"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentEnd="true"
-                android:layout_alignParentBottom="true"
-                android:background="@color/backgroundColor"
-                android:gravity="center">
-
-                <androidx.cardview.widget.CardView
-                    android:id="@+id/heartRate"
-                    android:layout_width="180dp"
-                    android:layout_height="150dp"
-                    android:layout_alignParentStart="true"
-                    android:layout_alignParentTop="true"
+                android:layout_height="wrap_content">
+
+                <androidx.viewpager2.widget.ViewPager2
+                    android:id="@+id/viewPager"
+                    android:layout_width="match_parent"
+                    android:layout_height="200dp"
                     android:layout_marginStart="10dp"
-                    android:layout_marginTop="10dp"
                     android:layout_marginEnd="10dp"
-                    android:layout_marginBottom="5dp"
-                    android:backgroundTint="@color/dark_green"
-                    app:cardCornerRadius="10dp"
-                    app:cardElevation="15dp"
+                    android:layout_marginBottom="10dp" />
+
+                <!--        <LinearLayout-->
+                <!--            android:id="@+id/llTabs"-->
+                <!--            android:layout_width="match_parent"-->
+                <!--            android:layout_height="wrap_content"-->
+                <!--            android:orientation="horizontal"-->
+                <!--            android:layout_below="@+id/vpChart"-->
+                <!--            android:gravity="center"-->
+                <!--            >-->
+                <!--            <com.google.android.material.button.MaterialButton-->
+                <!--                android:id="@+id/kcal"-->
+                <!--                android:layout_width="wrap_content"-->
+                <!--                android:layout_height="wrap_content"-->
+                <!--                android:text="Kcal"-->
+                <!--                android:backgroundTint="#40E0D0"-->
+                <!--                android:layout_marginRight="20dp"-->
+                <!--                android:layout_marginLeft="20dp"-->
+                <!--                app:cornerRadius="10dp"/>-->
+                <!--            <com.google.android.material.button.MaterialButton-->
+                <!--                android:id="@+id/time"-->
+                <!--                android:layout_width="wrap_content"-->
+                <!--                android:layout_height="wrap_content"-->
+                <!--                android:text="Time"-->
+                <!--                android:layout_marginRight="20dp"-->
+                <!--                android:layout_marginLeft="20dp"-->
+                <!--                android:backgroundTint="#40E0D0"-->
+                <!--                app:cornerRadius="10dp"/>-->
+                <!--            <com.google.android.material.button.MaterialButton-->
+                <!--                android:id="@+id/distance"-->
+                <!--                android:layout_width="wrap_content"-->
+                <!--                android:layout_height="wrap_content"-->
+                <!--                android:text="Distance"-->
+                <!--                android:backgroundTint="#40E0D0"-->
+                <!--                android:layout_marginRight="20dp"-->
+                <!--                android:layout_marginLeft="20dp"-->
+                <!--                app:cornerRadius="10dp"/>-->
+
+                <!--        </LinearLayout>-->
+
+                <com.google.android.material.tabs.TabLayout
+                    android:id="@+id/tabs"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/viewPager"
+                    android:background="@color/backgroundColor"
+                    app:tabIndicatorColor="@color/dark_green"
+                    app:tabSelectedTextColor="@color/dark_green"
+                    app:tabTextColor="@color/textColor">
+
+                    <com.google.android.material.tabs.TabItem
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Kcal" />
+
+                    <com.google.android.material.tabs.TabItem
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Time" />
+
+                    <com.google.android.material.tabs.TabItem
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Distance" />
+                </com.google.android.material.tabs.TabLayout>
+
+                <RelativeLayout
+                    android:id="@+id/cardViewRL"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/tabs"
+                    android:layout_alignParentStart="true"
+                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentBottom="true"
+                    android:background="@color/backgroundColor"
+                    android:gravity="center">
+
+                    <androidx.cardview.widget.CardView
+                        android:id="@+id/heartRate"
+                        android:layout_width="180dp"
+                        android:layout_height="150dp"
+                        android:layout_alignParentStart="true"
+                        android:layout_alignParentTop="true"
+                        android:layout_marginStart="10dp"
+                        android:layout_marginTop="10dp"
+                        android:layout_marginEnd="10dp"
+                        android:layout_marginBottom="5dp"
+                        android:backgroundTint="@color/dark_green"
+                        app:cardCornerRadius="10dp"
+                        app:cardElevation="15dp"
 
-                    >
+                        >
 
-                    <LinearLayout
-                        android:id="@+id/cvOfHeartRate"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:gravity="center"
-                        android:orientation="vertical"
+                        <LinearLayout
+                            android:id="@+id/cvOfHeartRate"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:gravity="center"
+                            android:orientation="vertical"
+
+                            >
+
+                            <TextView
+                                android:id="@+id/valueOfHeartRate"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_margin="8dp"
+                                android:text="0 bpm"
+                                android:textSize="35sp" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:hint="Heart Rate"
+                                android:textSize="18sp" />
+
+                        </LinearLayout>
+                    </androidx.cardview.widget.CardView>
+
+                    <androidx.cardview.widget.CardView
+                        android:id="@+id/cyclingSpeed"
+                        android:layout_width="180dp"
+                        android:layout_height="150dp"
+                        android:layout_alignParentTop="true"
+                        android:layout_alignParentEnd="true"
+
+                        android:layout_marginTop="10dp"
+                        android:layout_marginEnd="10dp"
+                        android:layout_marginBottom="5dp"
+                        android:layout_toEndOf="@id/heartRate"
+                        android:backgroundTint="@color/dark_green"
+                        app:cardCornerRadius="10dp"
+                        app:cardElevation="15dp"
 
                         >
 
-                        <TextView
-                            android:id="@+id/valueOfHeartRate"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_margin="8dp"
-                            android:text="0 bpm"
-                            android:textSize="35sp" />
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:hint="Heart Rate"
-                            android:textSize="18sp" />
-
-                    </LinearLayout>
-                </androidx.cardview.widget.CardView>
-
-                <androidx.cardview.widget.CardView
-                    android:id="@+id/cyclingSpeed"
-                    android:layout_width="180dp"
-                    android:layout_height="150dp"
-                    android:layout_alignParentTop="true"
-                    android:layout_alignParentEnd="true"
-
-                    android:layout_marginTop="10dp"
-                    android:layout_marginEnd="10dp"
-                    android:layout_marginBottom="5dp"
-                    android:layout_toEndOf="@id/heartRate"
-                    android:backgroundTint="@color/dark_green"
-                    app:cardCornerRadius="10dp"
-                    app:cardElevation="15dp"
-
-                    >
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:gravity="center"
-                        android:orientation="vertical">
-
-                        <TextView
-                            android:id="@+id/valueOfCyclingSpeed"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_margin="8dp"
-                            android:fontFamily="@font/lato"
-                            android:text="0 kmph"
-                            android:textSize="35sp" />
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-
-                            android:hint="Cycling Speed"
-                            android:textSize="18sp" />
-                    </LinearLayout>
-                </androidx.cardview.widget.CardView>
-
-                <androidx.cardview.widget.CardView
-                    android:id="@+id/kcalsBurnt"
-                    android:layout_width="180dp"
-                    android:layout_height="150dp"
-                    android:layout_below="@id/heartRate"
-                    android:layout_alignParentStart="true"
-                    android:layout_marginStart="10dp"
-                    android:layout_marginTop="5dp"
-                    android:layout_marginEnd="10dp"
-                    android:layout_marginBottom="10dp"
-                    android:backgroundTint="@color/dark_green"
-                    app:cardCornerRadius="10dp"
-                    app:cardElevation="15dp">
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:gravity="center"
-                        android:orientation="vertical">
-
-                        <TextView
-                            android:id="@+id/valueOfKcalsBurnt"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_margin="8dp"
-                            android:text="0 Kcal"
-                            android:textSize="35sp" />
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:hint="Kcals Burnt"
-                            android:textSize="18sp" />
-
-                    </LinearLayout>
-                </androidx.cardview.widget.CardView>
-
-                <androidx.cardview.widget.CardView
-                    android:id="@+id/distanceCovered"
-                    android:layout_width="180dp"
-                    android:layout_height="150dp"
-
-                    android:layout_below="@id/cyclingSpeed"
-                    android:layout_alignParentEnd="true"
-                    android:layout_marginTop="5dp"
-                    android:layout_marginEnd="10dp"
-                    android:layout_marginBottom="10dp"
-                    android:layout_toRightOf="@id/kcalsBurnt"
-                    android:backgroundTint="@color/dark_green"
-                    app:cardCornerRadius="10dp"
-                    app:cardElevation="15dp">
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:gravity="center"
-                        android:orientation="vertical">
-
-                        <TextView
-                            android:id="@+id/valueOfDistanceCovered"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_margin="8dp"
-                            android:text="0 Km"
-                            android:textSize="35sp" />
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:hint="Distance Covered"
-                            android:textSize="18sp" />
-                    </LinearLayout>
-                </androidx.cardview.widget.CardView>
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:gravity="center"
+                            android:orientation="vertical">
+
+                            <TextView
+                                android:id="@+id/valueOfCyclingSpeed"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_margin="8dp"
+                                android:fontFamily="@font/lato"
+                                android:text="0 kmph"
+                                android:textSize="35sp" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:hint="Cycling Speed"
+                                android:textSize="18sp" />
+                        </LinearLayout>
+                    </androidx.cardview.widget.CardView>
+
+                    <androidx.cardview.widget.CardView
+                        android:id="@+id/kcalsBurnt"
+                        android:layout_width="180dp"
+                        android:layout_height="150dp"
+                        android:layout_below="@id/heartRate"
+                        android:layout_alignParentStart="true"
+                        android:layout_marginStart="10dp"
+                        android:layout_marginTop="5dp"
+                        android:layout_marginEnd="10dp"
+                        android:layout_marginBottom="10dp"
+                        android:backgroundTint="@color/dark_green"
+                        app:cardCornerRadius="10dp"
+                        app:cardElevation="15dp">
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:gravity="center"
+                            android:orientation="vertical">
+
+                            <TextView
+                                android:id="@+id/valueOfKcalsBurnt"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_margin="8dp"
+                                android:text="0 Kcal"
+                                android:textSize="35sp" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:hint="Kcals Burnt"
+                                android:textSize="18sp" />
+
+                        </LinearLayout>
+                    </androidx.cardview.widget.CardView>
+
+                    <androidx.cardview.widget.CardView
+                        android:id="@+id/distanceCovered"
+                        android:layout_width="180dp"
+                        android:layout_height="150dp"
+
+                        android:layout_below="@id/cyclingSpeed"
+                        android:layout_alignParentEnd="true"
+                        android:layout_marginTop="5dp"
+                        android:layout_marginEnd="10dp"
+                        android:layout_marginBottom="10dp"
+                        android:layout_toRightOf="@id/kcalsBurnt"
+                        android:backgroundTint="@color/dark_green"
+                        app:cardCornerRadius="10dp"
+                        app:cardElevation="15dp">
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:gravity="center"
+                            android:orientation="vertical">
+
+                            <TextView
+                                android:id="@+id/valueOfDistanceCovered"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_margin="8dp"
+                                android:text="0 Km"
+                                android:textSize="35sp" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:hint="Distance Covered"
+                                android:textSize="18sp" />
+                        </LinearLayout>
+                    </androidx.cardview.widget.CardView>
+                </RelativeLayout>
             </RelativeLayout>
-        </RelativeLayout>
-    </ScrollView>
+        </androidx.core.widget.NestedScrollView>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </FrameLayout>
 
diff --git a/app/src/main/res/layout/fragment_leaderboard.xml b/app/src/main/res/layout/fragment_leaderboard.xml
index 38eccaf..4a00b4f 100644
--- a/app/src/main/res/layout/fragment_leaderboard.xml
+++ b/app/src/main/res/layout/fragment_leaderboard.xml
@@ -1,145 +1,145 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:context=".ui.fragment.LeaderboardFragment">
 
-    <RelativeLayout
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/backgroundColor"
-        >
+        android:background="@color/backgroundColor">
 
-        <LinearLayout
-            android:id="@+id/llLeaderboard"
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/appBarLayout"
             android:layout_width="match_parent"
-            android:layout_height="200dp"
-            android:orientation="vertical"
-            android:layout_marginTop="0dp"
-            android:background="@drawable/background_img">
-            <com.google.android.material.appbar.AppBarLayout
-                android:id="@+id/appBarLayout"
+            android:layout_height="wrap_content"
+            android:fitsSystemWindows="true"
+            android:outlineAmbientShadowColor="@color/dark_green"
+            android:outlineSpotShadowColor="@color/dark_green"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/toolbarDashboard"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:outlineAmbientShadowColor="@color/dark_green"
-                android:outlineSpotShadowColor="@color/dark_green"
+                android:background="@color/dark_green"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
-                <com.google.android.material.appbar.MaterialToolbar
-                    android:id="@+id/toolbarDashboard"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="@color/dark_green"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="parent">
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_scrollFlags="scroll|enterAlways|snap"
+                app:title="Leaderboard" />
+        </com.google.android.material.appbar.AppBarLayout>
 
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+            <ImageView
+                android:id="@+id/bg_image"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@drawable/background_img_small"
+                android:importantForAccessibility="no" />
 
-                </com.google.android.material.appbar.MaterialToolbar>
-            </com.google.android.material.appbar.AppBarLayout>
             <androidx.appcompat.widget.SearchView
                 android:id="@+id/searchBox"
-                android:textColor="@color/black"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:drawableStart="@drawable/ic_baseline_search_24"
                 android:layout_marginStart="20dp"
                 android:layout_marginTop="20dp"
                 android:layout_marginEnd="20dp"
                 android:layout_marginBottom="20dp"
-                android:backgroundTint="@color/backgroundColor"
-                app:queryHint="Search The LeaderBoard..."
                 android:background="@drawable/background_line"
-                app:iconifiedByDefault="false"
+                android:backgroundTint="@color/backgroundColor"
+                android:drawableStart="@drawable/ic_baseline_search_24"
+                android:textColor="@color/black"
                 android:textSize="10sp"
-                />
-        </LinearLayout>
-        <ImageView
-            android:layout_width="60dp"
-            android:layout_height="60dp"
-            android:src="@drawable/medal"
-            android:layout_below="@id/llLeaderboard"
-            android:layout_marginTop="28dp"
-            android:layout_marginStart="15dp"/>
-        <androidx.cardview.widget.CardView
-            android:id="@+id/rankOfUser"
-            app:cardCornerRadius="10dp"
-            app:cardElevation="16dp"
-            android:layout_marginTop="18dp"
-            android:layout_marginEnd="16sp"
-            android:backgroundTint="@color/topUserCardColor"
-            android:outlineSpotShadowColor="@color/topUserCardColor"
-            android:layout_width="300dp"
-            android:layout_height="85dp"
-            android:layout_below="@+id/llLeaderboard"
-            android:layout_marginStart="90dp">
-
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_margin="10dp">
+                app:iconifiedByDefault="false"
+                app:queryHint="Search The LeaderBoard..." />
 
-                <LinearLayout
-                    android:id="@+id/llUserName"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="10dp"
-                    android:layout_marginTop="10dp"
-                    android:layout_marginRight="10dp"
-                    android:orientation="horizontal"
-                    android:layout_alignParentEnd="true"
-                    android:layout_alignParentStart="true"
-                    >
+            <ImageView
+                android:layout_width="60dp"
+                android:layout_height="60dp"
+                android:layout_below="@id/bg_image"
+                android:layout_marginStart="15dp"
+                android:layout_marginTop="28dp"
+                android:src="@drawable/medal" />
 
+            <androidx.cardview.widget.CardView
+                android:id="@+id/rankOfUser"
+                android:layout_width="300dp"
+                android:layout_height="85dp"
+                android:layout_below="@+id/bg_image"
+                android:layout_marginStart="90dp"
+                android:layout_marginTop="18dp"
+                android:layout_marginEnd="16sp"
+                android:backgroundTint="@color/topUserCardColor"
+                android:outlineSpotShadowColor="@color/topUserCardColor"
+                app:cardCornerRadius="10dp"
+                app:cardElevation="16dp">
 
-                    <TextView
-                        android:id="@+id/nameOfUser"
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="10dp">
+
+                    <LinearLayout
+                        android:id="@+id/llUserName"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="Aditya Gupta"
-                        android:textSize="20sp"
-                        android:textStyle="bold" />
+                        android:layout_alignParentStart="true"
+                        android:layout_alignParentEnd="true"
+                        android:layout_marginLeft="10dp"
+                        android:layout_marginTop="10dp"
+                        android:layout_marginRight="10dp"
+                        android:orientation="horizontal">
+
+
+                        <TextView
+                            android:id="@+id/nameOfUser"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="Aditya Gupta"
+                            android:textSize="20sp"
+                            android:textStyle="bold" />
+
+                        <TextView
+                            android:id="@+id/distanceCovered"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:gravity="end"
+                            android:text="0.0km "
+                            android:textSize="20sp" />
+                    </LinearLayout>
+
                     <TextView
-                        android:id="@+id/distanceCovered"
-                        android:layout_width="0dp"
+                        android:id="@+id/emailOfUser"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="end"
-                        android:text="0.0km "
-                        android:textSize="20sp" />
-                </LinearLayout>
-
-                <TextView
-                    android:id="@+id/emailOfUser"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@+id/llUserName"
-                    android:layout_marginLeft="10dp"
-                    android:text="ashishgupta9936@gmail.com"
-                    android:textSize="17sp"
-                    android:maxLines="1"
-                    android:ellipsize="end"/>
-
-
-            </RelativeLayout>
-        </androidx.cardview.widget.CardView>
-        <LinearLayout
-            android:layout_below="@id/rankOfUser"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginTop="16sp"
-            android:background="@color/backgroundColor"
-            >
+                        android:layout_below="@+id/llUserName"
+                        android:layout_marginStart="10dp"
+                        android:ellipsize="end"
+                        android:maxLines="1"
+                        android:text="ashishgupta9936@gmail.com"
+                        android:textSize="17sp" />
+
+
+                </RelativeLayout>
+            </androidx.cardview.widget.CardView>
+
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/rvLeaderboard"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_gravity="center"
-                />
-        </LinearLayout>
-
-    </RelativeLayout>
-
+                android:layout_height="wrap_content"
+                android:layout_below="@id/rankOfUser"
+                android:clipToPadding="false"
+                android:paddingTop="16dp"
+                tools:listitem="@layout/item_leaderboard" />
+        </RelativeLayout>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </FrameLayout>
\ No newline at end of file