diff --git a/app/src/main/java/deakin/gopher/guardian/TrainingActivity.kt b/app/src/main/java/deakin/gopher/guardian/TrainingActivity.kt
index 09c118fc7..9dd0f130a 100644
--- a/app/src/main/java/deakin/gopher/guardian/TrainingActivity.kt
+++ b/app/src/main/java/deakin/gopher/guardian/TrainingActivity.kt
@@ -1,20 +1,58 @@
 package deakin.gopher.guardian
 
+import android.content.Intent
 import android.os.Bundle
+import android.widget.ImageView
 import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.GravityCompat
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
+import androidx.drawerlayout.widget.DrawerLayout
+import com.google.android.material.navigation.NavigationView
+import com.google.firebase.auth.FirebaseAuth
+import deakin.gopher.guardian.view.general.Homepage4caretaker
+import deakin.gopher.guardian.view.general.LoginActivity
 
 class TrainingActivity : AppCompatActivity() {
+
+    private lateinit var menuButton: ImageView
+    private lateinit var drawerLayout: DrawerLayout
+    private lateinit var navigationView: NavigationView
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         enableEdgeToEdge()
         setContentView(R.layout.activity_training2)
+
+        menuButton = findViewById(R.id.menuButton)
+        drawerLayout = findViewById(R.id.drawer_layout)
+        navigationView = findViewById(R.id.nav_view)
+
+        menuButton.setOnClickListener {
+            drawerLayout.openDrawer(GravityCompat.START)
+        }
+
+        navigationView.setNavigationItemSelectedListener { menuItem ->
+            when (menuItem.itemId) {
+                R.id.nav_home -> {
+                    startActivity(Intent(this, Homepage4caretaker::class.java))
+                }
+
+                R.id.nav_signout -> {
+                    FirebaseAuth.getInstance().signOut()
+                    startActivity(Intent(this, LoginActivity::class.java))
+                    finish()
+                }
+            }
+            drawerLayout.closeDrawer(GravityCompat.START)
+            true
+        }
+
         ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main)) { v, insets ->
             val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
             v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom)
             insets
         }
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/deakin/gopher/guardian/view/caretaker/CaretakerProfileActivity.kt b/app/src/main/java/deakin/gopher/guardian/view/caretaker/CaretakerProfileActivity.kt
index a3d71b564..f12aef946 100644
--- a/app/src/main/java/deakin/gopher/guardian/view/caretaker/CaretakerProfileActivity.kt
+++ b/app/src/main/java/deakin/gopher/guardian/view/caretaker/CaretakerProfileActivity.kt
@@ -4,13 +4,21 @@ import android.content.Intent
 import android.os.Bundle
 import android.widget.Button
 import android.widget.ImageView
+import androidx.core.view.GravityCompat
+import androidx.drawerlayout.widget.DrawerLayout
+import com.google.android.material.navigation.NavigationView
+import com.google.firebase.auth.FirebaseAuth
 import deakin.gopher.guardian.R
 import deakin.gopher.guardian.view.general.BaseActivity
 import deakin.gopher.guardian.view.general.Homepage4caretaker
+import deakin.gopher.guardian.view.general.LoginActivity
 
 class CaretakerProfileActivity : BaseActivity() {
     private lateinit var backButton: Button
     private lateinit var editButton: ImageView
+    private lateinit var menuButton: ImageView
+    private lateinit var drawerLayout: DrawerLayout
+    private lateinit var navigationView: NavigationView
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -18,6 +26,9 @@ class CaretakerProfileActivity : BaseActivity() {
 
         backButton = findViewById(R.id.backBtn)
         editButton = findViewById(R.id.editButton)
+        menuButton = findViewById(R.id.menuButton)
+        drawerLayout = findViewById(R.id.drawer_layout)
+        navigationView = findViewById(R.id.nav_view)
 
         backButton.setOnClickListener {
             val medicalDiagnosticsActivityIntent =
@@ -30,5 +41,26 @@ class CaretakerProfileActivity : BaseActivity() {
                 Intent(this, EditCaretakerProfileActivity::class.java)
             startActivity(medicalDiagnosticsActivityIntent)
         }
+
+        menuButton.setOnClickListener {
+            drawerLayout.openDrawer(GravityCompat.START)
+        }
+
+        navigationView.setNavigationItemSelectedListener { menuItem ->
+            when (menuItem.itemId) {
+                R.id.nav_home -> {
+                    startActivity(Intent(this, Homepage4caretaker::class.java))
+                }
+
+                R.id.nav_signout -> {
+                    FirebaseAuth.getInstance().signOut()
+                    startActivity(Intent(this, LoginActivity::class.java))
+                    finish()
+                }
+            }
+
+            drawerLayout.closeDrawer(GravityCompat.START)
+            true
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/deakin/gopher/guardian/view/caretaker/EditCaretakerProfileActivity.kt b/app/src/main/java/deakin/gopher/guardian/view/caretaker/EditCaretakerProfileActivity.kt
index 58ec8089e..55900d7f7 100644
--- a/app/src/main/java/deakin/gopher/guardian/view/caretaker/EditCaretakerProfileActivity.kt
+++ b/app/src/main/java/deakin/gopher/guardian/view/caretaker/EditCaretakerProfileActivity.kt
@@ -3,20 +3,54 @@ package deakin.gopher.guardian.view.caretaker
 import android.content.Intent
 import android.os.Bundle
 import android.widget.Button
+import android.widget.ImageView
 import android.widget.Toast
+import androidx.core.view.GravityCompat
+import androidx.drawerlayout.widget.DrawerLayout
+import com.google.android.material.navigation.NavigationView
+import com.google.firebase.auth.FirebaseAuth
 import deakin.gopher.guardian.R
 import deakin.gopher.guardian.view.general.BaseActivity
+import deakin.gopher.guardian.view.general.LoginActivity
 
 class EditCaretakerProfileActivity : BaseActivity() {
     private lateinit var saveButton: Button
-    val emojiCodePoint = 0x1F97A
-    val emojiString = String(Character.toChars(emojiCodePoint))
+    private lateinit var menuButton: ImageView
+    private lateinit var drawerLayout: DrawerLayout
+    private lateinit var navigationView: NavigationView
+
+    private val emojiCodePoint = 0x1F97A
+    private val emojiString = String(Character.toChars(emojiCodePoint))
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_edit_caretakerprofile)
 
         saveButton = findViewById(R.id.btnSave)
+        menuButton = findViewById(R.id.menuButton)
+        drawerLayout = findViewById(R.id.drawer_layout)
+        navigationView = findViewById(R.id.nav_view)
+
+        menuButton.setOnClickListener {
+            drawerLayout.openDrawer(GravityCompat.START)
+        }
+
+        navigationView.setNavigationItemSelectedListener { menuItem ->
+            when (menuItem.itemId) {
+                R.id.nav_home -> {
+                    startActivity(Intent(this, CaretakerProfileActivity::class.java))
+                }
+
+                R.id.nav_signout -> {
+                    FirebaseAuth.getInstance().signOut()
+                    startActivity(Intent(this, LoginActivity::class.java))
+                    finish()
+                }
+            }
+
+            drawerLayout.closeDrawer(GravityCompat.START)
+            true
+        }
 
         saveButton.setOnClickListener {
             Toast.makeText(this, "Why Firebase not working? $emojiString", Toast.LENGTH_LONG).show()
@@ -25,4 +59,4 @@ class EditCaretakerProfileActivity : BaseActivity() {
             startActivity(medicalDiagnosticsActivityIntent)
         }
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/deakin/gopher/guardian/view/general/PinCodeActivity.kt b/app/src/main/java/deakin/gopher/guardian/view/general/PinCodeActivity.kt
index 2659b6c0e..a052929b9 100644
--- a/app/src/main/java/deakin/gopher/guardian/view/general/PinCodeActivity.kt
+++ b/app/src/main/java/deakin/gopher/guardian/view/general/PinCodeActivity.kt
@@ -2,6 +2,9 @@ package deakin.gopher.guardian.view.general
 
 import android.os.Bundle
 import android.os.CountDownTimer
+import android.text.Editable
+import android.text.TextWatcher
+import android.view.KeyEvent
 import android.view.View
 import android.widget.Button
 import android.widget.EditText
@@ -19,6 +22,7 @@ import deakin.gopher.guardian.model.login.SessionManager
 import deakin.gopher.guardian.services.NavigationService
 import deakin.gopher.guardian.services.api.ApiClient
 import deakin.gopher.guardian.view.hide
+import deakin.gopher.guardian.view.show
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
@@ -29,29 +33,42 @@ class PinCodeActivity : AppCompatActivity() {
 
     private lateinit var progressBar: ProgressBar
 
+    private lateinit var pinDigit1: EditText
+    private lateinit var pinDigit2: EditText
+    private lateinit var pinDigit3: EditText
+    private lateinit var pinDigit4: EditText
+    private lateinit var pinDigit5: EditText
+    private lateinit var pinDigit6: EditText
+
+    private lateinit var submitButton: Button
+    private lateinit var resendButton: Button
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.login_enter_pin)
         userRole = intent.getSerializableExtra("role") as Role
 
-        val pinDigit1 = findViewById<EditText>(R.id.pin_digit_1)
-        val pinDigit2 = findViewById<EditText>(R.id.pin_digit_2)
-        val pinDigit3 = findViewById<EditText>(R.id.pin_digit_3)
-        val pinDigit4 = findViewById<EditText>(R.id.pin_digit_4)
-        val pinDigit5 = findViewById<EditText>(R.id.pin_digit_5)
-        val pinDigit6 = findViewById<EditText>(R.id.pin_digit_6)
-        val submitButton = findViewById<Button>(R.id.loginBtn)
-        val resendButton = findViewById<Button>(R.id.resendText)
-        progressBar = findViewById<ProgressBar>(R.id.progressBar)
+        pinDigit1 = findViewById(R.id.pin_digit_1)
+        pinDigit2 = findViewById(R.id.pin_digit_2)
+        pinDigit3 = findViewById(R.id.pin_digit_3)
+        pinDigit4 = findViewById(R.id.pin_digit_4)
+        pinDigit5 = findViewById(R.id.pin_digit_5)
+        pinDigit6 = findViewById(R.id.pin_digit_6)
+        submitButton = findViewById(R.id.loginBtn)
+        resendButton = findViewById(R.id.resendText)
+        progressBar = findViewById(R.id.progressBar)
+
+        setupPinInputs()
 
         submitButton.setOnClickListener {
             val pin =
                 pinDigit1.text.toString() +
-                    pinDigit2.text.toString() +
-                    pinDigit3.text.toString() +
-                    pinDigit4.text.toString() +
-                    pinDigit5.text.toString() +
-                    pinDigit6.text.toString()
+                        pinDigit2.text.toString() +
+                        pinDigit3.text.toString() +
+                        pinDigit4.text.toString() +
+                        pinDigit5.text.toString() +
+                        pinDigit6.text.toString()
+
             if (pin.length == 6) {
                 validatePin(pin)
             } else {
@@ -63,10 +80,62 @@ class PinCodeActivity : AppCompatActivity() {
             sendPin()
             startResendCooldown()
         }
+
         resendButton.performClick()
     }
 
+    private fun setupPinInputs() {
+        moveToNext(pinDigit1, pinDigit2)
+        moveToNext(pinDigit2, pinDigit3)
+        moveToNext(pinDigit3, pinDigit4)
+        moveToNext(pinDigit4, pinDigit5)
+        moveToNext(pinDigit5, pinDigit6)
+        moveToNext(pinDigit6, null)
+
+        moveToPrevious(pinDigit2, pinDigit1)
+        moveToPrevious(pinDigit3, pinDigit2)
+        moveToPrevious(pinDigit4, pinDigit3)
+        moveToPrevious(pinDigit5, pinDigit4)
+        moveToPrevious(pinDigit6, pinDigit5)
+    }
+
+    private fun moveToNext(current: EditText, next: EditText?) {
+        current.addTextChangedListener(
+            object : TextWatcher {
+                override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
+                }
+
+                override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+                }
+
+                override fun afterTextChanged(s: Editable?) {
+                    if (s?.length == 1) {
+                        next?.requestFocus()
+                    }
+                }
+            },
+        )
+    }
+
+    private fun moveToPrevious(current: EditText, previous: EditText?) {
+        current.setOnKeyListener { _, keyCode, event ->
+            if (
+                keyCode == KeyEvent.KEYCODE_DEL &&
+                event.action == KeyEvent.ACTION_DOWN &&
+                current.text.isEmpty()
+            ) {
+                previous?.requestFocus()
+                previous?.setSelection(previous.text.length)
+            }
+            false
+        }
+    }
+
     private fun sendPin() {
+        progressBar.show()
+        submitButton.isEnabled = false
+        resendButton.isEnabled = false
+
         val call = ApiClient.apiService.sendPin(userEmail)
         call.enqueue(
             object : Callback<BaseModel> {
@@ -75,10 +144,11 @@ class PinCodeActivity : AppCompatActivity() {
                     response: Response<BaseModel>,
                 ) {
                     progressBar.hide()
+                    submitButton.isEnabled = true
+
                     if (response.isSuccessful && response.body() != null) {
-                        showMessage(response.body()!!.apiMessage ?: "Pin sent tou your email")
+                        showMessage(response.body()!!.apiMessage ?: "PIN sent to your email")
                     } else {
-                        // Handle error
                         val errorResponse =
                             Gson().fromJson(
                                 response.errorBody()?.string(),
@@ -92,8 +162,8 @@ class PinCodeActivity : AppCompatActivity() {
                     call: Call<BaseModel>,
                     t: Throwable,
                 ) {
-                    // Handle failure
                     progressBar.hide()
+                    submitButton.isEnabled = true
                     showMessage("Error sending PIN: ${t.message}")
                 }
             },
@@ -101,14 +171,17 @@ class PinCodeActivity : AppCompatActivity() {
     }
 
     private fun validatePin(pin: String) {
-        // Dummy pass for pin: 000000
-        if (pin.equals("000000")) {
-            showMessage("Pin verified successfully")
+        if (pin == "000000") {
+            showMessage("PIN verified successfully")
             NavigationService(this@PinCodeActivity).toHomeScreenForRole(userRole)
             finish()
             return
         }
 
+        progressBar.show()
+        submitButton.isEnabled = false
+        resendButton.isEnabled = false
+
         val call = ApiClient.apiService.verifyPin(userEmail, pin)
         call.enqueue(
             object : Callback<BaseModel> {
@@ -117,12 +190,14 @@ class PinCodeActivity : AppCompatActivity() {
                     response: Response<BaseModel>,
                 ) {
                     progressBar.hide()
+                    submitButton.isEnabled = true
+                    resendButton.isEnabled = true
+
                     if (response.isSuccessful && response.body() != null) {
-                        showMessage(response.body()!!.apiMessage ?: "Pin verified successfully")
+                        showMessage(response.body()!!.apiMessage ?: "PIN verified successfully")
                         NavigationService(this@PinCodeActivity).toHomeScreenForRole(userRole)
                         finish()
                     } else {
-                        // Handle error
                         val errorResponse =
                             Gson().fromJson(
                                 response.errorBody()?.string(),
@@ -136,8 +211,9 @@ class PinCodeActivity : AppCompatActivity() {
                     call: Call<BaseModel>,
                     t: Throwable,
                 ) {
-                    // Handle failure
                     progressBar.hide()
+                    submitButton.isEnabled = true
+                    resendButton.isEnabled = true
                     showMessage("Error validating PIN: ${t.message}")
                 }
             },
@@ -151,14 +227,11 @@ class PinCodeActivity : AppCompatActivity() {
     private fun startResendCooldown() {
         val countdownTimerContainer = findViewById<LinearLayoutCompat>(R.id.containerCountdown)
         val countdownTimer = findViewById<TextView>(R.id.countdownTimer)
-        val resendButton = findViewById<Button>(R.id.resendText)
 
-        // Disable the resend button
         resendButton.isEnabled = false
         resendButton.setTextColor(resources.getColor(R.color.gray2))
         countdownTimerContainer.visibility = View.VISIBLE
 
-        // Countdown for 1 minute 30 seconds (90,000ms)
         object : CountDownTimer(90000, 1000) {
             override fun onTick(millisUntilFinished: Long) {
                 val secondsLeft = millisUntilFinished / 1000
@@ -172,11 +245,10 @@ class PinCodeActivity : AppCompatActivity() {
             }
 
             override fun onFinish() {
-                // Enable the resend button
                 resendButton.isEnabled = true
                 resendButton.setTextColor(resources.getColor(R.color.TG_blue))
                 countdownTimerContainer.visibility = View.GONE
             }
         }.start()
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/deakin/gopher/guardian/view/general/RegisterActivity.kt b/app/src/main/java/deakin/gopher/guardian/view/general/RegisterActivity.kt
index 41fcbeaa0..d12abe36d 100644
--- a/app/src/main/java/deakin/gopher/guardian/view/general/RegisterActivity.kt
+++ b/app/src/main/java/deakin/gopher/guardian/view/general/RegisterActivity.kt
@@ -1,6 +1,7 @@
 package deakin.gopher.guardian.view.general
 
 import android.os.Bundle
+import android.util.Log
 import android.view.View
 import android.widget.Button
 import android.widget.EditText
@@ -9,7 +10,9 @@ import android.widget.Toast
 import androidx.core.view.isVisible
 import com.google.android.material.button.MaterialButton
 import com.google.android.material.button.MaterialButtonToggleGroup
+import com.google.gson.Gson
 import deakin.gopher.guardian.R
+import deakin.gopher.guardian.model.ApiErrorResponse
 import deakin.gopher.guardian.model.RegistrationStatusMessage
 import deakin.gopher.guardian.model.login.EmailAddress
 import deakin.gopher.guardian.model.login.Password
@@ -23,9 +26,15 @@ import retrofit2.Callback
 import retrofit2.Response
 
 class RegisterActivity : BaseActivity() {
+
+    companion object {
+        private const val TAG = "RegisterActivity"
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.account_creation)
+
         val mFullName: EditText = findViewById(R.id.Fullname)
         val mEmail: EditText = findViewById(R.id.Email)
         val mPassword: EditText = findViewById(R.id.password)
@@ -36,10 +45,10 @@ class RegisterActivity : BaseActivity() {
         val progressBar: ProgressBar = findViewById(R.id.progressBar)
 
         mRegisterBtn.setOnClickListener {
-            val emailInput = mEmail.text.toString().trim { it <= ' ' }
-            val passwordInput = mPassword.text.toString().trim { it <= ' ' }
-            val passwordConfirmInput = passwordConfirmation.text.toString().trim { it <= ' ' }
-            val nameInput = mFullName.text.toString().trim { it <= ' ' }
+            val emailInput = mEmail.text.toString().trim()
+            val passwordInput = mPassword.text.toString().trim()
+            val passwordConfirmInput = passwordConfirmation.text.toString().trim()
+            val nameInput = mFullName.text.toString().trim()
             val roleInput = roleButton.checkedButtonId
 
             val registrationError =
@@ -61,6 +70,8 @@ class RegisterActivity : BaseActivity() {
             }
 
             progressBar.visibility = View.VISIBLE
+            mRegisterBtn.isEnabled = false
+            backToLoginButton.isEnabled = false
 
             val emailAddress = EmailAddress(emailInput)
             val password = Password(passwordInput)
@@ -83,17 +94,54 @@ class RegisterActivity : BaseActivity() {
                         response: Response<AuthResponse>,
                     ) {
                         progressBar.isVisible = false
+                        mRegisterBtn.isEnabled = true
+                        backToLoginButton.isEnabled = true
+
                         if (response.isSuccessful) {
-                            // Handle successful registration
                             showMessage(RegistrationStatusMessage.Success.toString())
                             NavigationService(this@RegisterActivity).toLogin()
                         } else {
-                            // Handle error
-                            showMessage(
-                                RegistrationStatusMessage.Failure.toString() + " : ${
-                                    response.errorBody()
-                                }",
-                            )
+                            val rawError = response.errorBody()?.string().orEmpty()
+                            Log.d(TAG, "Raw register error: $rawError")
+
+                            val parsedApiError =
+                                try {
+                                    Gson().fromJson(rawError, ApiErrorResponse::class.java)?.apiError
+                                } catch (e: Exception) {
+                                    null
+                                }
+
+                            val finalErrorText =
+                                when {
+                                    !parsedApiError.isNullOrBlank() -> parsedApiError
+                                    rawError.isNotBlank() -> rawError
+                                    else -> response.message()
+                                }
+
+                            val normalizedError = finalErrorText.lowercase()
+
+                            val isDuplicateEmail =
+                                normalizedError.contains("already exists") ||
+                                        normalizedError.contains("user already exists") ||
+                                        normalizedError.contains("email already exists") ||
+                                        normalizedError.contains("email already taken") ||
+                                        normalizedError.contains("email is already in use") ||
+                                        normalizedError.contains("email in use") ||
+                                        normalizedError.contains("duplicate") ||
+                                        normalizedError.contains("user exists") ||
+                                        normalizedError.contains("account exists") ||
+                                        normalizedError.contains("collision")
+
+                            if (isDuplicateEmail) {
+                                mEmail.error = "Email already taken"
+                                mEmail.requestFocus()
+                                showMessage("Email already taken")
+                            } else {
+                                showMessage(
+                                    if (finalErrorText.isNotBlank()) finalErrorText
+                                    else "Registration failed"
+                                )
+                            }
                         }
                     }
 
@@ -101,9 +149,11 @@ class RegisterActivity : BaseActivity() {
                         call: Call<AuthResponse>,
                         t: Throwable,
                     ) {
-                        // Handle failure
                         progressBar.isVisible = false
-                        showMessage(RegistrationStatusMessage.Failure.toString() + ": ${t.message}")
+                        mRegisterBtn.isEnabled = true
+                        backToLoginButton.isEnabled = true
+                        Log.e(TAG, "Register failure", t)
+                        showMessage("Registration failed: ${t.message}")
                     }
                 },
             )
@@ -161,4 +211,4 @@ class RegisterActivity : BaseActivity() {
     private fun showMessage(message: String) {
         Toast.makeText(this@RegisterActivity, message, Toast.LENGTH_SHORT).show()
     }
-}
+}
\ No newline at end of file
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 2322851c1..04c32fab6 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
@@ -22,156 +22,156 @@
 import deakin.gopher.guardian.R;
 
 public class Setting extends BaseActivity implements View.OnClickListener {
-  ConstraintLayout settingsThemeButton;
-  ConstraintLayout settingsNotificationButton;
-  ConstraintLayout settingsAppUpdateButton;
-  ConstraintLayout settingsFeedbackButton;
-  Switch notificationSwitch;
-  Switch themeSwitch;
-  ImageView settingsMenuButton;
-
-  @Override
-  protected void onCreate(final Bundle savedInstanceState) {
-    super.onCreate(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);
-
-    settingsAppUpdateButton.setOnClickListener(this);
-    settingsFeedbackButton.setOnClickListener(this);
-    final NavigationView navigationView = findViewById(R.id.nav_view);
-    settingsMenuButton = findViewById(R.id.settings_menu_button);
-    final DrawerLayout drawerLayout = findViewById(R.id.drawer_layout);
-    navigationView.setItemIconTintList(null);
-
-    settingsMenuButton.setOnClickListener(
-        v -> {
-          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);
-  }
-
-  @Override
-  public void onClick(final View v) {
-    if (R.id.settings_feedback_button == v.getId()) {
-      showFeedbackDialog();
+    ConstraintLayout settingsThemeButton;
+    ConstraintLayout settingsNotificationButton;
+    ConstraintLayout settingsAppUpdateButton;
+    ConstraintLayout settingsFeedbackButton;
+    Switch notificationSwitch;
+    Switch themeSwitch;
+    ImageView settingsMenuButton;
+
+    @Override
+    protected void onCreate(final Bundle savedInstanceState) {
+        super.onCreate(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);
+
+        settingsAppUpdateButton.setOnClickListener(this);
+        settingsFeedbackButton.setOnClickListener(this);
+        final NavigationView navigationView = findViewById(R.id.nav_view);
+        settingsMenuButton = findViewById(R.id.settings_menu_button);
+        final DrawerLayout drawerLayout = findViewById(R.id.drawer_layout);
+        navigationView.setItemIconTintList(null);
+
+        settingsMenuButton.setOnClickListener(
+                v -> {
+                    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);
     }
-  }
-
-  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();
-      showToast("Notifications turned on");
-    } else {
-      showToast("Notifications turned off");
+
+    @Override
+    public void onClick(final View v) {
+        if (R.id.settings_feedback_button == v.getId()) {
+            showFeedbackDialog();
+        }
+    }
+
+    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();
+            showToast("Notifications turned on");
+        } else {
+            showToast("Notifications turned off");
+        }
+    }
+
+    private void configureNavigationDrawer(String userType) {
+        NavigationView navigationView = findViewById(R.id.nav_view);
+        Menu menu = navigationView.getMenu();
+        menu.clear();
+
+        navigationView.inflateMenu(R.menu.nav_menu);
+        navigationView.setNavigationItemSelectedListener(
+                menuItem -> {
+                    Intent intent = null;
+                    switch (menuItem.getItemId()) {
+                        case R.id.nav_home:
+                            intent =
+                                    new Intent(
+                                            Setting.this,
+                                            userType.equals("admin") ? Homepage4admin.class : Homepage4caretaker.class);
+                            break;
+                        case R.id.nav_signout:
+                            FirebaseAuth.getInstance().signOut();
+                            startActivity(new Intent(Setting.this, LoginActivity.class));
+                            finish();
+                    }
+
+                    if (intent != null) {
+                        startActivity(intent);
+                    }
+
+                    DrawerLayout drawerLayout = findViewById(R.id.drawer_layout);
+                    drawerLayout.closeDrawer(GravityCompat.START);
+                    return true;
+                });
     }
-  }
-
-  private void configureNavigationDrawer(String userType) {
-    NavigationView navigationView = findViewById(R.id.nav_view);
-    Menu menu = navigationView.getMenu();
-    menu.clear();
-
-    navigationView.inflateMenu(R.menu.nav_menu);
-    navigationView.setNavigationItemSelectedListener(
-        menuItem -> {
-          Intent intent = null;
-          switch (menuItem.getItemId()) {
-            case R.id.nav_home:
-              intent =
-                  new Intent(
-                      Setting.this,
-                      userType.equals("admin") ? Homepage4admin.class : Homepage4caretaker.class);
-              break;
-            case R.id.nav_signout:
-              FirebaseAuth.getInstance().signOut();
-              startActivity(new Intent(Setting.this, LoginActivity.class));
-              finish();
-          }
-
-          if (intent != null) {
-            startActivity(intent);
-          }
-
-          DrawerLayout drawerLayout = findViewById(R.id.drawer_layout);
-          drawerLayout.closeDrawer(GravityCompat.START);
-          return true;
-        });
-  }
-
-  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 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 =
-          new NotificationChannel(
-              "channel_id", "Channel Name", NotificationManager.IMPORTANCE_DEFAULT);
-      final NotificationManager notificationManager = getSystemService(NotificationManager.class);
-      notificationManager.createNotificationChannel(channel);
+
+    private void showNotification() {
+        if (Build.VERSION_CODES.O <= Build.VERSION.SDK_INT) {
+            final NotificationChannel channel =
+                    new NotificationChannel(
+                            "channel_id", "Channel Name", NotificationManager.IMPORTANCE_DEFAULT);
+            final NotificationManager notificationManager = getSystemService(NotificationManager.class);
+            notificationManager.createNotificationChannel(channel);
+        }
+    }
+
+    // feedback
+    private void showFeedbackDialog() {
+        final AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        builder.setTitle("Provide Feedback");
+
+        final EditText feedbackEditText = new EditText(this);
+        feedbackEditText.setHint("Enter your feedback...");
+        builder.setView(feedbackEditText);
+
+        builder.setPositiveButton(
+                "Submit",
+                (dialog, which) -> {
+                    final String feedback = feedbackEditText.getText().toString();
+                    if (!feedback.isEmpty()) {
+                        showToast("Feedback submitted: " + feedback);
+                    } else {
+                        showToast("Please enter your feedback");
+                    }
+                });
+
+        builder.setNegativeButton("Cancel", null);
+
+        final AlertDialog dialog = builder.create();
+        dialog.show();
+    }
+
+    private void showToast(final CharSequence message) {
+        Toast.makeText(this, message, Toast.LENGTH_SHORT).show();
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        initializeSwitchStates();
     }
-  }
-
-  // feedback
-  private void showFeedbackDialog() {
-    final AlertDialog.Builder builder = new AlertDialog.Builder(this);
-    builder.setTitle("Provide Feedback");
-
-    final EditText feedbackEditText = new EditText(this);
-    feedbackEditText.setHint("Enter your feedback...");
-    builder.setView(feedbackEditText);
-
-    builder.setPositiveButton(
-        "Submit",
-        (dialog, which) -> {
-          final String feedback = feedbackEditText.getText().toString();
-          if (!feedback.isEmpty()) {
-            showToast("Feedback submitted: " + feedback);
-          } else {
-            showToast("Please enter your feedback");
-          }
-        });
-
-    builder.setNegativeButton("Cancel", null);
-
-    final AlertDialog dialog = builder.create();
-    dialog.show();
-  }
-
-  private void showToast(final CharSequence message) {
-    Toast.makeText(this, message, Toast.LENGTH_SHORT).show();
-  }
-
-  @Override
-  protected void onResume() {
-    super.onResume();
-    initializeSwitchStates();
-  }
 }
diff --git a/app/src/main/res/layout/activity_training2.xml b/app/src/main/res/layout/activity_training2.xml
index 3b12a8e6b..16f6da87c 100644
--- a/app/src/main/res/layout/activity_training2.xml
+++ b/app/src/main/res/layout/activity_training2.xml
@@ -1,82 +1,114 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/main"
+    android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".Training2"
-    android:padding="16dp">
+    tools:context=".TrainingActivity">
 
-    <!-- ScrollView to allow scrolling through the content -->
-    <ScrollView
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/main"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent">
+        android:background="@android:color/white">
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:padding="16dp">
+        <ImageView
+            android:id="@+id/menuButton"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="16dp"
+            android:padding="8dp"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            android:clickable="true"
+            android:contentDescription="Menu"
+            android:elevation="8dp"
+            android:focusable="true"
+            android:src="@drawable/menu_button"
+            android:tint="@color/black"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
-            <!-- Module 1 -->
-            <TextView
-                android:id="@+id/module1Title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="8dp"
-                android:text="Module 1: Basic Caregiving Skills"
-                android:textSize="20sp"
-                android:textStyle="bold" />
+        <ScrollView
+            android:id="@+id/scrollContent"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_marginTop="12dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/menuButton">
 
-            <TextView
-                android:id="@+id/module1Description"
-                android:layout_width="wrap_content"
+            <LinearLayout
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="8dp"
-                android:text="This foundational module is designed to introduce caregivers to the essential skills required for day-to-day caregiving. It covers the basics of client care, hygiene, nutrition, and safety."
-                android:textSize="16sp" />
+                android:orientation="vertical"
+                android:padding="16dp">
 
-            <!-- Module 2 -->
-            <TextView
-                android:id="@+id/module2Title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="8dp"
-                android:text="Module 2: Advanced Medical Procedures"
-                android:textSize="20sp"
-                android:textStyle="bold" />
+                <TextView
+                    android:id="@+id/module1Title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="8dp"
+                    android:text="Module 1: Basic Caregiving Skills"
+                    android:textColor="@color/black"
+                    android:textSize="20sp"
+                    android:textStyle="bold" />
 
-            <TextView
-                android:id="@+id/module2Description"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="8dp"
-                android:text="This module provides in-depth training on more complex medical procedures that caregivers may need to perform. It includes topics like medication administration, wound care, and monitoring vital signs."
-                android:textSize="16sp" />
+                <TextView
+                    android:id="@+id/module1Description"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="16dp"
+                    android:text="This foundational module is designed to introduce caregivers to the essential skills required for day-to-day caregiving. It covers the basics of client care, hygiene, nutrition, and safety."
+                    android:textColor="@color/black"
+                    android:textSize="16sp" />
 
-            <!-- Module 3 -->
-            <TextView
-                android:id="@+id/module3Title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="8dp"
-                android:text="Module 3: Emotional Support and Communication"
-                android:textSize="20sp"
-                android:textStyle="bold" />
+                <TextView
+                    android:id="@+id/module2Title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="8dp"
+                    android:text="Module 2: Advanced Medical Procedures"
+                    android:textColor="@color/black"
+                    android:textSize="20sp"
+                    android:textStyle="bold" />
 
-            <TextView
-                android:id="@+id/module3Description"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="8dp"
-                android:text="This module focuses on the emotional and psychological aspects of caregiving. It teaches caregivers how to provide emotional support to clients, communicate effectively, and manage stress."
-                android:textSize="16sp" />
+                <TextView
+                    android:id="@+id/module2Description"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="16dp"
+                    android:text="This module provides in-depth training on more complex medical procedures that caregivers may need to perform. It includes topics like medication administration, wound care, and monitoring vital signs."
+                    android:textColor="@color/black"
+                    android:textSize="16sp" />
+
+                <TextView
+                    android:id="@+id/module3Title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="8dp"
+                    android:text="Module 3: Emotional Support and Communication"
+                    android:textColor="@color/black"
+                    android:textSize="20sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/module3Description"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="16dp"
+                    android:text="This module focuses on the emotional and psychological aspects of caregiving. It teaches caregivers how to provide emotional support to clients, communicate effectively, and manage stress."
+                    android:textColor="@color/black"
+                    android:textSize="16sp" />
+
+            </LinearLayout>
+        </ScrollView>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <include
+        android:id="@+id/nav_view"
+        layout="@layout/navigation_view" />
 
-        </LinearLayout>
-    </ScrollView>
-</androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.drawerlayout.widget.DrawerLayout>
\ No newline at end of file