diff --git a/app/src/main/java/com/prasan/kotlinmvvmhiltflowapp/presentation/fragment/PopularPhotosFragment.kt b/app/src/main/java/com/prasan/kotlinmvvmhiltflowapp/presentation/fragment/PopularPhotosFragment.kt
index 79dd80f..986c325 100644
--- a/app/src/main/java/com/prasan/kotlinmvvmhiltflowapp/presentation/fragment/PopularPhotosFragment.kt
+++ b/app/src/main/java/com/prasan/kotlinmvvmhiltflowapp/presentation/fragment/PopularPhotosFragment.kt
@@ -9,6 +9,8 @@ import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.Observer
 import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.StaggeredGridLayoutManager
+import androidx.recyclerview.widget.StaggeredGridLayoutManager.VERTICAL
 import com.prasan.kotlinmvvmhiltflowapp.*
 import com.prasan.kotlinmvvmhiltflowapp.data.datamodel.Photo
 import com.prasan.kotlinmvvmhiltflowapp.data.datamodel.PhotoDetails
@@ -63,8 +65,9 @@ class PopularPhotosFragment : Fragment() {
 
     @ExperimentalCoroutinesApi
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-
         super.onViewCreated(view, savedInstanceState)
+        binding.popularPhotoList.layoutManager = StaggeredGridLayoutManager(2, VERTICAL)
+
         binding.popularPhotoList.addOnScrollListener(object : RecyclerView.OnScrollListener() {
 
             override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
diff --git a/app/src/main/res/layout/popular_photos_fragment.xml b/app/src/main/res/layout/popular_photos_fragment.xml
index 5a0bea3..746d18a 100644
--- a/app/src/main/res/layout/popular_photos_fragment.xml
+++ b/app/src/main/res/layout/popular_photos_fragment.xml
@@ -12,11 +12,6 @@
             android:id="@+id/popular_photo_list"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:clipToPadding="false"
-            android:padding="2dp"
-            app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
-            app:spanCount="2"
-            tools:itemCount="30"
             tools:listitem="@layout/popular_photos_item" />
 
         <ProgressBar
diff --git a/app/src/main/res/layout/popular_photos_item.xml b/app/src/main/res/layout/popular_photos_item.xml
index b0e3b02..8900d6d 100644
--- a/app/src/main/res/layout/popular_photos_item.xml
+++ b/app/src/main/res/layout/popular_photos_item.xml
@@ -1,19 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout>
 
-    <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:padding="8dp">
+        android:layout_height="wrap_content"
+        android:layout_margin="2dp"
+        app:cardBackgroundColor="@android:color/white"
+        app:cardCornerRadius="0dp"
+        app:cardPreventCornerOverlap="false">
 
         <ImageView
             android:id="@+id/popular_photo"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:contentDescription="@string/photo_from_popular_section"
+            android:layout_margin="2dp"
+            android:adjustViewBounds="true"
+            android:scaleType="fitXY"
             tools:src="@drawable/ic_launcher_background" />
 
-    </FrameLayout>
+    </androidx.cardview.widget.CardView>
 </layout>
\ No newline at end of file