diff --git a/app/build.gradle b/app/build.gradle
index 43bd303..f47d934 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -43,6 +43,7 @@ android {
 
     buildFeatures {
         viewBinding = true
+        dataBinding = true
     }
 }
 
@@ -55,7 +56,7 @@ dependencies {
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
-
+    implementation 'androidx.recyclerview:recyclerview:1.2.1'
     // networking
     implementation 'com.squareup.moshi:moshi:1.14.0'
     implementation 'com.squareup.moshi:moshi-kotlin:1.14.0'
@@ -95,6 +96,9 @@ dependencies {
     implementation("com.google.firebase:firebase-crashlytics-ktx")
     implementation("com.google.firebase:firebase-analytics-ktx")
 
+    // lottie
     implementation 'com.airbnb.android:lottie:6.0.0'
 
+    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01"
+
 }
\ No newline at end of file
diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png
deleted file mode 100644
index b2ae6d6..0000000
Binary files a/app/src/main/ic_launcher-playstore.png and /dev/null differ
diff --git a/app/src/main/java/com/example/rickmorty/BindingAdapter.kt b/app/src/main/java/com/example/rickmorty/BindingAdapter.kt
new file mode 100644
index 0000000..5ce144a
--- /dev/null
+++ b/app/src/main/java/com/example/rickmorty/BindingAdapter.kt
@@ -0,0 +1,16 @@
+package com.example.rickmorty
+
+import android.widget.ImageView
+import androidx.databinding.BindingAdapter
+import com.squareup.picasso.Picasso
+
+
+//In Kotlin, the let function is a scoping function that allows you to perform operations on a non-null object within a safe context.
+// It is particularly useful for executing a block of code only if the object is not null.
+@BindingAdapter("setImage")
+fun bindImage(imgView: ImageView, imgUrl: String?) {
+    // it will only execute if imageUrl is non null
+    imgUrl?.let {
+        Picasso.get().load(imgUrl).into(imgView)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/rickmorty/HomeActivity.kt b/app/src/main/java/com/example/rickmorty/HomeActivity.kt
index ce8e462..2be3c00 100644
--- a/app/src/main/java/com/example/rickmorty/HomeActivity.kt
+++ b/app/src/main/java/com/example/rickmorty/HomeActivity.kt
@@ -1,5 +1,7 @@
 package com.example.rickmorty
 
+import android.content.Intent
+import android.net.Uri
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.drawerlayout.widget.DrawerLayout
@@ -42,8 +44,19 @@ class HomeActivity : AppCompatActivity() {
             navController.graph.startDestinationId
         )
 
+
+        // about dev menu item
+        val menu = findViewById<NavigationView>(R.id.nav_view).menu
+        val aboutDev = menu.findItem(R.id.about_dev)
+        aboutDev?.setOnMenuItemClickListener {
+            val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://harisheoran.github.io"))
+            startActivity(intent)
+            true
+        }
     }
 
+
+
     // support back navigation
     override fun onSupportNavigateUp(): Boolean {
         return navController.navigateUp(appBarConfiguration)
diff --git a/app/src/main/java/com/example/rickmorty/characters/CharacterListAdapter.kt b/app/src/main/java/com/example/rickmorty/characters/CharacterListAdapter.kt
new file mode 100644
index 0000000..344bcd3
--- /dev/null
+++ b/app/src/main/java/com/example/rickmorty/characters/CharacterListAdapter.kt
@@ -0,0 +1,46 @@
+package com.example.rickmorty.characters
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.paging.PagingDataAdapter
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.RecyclerView
+import com.example.rickmorty.databinding.ModelCharacterListItemBinding
+import com.example.rickmorty.network.response.GetCharacterByIdResponse
+
+class CharacterListAdapter(private val onCharacterClick: (Int) -> Unit) :
+    PagingDataAdapter<GetCharacterByIdResponse, RecyclerView.ViewHolder>(DiffCallback) {
+
+    class CharacterViewHolder(var binding: ModelCharacterListItemBinding) : RecyclerView.ViewHolder(binding.root) {
+        fun bind(onCharacterClick: (Int) -> Unit, character: GetCharacterByIdResponse) {
+            binding.character = character
+            binding.executePendingBindings()
+            binding.root.setOnClickListener {
+                onCharacterClick(character.id)
+            }
+        }
+    }
+
+
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+        val view = CharacterViewHolder(ModelCharacterListItemBinding.inflate(LayoutInflater.from(parent.context)))
+        return view
+    }
+
+    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+        val myCharacter = getItem(position)
+        (holder as? CharacterViewHolder)?.bind(onCharacterClick, myCharacter!!)
+    }
+
+    companion object DiffCallback : DiffUtil.ItemCallback<GetCharacterByIdResponse>() {
+        override fun areItemsTheSame(oldItem: GetCharacterByIdResponse, newItem: GetCharacterByIdResponse): Boolean {
+            return oldItem.name == newItem.name
+        }
+
+        override fun areContentsTheSame(oldItem: GetCharacterByIdResponse, newItem: GetCharacterByIdResponse): Boolean {
+            return oldItem.name == newItem.name
+        }
+    }
+}
+
diff --git a/app/src/main/java/com/example/rickmorty/characters/CharacterListFragment.kt b/app/src/main/java/com/example/rickmorty/characters/CharacterListFragment.kt
index 531ac02..1f14fe3 100644
--- a/app/src/main/java/com/example/rickmorty/characters/CharacterListFragment.kt
+++ b/app/src/main/java/com/example/rickmorty/characters/CharacterListFragment.kt
@@ -4,14 +4,18 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.view.isVisible
+import androidx.core.widget.ContentLoadingProgressBar
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
-import com.airbnb.epoxy.EpoxyRecyclerView
-import com.airbnb.lottie.LottieAnimationView
+import androidx.paging.LoadState
+import androidx.recyclerview.widget.RecyclerView
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import com.example.rickmorty.NetworkViewModel
 import com.example.rickmorty.R
+import com.google.android.material.button.MaterialButton
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
 
@@ -25,6 +29,8 @@ class CharacterListFragment : Fragment() {
         ViewModelProvider(this).get(CharacterListViewModel::class.java)
     }
 
+    private lateinit var characterAdapter: CharacterListAdapter
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -35,39 +41,55 @@ class CharacterListFragment : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        view.findViewById<LottieAnimationView>(R.id.loading).visibility = View.VISIBLE
-        view.findViewById<LottieAnimationView>(R.id.no_internet).visibility = View.GONE
-
-        networkViewModel = ViewModelProvider(this).get(NetworkViewModel::class.java)
-
-
-        networkViewModel.getNetworkState().observe(viewLifecycleOwner, {
-            if (it) {
-                view.findViewById<LottieAnimationView>(R.id.loading).visibility = View.GONE
-                view.findViewById<EpoxyRecyclerView>(R.id.epoxy_character_recycler_view).visibility = View.VISIBLE
-                view.findViewById<LottieAnimationView>(R.id.no_internet).visibility = View.GONE
-                lifecycleScope.launch {
-                    viewModel.pagingDataFlow.collectLatest {
-                        epoxyController.submitData(it)
-                    }
-                }
-            } else {
-                view.findViewById<LottieAnimationView>(R.id.loading).visibility = View.GONE
-                view.findViewById<EpoxyRecyclerView>(R.id.epoxy_character_recycler_view).visibility = View.GONE
-                view.findViewById<LottieAnimationView>(R.id.no_internet).visibility = View.VISIBLE
+        characterAdapter = CharacterListAdapter(::onCharacterClicked)
+
+        initViewModelData()
+        initRecyclerView()
+
+    }
+
+    private fun initViewModelData() {
+        lifecycleScope.launch {
+            viewModel.pagingDataFlow.collectLatest {
+                characterAdapter.submitData(it)
             }
-        })
+        }
+    }
+
 
+    private fun initRecyclerView() {
+        view?.findViewById<RecyclerView>(R.id.character_recycler_view)?.adapter =
+            characterAdapter.withLoadStateHeaderAndFooter(
+                header = PagingLoadStateAdapter { characterAdapter.retry() },
+                footer = PagingLoadStateAdapter { characterAdapter.retry() }
+            )
+
+
+        characterAdapter.addLoadStateListener { loadState ->
+            view?.findViewById<SwipeRefreshLayout>(R.id.swipe_refresh)?.isRefreshing =
+                loadState.refresh is LoadState.Loading
+            view?.findViewById<RecyclerView>(R.id.character_recycler_view)?.isVisible =
+                loadState.source.refresh is LoadState.NotLoading
+            view?.findViewById<ContentLoadingProgressBar>(R.id.progress_bar)?.isVisible =
+                loadState.source.refresh is LoadState.Loading
+            view?.findViewById<MaterialButton>(R.id.retry_button)?.isVisible =
+                loadState.source.refresh is LoadState.Error
+
+        }
+
+        view?.findViewById<SwipeRefreshLayout>(R.id.swipe_refresh)?.setOnRefreshListener {
+            characterAdapter.refresh()
+        }
+
+        view?.findViewById<MaterialButton>(R.id.retry_button)?.setOnClickListener {
+            characterAdapter.retry()
+        }
 
-        view.findViewById<EpoxyRecyclerView>(R.id.epoxy_character_recycler_view)
-            .setController(epoxyController)
     }
 
-    private fun onCharacterClicked(characterId: Int) {
 
-        val action = CharacterListFragmentDirections.actionCharacterListFragmentToCharacterFragment(
-            characterId
-        )
+    private fun onCharacterClicked(characterId: Int) {
+        val action = CharacterListFragmentDirections.actionCharacterListFragmentToCharacterFragment(characterId)
         findNavController().navigate(action)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/rickmorty/characters/CharacterListPagingDataSource.kt b/app/src/main/java/com/example/rickmorty/characters/CharacterListPagingDataSource.kt
index 2fdf02e..9728b22 100644
--- a/app/src/main/java/com/example/rickmorty/characters/CharacterListPagingDataSource.kt
+++ b/app/src/main/java/com/example/rickmorty/characters/CharacterListPagingDataSource.kt
@@ -37,6 +37,10 @@ class CharacterListPagingDataSource(
     }
 
     override fun getRefreshKey(state: PagingState<Int, GetCharacterByIdResponse>): Int? {
-        TODO("Not yet implemented")
+        return state.anchorPosition?.let { anchorPosition ->
+            val anchorPage = state.closestPageToPosition(anchorPosition)
+            anchorPage?.prevKey?.plus(1) ?: anchorPage?.nextKey?.minus(1)
+
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/rickmorty/characters/CharacterListViewModel.kt b/app/src/main/java/com/example/rickmorty/characters/CharacterListViewModel.kt
index 7007915..19975e1 100644
--- a/app/src/main/java/com/example/rickmorty/characters/CharacterListViewModel.kt
+++ b/app/src/main/java/com/example/rickmorty/characters/CharacterListViewModel.kt
@@ -27,5 +27,4 @@ class CharacterListViewModel : ViewModel() {
 
     val pagingDataFlow: Flow<PagingData<GetCharacterByIdResponse>> = pager.flow.cachedIn(viewModelScope)
 
-
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/rickmorty/characters/PagingLoadStateAdapter.kt b/app/src/main/java/com/example/rickmorty/characters/PagingLoadStateAdapter.kt
new file mode 100644
index 0000000..75946a0
--- /dev/null
+++ b/app/src/main/java/com/example/rickmorty/characters/PagingLoadStateAdapter.kt
@@ -0,0 +1,48 @@
+package com.example.rickmorty.characters
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.view.isVisible
+import androidx.core.widget.ContentLoadingProgressBar
+import androidx.paging.LoadState
+import androidx.paging.LoadStateAdapter
+import androidx.recyclerview.widget.RecyclerView
+import com.example.rickmorty.R
+import com.google.android.material.button.MaterialButton
+import com.google.android.material.textview.MaterialTextView
+
+class PagingLoadStateAdapter(val retryCallback: () -> Unit) :
+    LoadStateAdapter<PagingLoadStateAdapter.LoadStateViewHolder>() {
+
+    class LoadStateViewHolder(itemView: View, retry: () -> Unit) : RecyclerView.ViewHolder(itemView) {
+
+        init {
+            itemView.findViewById<MaterialButton>(R.id.retry_button).setOnClickListener {
+                retry.invoke()
+            }
+        }
+
+        val progressBar = itemView.findViewById<ContentLoadingProgressBar>(R.id.progress_bar)
+        val errorText = itemView.findViewById<MaterialTextView>(R.id.error_msg)
+        fun bind(loadState: LoadState) {
+            if (loadState is LoadState.Error) {
+                errorText.text = "Try Again later..."
+            }
+            progressBar.isVisible = loadState is LoadState.Loading
+            itemView.findViewById<MaterialButton>(R.id.retry_button).isVisible = loadState !is LoadState.Error
+            errorText.isVisible = loadState !is LoadState.Loading
+        }
+    }
+
+    override fun onBindViewHolder(holder: LoadStateViewHolder, loadState: LoadState) {
+        holder.bind(loadState)
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, loadState: LoadState): LoadStateViewHolder {
+        return LoadStateViewHolder(
+            LayoutInflater.from(parent.context).inflate(R.layout.model_network_state, parent, false),
+            retry = retryCallback
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/appicon.jpg b/app/src/main/res/drawable/appicon.jpg
deleted file mode 100644
index e6aaac3..0000000
Binary files a/app/src/main/res/drawable/appicon.jpg and /dev/null differ
diff --git a/app/src/main/res/drawable/episode_number_bg.xml b/app/src/main/res/drawable/episode_number_bg.xml
index ff7fe9d..94e6961 100644
--- a/app/src/main/res/drawable/episode_number_bg.xml
+++ b/app/src/main/res/drawable/episode_number_bg.xml
@@ -3,7 +3,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        android:shape="rectangle">
 
-    <solid android:color="@color/md_theme_light_secondary"/> <!-- Replace "#FF0000" with your desired color -->
+    <solid android:color="?colorTertiary"/> <!-- Replace "#FF0000" with your desired color -->
 
     <!-- Optional: Add corner radius to round the corners -->
     <corners android:bottomLeftRadius="8dp" />
diff --git a/app/src/main/res/drawable/info_24.xml b/app/src/main/res/drawable/info_24.xml
new file mode 100644
index 0000000..e0ecb40
--- /dev/null
+++ b/app/src/main/res/drawable/info_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-6h2v6zM13,9h-2L11,7h2v2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/main.png b/app/src/main/res/drawable/main.png
new file mode 100644
index 0000000..852cd73
Binary files /dev/null and b/app/src/main/res/drawable/main.png differ
diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
index 041058d..ba868ae 100644
--- a/app/src/main/res/layout/activity_home.xml
+++ b/app/src/main/res/layout/activity_home.xml
@@ -28,7 +28,7 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_gravity="start"
-        android:fitsSystemWindows="true"
+        android:fitsSystemWindows="false"
         app:headerLayout="@layout/header_drawer_layout"
         app:menu="@menu/menu_drawer"/>
 
diff --git a/app/src/main/res/layout/fragment_character__list.xml b/app/src/main/res/layout/fragment_character__list.xml
index ad03e2d..7f78cbf 100644
--- a/app/src/main/res/layout/fragment_character__list.xml
+++ b/app/src/main/res/layout/fragment_character__list.xml
@@ -1,42 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+    android:id="@+id/swipe_refresh"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".characters.CharacterListFragment">
-
-    <com.airbnb.lottie.LottieAnimationView
-        android:id="@+id/loading"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:lottie_autoPlay="true"
-        app:lottie_fileName="loading.json"
-        app:lottie_loop="true"
-        app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"/>
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <com.airbnb.epoxy.EpoxyRecyclerView
-        android:id="@+id/epoxy_character_recycler_view"
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:itemSpacing="8dp"
-        android:padding="8dp"
-        app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
-        app:spanCount="2"/>
+        android:layout_height="match_parent">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/character_recycler_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:paddingStart="8dp"
+            android:paddingEnd="8dp"
+            android:clipToPadding="false"
+            app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+            app:spanCount="2"
+            tools:listitem="@layout/model_character_list_item" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/retry_button"
+            style="@style/Widget.MaterialComponents.Button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Retry"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:layout_marginTop="8dp"
+            android:visibility="gone" />
+
+        <androidx.core.widget.ContentLoadingProgressBar
+            android:id="@+id/progress_bar"
+            style="?android:attr/progressBarStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:visibility="gone" />
 
-    <com.airbnb.lottie.LottieAnimationView
-        android:id="@+id/no_internet"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:lottie_autoPlay="true"
-        app:lottie_fileName="no_internet.json"
-        app:lottie_loop="true"/>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
diff --git a/app/src/main/res/layout/header_drawer_layout.xml b/app/src/main/res/layout/header_drawer_layout.xml
index ea7408e..9bdb24e 100644
--- a/app/src/main/res/layout/header_drawer_layout.xml
+++ b/app/src/main/res/layout/header_drawer_layout.xml
@@ -1,8 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="200dp"
-    android:background="@color/md_theme_light_primary">
+    android:layout_height="150dp">
+
+    <com.google.android.material.card.MaterialCardView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_margin="8dp"
+        app:cardCornerRadius="8dp"
+        app:cardElevation="6dp">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="?colorSurface">
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:id="@+id/headerImageView"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:scaleType="centerCrop"
+                app:layout_constraintDimensionRatio="1:1"
+                app:layout_constraintStart_toStartOf="parent"
+                app:srcCompat="@drawable/main"/>
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/headerTextView"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:ellipsize="end"
+                android:gravity="center_vertical"
+                android:maxLines="2"
+                android:paddingHorizontal="12dp"
+                android:text="@string/app_name"
+                android:textColor="?colorOnSurface"
+                android:textSize="20sp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/headerImageView"/>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </com.google.android.material.card.MaterialCardView>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/model_character_list_item.xml b/app/src/main/res/layout/model_character_list_item.xml
index e141a80..2973fb3 100644
--- a/app/src/main/res/layout/model_character_list_item.xml
+++ b/app/src/main/res/layout/model_character_list_item.xml
@@ -1,34 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<com.google.android.material.card.MaterialCardView
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    app:cardCornerRadius="8dp"
-    android:layout_height="220dp">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
+<layout xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools">
+    <data>
+        <variable name="character" type="com.example.rickmorty.network.response.GetCharacterByIdResponse"/>
+    </data>
+
+    <com.google.android.material.card.MaterialCardView
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        app:cardCornerRadius="8dp"
+        app:cardPreventCornerOverlap="true"
+        app:cardElevation="4dp"
+        app:cardUseCompatPadding="true"
+        android:layout_margin="16dp"
+        android:elevation="16dp"
 
-        <androidx.appcompat.widget.AppCompatImageView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:id="@+id/character_list_image_view"
-            android:scaleType="centerCrop"/>
+        android:layout_height="wrap_content">
 
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/character_list_text_view"
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="#44000000"
-            android:padding="16dp"
-            android:textColor="@color/black"
-            android:textSize="18sp"
-            android:textStyle="bold"
-            app:layout_constraintBottom_toBottomOf="parent"/>
+            android:layout_height="match_parent">
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:layout_width="match_parent"
+                android:layout_height="220dp"
+                android:src="@drawable/main"
+                android:id="@+id/character_list_image_view"
+                app:setImage="@{character.image}"
+                android:scaleType="centerCrop"/>
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/character_list_text_view"
+                android:text="@{character.name}"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="#44000000"
+                android:padding="16dp"
+                android:textColor="@color/black"
+                android:textSize="18sp"
+                android:textStyle="bold"
+                app:layout_constraintBottom_toBottomOf="parent"/>
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
-</com.google.android.material.card.MaterialCardView>
+    </com.google.android.material.card.MaterialCardView>
+</layout>
diff --git a/app/src/main/res/layout/model_episodes_page.xml b/app/src/main/res/layout/model_episodes_page.xml
index 7675177..934d6db 100644
--- a/app/src/main/res/layout/model_episodes_page.xml
+++ b/app/src/main/res/layout/model_episodes_page.xml
@@ -7,8 +7,8 @@
     android:layout_height="80dp"
     app:cardCornerRadius="8dp"
     app:cardElevation="8dp"
-    app:strokeColor="?colorOnSurface"
-    app:cardBackgroundColor="@color/md_theme_light_primaryContainer">
+    app:strokeColor="@color/black"
+    app:cardBackgroundColor="?colorPrimaryContainer">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
@@ -28,6 +28,7 @@
             android:layout_height="wrap_content"
             android:text="Episode Name"
             android:textSize="18sp"
+            android:textColor="?colorOnPrimaryContainer"
             android:textStyle="bold"
             app:layout_constraintBottom_toTopOf="@+id/textAirDate"
             app:layout_constraintStart_toStartOf="@+id/guideline1" app:layout_constraintTop_toTopOf="parent"
@@ -40,6 +41,7 @@
             android:layout_height="wrap_content"
             android:text="Air Date"
             android:textSize="14sp"
+            android:textColor="?colorOnPrimaryContainer"
             android:layout_marginTop="4dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="@+id/textEpisodeName"
diff --git a/app/src/main/res/layout/model_loading.xml b/app/src/main/res/layout/model_loading.xml
index 253b0f5..aa319db 100644
--- a/app/src/main/res/layout/model_loading.xml
+++ b/app/src/main/res/layout/model_loading.xml
@@ -10,7 +10,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:indeterminateOnly="true"
-        android:indeterminateTint="?attr/colorSecondary"
+        android:indeterminateTint="@color/md_theme_dark_inversePrimary"
         style="?android:attr/progressBarStyle"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/model_network_state.xml b/app/src/main/res/layout/model_network_state.xml
new file mode 100644
index 0000000..a7fbbf5
--- /dev/null
+++ b/app/src/main/res/layout/model_network_state.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/linearLayout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/error_msg"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:gravity="center"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="No Internet Connection"/>
+
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/retry_button"
+        style="@style/Widget.AppCompat.Button.Colored"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:text="Retry"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"/>
+
+    <androidx.core.widget.ContentLoadingProgressBar
+        android:id="@+id/progress_bar"
+        style="?android:attr/progressBarStyle"
+        android:layout_width="0dp"
+        android:indeterminateTint="@color/md_theme_dark_inversePrimary"
+
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"/>
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/menu/menu_drawer.xml b/app/src/main/res/menu/menu_drawer.xml
index eea96b3..3a82544 100644
--- a/app/src/main/res/menu/menu_drawer.xml
+++ b/app/src/main/res/menu/menu_drawer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:title="Characters">
         <menu>
             <group android:checkableBehavior="single">
@@ -20,4 +20,10 @@
         </menu>
     </item>
 
+
+    <item android:id="@+id/about_dev"
+          android:title="About Developer"
+          android:icon="@drawable/info_24"/>
+
+
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index d6a5923..dbd2b32 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,65 +1,65 @@
 
 <resources>
     <color name="black">#FF000000</color>
-    <color name="seed">#f9bf1e</color>
-    <color name="md_theme_light_primary">#785A00</color>
+    <color name="seed">#344955</color>
+    <color name="md_theme_light_primary">#006688</color>
     <color name="md_theme_light_onPrimary">#FFFFFF</color>
-    <color name="md_theme_light_primaryContainer">#FFDF9C</color>
-    <color name="md_theme_light_onPrimaryContainer">#251A00</color>
-    <color name="md_theme_light_secondary">#006971</color>
+    <color name="md_theme_light_primaryContainer">#C2E8FF</color>
+    <color name="md_theme_light_onPrimaryContainer">#001E2C</color>
+    <color name="md_theme_light_secondary">#845400</color>
     <color name="md_theme_light_onSecondary">#FFFFFF</color>
-    <color name="md_theme_light_secondaryContainer">#82F3FF</color>
-    <color name="md_theme_light_onSecondaryContainer">#002022</color>
-    <color name="md_theme_light_tertiary">#944B00</color>
+    <color name="md_theme_light_secondaryContainer">#FFDDB6</color>
+    <color name="md_theme_light_onSecondaryContainer">#2A1800</color>
+    <color name="md_theme_light_tertiary">#006684</color>
     <color name="md_theme_light_onTertiary">#FFFFFF</color>
-    <color name="md_theme_light_tertiaryContainer">#FFDCC5</color>
-    <color name="md_theme_light_onTertiaryContainer">#301400</color>
+    <color name="md_theme_light_tertiaryContainer">#BDE9FF</color>
+    <color name="md_theme_light_onTertiaryContainer">#001F2A</color>
     <color name="md_theme_light_error">#BA1A1A</color>
     <color name="md_theme_light_errorContainer">#FFDAD6</color>
     <color name="md_theme_light_onError">#FFFFFF</color>
     <color name="md_theme_light_onErrorContainer">#410002</color>
-    <color name="md_theme_light_background">#FFFBFF</color>
-    <color name="md_theme_light_onBackground">#2A1800</color>
-    <color name="md_theme_light_surface">#FFFBFF</color>
-    <color name="md_theme_light_onSurface">#2A1800</color>
-    <color name="md_theme_light_surfaceVariant">#EDE1CF</color>
-    <color name="md_theme_light_onSurfaceVariant">#4D4639</color>
-    <color name="md_theme_light_outline">#7F7667</color>
-    <color name="md_theme_light_inverseOnSurface">#FFEEDE</color>
-    <color name="md_theme_light_inverseSurface">#462A00</color>
-    <color name="md_theme_light_inversePrimary">#F8BE1C</color>
+    <color name="md_theme_light_background">#FAFCFF</color>
+    <color name="md_theme_light_onBackground">#001F2A</color>
+    <color name="md_theme_light_surface">#FAFCFF</color>
+    <color name="md_theme_light_onSurface">#001F2A</color>
+    <color name="md_theme_light_surfaceVariant">#DCE3E9</color>
+    <color name="md_theme_light_onSurfaceVariant">#40484D</color>
+    <color name="md_theme_light_outline">#71787D</color>
+    <color name="md_theme_light_inverseOnSurface">#E1F4FF</color>
+    <color name="md_theme_light_inverseSurface">#003547</color>
+    <color name="md_theme_light_inversePrimary">#77D1FF</color>
     <color name="md_theme_light_shadow">#000000</color>
-    <color name="md_theme_light_surfaceTint">#785A00</color>
-    <color name="md_theme_light_outlineVariant">#D0C5B4</color>
+    <color name="md_theme_light_surfaceTint">#006688</color>
+    <color name="md_theme_light_outlineVariant">#C0C7CD</color>
     <color name="md_theme_light_scrim">#000000</color>
-    <color name="md_theme_dark_primary">#F8BE1C</color>
-    <color name="md_theme_dark_onPrimary">#3F2E00</color>
-    <color name="md_theme_dark_primaryContainer">#5B4300</color>
-    <color name="md_theme_dark_onPrimaryContainer">#FFDF9C</color>
-    <color name="md_theme_dark_secondary">#4DD9E6</color>
-    <color name="md_theme_dark_onSecondary">#00363B</color>
-    <color name="md_theme_dark_secondaryContainer">#004F55</color>
-    <color name="md_theme_dark_onSecondaryContainer">#82F3FF</color>
-    <color name="md_theme_dark_tertiary">#FFB783</color>
-    <color name="md_theme_dark_onTertiary">#4F2500</color>
-    <color name="md_theme_dark_tertiaryContainer">#703700</color>
-    <color name="md_theme_dark_onTertiaryContainer">#FFDCC5</color>
+    <color name="md_theme_dark_primary">#77D1FF</color>
+    <color name="md_theme_dark_onPrimary">#003548</color>
+    <color name="md_theme_dark_primaryContainer">#004D68</color>
+    <color name="md_theme_dark_onPrimaryContainer">#C2E8FF</color>
+    <color name="md_theme_dark_secondary">#FFB959</color>
+    <color name="md_theme_dark_onSecondary">#462A00</color>
+    <color name="md_theme_dark_secondaryContainer">#643F00</color>
+    <color name="md_theme_dark_onSecondaryContainer">#FFDDB6</color>
+    <color name="md_theme_dark_tertiary">#66D3FF</color>
+    <color name="md_theme_dark_onTertiary">#003546</color>
+    <color name="md_theme_dark_tertiaryContainer">#004D64</color>
+    <color name="md_theme_dark_onTertiaryContainer">#BDE9FF</color>
     <color name="md_theme_dark_error">#FFB4AB</color>
     <color name="md_theme_dark_errorContainer">#93000A</color>
     <color name="md_theme_dark_onError">#690005</color>
     <color name="md_theme_dark_onErrorContainer">#FFDAD6</color>
-    <color name="md_theme_dark_background">#2A1800</color>
-    <color name="md_theme_dark_onBackground">#FFDDB6</color>
-    <color name="md_theme_dark_surface">#2A1800</color>
-    <color name="md_theme_dark_onSurface">#FFDDB6</color>
-    <color name="md_theme_dark_surfaceVariant">#4D4639</color>
-    <color name="md_theme_dark_onSurfaceVariant">#D0C5B4</color>
-    <color name="md_theme_dark_outline">#999080</color>
-    <color name="md_theme_dark_inverseOnSurface">#2A1800</color>
-    <color name="md_theme_dark_inverseSurface">#FFDDB6</color>
-    <color name="md_theme_dark_inversePrimary">#785A00</color>
+    <color name="md_theme_dark_background">#001F2A</color>
+    <color name="md_theme_dark_onBackground">#BFE9FF</color>
+    <color name="md_theme_dark_surface">#001F2A</color>
+    <color name="md_theme_dark_onSurface">#BFE9FF</color>
+    <color name="md_theme_dark_surfaceVariant">#40484D</color>
+    <color name="md_theme_dark_onSurfaceVariant">#C0C7CD</color>
+    <color name="md_theme_dark_outline">#8A9297</color>
+    <color name="md_theme_dark_inverseOnSurface">#001F2A</color>
+    <color name="md_theme_dark_inverseSurface">#BFE9FF</color>
+    <color name="md_theme_dark_inversePrimary">#006688</color>
     <color name="md_theme_dark_shadow">#000000</color>
-    <color name="md_theme_dark_surfaceTint">#F8BE1C</color>
-    <color name="md_theme_dark_outlineVariant">#4D4639</color>
+    <color name="md_theme_dark_surfaceTint">#77D1FF</color>
+    <color name="md_theme_dark_outlineVariant">#40484D</color>
     <color name="md_theme_dark_scrim">#000000</color>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9a42eef..80223d9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">Rick&amp;Morty</string>
+    <string name="app_name">Rick &amp; Morty</string>
     <!-- TODO: Remove or change this placeholder text -->
     <string name="hello_blank_fragment">Hello blank fragment</string>
 </resources>
\ No newline at end of file