diff --git a/app/build.gradle b/app/build.gradle
index 18f94621..7308002d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.5.1'
+        classpath 'com.android.tools.build:gradle:8.11.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20"
         classpath "org.jetbrains.kotlin:kotlin-android-extensions:1.9.20"
     }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 837d337b..b9159a40 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -149,6 +149,9 @@
         <activity
             android:name=".view.general.PatientDetailsActivity"
             android:exported="false" />
+        <activity
+            android:name=".view.general.AssignDoctorActivity"
+            android:exported="false" />
         <activity
             android:name=".view.general.AddPatientLogActivity"
             android:exported="false" />
diff --git a/app/src/main/java/deakin/gopher/guardian/PatientExercisePortalFragment.kt b/app/src/main/java/deakin/gopher/guardian/PatientExercisePortalFragment.kt
index f2baefe2..63157263 100644
--- a/app/src/main/java/deakin/gopher/guardian/PatientExercisePortalFragment.kt
+++ b/app/src/main/java/deakin/gopher/guardian/PatientExercisePortalFragment.kt
@@ -7,8 +7,11 @@ import android.view.ViewGroup
 import android.widget.Button
 import android.widget.TextView
 import android.widget.Toast
-import androidx.cardview.widget.CardView
 import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import deakin.gopher.guardian.adapter.ExerciseAdapter
+import deakin.gopher.guardian.model.ExerciseItem
 
 /**
  * Fragment that handles both the exercise portal and detail views
@@ -16,6 +19,8 @@ import androidx.fragment.app.Fragment
 class PatientExercisePortalFragment : Fragment() {
     private var currentExerciseType: String? = null
     private var currentTabState: TabState = TabState.TO_DO
+    private lateinit var adapter: ExerciseAdapter
+    private lateinit var recyclerView: RecyclerView
 
     enum class TabState {
         TO_DO,
@@ -23,12 +28,18 @@ class PatientExercisePortalFragment : Fragment() {
         COMPLETED,
     }
 
+    private val allExercises =
+        listOf(
+            ExerciseItem("flexibility", "Flexibility", R.drawable.stretching),
+            ExerciseItem("strength", "Strength", R.drawable.walking2),
+            ExerciseItem("breathing", "Breathing", R.drawable.breathing),
+            ExerciseItem("balance", "Balance", R.drawable.balance),
+            ExerciseItem("cardio", "Cardio", R.drawable.walking2),
+        )
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-
-        arguments?.let {
-            currentExerciseType = it.getString("exercise_type")
-        }
+        currentExerciseType = arguments?.getString("exercise_type")
     }
 
     override fun onCreateView(
@@ -45,9 +56,9 @@ class PatientExercisePortalFragment : Fragment() {
                 when (currentExerciseType) {
                     "flexibility" -> R.layout.activity_exercise_flexibility_module
                     "strength" -> R.layout.activity_exercise_strength_module
-                    // "breathing" -> R.layout.activity_exercise_breathing_module //PR not yet approved
-                    // "balance" -> R.layout.activity_exercise_balance_module //PR not yet approved
                     "cardio" -> R.layout.activity_exercise_cardio_module
+//              "breathing" -> R.layout.activity_exercise_breathing  //PR not yet approved
+//              "balance" -> R.layout.activity_exercise_balance   //PR not yet approved
                     else -> R.layout.activity_exercise_flexibility_module
                 }
             val view = inflater.inflate(layoutResId, container, false)
@@ -56,142 +67,80 @@ class PatientExercisePortalFragment : Fragment() {
         }
     }
 
-    override fun onResume() {
-        super.onResume()
-
-        if (currentExerciseType == null) {
-            view?.let { updateExerciseVisibility(it, currentTabState) }
-        }
-    }
-
     private fun setupPortalView(view: View) {
-        try {
-            currentTabState = TabState.TO_DO
-
-            view.findViewById<CardView>(R.id.flexibilityCard)?.setOnClickListener {
-                navigateToExercise("flexibility")
-            }
-
-            view.findViewById<CardView>(R.id.strengthCard)?.setOnClickListener {
-                navigateToExercise("strength")
-            }
-
-            view.findViewById<CardView>(R.id.breathingCard)?.setOnClickListener {
-                navigateToExercise("breathing")
-            }
-
-            view.findViewById<CardView>(R.id.balanceCard)?.setOnClickListener {
-                navigateToExercise("balance")
-            }
-
-            view.findViewById<CardView>(R.id.cardioCard)?.setOnClickListener {
-                navigateToExercise("cardio")
-            }
+        recyclerView = view.findViewById(R.id.exerciseRecyclerView)
+        recyclerView.layoutManager = GridLayoutManager(context, 2)
 
-            view.findViewById<TextView>(R.id.tabToDo)?.setOnClickListener {
-                setActiveTab(view, it as TextView)
-                currentTabState = TabState.TO_DO
-                updateExerciseVisibility(view, TabState.TO_DO)
+        adapter =
+            ExerciseAdapter(emptyList()) { item ->
+                navigateToExercise(item.type)
             }
+        recyclerView.adapter = adapter
 
-            view.findViewById<TextView>(R.id.tabInProgress)?.setOnClickListener {
-                setActiveTab(view, it as TextView)
-                currentTabState = TabState.IN_PROGRESS
-                updateExerciseVisibility(view, TabState.IN_PROGRESS)
-            }
-
-            view.findViewById<TextView>(R.id.tabCompleted)?.setOnClickListener {
-                setActiveTab(view, it as TextView)
-                currentTabState = TabState.COMPLETED
-                updateExerciseVisibility(view, TabState.COMPLETED)
-            }
+        view.findViewById<TextView>(R.id.tabToDo)?.setOnClickListener {
+            setActiveTab(view, it as TextView)
+            currentTabState = TabState.TO_DO
+            updateRecyclerView()
+        }
 
-            view.findViewById<Button>(R.id.backButton)?.setOnClickListener {
-                activity?.finish()
-            }
+        view.findViewById<TextView>(R.id.tabInProgress)?.setOnClickListener {
+            setActiveTab(view, it as TextView)
+            currentTabState = TabState.IN_PROGRESS
+            updateRecyclerView()
+        }
 
-            setActiveTab(view, view.findViewById(R.id.tabToDo)!!)
-            updateExerciseVisibility(view, TabState.TO_DO)
-        } catch (e: Exception) {
-            e.printStackTrace()
+        view.findViewById<TextView>(R.id.tabCompleted)?.setOnClickListener {
+            setActiveTab(view, it as TextView)
+            currentTabState = TabState.COMPLETED
+            updateRecyclerView()
         }
-    }
 
-    private fun updateExerciseVisibility(
-        view: View,
-        tabState: TabState,
-    ) {
-        val sharedPreferences = requireActivity().getSharedPreferences("exercise_prefs", 0)
-
-        val flexibilityCard = view.findViewById<CardView>(R.id.flexibilityCard)
-        val strengthCard = view.findViewById<CardView>(R.id.strengthCard)
-        val breathingCard = view.findViewById<CardView>(R.id.breathingCard)
-        val balanceCard = view.findViewById<CardView>(R.id.balanceCard)
-        val cardioCard = view.findViewById<CardView>(R.id.cardioCard)
-
-        fun updateCardVisibility(
-            card: CardView?,
-            exerciseType: String,
-        ) {
-            val isCompleted = sharedPreferences.getBoolean("completed_$exerciseType", false)
-            val isSaved = sharedPreferences.getBoolean("saved_$exerciseType", false)
-
-            card?.visibility =
-                when (tabState) {
-                    TabState.TO_DO -> if (!isCompleted && !isSaved) View.VISIBLE else View.GONE
-                    TabState.IN_PROGRESS -> if (isSaved && !isCompleted) View.VISIBLE else View.GONE
-                    TabState.COMPLETED -> if (isCompleted) View.VISIBLE else View.GONE
-                }
+        view.findViewById<Button>(R.id.backButton)?.setOnClickListener {
+            activity?.finish()
         }
 
-        updateCardVisibility(flexibilityCard, "flexibility")
-        updateCardVisibility(strengthCard, "strength")
-        updateCardVisibility(breathingCard, "breathing")
-        updateCardVisibility(balanceCard, "balance")
-        updateCardVisibility(cardioCard, "cardio")
+        setActiveTab(view, view.findViewById(R.id.tabToDo))
+        updateRecyclerView()
     }
 
     private fun setupExerciseDetailView(view: View) {
         try {
             view.findViewById<Button>(R.id.saveForLaterButton)?.setOnClickListener {
-                val exerciseName = view.findViewById<TextView>(R.id.benefits_exercising)?.text.toString() ?: ""
-
+                val exerciseName =
+                    view.findViewById<TextView>(R.id.benefits_exercising)?.text.toString()
                 Toast.makeText(
                     requireContext(),
                     "$exerciseName saved for later",
                     Toast.LENGTH_SHORT,
-                ).show()
+                )
+                    .show()
 
-                val sharedPreferences =
-                    requireActivity().getSharedPreferences(
-                        "exercise_prefs",
-                        0,
-                    )
+                val sharedPreferences = requireActivity().getSharedPreferences("exercise_prefs", 0)
                 sharedPreferences.edit()
                     .putBoolean("saved_$currentExerciseType", true)
-                    .putBoolean("completed_$currentExerciseType", false) // Ensure it's not marked as completed
+                    .putBoolean("completed_$currentExerciseType", false)
                     .apply()
 
                 navigateBackToPortal()
             }
 
             view.findViewById<Button>(R.id.markCompleteButton)?.setOnClickListener {
-                val exerciseName = view.findViewById<TextView>(R.id.benefits_exercising)?.text.toString() ?: ""
-
+                val exerciseName =
+                    view.findViewById<TextView>(R.id.benefits_exercising)?.text.toString()
                 Toast.makeText(
                     requireContext(),
                     "$exerciseName marked as complete",
                     Toast.LENGTH_SHORT,
-                ).show()
+                )
+                    .show()
 
-                val sharedPreferences =
-                    requireActivity().getSharedPreferences(
-                        "exercise_prefs",
-                        0,
-                    )
+                val sharedPreferences = requireActivity().getSharedPreferences("exercise_prefs", 0)
                 sharedPreferences.edit()
                     .putBoolean("completed_$currentExerciseType", true)
-                    .putBoolean("saved_$currentExerciseType", false)
+                    .putBoolean(
+                        "saved_$currentExerciseType",
+                        false,
+                    ) // Ensure it's not marked as completed
                     .apply()
 
                 // Go back to portal
@@ -200,11 +149,7 @@ class PatientExercisePortalFragment : Fragment() {
 
             view.findViewById<Button>(R.id.backButton)?.setOnClickListener {
                 // Reset the exercise to "To Do" when back button is pressed
-                val sharedPreferences =
-                    requireActivity().getSharedPreferences(
-                        "exercise_prefs",
-                        0,
-                    )
+                val sharedPreferences = requireActivity().getSharedPreferences("exercise_prefs", 0)
                 sharedPreferences.edit()
                     .putBoolean("saved_$currentExerciseType", false)
                     .putBoolean("completed_$currentExerciseType", false)
@@ -217,15 +162,47 @@ class PatientExercisePortalFragment : Fragment() {
         }
     }
 
-    private fun navigateToExercise(exerciseType: String) {
+    override fun onResume() {
+        super.onResume()
+        if (currentExerciseType == null && view != null) {
+            // force reset to currentTabState
+            when (currentTabState) {
+                TabState.TO_DO -> {
+                    setActiveTab(requireView(), requireView().findViewById(R.id.tabToDo))
+                }
+
+                TabState.IN_PROGRESS -> {
+                    setActiveTab(requireView(), requireView().findViewById(R.id.tabInProgress))
+                }
+
+                TabState.COMPLETED -> {
+                    setActiveTab(requireView(), requireView().findViewById(R.id.tabCompleted))
+                }
+            }
+            updateRecyclerView()
+        }
+    }
+
+    private fun updateRecyclerView() {
+        val prefs = requireActivity().getSharedPreferences("exercise_prefs", 0)
+        val filtered =
+            allExercises.filter { item ->
+                val isCompleted = prefs.getBoolean("completed_${item.type}", false)
+                val isSaved = prefs.getBoolean("saved_${item.type}", false)
+                when (currentTabState) {
+                    TabState.TO_DO -> !isCompleted && !isSaved
+                    TabState.IN_PROGRESS -> isSaved && !isCompleted
+                    TabState.COMPLETED -> isCompleted
+                }
+            }
+        adapter.updateList(filtered)
+    }
+
+    private fun navigateToExercise(type: String) {
         val fragment =
             PatientExercisePortalFragment().apply {
-                arguments =
-                    Bundle().apply {
-                        putString("exercise_type", exerciseType)
-                    }
+                arguments = Bundle().apply { putString("exercise_type", type) }
             }
-
         requireActivity().supportFragmentManager.beginTransaction()
             .replace(R.id.fragment_container, fragment)
             .addToBackStack(null)
@@ -233,6 +210,7 @@ class PatientExercisePortalFragment : Fragment() {
     }
 
     private fun navigateBackToPortal() {
+        currentTabState = TabState.TO_DO
         requireActivity().supportFragmentManager.popBackStack()
     }
 
diff --git a/app/src/main/java/deakin/gopher/guardian/adapter/DoctorListAdapter.kt b/app/src/main/java/deakin/gopher/guardian/adapter/DoctorListAdapter.kt
new file mode 100644
index 00000000..f5bd7219
--- /dev/null
+++ b/app/src/main/java/deakin/gopher/guardian/adapter/DoctorListAdapter.kt
@@ -0,0 +1,117 @@
+package deakin.gopher.guardian.adapter
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Button
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import com.bumptech.glide.Glide
+import deakin.gopher.guardian.R
+import deakin.gopher.guardian.model.Doctor
+
+class DoctorListAdapter(
+    private var doctors: List<Doctor>,
+    private val onAssign: (Doctor) -> Unit,
+    private val onRequest: (Doctor) -> Unit,
+    private val onUnassign: (Doctor) -> Unit,
+    private val onCancelRequest: (Doctor) -> Unit,
+) : RecyclerView.Adapter<DoctorListAdapter.DoctorVH>() {
+    private var assignedDoctorId: String? = null
+    private var requestedDoctorIds: Set<String> = emptySet()
+
+    inner class DoctorVH(view: View) : RecyclerView.ViewHolder(view) {
+        val photo: ImageView = view.findViewById(R.id.ivPhoto)
+        val name: TextView = view.findViewById(R.id.tvName)
+        val specialty: TextView = view.findViewById(R.id.tvSpecialty)
+        val btnAssign: Button = view.findViewById(R.id.btnAssign)
+        val btnRequest: Button = view.findViewById(R.id.btnRequest)
+    }
+
+    override fun onCreateViewHolder(
+        parent: ViewGroup,
+        viewType: Int,
+    ): DoctorVH {
+        val view = LayoutInflater.from(parent.context).inflate(R.layout.item_doctor, parent, false)
+        return DoctorVH(view)
+    }
+
+    override fun onBindViewHolder(
+        holder: DoctorVH,
+        position: Int,
+    ) {
+        val d = doctors[position]
+        holder.name.text = d.fullname
+        holder.specialty.text = d.specialty?.let { "Specialty: $it" } ?: "Specialty: —"
+
+        Glide.with(holder.itemView.context)
+            .load(d.photoUrl)
+            .placeholder(R.drawable.profile)
+            .circleCrop()
+            .into(holder.photo)
+
+        val isAssignedToThis = (assignedDoctorId != null && d.id == assignedDoctorId)
+        val isRequested = requestedDoctorIds.contains(d.id)
+
+        if (isAssignedToThis) {
+            holder.btnAssign.text = "Unassign"
+            holder.btnAssign.isEnabled = true
+            holder.btnAssign.setOnClickListener { onUnassign(d) }
+        } else {
+            holder.btnAssign.text = "Assign"
+            holder.btnAssign.isEnabled = true
+            holder.btnAssign.setOnClickListener { onAssign(d) }
+        }
+//
+//        holder.btnAssign.isEnabled = true
+//        holder.btnAssign.text = holder.itemView.context.getString(R.string.assign)
+//        holder.btnRequest.isEnabled = true
+//        holder.btnRequest.text = holder.itemView.context.getString(R.string.request)
+
+        if (isAssignedToThis) {
+            // If already assigned, we typically disable request
+            holder.btnRequest.text = "Request"
+            holder.btnRequest.isEnabled = false
+            holder.btnRequest.setOnClickListener(null)
+        } else if (isRequested) {
+            holder.btnRequest.text = "Cancel"
+            holder.btnRequest.isEnabled = true
+            holder.btnRequest.setOnClickListener { onCancelRequest(d) }
+        } else {
+            holder.btnRequest.text = "Request"
+            holder.btnRequest.isEnabled = true
+            holder.btnRequest.setOnClickListener { onRequest(d) }
+        }
+    }
+
+//        if (assignedDoctorId != null && d.id == assignedDoctorId) {
+//            holder.btnAssign.isEnabled = false
+//            holder.btnAssign.text = holder.itemView.context.getString(R.string.assigned)
+//
+//            holder.btnRequest.isEnabled = false
+//        } else if (requestedDoctorIds.contains(d.id)) {
+//            holder.btnRequest.isEnabled = false
+//            holder.btnRequest.text = holder.itemView.context.getString(R.string.requested)
+//        }
+//
+//        holder.btnAssign.setOnClickListener { onAssign(d) }
+//        holder.btnRequest.setOnClickListener { onRequest(d) }
+//    }
+
+    override fun getItemCount(): Int = doctors.size
+
+    fun updateData(newDoctors: List<Doctor>) {
+        doctors = newDoctors
+        notifyDataSetChanged()
+    }
+
+    fun updateState(
+        assignedDoctorId: String?,
+        requestedDoctorIds: Set<String>,
+    ) {
+        this.assignedDoctorId = assignedDoctorId
+        this.requestedDoctorIds = requestedDoctorIds
+        notifyDataSetChanged()
+    }
+}
diff --git a/app/src/main/java/deakin/gopher/guardian/adapter/ExerciseAdapter.kt b/app/src/main/java/deakin/gopher/guardian/adapter/ExerciseAdapter.kt
new file mode 100644
index 00000000..f0dc26a7
--- /dev/null
+++ b/app/src/main/java/deakin/gopher/guardian/adapter/ExerciseAdapter.kt
@@ -0,0 +1,47 @@
+package deakin.gopher.guardian.adapter
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.cardview.widget.CardView
+import androidx.recyclerview.widget.RecyclerView
+import deakin.gopher.guardian.R
+import deakin.gopher.guardian.model.ExerciseItem
+
+class ExerciseAdapter(
+    private var items: List<ExerciseItem>,
+    private val onClick: (ExerciseItem) -> Unit,
+) : RecyclerView.Adapter<ExerciseAdapter.ExerciseViewHolder>() {
+    inner class ExerciseViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+        val card: CardView = itemView.findViewById(R.id.exerciseCard)
+        val title: TextView = itemView.findViewById(R.id.exerciseTitle)
+        val icon: ImageView = itemView.findViewById(R.id.exerciseIcon)
+    }
+
+    override fun onCreateViewHolder(
+        parent: ViewGroup,
+        viewType: Int,
+    ): ExerciseViewHolder {
+        val view = LayoutInflater.from(parent.context).inflate(R.layout.item_exercise_card, parent, false)
+        return ExerciseViewHolder(view)
+    }
+
+    override fun onBindViewHolder(
+        holder: ExerciseViewHolder,
+        position: Int,
+    ) {
+        val item = items[position]
+        holder.title.text = item.title
+        holder.icon.setImageResource(item.iconRes)
+        holder.card.setOnClickListener { onClick(item) }
+    }
+
+    override fun getItemCount(): Int = items.size
+
+    fun updateList(newItems: List<ExerciseItem>) {
+        items = newItems
+        notifyDataSetChanged()
+    }
+}
diff --git a/app/src/main/java/deakin/gopher/guardian/adapter/PatientListAdapter.kt b/app/src/main/java/deakin/gopher/guardian/adapter/PatientListAdapter.kt
index 297137b4..5fd57320 100644
--- a/app/src/main/java/deakin/gopher/guardian/adapter/PatientListAdapter.kt
+++ b/app/src/main/java/deakin/gopher/guardian/adapter/PatientListAdapter.kt
@@ -16,6 +16,7 @@ class PatientListAdapter(
     private var patients: List<Patient>,
     private val onPatientClick: ((Patient) -> Unit)? = null,
     private val onAssignNurseClick: ((Patient) -> Unit)? = null,
+    private val onAssignDoctorClick: ((Patient) -> Unit)? = null,
     private val onDeleteClick: ((Patient) -> Unit)? = null,
 ) : RecyclerView.Adapter<PatientListAdapter.PatientViewHolder>() {
     inner class PatientViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
@@ -71,6 +72,10 @@ class PatientListAdapter(
                         onAssignNurseClick?.invoke(patient)
                         true
                     }
+                    R.id.assign_doctor -> {
+                        onAssignDoctorClick?.invoke(patient)
+                        true
+                    }
                     R.id.action_delete -> { // Handle delete click
                         onDeleteClick?.invoke(patient)
                         true
diff --git a/app/src/main/java/deakin/gopher/guardian/model/Doctor.kt b/app/src/main/java/deakin/gopher/guardian/model/Doctor.kt
new file mode 100644
index 00000000..ef27e158
--- /dev/null
+++ b/app/src/main/java/deakin/gopher/guardian/model/Doctor.kt
@@ -0,0 +1,8 @@
+package deakin.gopher.guardian.model
+
+data class Doctor(
+    val id: String,
+    val fullname: String,
+    val specialty: String? = null,
+    val photoUrl: String? = null,
+)
diff --git a/app/src/main/java/deakin/gopher/guardian/model/ExerciseItem.kt b/app/src/main/java/deakin/gopher/guardian/model/ExerciseItem.kt
new file mode 100644
index 00000000..36f79915
--- /dev/null
+++ b/app/src/main/java/deakin/gopher/guardian/model/ExerciseItem.kt
@@ -0,0 +1,7 @@
+package deakin.gopher.guardian.model
+
+data class ExerciseItem(
+    val type: String,
+    val title: String,
+    val iconRes: Int,
+)
diff --git a/app/src/main/java/deakin/gopher/guardian/services/api/ApiClient.kt b/app/src/main/java/deakin/gopher/guardian/services/api/ApiClient.kt
index 48eff44c..aa21114d 100644
--- a/app/src/main/java/deakin/gopher/guardian/services/api/ApiClient.kt
+++ b/app/src/main/java/deakin/gopher/guardian/services/api/ApiClient.kt
@@ -7,8 +7,7 @@ import retrofit2.converter.gson.GsonConverterFactory
 
 object RetrofitClient {
 //    private const val BASE_URL = "http://10.0.2.2:3000/api/v1/"
-    private const val BASE_URL = "https://guardian-backend-opal.vercel.app/api/v1/"
-
+    private const val BASE_URL = "https://guardian-backend-x5v6.vercel.app/api/v1/"
     private val client = OkHttpClient()
     private val interceptor = HttpLoggingInterceptor().setLevel(HttpLoggingInterceptor.Level.BODY)
     private val clientBuilder = client.newBuilder().addInterceptor(interceptor)
diff --git a/app/src/main/java/deakin/gopher/guardian/view/general/AssignDoctorActivity.kt b/app/src/main/java/deakin/gopher/guardian/view/general/AssignDoctorActivity.kt
new file mode 100644
index 00000000..b6650f59
--- /dev/null
+++ b/app/src/main/java/deakin/gopher/guardian/view/general/AssignDoctorActivity.kt
@@ -0,0 +1,239 @@
+package deakin.gopher.guardian.view.general
+
+import android.os.Bundle
+import android.text.Editable
+import android.text.TextWatcher
+import android.view.View
+import android.widget.Toast
+import androidx.recyclerview.widget.LinearLayoutManager
+import deakin.gopher.guardian.adapter.DoctorListAdapter
+import deakin.gopher.guardian.databinding.ActivityAssignDoctorBinding
+import deakin.gopher.guardian.model.Doctor
+
+class AssignDoctorActivity : BaseActivity() {
+    private lateinit var binding: ActivityAssignDoctorBinding
+    private val patientId: String by lazy { intent.getStringExtra("patientId") ?: "" }
+
+    private lateinit var adapter: DoctorListAdapter
+    private var allDoctors: List<Doctor> = emptyList()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        if (patientId.isBlank()) {
+            Toast.makeText(this, "Invalid patient", Toast.LENGTH_SHORT).show()
+            finish()
+            return
+        }
+
+        binding = ActivityAssignDoctorBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+
+        setSupportActionBar(binding.toolbar)
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        binding.toolbar.setNavigationOnClickListener { onBackPressedDispatcher.onBackPressed() }
+        supportActionBar?.title = "Assign / Request Doctor"
+
+        adapter =
+            DoctorListAdapter(
+                doctors = emptyList(),
+                onAssign = { d -> assignDoctorLocal(d) },
+                onRequest = { d -> sendDoctorRequestLocal(d) },
+                onUnassign = { d -> unassignDoctorLocal(d) },
+                onCancelRequest = { d -> cancelDoctorRequestLocal(d) },
+            )
+
+        binding.recyclerViewDoctors.layoutManager = LinearLayoutManager(this)
+        binding.recyclerViewDoctors.adapter = adapter
+
+        loadDummyDoctors()
+
+        refreshAdapterState()
+
+        binding.etSearch.addTextChangedListener(
+            object : TextWatcher {
+                override fun beforeTextChanged(
+                    s: CharSequence?,
+                    start: Int,
+                    count: Int,
+                    after: Int,
+                ) {}
+
+                override fun afterTextChanged(s: Editable?) {}
+
+                override fun onTextChanged(
+                    s: CharSequence?,
+                    start: Int,
+                    before: Int,
+                    count: Int,
+                ) {
+                    filterLocal(s?.toString().orEmpty())
+                }
+            },
+        )
+    }
+
+    private fun prefs() = getSharedPreferences("assignments", MODE_PRIVATE)
+
+    private fun getAssignedDoctorId(): String? = prefs().getString("doctor_for_$patientId", null)
+
+    private fun isRequestAlreadySent(doctorId: String): Boolean = prefs().contains("request_${doctorId}_$patientId")
+
+    private fun refreshAdapterState() {
+        val assignedId = getAssignedDoctorId()
+        val requestedIds =
+            allDoctors
+                .map { it.id }
+                .filter { isRequestAlreadySent(it) }
+                .toSet()
+        adapter.updateState(assignedDoctorId = assignedId, requestedDoctorIds = requestedIds)
+    }
+
+    private fun filterLocal(query: String) {
+        val q = query.trim().lowercase()
+        val filtered =
+            if (q.isEmpty()) {
+                allDoctors
+            } else {
+                allDoctors.filter {
+                    it.fullname.lowercase().contains(q) ||
+                        (it.specialty?.lowercase()?.contains(q) == true)
+                }
+            }
+
+        adapter.updateData(filtered)
+        binding.tvEmptyMessage.text = if (filtered.isEmpty()) "No matching doctors" else ""
+        binding.tvEmptyMessage.visibility = if (filtered.isEmpty()) View.VISIBLE else View.GONE
+
+        refreshAdapterState()
+    }
+
+    private fun loadDummyDoctors() {
+        allDoctors =
+            listOf(
+                Doctor("d1", "Dr. Priya Sharma", "Cardiology"),
+                Doctor("d2", "Dr. Karan Malhotra", "Orthopedics"),
+                Doctor("d3", "Dr. Aditi Rao", "Pediatrics"),
+                Doctor("d4", "Dr. Vikram Singh", "Neurology"),
+                Doctor("d5", "Dr. Meera Iyer", "Dermatology"),
+            )
+        adapter.updateData(allDoctors)
+        binding.tvEmptyMessage.visibility = View.GONE
+    }
+
+    private fun assignDoctorLocal(doctor: Doctor) {
+        val currentAssigned = getAssignedDoctorId()
+        if (currentAssigned != null) {
+            val name = allDoctors.firstOrNull { it.id == currentAssigned }?.fullname ?: "another doctor"
+            Toast.makeText(this, "Already assigned to $name", Toast.LENGTH_SHORT).show()
+            return
+        }
+        prefs().edit()
+            .putString("doctor_for_$patientId", doctor.id)
+            .apply()
+        Toast.makeText(this, "Assigned ${doctor.fullname}", Toast.LENGTH_SHORT).show()
+
+        finish()
+    }
+
+    private fun sendDoctorRequestLocal(doctor: Doctor) {
+        val currentAssigned = getAssignedDoctorId()
+        if (currentAssigned != null) {
+            val name = allDoctors.firstOrNull { it.id == currentAssigned }?.fullname ?: "the assigned doctor"
+            Toast.makeText(this, "Patient already assigned to $name", Toast.LENGTH_SHORT).show()
+            return
+        }
+
+        if (isRequestAlreadySent(doctor.id)) {
+            Toast.makeText(this, "Request already sent to ${doctor.fullname}", Toast.LENGTH_SHORT).show()
+            return
+        }
+
+        val key = "request_${doctor.id}_$patientId"
+        val payload =
+            """{"patientId":"$patientId","doctorId":"${doctor.id}","at":${System.currentTimeMillis()}}"""
+        prefs().edit().putString(key, payload).apply()
+
+        Toast.makeText(this, "Request sent to ${doctor.fullname}", Toast.LENGTH_SHORT).show()
+        finish()
+    }
+
+    private fun unassignDoctorLocal(doctor: Doctor) {
+        val key = "doctor_for_$patientId"
+        if (prefs().getString(key, null) == null) {
+            Toast.makeText(this, "No doctor assigned", Toast.LENGTH_SHORT).show()
+            return
+        }
+        prefs().edit().remove(key).apply()
+        Toast.makeText(this, "Unassigned ${doctor.fullname}", Toast.LENGTH_SHORT).show()
+        refreshAdapterState() // stay and reflect new state
+    }
+
+    private fun cancelDoctorRequestLocal(doctor: Doctor) {
+        val key = "request_${doctor.id}_$patientId"
+        if (!prefs().contains(key)) {
+            Toast.makeText(this, "No request to cancel", Toast.LENGTH_SHORT).show()
+            return
+        }
+        prefs().edit().remove(key).apply()
+        Toast.makeText(this, "Cancelled request to ${doctor.fullname}", Toast.LENGTH_SHORT).show()
+        refreshAdapterState() // stay and reflect new state
+    }
+}
+
+//    private fun fetchDoctors() {
+//        val token = "Bearer ${SessionManager.getToken()}"
+//        CoroutineScope(Dispatchers.IO).launch {
+//            withContext(Dispatchers.Main) { binding.progressBar.show() }
+//            val response = try {
+//                ApiClient.apiService.getDoctors(token)
+//            } catch (e: Exception) {
+//                null
+//            }
+//            withContext(Dispatchers.Main) {
+//                binding.progressBar.hide()
+//                if (response?.isSuccessful == true) {
+//                    val list = response.body().orEmpty()
+//                    allDoctors = list
+//                    adapter.updateData(list)
+//                    binding.tvEmptyMessage.visibility = if (list.isEmpty()) android.view.View.VISIBLE else android.view.View.GONE
+//                    binding.tvEmptyMessage.text = if (list.isEmpty()) "No doctors available" else ""
+//                } else {
+//                    val error = response?.errorBody()?.string()
+//                    val parsed = try { Gson().fromJson(error, ApiErrorResponse::class.java) } catch (_: Exception) { null }
+//                    Toast.makeText(this@AssignDoctorActivity, parsed?.apiError ?: "Failed to load doctors", Toast.LENGTH_SHORT).show()
+//                    binding.tvEmptyMessage.visibility = android.view.View.VISIBLE
+//                    binding.tvEmptyMessage.text = "Failed to load doctors"
+//                }
+//            }
+//        }
+//    }
+
+//    private fun assignDoctor(doctor: Doctor) {
+//        val token = "Bearer ${SessionManager.getToken()}"
+//        CoroutineScope(Dispatchers.IO).launch {
+//            withContext(Dispatchers.Main) { binding.progressBar.show() }
+//            val res =
+//                try {
+//                ApiClient.apiService.assignDoctor(
+//                    token = token,
+//                    patientId = patientId,
+//                    body = AssignDoctorRequest(doctorId = doctor.id)
+//                )
+//                } catch (e: Exception) {
+//                    null
+//                }
+//            withContext(Dispatchers.Main) {
+//                binding.progressBar.hide()
+//                if (res?.isSuccessful == true) {
+//                    Toast.makeText(this@AssignDoctorActivity, "Doctor assigned", Toast.LENGTH_SHORT).show()
+//                    finish() // PatientListActivity refreshes in onResume()
+//                } else {
+//                    val error = res?.errorBody()?.string()
+//                    val parsed = try { Gson().fromJson(error, ApiErrorResponse::class.java) } catch (_: Exception) { null }
+//                    Toast.makeText(this@AssignDoctorActivity, parsed?.apiError ?: "Failed to assign doctor", Toast.LENGTH_SHORT).show()
+//                }
+//        }
+//    }
+// }
+// }
diff --git a/app/src/main/java/deakin/gopher/guardian/view/general/DoctorPatientsActivity.kt b/app/src/main/java/deakin/gopher/guardian/view/general/DoctorPatientsActivity.kt
new file mode 100644
index 00000000..d130b6a0
--- /dev/null
+++ b/app/src/main/java/deakin/gopher/guardian/view/general/DoctorPatientsActivity.kt
@@ -0,0 +1,79 @@
+package deakin.gopher.guardian.view.general
+
+import android.os.Bundle
+import android.view.View
+import androidx.appcompat.app.AppCompatActivity
+import androidx.recyclerview.widget.LinearLayoutManager
+import deakin.gopher.guardian.adapter.PatientListAdapter
+import deakin.gopher.guardian.databinding.ActivityDoctorPatientsBinding
+import deakin.gopher.guardian.model.Patient
+import deakin.gopher.guardian.model.login.SessionManager
+import deakin.gopher.guardian.model.register.User
+
+class DoctorPatientsActivity : AppCompatActivity() {
+    private lateinit var binding: ActivityDoctorPatientsBinding
+    private lateinit var adapter: PatientListAdapter
+//    private var allPatients: MutableList<Patient> = mutableListOf()
+
+    private val dummyCaretaker =
+        User(
+            id = "0",
+            email = "N/A",
+            name = TODO(),
+            roleName = TODO(),
+            photoUrl = TODO(),
+            organization = TODO(),
+        )
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = ActivityDoctorPatientsBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+
+        supportActionBar?.title = "My Patients"
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+
+        adapter =
+            PatientListAdapter(
+                emptyList(),
+                onPatientClick = { patient ->
+                },
+            )
+
+        binding.recyclerViewPatients.layoutManager = LinearLayoutManager(this)
+        binding.recyclerViewPatients.adapter = adapter
+
+        loadMyPatients()
+    }
+
+    private fun loadMyPatients() {
+        val prefs = getSharedPreferences("assignments", MODE_PRIVATE)
+        val myDoctorId = SessionManager.getCurrentUser()?.id ?: return
+
+        val results = mutableListOf<Patient>()
+        for ((key, value) in prefs.all) {
+            if (key.startsWith("doctor_for_") && value == myDoctorId) {
+                val patientId = key.removePrefix("doctor_for_")
+
+                // Replace this dummy Patient with a real fetch operation later
+                results.add(
+                    Patient(
+                        id = patientId,
+                        fullname = "Patient $patientId",
+                        photoUrl = "",
+                        dateOfBirth = "",
+                        _age = 0,
+                        gender = "Unknown",
+                        healthConditions = emptyList(),
+                        caretaker = dummyCaretaker,
+                        assignedNurses = emptyList(),
+                    ),
+                )
+
+                adapter.updateData(results)
+                binding.tvEmptyMessage.visibility =
+                    if (results.isEmpty()) View.VISIBLE else View.GONE
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/deakin/gopher/guardian/view/general/PatientListActivity.kt b/app/src/main/java/deakin/gopher/guardian/view/general/PatientListActivity.kt
index c2bbfe07..59b604d7 100644
--- a/app/src/main/java/deakin/gopher/guardian/view/general/PatientListActivity.kt
+++ b/app/src/main/java/deakin/gopher/guardian/view/general/PatientListActivity.kt
@@ -38,6 +38,11 @@ class PatientListActivity : BaseActivity() {
 //            intent.putExtra("patientId", patient.id)
 //            startActivity(intent)
             },
+            onAssignDoctorClick = { patient ->
+                val intent = Intent(this, AssignDoctorActivity::class.java)
+                intent.putExtra("patientId", patient.id)
+                startActivity(intent)
+            },
             onDeleteClick = { patient ->
                 confirmDeletePatient(patient)
             },
diff --git a/app/src/main/java/deakin/gopher/guardian/view/general/Setting.java b/app/src/main/java/deakin/gopher/guardian/view/general/Setting.java
index 2322851c..072281a9 100644
--- a/app/src/main/java/deakin/gopher/guardian/view/general/Setting.java
+++ b/app/src/main/java/deakin/gopher/guardian/view/general/Setting.java
@@ -29,6 +29,8 @@ public class Setting extends BaseActivity implements View.OnClickListener {
   Switch notificationSwitch;
   Switch themeSwitch;
   ImageView settingsMenuButton;
+  private static final String PREFS = "app_prefs";
+  private static final String KEY_NIGHT = "night_mode";
 
   @Override
   protected void onCreate(final Bundle savedInstanceState) {
@@ -36,7 +38,6 @@ protected void onCreate(final Bundle savedInstanceState) {
     setContentView(R.layout.activity_setting);
     String userType = getIntent().getStringExtra("userType");
 
-    settingsThemeButton = findViewById(R.id.settings_theme_button);
     settingsNotificationButton = findViewById(R.id.settings_notification_button);
     settingsAppUpdateButton = findViewById(R.id.settings_app_update_button);
     settingsFeedbackButton = findViewById(R.id.settings_feedback_button);
@@ -53,15 +54,17 @@ protected void onCreate(final Bundle savedInstanceState) {
           drawerLayout.openDrawer(GravityCompat.START);
         });
 
-    final ConstraintLayout settingsThemeButton = findViewById(R.id.settings_theme_button);
-
     notificationSwitch = findViewById(R.id.notification_switch);
     notificationSwitch.setOnCheckedChangeListener(
         (buttonView, isChecked) -> handleNotificationSwitch(isChecked));
 
-    themeSwitch = findViewById(R.id.theme_switch);
-    themeSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> handleThemeSwitch(isChecked));
     configureNavigationDrawer(userType);
+
+    SharedPreferences sp = getSharedPreferences(PREFS, MODE_PRIVATE);
+    boolean isNight = sp.getBoolean(KEY_NIGHT, false);
+
+    AppCompatDelegate.setDefaultNightMode(
+        isNight ? AppCompatDelegate.MODE_NIGHT_YES : AppCompatDelegate.MODE_NIGHT_NO);
   }
 
   @Override
@@ -71,12 +74,6 @@ public void onClick(final View v) {
     }
   }
 
-  private void initializeSwitchStates() {
-    final SharedPreferences sharedPreferences = getSharedPreferences("settings", MODE_PRIVATE);
-    boolean isNightMode = sharedPreferences.getBoolean("night_mode", false);
-    themeSwitch.setChecked(isNightMode);
-  }
-
   private void handleNotificationSwitch(final boolean isChecked) {
     if (isChecked) {
       showNotification();
@@ -118,17 +115,6 @@ private void configureNavigationDrawer(String userType) {
         });
   }
 
-  private void handleThemeSwitch(final boolean isChecked) {
-    final SharedPreferences sharedPreferences = getSharedPreferences("settings", MODE_PRIVATE);
-    if (isChecked) {
-      AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
-      sharedPreferences.edit().putBoolean("night_mode", true).apply();
-    } else {
-      AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
-      sharedPreferences.edit().putBoolean("night_mode", false).apply();
-    }
-  }
-
   private void showNotification() {
     if (Build.VERSION_CODES.O <= Build.VERSION.SDK_INT) {
       final NotificationChannel channel =
@@ -172,6 +158,5 @@ private void showToast(final CharSequence message) {
   @Override
   protected void onResume() {
     super.onResume();
-    initializeSwitchStates();
   }
 }
diff --git a/app/src/main/res/layout/activity_assign_doctor.xml b/app/src/main/res/layout/activity_assign_doctor.xml
new file mode 100644
index 00000000..fd01985f
--- /dev/null
+++ b/app/src/main/res/layout/activity_assign_doctor.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/root"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="@style/ThemeOverlay.Material3.ActionBar">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            app:navigationIcon="?attr/homeAsUpIndicator"
+            app:title="Assign Doctor"/>
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:padding="16dp"
+        android:layout_marginTop="?attr/actionBarSize"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <EditText
+            android:id="@+id/etSearch"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="Search doctors by name or specialty"
+            android:imeOptions="actionDone"
+            android:singleLine="true"
+            android:drawableStart="@android:drawable/ic_menu_search"
+            android:padding="12dp"/>
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/recyclerViewDoctors"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_marginTop="12dp"
+            android:layout_weight="1"/>
+
+        <TextView
+            android:id="@+id/tvEmptyMessage"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text=""
+            android:gravity="center"
+            android:padding="12dp"
+            android:visibility="gone"/>
+
+        <ProgressBar
+            android:id="@+id/progressBar"
+            style="?android:attr/progressBarStyleLarge"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:visibility="gone"/>
+    </LinearLayout>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/activity_doctor_patients.xml b/app/src/main/res/layout/activity_doctor_patients.xml
new file mode 100644
index 00000000..0b30e479
--- /dev/null
+++ b/app/src/main/res/layout/activity_doctor_patients.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recyclerViewPatients"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"/>
+
+    <TextView
+        android:id="@+id/tvEmptyMessage"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="No patients assigned to you"
+        android:layout_gravity="center"
+        android:visibility="gone"
+        android:padding="16dp"/>
+</LinearLayout>
diff --git a/app/src/main/res/layout/activity_exercise_balance.xml b/app/src/main/res/layout/activity_exercise_balance.xml
index 5a5a2654..465c1773 100644
--- a/app/src/main/res/layout/activity_exercise_balance.xml
+++ b/app/src/main/res/layout/activity_exercise_balance.xml
@@ -19,7 +19,7 @@
         android:layout_width="0dp"
         android:layout_height="220dp"
         android:layout_marginTop="-40dp"
-        app:cardBackgroundColor="@color/TG_blue"
+        app:cardBackgroundColor="?attr/colorPrimary"
         app:cardCornerRadius="40dp"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/activity_exercise_cardio_module.xml b/app/src/main/res/layout/activity_exercise_cardio_module.xml
index 61387fe3..8a75bba5 100644
--- a/app/src/main/res/layout/activity_exercise_cardio_module.xml
+++ b/app/src/main/res/layout/activity_exercise_cardio_module.xml
@@ -19,7 +19,7 @@
         android:layout_width="0dp"
         android:layout_height="220dp"
         android:layout_marginTop="-40dp"
-        app:cardBackgroundColor="@color/TG_blue"
+        app:cardBackgroundColor="?attr/colorPrimary"
         app:cardCornerRadius="40dp"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/activity_exercise_flexibility_module.xml b/app/src/main/res/layout/activity_exercise_flexibility_module.xml
index 1f8802ff..56742582 100644
--- a/app/src/main/res/layout/activity_exercise_flexibility_module.xml
+++ b/app/src/main/res/layout/activity_exercise_flexibility_module.xml
@@ -19,7 +19,7 @@
         android:layout_width="0dp"
         android:layout_height="220dp"
         android:layout_marginTop="-40dp"
-        app:cardBackgroundColor="@color/TG_blue"
+        app:cardBackgroundColor="?attr/colorPrimary"
         app:cardCornerRadius="40dp"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/activity_exercise_main_portal.xml b/app/src/main/res/layout/activity_exercise_main_portal.xml
index e10339a0..0fac82d1 100644
--- a/app/src/main/res/layout/activity_exercise_main_portal.xml
+++ b/app/src/main/res/layout/activity_exercise_main_portal.xml
@@ -97,286 +97,288 @@
             android:padding="8dp" />
     </LinearLayout>
 
-    <ScrollView
-        android:id="@+id/contentScrollView"
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/exerciseRecyclerView"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:fillViewport="true"
+        android:layout_marginTop="12dp"
+        android:clipToPadding="false"
+        android:padding="12dp"
         app:layout_constraintTop_toBottomOf="@+id/tabCardView"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:padding="12dp">
-
-            <GridLayout
-                android:id="@+id/exerciseGrid"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="12dp"
-                android:columnCount="2"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
-
-                <androidx.cardview.widget.CardView
-                    android:id="@+id/flexibilityCard"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_columnWeight="1"
-                    android:layout_margin="8dp"
-                    app:cardBackgroundColor="#FFFFFF"
-                    app:cardCornerRadius="10dp"
-                    app:cardElevation="2dp">
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        android:padding="12dp">
-
-                        <androidx.cardview.widget.CardView
-                            android:layout_width="match_parent"
-                            android:layout_height="120dp"
-                            app:cardBackgroundColor="#E6E6FA"
-                            app:cardCornerRadius="5dp"
-                            app:cardElevation="0dp">
-
-                            <LinearLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="match_parent"
-                                android:gravity="center"
-                                android:orientation="vertical">
-
-                                <TextView
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:layout_marginBottom="8dp"
-                                    android:text="@string/flexibility_exercise1"
-                                    android:textColor="#000000"
-                                    android:textSize="16sp"
-                                    android:textStyle="bold" />
-
-                                <ImageView
-                                    android:id="@+id/stretching"
-                                    android:layout_width="38dp"
-                                    android:layout_height="32dp"
-                                    android:layout_marginTop="4dp"
-                                    android:contentDescription="@string/flexibility_exercise1"
-                                    android:src="@drawable/stretching" />
-
-                            </LinearLayout>
-                        </androidx.cardview.widget.CardView>
-                    </LinearLayout>
-                </androidx.cardview.widget.CardView>
-
-                <androidx.cardview.widget.CardView
-                    android:id="@+id/strengthCard"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_columnWeight="1"
-                    android:layout_margin="8dp"
-                    app:cardBackgroundColor="#FFFFFF"
-                    app:cardCornerRadius="10dp"
-                    app:cardElevation="2dp">
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        android:padding="12dp">
-
-                        <androidx.cardview.widget.CardView
-                            android:layout_width="match_parent"
-                            android:layout_height="120dp"
-                            app:cardBackgroundColor="#FFFCF5E0"
-                            app:cardCornerRadius="5dp"
-                            app:cardElevation="0dp">
-
-                            <LinearLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="match_parent"
-                                android:gravity="center"
-                                android:orientation="vertical">
-
-                                <TextView
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:layout_marginBottom="8dp"
-                                    android:text="@string/strength_exercise1"
-                                    android:textColor="#000000"
-                                    android:textSize="16sp"
-                                    android:textStyle="bold" />
-
-                                <ImageView
-                                    android:id="@+id/walking"
-                                    android:layout_width="38dp"
-                                    android:layout_height="32dp"
-                                    android:layout_marginTop="8dp"
-                                    android:contentDescription="@string/strength_exercise1"
-                                    android:src="@drawable/walking2" />
-
-                            </LinearLayout>
-                        </androidx.cardview.widget.CardView>
-                    </LinearLayout>
-                </androidx.cardview.widget.CardView>
-
-                <androidx.cardview.widget.CardView
-                    android:id="@+id/breathingCard"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_columnWeight="1"
-                    android:layout_margin="8dp"
-                    app:cardBackgroundColor="#FFFFFF"
-                    app:cardCornerRadius="10dp"
-                    app:cardElevation="2dp">
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        android:padding="12dp">
-
-                        <androidx.cardview.widget.CardView
-                            android:layout_width="match_parent"
-                            android:layout_height="120dp"
-                            app:cardBackgroundColor="#FFE8F8E8"
-                            app:cardCornerRadius="5dp"
-                            app:cardElevation="0dp">
-
-                            <LinearLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="match_parent"
-                                android:gravity="center"
-                                android:orientation="vertical">
-
-                                <TextView
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:layout_marginBottom="8dp"
-                                    android:text="@string/breathing_exercise1"
-                                    android:textColor="#000000"
-                                    android:textSize="16sp"
-                                    android:textStyle="bold" />
-
-                                <ImageView
-                                    android:id="@+id/breathing"
-                                    android:layout_width="38dp"
-                                    android:layout_height="32dp"
-                                    android:layout_marginTop="4dp"
-                                    android:contentDescription="@string/breathing_exercise1"
-                                    android:src="@drawable/breathing" />
-
-                            </LinearLayout>
-                        </androidx.cardview.widget.CardView>
-                    </LinearLayout>
-                </androidx.cardview.widget.CardView>
-
-                <androidx.cardview.widget.CardView
-                    android:id="@+id/balanceCard"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_columnWeight="1"
-                    android:layout_margin="8dp"
-                    app:cardBackgroundColor="#FFFFFF"
-                    app:cardCornerRadius="10dp"
-                    app:cardElevation="2dp">
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        android:padding="12dp">
-
-                        <androidx.cardview.widget.CardView
-                            android:layout_width="match_parent"
-                            android:layout_height="120dp"
-                            app:cardBackgroundColor="#FFF0F8FF"
-                            app:cardCornerRadius="5dp"
-                            app:cardElevation="0dp">
-
-                            <LinearLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="match_parent"
-                                android:gravity="center"
-                                android:orientation="vertical">
-
-                                <TextView
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:layout_marginBottom="8dp"
-                                    android:text="@string/balance_exercise1"
-                                    android:textColor="#000000"
-                                    android:textSize="16sp"
-                                    android:textStyle="bold" />
-
-                                <ImageView
-                                    android:id="@+id/balance"
-                                    android:layout_width="38dp"
-                                    android:layout_height="32dp"
-                                    android:layout_marginTop="4dp"
-                                    android:contentDescription="@string/balance_exercise1"
-                                    android:src="@drawable/balance" />
-
-                            </LinearLayout>
-                        </androidx.cardview.widget.CardView>
-                    </LinearLayout>
-                </androidx.cardview.widget.CardView>
-
-                <androidx.cardview.widget.CardView
-                    android:id="@+id/cardioCard"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_columnWeight="1"
-                    android:layout_margin="8dp"
-                    app:cardBackgroundColor="#FFFFFF"
-                    app:cardCornerRadius="10dp"
-                    app:cardElevation="2dp">
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        android:padding="12dp">
-
-                        <androidx.cardview.widget.CardView
-                            android:layout_width="match_parent"
-                            android:layout_height="120dp"
-                            app:cardBackgroundColor="#FFFFE8E8"
-                            app:cardCornerRadius="5dp"
-                            app:cardElevation="0dp">
-
-                            <LinearLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="match_parent"
-                                android:gravity="center"
-                                android:orientation="vertical">
-
-                                <TextView
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:layout_marginBottom="8dp"
-                                    android:text="@string/cardio_exercise1"
-                                    android:textColor="#000000"
-                                    android:textSize="16sp"
-                                    android:textStyle="bold" />
-
-                                <ImageView
-                                    android:id="@+id/cardioIcon"
-                                    android:layout_width="38dp"
-                                    android:layout_height="32dp"
-                                    android:layout_marginTop="8dp"
-                                    android:contentDescription="@string/cardio_exercise1"
-                                    android:src="@drawable/walking2" />
-
-                            </LinearLayout>
-                        </androidx.cardview.widget.CardView>
-                    </LinearLayout>
-                </androidx.cardview.widget.CardView>
-            </GridLayout>
+        app:layout_constraintEnd_toEndOf="parent" />
+
+<!--        <androidx.constraintlayout.widget.ConstraintLayout-->
+<!--            android:layout_width="match_parent"-->
+<!--            android:layout_height="wrap_content"-->
+<!--            android:padding="12dp">-->
+
+<!--            <GridLayout-->
+<!--                android:id="@+id/exerciseGrid"-->
+<!--                android:layout_width="match_parent"-->
+<!--                android:layout_height="wrap_content"-->
+<!--                android:layout_marginTop="12dp"-->
+<!--                android:columnCount="2"-->
+<!--                app:layout_constraintEnd_toEndOf="parent"-->
+<!--                app:layout_constraintStart_toStartOf="parent"-->
+<!--                app:layout_constraintTop_toTopOf="parent">-->
+
+<!--                <androidx.cardview.widget.CardView-->
+<!--                    android:id="@+id/flexibilityCard"-->
+<!--                    android:layout_width="0dp"-->
+<!--                    android:layout_height="wrap_content"-->
+<!--                    android:layout_columnWeight="1"-->
+<!--                    android:layout_margin="8dp"-->
+<!--                    app:cardBackgroundColor="#FFFFFF"-->
+<!--                    app:cardCornerRadius="10dp"-->
+<!--                    app:cardElevation="2dp">-->
+
+<!--                    <LinearLayout-->
+<!--                        android:layout_width="match_parent"-->
+<!--                        android:layout_height="wrap_content"-->
+<!--                        android:orientation="vertical"-->
+<!--                        android:padding="12dp">-->
+
+<!--                        <androidx.cardview.widget.CardView-->
+<!--                            android:layout_width="match_parent"-->
+<!--                            android:layout_height="120dp"-->
+<!--                            app:cardBackgroundColor="#E6E6FA"-->
+<!--                            app:cardCornerRadius="5dp"-->
+<!--                            app:cardElevation="0dp">-->
+
+<!--                            <LinearLayout-->
+<!--                                android:layout_width="match_parent"-->
+<!--                                android:layout_height="match_parent"-->
+<!--                                android:gravity="center"-->
+<!--                                android:orientation="vertical">-->
+
+<!--                                <TextView-->
+<!--                                    android:layout_width="wrap_content"-->
+<!--                                    android:layout_height="wrap_content"-->
+<!--                                    android:layout_marginBottom="8dp"-->
+<!--                                    android:text="@string/flexibility_exercise1"-->
+<!--                                    android:textColor="#000000"-->
+<!--                                    android:textSize="16sp"-->
+<!--                                    android:textStyle="bold" />-->
+
+<!--                                <ImageView-->
+<!--                                    android:id="@+id/stretching"-->
+<!--                                    android:layout_width="38dp"-->
+<!--                                    android:layout_height="32dp"-->
+<!--                                    android:layout_marginTop="4dp"-->
+<!--                                    android:contentDescription="@string/flexibility_exercise1"-->
+<!--                                    android:src="@drawable/stretching" />-->
+
+<!--                            </LinearLayout>-->
+<!--                        </androidx.cardview.widget.CardView>-->
+<!--                    </LinearLayout>-->
+<!--                </androidx.cardview.widget.CardView>-->
+
+<!--                <androidx.cardview.widget.CardView-->
+<!--                    android:id="@+id/strengthCard"-->
+<!--                    android:layout_width="0dp"-->
+<!--                    android:layout_height="wrap_content"-->
+<!--                    android:layout_columnWeight="1"-->
+<!--                    android:layout_margin="8dp"-->
+<!--                    app:cardBackgroundColor="#FFFFFF"-->
+<!--                    app:cardCornerRadius="10dp"-->
+<!--                    app:cardElevation="2dp">-->
+
+<!--                    <LinearLayout-->
+<!--                        android:layout_width="match_parent"-->
+<!--                        android:layout_height="wrap_content"-->
+<!--                        android:orientation="vertical"-->
+<!--                        android:padding="12dp">-->
+
+<!--                        <androidx.cardview.widget.CardView-->
+<!--                            android:layout_width="match_parent"-->
+<!--                            android:layout_height="120dp"-->
+<!--                            app:cardBackgroundColor="#FFFCF5E0"-->
+<!--                            app:cardCornerRadius="5dp"-->
+<!--                            app:cardElevation="0dp">-->
+
+<!--                            <LinearLayout-->
+<!--                                android:layout_width="match_parent"-->
+<!--                                android:layout_height="match_parent"-->
+<!--                                android:gravity="center"-->
+<!--                                android:orientation="vertical">-->
+
+<!--                                <TextView-->
+<!--                                    android:layout_width="wrap_content"-->
+<!--                                    android:layout_height="wrap_content"-->
+<!--                                    android:layout_marginBottom="8dp"-->
+<!--                                    android:text="@string/strength_exercise1"-->
+<!--                                    android:textColor="#000000"-->
+<!--                                    android:textSize="16sp"-->
+<!--                                    android:textStyle="bold" />-->
+
+<!--                                <ImageView-->
+<!--                                    android:id="@+id/walking"-->
+<!--                                    android:layout_width="38dp"-->
+<!--                                    android:layout_height="32dp"-->
+<!--                                    android:layout_marginTop="8dp"-->
+<!--                                    android:contentDescription="@string/strength_exercise1"-->
+<!--                                    android:src="@drawable/walking2" />-->
+
+<!--                            </LinearLayout>-->
+<!--                        </androidx.cardview.widget.CardView>-->
+<!--                    </LinearLayout>-->
+<!--                </androidx.cardview.widget.CardView>-->
+
+<!--                <androidx.cardview.widget.CardView-->
+<!--                    android:id="@+id/breathingCard"-->
+<!--                    android:layout_width="0dp"-->
+<!--                    android:layout_height="wrap_content"-->
+<!--                    android:layout_columnWeight="1"-->
+<!--                    android:layout_margin="8dp"-->
+<!--                    app:cardBackgroundColor="#FFFFFF"-->
+<!--                    app:cardCornerRadius="10dp"-->
+<!--                    app:cardElevation="2dp">-->
+
+<!--                    <LinearLayout-->
+<!--                        android:layout_width="match_parent"-->
+<!--                        android:layout_height="wrap_content"-->
+<!--                        android:orientation="vertical"-->
+<!--                        android:padding="12dp">-->
+
+<!--                        <androidx.cardview.widget.CardView-->
+<!--                            android:layout_width="match_parent"-->
+<!--                            android:layout_height="120dp"-->
+<!--                            app:cardBackgroundColor="#FFE8F8E8"-->
+<!--                            app:cardCornerRadius="5dp"-->
+<!--                            app:cardElevation="0dp">-->
+
+<!--                            <LinearLayout-->
+<!--                                android:layout_width="match_parent"-->
+<!--                                android:layout_height="match_parent"-->
+<!--                                android:gravity="center"-->
+<!--                                android:orientation="vertical">-->
+
+<!--                                <TextView-->
+<!--                                    android:layout_width="wrap_content"-->
+<!--                                    android:layout_height="wrap_content"-->
+<!--                                    android:layout_marginBottom="8dp"-->
+<!--                                    android:text="@string/breathing_exercise1"-->
+<!--                                    android:textColor="#000000"-->
+<!--                                    android:textSize="16sp"-->
+<!--                                    android:textStyle="bold" />-->
+
+<!--                                <ImageView-->
+<!--                                    android:id="@+id/breathing"-->
+<!--                                    android:layout_width="38dp"-->
+<!--                                    android:layout_height="32dp"-->
+<!--                                    android:layout_marginTop="4dp"-->
+<!--                                    android:contentDescription="@string/breathing_exercise1"-->
+<!--                                    android:src="@drawable/breathing" />-->
+
+<!--                            </LinearLayout>-->
+<!--                        </androidx.cardview.widget.CardView>-->
+<!--                    </LinearLayout>-->
+<!--                </androidx.cardview.widget.CardView>-->
+
+<!--                <androidx.cardview.widget.CardView-->
+<!--                    android:id="@+id/balanceCard"-->
+<!--                    android:layout_width="0dp"-->
+<!--                    android:layout_height="wrap_content"-->
+<!--                    android:layout_columnWeight="1"-->
+<!--                    android:layout_margin="8dp"-->
+<!--                    app:cardBackgroundColor="#FFFFFF"-->
+<!--                    app:cardCornerRadius="10dp"-->
+<!--                    app:cardElevation="2dp">-->
+
+<!--                    <LinearLayout-->
+<!--                        android:layout_width="match_parent"-->
+<!--                        android:layout_height="wrap_content"-->
+<!--                        android:orientation="vertical"-->
+<!--                        android:padding="12dp">-->
+
+<!--                        <androidx.cardview.widget.CardView-->
+<!--                            android:layout_width="match_parent"-->
+<!--                            android:layout_height="120dp"-->
+<!--                            app:cardBackgroundColor="#FFF0F8FF"-->
+<!--                            app:cardCornerRadius="5dp"-->
+<!--                            app:cardElevation="0dp">-->
+
+<!--                            <LinearLayout-->
+<!--                                android:layout_width="match_parent"-->
+<!--                                android:layout_height="match_parent"-->
+<!--                                android:gravity="center"-->
+<!--                                android:orientation="vertical">-->
+
+<!--                                <TextView-->
+<!--                                    android:layout_width="wrap_content"-->
+<!--                                    android:layout_height="wrap_content"-->
+<!--                                    android:layout_marginBottom="8dp"-->
+<!--                                    android:text="@string/balance_exercise1"-->
+<!--                                    android:textColor="#000000"-->
+<!--                                    android:textSize="16sp"-->
+<!--                                    android:textStyle="bold" />-->
+
+<!--                                <ImageView-->
+<!--                                    android:id="@+id/balance"-->
+<!--                                    android:layout_width="38dp"-->
+<!--                                    android:layout_height="32dp"-->
+<!--                                    android:layout_marginTop="4dp"-->
+<!--                                    android:contentDescription="@string/balance_exercise1"-->
+<!--                                    android:src="@drawable/balance" />-->
+
+<!--                            </LinearLayout>-->
+<!--                        </androidx.cardview.widget.CardView>-->
+<!--                    </LinearLayout>-->
+<!--                </androidx.cardview.widget.CardView>-->
+
+<!--                <androidx.cardview.widget.CardView-->
+<!--                    android:id="@+id/cardioCard"-->
+<!--                    android:layout_width="0dp"-->
+<!--                    android:layout_height="wrap_content"-->
+<!--                    android:layout_columnWeight="1"-->
+<!--                    android:layout_margin="8dp"-->
+<!--                    app:cardBackgroundColor="#FFFFFF"-->
+<!--                    app:cardCornerRadius="10dp"-->
+<!--                    app:cardElevation="2dp">-->
+
+<!--                    <LinearLayout-->
+<!--                        android:layout_width="match_parent"-->
+<!--                        android:layout_height="wrap_content"-->
+<!--                        android:orientation="vertical"-->
+<!--                        android:padding="12dp">-->
+
+<!--                        <androidx.cardview.widget.CardView-->
+<!--                            android:layout_width="match_parent"-->
+<!--                            android:layout_height="120dp"-->
+<!--                            app:cardBackgroundColor="#FFFFE8E8"-->
+<!--                            app:cardCornerRadius="5dp"-->
+<!--                            app:cardElevation="0dp">-->
+
+<!--                            <LinearLayout-->
+<!--                                android:layout_width="match_parent"-->
+<!--                                android:layout_height="match_parent"-->
+<!--                                android:gravity="center"-->
+<!--                                android:orientation="vertical">-->
+
+<!--                                <TextView-->
+<!--                                    android:layout_width="wrap_content"-->
+<!--                                    android:layout_height="wrap_content"-->
+<!--                                    android:layout_marginBottom="8dp"-->
+<!--                                    android:text="@string/cardio_exercise1"-->
+<!--                                    android:textColor="#000000"-->
+<!--                                    android:textSize="16sp"-->
+<!--                                    android:textStyle="bold" />-->
+
+<!--                                <ImageView-->
+<!--                                    android:id="@+id/cardioIcon"-->
+<!--                                    android:layout_width="38dp"-->
+<!--                                    android:layout_height="32dp"-->
+<!--                                    android:layout_marginTop="8dp"-->
+<!--                                    android:contentDescription="@string/cardio_exercise1"-->
+<!--                                    android:src="@drawable/walking2" />-->
+
+<!--                            </LinearLayout>-->
+<!--                        </androidx.cardview.widget.CardView>-->
+<!--                    </LinearLayout>-->
+<!--                </androidx.cardview.widget.CardView>-->
+<!--            </GridLayout>-->
 
             <Button
                 android:id="@+id/backButton"
@@ -393,6 +395,4 @@
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent" />
 
-        </androidx.constraintlayout.widget.ConstraintLayout>
-    </ScrollView>
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+        </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_exercise_portal.xml b/app/src/main/res/layout/activity_exercise_portal.xml
index c9088a05..f756c801 100644
--- a/app/src/main/res/layout/activity_exercise_portal.xml
+++ b/app/src/main/res/layout/activity_exercise_portal.xml
@@ -22,7 +22,7 @@
         android:layout_width="0dp"
         android:layout_height="220dp"
         android:layout_marginTop="-40dp"
-        app:cardBackgroundColor="@color/TG_blue"
+        app:cardBackgroundColor="?attr/colorPrimary"
         app:cardCornerRadius="40dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/activity_setting.xml b/app/src/main/res/layout/activity_setting.xml
index 6ec972a9..3fa2f751 100644
--- a/app/src/main/res/layout/activity_setting.xml
+++ b/app/src/main/res/layout/activity_setting.xml
@@ -12,6 +12,7 @@
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        app:cardBackgroundColor="?attr/colorPrimary"
         tools:context="deakin.gopher.guardian.view.general.Setting">
 
         <androidx.cardview.widget.CardView
@@ -19,7 +20,7 @@
             android:layout_width="0dp"
             android:layout_height="220dp"
             android:layout_marginTop="-40dp"
-            app:cardBackgroundColor="@color/TG_blue"
+            app:cardBackgroundColor="?attr/colorPrimary"
             app:cardCornerRadius="40dp"
             app:cardElevation="4dp"
             app:layout_constraintEnd_toEndOf="parent"
@@ -28,7 +29,8 @@
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent">
+                android:layout_height="match_parent"
+                app:cardBackgroundColor="?attr/colorPrimary">
 
                 <ImageView
                     android:id="@+id/settings_menu_button"
@@ -48,7 +50,7 @@
                     android:layout_marginBottom="16dp"
                     android:fontFamily="@font/poppins_bold"
                     android:text="@string/settings"
-                    android:textColor="@color/white"
+                    android:textColor="?attr/colorOnPrimary"
                     android:textSize="20sp"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintLeft_toLeftOf="parent"
@@ -69,47 +71,6 @@
             </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.cardview.widget.CardView>
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/settings_theme_button"
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:layout_marginLeft="15dp"
-            android:layout_marginTop="50dp"
-            android:layout_marginRight="15dp"
-            android:background="@drawable/settings_button_background"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/settings_header_card_view">
-
-
-            <TextView
-                android:id="@+id/theme_button_title"
-                android:layout_width="wrap_content"
-                android:layout_height="20sp"
-                android:layout_marginStart="25dp"
-                android:fontFamily="@font/poppins"
-                android:text="@string/night_mode"
-                android:textColor="#FFFFFF"
-                android:textFontWeight="400"
-                android:textSize="16sp"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintVertical_bias="0.533" />
-
-            <Switch
-                android:id="@+id/theme_switch"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="12dp"
-                android:layout_marginEnd="15dp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent"/>
-
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/settings_notification_button"
             android:layout_width="match_parent"
@@ -120,7 +81,7 @@
             android:background="@drawable/settings_button_background"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/settings_theme_button">
+            app:layout_constraintTop_toBottomOf="@+id/settings_header_card_view">
 
             <TextView
                 android:id="@+id/notification_button_title"
@@ -129,7 +90,7 @@
                 android:layout_marginStart="25dp"
                 android:fontFamily="@font/poppins"
                 android:text="@string/notifications"
-                android:textColor="#FFFFFF"
+                android:textColor="?android:textColorPrimary"
                 android:textFontWeight="400"
                 android:textSize="16sp"
                 app:layout_constraintBottom_toBottomOf="parent"
@@ -169,7 +130,7 @@
                 android:layout_marginStart="25dp"
                 android:fontFamily="@font/poppins"
                 android:text="@string/app_update"
-                android:textColor="#FFFFFF"
+                android:textColor="?android:textColorPrimary"
                 android:textFontWeight="400"
                 android:textSize="16sp"
                 app:layout_constraintBottom_toBottomOf="parent"
@@ -207,7 +168,7 @@
                 android:layout_marginStart="25dp"
                 android:fontFamily="@font/poppins"
                 android:text="@string/feedback"
-                android:textColor="#FFFFFF"
+                android:textColor="?android:textColorPrimary"
                 android:textFontWeight="400"
                 android:textSize="16sp"
                 app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/item_doctor.xml b/app/src/main/res/layout/item_doctor.xml
new file mode 100644
index 00000000..43c30ce6
--- /dev/null
+++ b/app/src/main/res/layout/item_doctor.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.cardview.widget.CardView 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="wrap_content"
+    android:layout_margin="8dp"
+    app:cardCornerRadius="12dp"
+    app:cardUseCompatPadding="true">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="12dp">
+
+
+        <ImageView
+            android:id="@+id/ivPhoto"
+            android:layout_width="56dp"
+            android:layout_height="56dp"
+            android:src="@drawable/profile"
+            android:scaleType="centerCrop"
+            android:contentDescription="@string/photo"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+
+        <TextView
+            android:id="@+id/tvName"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:text="Dr. John Doe"
+            android:textStyle="bold"
+            android:textSize="16sp"
+            android:ellipsize="end"
+            android:singleLine="true"
+            app:layout_constraintStart_toEndOf="@id/ivPhoto"
+            app:layout_constraintTop_toTopOf="@id/ivPhoto"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:layout_marginStart="12dp" />
+
+
+        <TextView
+            android:id="@+id/tvSpecialty"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:text="Specialty: Cardiology"
+            android:textSize="13sp"
+            android:ellipsize="end"
+            android:singleLine="true"
+            app:layout_constraintStart_toStartOf="@id/tvName"
+            app:layout_constraintTop_toBottomOf="@id/tvName"
+            app:layout_constraintEnd_toEndOf="@id/tvName"
+            android:layout_marginTop="4dp" />
+
+
+        <LinearLayout
+            android:id="@+id/buttonGroup"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            app:layout_constraintStart_toStartOf="@id/tvName"
+            app:layout_constraintTop_toBottomOf="@id/tvSpecialty"
+            android:layout_marginTop="8dp">
+
+            <Button
+                android:id="@+id/btnAssign"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/assign" />
+
+            <Button
+                android:id="@+id/btnRequest"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/request"
+                android:layout_marginStart="12dp" />
+        </LinearLayout>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/item_exercise_card.xml b/app/src/main/res/layout/item_exercise_card.xml
new file mode 100644
index 00000000..714614b8
--- /dev/null
+++ b/app/src/main/res/layout/item_exercise_card.xml
@@ -0,0 +1,32 @@
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/exerciseCard"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_margin="8dp"
+    app:cardCornerRadius="10dp"
+    app:cardElevation="4dp">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="120dp"
+        android:orientation="vertical"
+        android:gravity="center"
+        android:padding="8dp">
+
+        <TextView
+            android:id="@+id/exerciseTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Title"
+            android:textSize="16sp"
+            android:textStyle="bold" />
+
+        <ImageView
+            android:id="@+id/exerciseIcon"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:layout_marginTop="8dp"
+            android:src="@drawable/stretching" />
+    </LinearLayout>
+</androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/menu/menu_patient_item.xml b/app/src/main/res/menu/menu_patient_item.xml
index 1f11cf04..521cb6e0 100644
--- a/app/src/main/res/menu/menu_patient_item.xml
+++ b/app/src/main/res/menu/menu_patient_item.xml
@@ -3,6 +3,9 @@
     <item
         android:id="@+id/assign_nurse"
         android:title="Assign Nurse" />
+    <item
+        android:id="@+id/assign_doctor"
+        android:title="Assign Doctor" />
     <item
         android:id="@+id/action_delete"
         android:title="Delete" />
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
deleted file mode 100644
index e2872e11..00000000
--- a/app/src/main/res/values-night/themes.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<resources>
-
-    <!-- Dark mode theme -->
-    <style name="Theme.TeamGuardians" parent="Theme.AppCompat.NoActionBar">
-        <item name="colorPrimary">@color/dark_primary_color</item>
-        <item name="colorPrimaryVariant">@color/dark_primary_variant_color</item>
-        <item name="colorOnPrimary">@color/dark_primary_color</item>
-        <!-- Customize other dark mode attributes here -->
-        <item name="android:fontFamily">@font/poppins</item>
-        <item name="android:textColorPrimary">@color/white</item>
-    </style>
-
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9fe4ecab..84a8e7b6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -710,6 +710,10 @@
     <string name="patient_photo">Patient photo</string>
     <string name="more_options">More Options</string>
     <string name="add_activity">Add Activity</string>
+    <string name="assign">Assign</string>
+    <string name="request">Request</string>
+    <string name="assigned">Assigned</string>
+    <string name="requested">Requested</string>
 
 
     <string-array name="dropdown_items">
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index ef666463..884aa4b8 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -79,4 +79,4 @@
         <item name="android:textSize">14sp</item>
     </style>
 
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 2155e52b..2d302ba8 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -14,4 +14,4 @@
     </style>
 
 
-</resources>
+</resources>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 55809287..2d3258e3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,8 +12,8 @@ buildscript {
 }
 
 plugins {
-    id 'com.android.application' version '8.5.1' apply false
-    id 'com.android.library' version '8.5.1' apply false
+    id 'com.android.application' version '8.11.1' apply false
+    id 'com.android.library' version '8.11.1' apply false
     id 'org.jetbrains.kotlin.android' version '1.9.20' apply false
 }
 
diff --git a/gradle.properties b/gradle.properties
index ec63151a..f7faa42e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,4 +20,4 @@ android.useAndroidX=true
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
 android.defaults.buildfeatures.buildconfig=true
-android.nonFinalResIds=false
\ No newline at end of file
+android.nonFinalResIds=false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 404bb61a..2c628d5c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Wed Aug 31 11:56:40 AEST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME