diff --git a/app/src/main/java/deakin/gopher/guardian/services/EmailPasswordAuthService.kt b/app/src/main/java/deakin/gopher/guardian/services/EmailPasswordAuthService.kt
index 14b16ac90..387f3c2cd 100644
--- a/app/src/main/java/deakin/gopher/guardian/services/EmailPasswordAuthService.kt
+++ b/app/src/main/java/deakin/gopher/guardian/services/EmailPasswordAuthService.kt
@@ -50,6 +50,7 @@ class EmailPasswordAuthService(
     }
 
     companion object {
+        @JvmStatic
         fun resetPassword(emailAddress: EmailAddress): Task<Void>? {
             return try {
                 FirebaseAuth.getInstance().sendPasswordResetEmail(emailAddress.emailAddress)
@@ -59,6 +60,7 @@ class EmailPasswordAuthService(
             }
         }
 
+        @JvmStatic
         fun signOut(context: Context) {
             try {
                 SessionManager.logoutUser()
diff --git a/app/src/main/java/deakin/gopher/guardian/view/caretaker/notifications/confirmincident/CallAmbulanceActivity.kt b/app/src/main/java/deakin/gopher/guardian/view/caretaker/notifications/confirmincident/CallAmbulanceActivity.kt
index d52188ba9..d370dd6e9 100644
--- a/app/src/main/java/deakin/gopher/guardian/view/caretaker/notifications/confirmincident/CallAmbulanceActivity.kt
+++ b/app/src/main/java/deakin/gopher/guardian/view/caretaker/notifications/confirmincident/CallAmbulanceActivity.kt
@@ -12,8 +12,9 @@ import androidx.core.view.GravityCompat
 import androidx.drawerlayout.widget.DrawerLayout
 import com.google.android.material.navigation.NavigationView
 import deakin.gopher.guardian.R
+import deakin.gopher.guardian.services.EmailPasswordAuthService
 import deakin.gopher.guardian.view.general.BaseActivity
-import deakin.gopher.guardian.view.general.Homepage4caretaker
+import deakin.gopher.guardian.view.general.Homepage4admin
 
 class CallAmbulanceActivity : BaseActivity() {
     var hospitalSpinner: Spinner? = null
@@ -35,6 +36,29 @@ class CallAmbulanceActivity : BaseActivity() {
             }
         }
 
+        navigationView.setNavigationItemSelectedListener { item ->
+            when (item.itemId) {
+                R.id.nav_home -> {
+                    startActivity(Intent(this, Homepage4admin::class.java))
+                    finish()
+                    true
+                }
+                R.id.nav_signout -> {
+                    androidx.appcompat.app.AlertDialog.Builder(this)
+                        .setTitle(R.string.sign_out)
+                        .setMessage(R.string.sign_out_confirmation_message)
+                        .setPositiveButton(R.string.sign_out) { _, _ ->
+                            EmailPasswordAuthService.signOut(this)
+                            finish()
+                        }
+                        .setNegativeButton(R.string.stay_in, null)
+                        .show()
+                    true
+                }
+                else -> false
+            }
+        }
+
         hospitalSpinner = findViewById(R.id.hospitalSpinner)
 
         // Create an ArrayAdapter using the string array and a default Spinner layout
@@ -69,7 +93,7 @@ class CallAmbulanceActivity : BaseActivity() {
 
     fun onConfirmIncidentCancelClick(view: View?) {
         val medicalDiagnosticsActivityIntent =
-            Intent(this@CallAmbulanceActivity, Homepage4caretaker::class.java)
+            Intent(this@CallAmbulanceActivity, Homepage4admin::class.java)
         startActivity(medicalDiagnosticsActivityIntent)
     }
 
diff --git a/app/src/main/java/deakin/gopher/guardian/view/caretaker/notifications/confirmincident/ConfirmIncidentActivity.kt b/app/src/main/java/deakin/gopher/guardian/view/caretaker/notifications/confirmincident/ConfirmIncidentActivity.kt
index 77dc78817..d8cc8b1f0 100644
--- a/app/src/main/java/deakin/gopher/guardian/view/caretaker/notifications/confirmincident/ConfirmIncidentActivity.kt
+++ b/app/src/main/java/deakin/gopher/guardian/view/caretaker/notifications/confirmincident/ConfirmIncidentActivity.kt
@@ -14,8 +14,10 @@ import androidx.drawerlayout.widget.DrawerLayout
 import androidx.media3.common.util.UnstableApi
 import com.google.android.material.navigation.NavigationView
 import deakin.gopher.guardian.R
+import deakin.gopher.guardian.services.EmailPasswordAuthService
 import deakin.gopher.guardian.view.falldetection.FallAlertActivity
 import deakin.gopher.guardian.view.general.BaseActivity
+import deakin.gopher.guardian.view.general.Homepage4admin
 
 class ConfirmIncidentActivity : BaseActivity() {
     var hospitalSpinner: Spinner? = null
@@ -37,6 +39,29 @@ class ConfirmIncidentActivity : BaseActivity() {
             }
         }
 
+        navigationView.setNavigationItemSelectedListener { item ->
+            when (item.itemId) {
+                R.id.nav_home -> {
+                    startActivity(Intent(this, Homepage4admin::class.java))
+                    finish()
+                    true
+                }
+                R.id.nav_signout -> {
+                    androidx.appcompat.app.AlertDialog.Builder(this)
+                        .setTitle(R.string.sign_out)
+                        .setMessage(R.string.sign_out_confirmation_message)
+                        .setPositiveButton(R.string.sign_out) { _, _ ->
+                            EmailPasswordAuthService.signOut(this)
+                            finish()
+                        }
+                        .setNegativeButton(R.string.stay_in, null)
+                        .show()
+                    true
+                }
+                else -> false
+            }
+        }
+
         hospitalSpinner = findViewById(R.id.hospitalSpinner)
 
         // Create an ArrayAdapter using the string array and a default Spinner layout
diff --git a/app/src/main/java/deakin/gopher/guardian/view/caretaker/notifications/falsealarm/FalseAlertConfirmedActivity.kt b/app/src/main/java/deakin/gopher/guardian/view/caretaker/notifications/falsealarm/FalseAlertConfirmedActivity.kt
index 6ece3f78c..d522a2a84 100644
--- a/app/src/main/java/deakin/gopher/guardian/view/caretaker/notifications/falsealarm/FalseAlertConfirmedActivity.kt
+++ b/app/src/main/java/deakin/gopher/guardian/view/caretaker/notifications/falsealarm/FalseAlertConfirmedActivity.kt
@@ -10,8 +10,9 @@ import androidx.core.view.GravityCompat
 import androidx.drawerlayout.widget.DrawerLayout
 import com.google.android.material.navigation.NavigationView
 import deakin.gopher.guardian.R
+import deakin.gopher.guardian.services.EmailPasswordAuthService
 import deakin.gopher.guardian.view.general.BaseActivity
-import deakin.gopher.guardian.view.general.Homepage4caretaker
+import deakin.gopher.guardian.view.general.Homepage4admin
 
 class FalseAlertConfirmedActivity : BaseActivity() {
     var falseAlertMenuButton: ImageView? = null
@@ -29,11 +30,32 @@ class FalseAlertConfirmedActivity : BaseActivity() {
         val drawerLayout = findViewById<DrawerLayout>(R.id.drawer_layout)
         navigationView.itemIconTintList = null
 
-        falseAlertMenuButton?.setOnClickListener(
-            View.OnClickListener { v: View? ->
-                drawerLayout.openDrawer(GravityCompat.START)
-            },
-        )
+        falseAlertMenuButton?.setOnClickListener {
+            drawerLayout.openDrawer(GravityCompat.START)
+        }
+
+        navigationView.setNavigationItemSelectedListener { item ->
+            when (item.itemId) {
+                R.id.nav_home -> {
+                    startActivity(Intent(this, Homepage4admin::class.java))
+                    finish()
+                    true
+                }
+                R.id.nav_signout -> {
+                    androidx.appcompat.app.AlertDialog.Builder(this)
+                        .setTitle(R.string.sign_out)
+                        .setMessage(R.string.sign_out_confirmation_message)
+                        .setPositiveButton(R.string.sign_out) { _, _ ->
+                            EmailPasswordAuthService.signOut(this)
+                            finish()
+                        }
+                        .setNegativeButton(R.string.stay_in, null)
+                        .show()
+                    true
+                }
+                else -> false
+            }
+        }
     }
 
     private fun showDialog() {
@@ -43,7 +65,7 @@ class FalseAlertConfirmedActivity : BaseActivity() {
         val okButtonFalseAlert = dialog.findViewById<Button>(R.id.okButtonFalseAlert)
         okButtonFalseAlert.setOnClickListener { v: View? ->
             val intent =
-                Intent(applicationContext, Homepage4caretaker::class.java)
+                Intent(applicationContext, Homepage4admin::class.java)
             startActivity(intent)
             finish()
         }
diff --git a/app/src/main/java/deakin/gopher/guardian/view/general/Homepage4admin.kt b/app/src/main/java/deakin/gopher/guardian/view/general/Homepage4admin.kt
index fa6f64e5b..c34bd9cf7 100644
--- a/app/src/main/java/deakin/gopher/guardian/view/general/Homepage4admin.kt
+++ b/app/src/main/java/deakin/gopher/guardian/view/general/Homepage4admin.kt
@@ -1,6 +1,7 @@
 package deakin.gopher.guardian.view.general
 
 import android.content.Intent
+import androidx.appcompat.app.AlertDialog
 import android.os.Bundle
 import android.widget.Button
 import deakin.gopher.guardian.R
@@ -56,8 +57,15 @@ class Homepage4admin : BaseActivity() {
 
         // sign out button
         signOutButton.setOnClickListener {
-            EmailPasswordAuthService.signOut(this)
-            finish()
+            AlertDialog.Builder(this)
+                .setTitle(R.string.sign_out)
+                .setMessage(R.string.sign_out_confirmation_message)
+                .setPositiveButton(R.string.sign_out) { _, _ ->
+                    EmailPasswordAuthService.signOut(this)
+                    finish()
+                }
+                .setNegativeButton(R.string.stay_in, null)
+                .show()
         }
 
         // nurse roster button
@@ -67,4 +75,16 @@ class Homepage4admin : BaseActivity() {
             startActivity(nurseRosterActivityIntent)
         }
     }
+
+    override fun onBackPressed() {
+        AlertDialog.Builder(this)
+            .setTitle(R.string.sign_out)
+            .setMessage(R.string.sign_out_confirmation_message)
+            .setPositiveButton(R.string.sign_out) { _, _ ->
+                EmailPasswordAuthService.signOut(this)
+                finish()
+            }
+            .setNegativeButton(R.string.stay_in, null)
+            .show()
+    }
 }
diff --git a/app/src/main/java/deakin/gopher/guardian/view/general/NurseRosterActivity.java b/app/src/main/java/deakin/gopher/guardian/view/general/NurseRosterActivity.java
index 20b970679..17ffa3c6e 100644
--- a/app/src/main/java/deakin/gopher/guardian/view/general/NurseRosterActivity.java
+++ b/app/src/main/java/deakin/gopher/guardian/view/general/NurseRosterActivity.java
@@ -1,12 +1,50 @@
 package deakin.gopher.guardian.view.general;
 
+import android.content.Intent;
 import android.os.Bundle;
+import android.widget.ImageView;
+import androidx.appcompat.app.AlertDialog;
+import androidx.core.view.GravityCompat;
+import androidx.drawerlayout.widget.DrawerLayout;
+import com.google.android.material.navigation.NavigationView;
 import deakin.gopher.guardian.R;
+import deakin.gopher.guardian.services.EmailPasswordAuthService;
 
 public class NurseRosterActivity extends BaseActivity {
   @Override
   protected void onCreate(final Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     setContentView(R.layout.activity_nurse_roster);
+
+    final NavigationView navigationView = findViewById(R.id.nav_view);
+    final DrawerLayout drawerLayout = findViewById(R.id.drawer_layout);
+    final ImageView menuButton = findViewById(R.id.menuButton);
+
+    navigationView.setItemIconTintList(null);
+
+    menuButton.setOnClickListener(v -> drawerLayout.openDrawer(GravityCompat.START));
+
+    navigationView.setNavigationItemSelectedListener(
+        item -> {
+          final int id = item.getItemId();
+          if (id == R.id.nav_home) {
+            startActivity(new Intent(NurseRosterActivity.this, Homepage4admin.class));
+            finish();
+          } else if (id == R.id.nav_signout) {
+            new AlertDialog.Builder(this)
+                .setTitle(R.string.sign_out)
+                .setMessage(R.string.sign_out_confirmation_message)
+                .setPositiveButton(
+                    R.string.sign_out,
+                    (dialog, which) -> {
+                      EmailPasswordAuthService.signOut(this);
+                      finish();
+                    })
+                .setNegativeButton(R.string.stay_in, null)
+                .show();
+          }
+          drawerLayout.closeDrawer(GravityCompat.START);
+          return true;
+        });
   }
 }
diff --git a/app/src/main/java/deakin/gopher/guardian/view/general/PatientProfileActivity.java b/app/src/main/java/deakin/gopher/guardian/view/general/PatientProfileActivity.java
index d12034ffb..08484f3fb 100644
--- a/app/src/main/java/deakin/gopher/guardian/view/general/PatientProfileActivity.java
+++ b/app/src/main/java/deakin/gopher/guardian/view/general/PatientProfileActivity.java
@@ -16,6 +16,7 @@
 import com.google.firebase.database.FirebaseDatabase;
 import deakin.gopher.guardian.R;
 import deakin.gopher.guardian.adapter.PatientProfileAdapter;
+import deakin.gopher.guardian.services.EmailPasswordAuthService;
 
 public class PatientProfileActivity extends BaseActivity {
 
@@ -79,15 +80,9 @@ protected void onCreate(final Bundle savedInstanceState) {
                     final int id = menuItem.getItemId();
                     if (R.id.nav_home == id) {
                       startActivity(new Intent(PatientProfileActivity.this, Homepage4admin.class));
-
-                    } /*else if (R.id.nav_admin == id) {
-                          startActivity(new Intent(PatientProfileActivity.this, Homepage4admin.class));
-                      } else if (R.id.nav_settings == id) {
-                          startActivity(new Intent(PatientProfileActivity.this, Setting.class));
-                      }*/ else if (R.id.nav_signout == id) {
-                      mAuth.getInstance().signOut();
-                      startActivity(new Intent(PatientProfileActivity.this, LoginActivity.class));
                       finish();
+                    } else if (R.id.nav_signout == id) {
+                      showSignOutConfirmationDialog();
                     }
                     return true;
                   });
@@ -173,4 +168,18 @@ private void deletePatient(String patientId) {
                         PatientProfileActivity.this, "Failed to delete patient", Toast.LENGTH_SHORT)
                     .show());
   }
+
+  private void showSignOutConfirmationDialog() {
+    new androidx.appcompat.app.AlertDialog.Builder(this)
+        .setTitle(R.string.sign_out)
+        .setMessage(R.string.sign_out_confirmation_message)
+        .setPositiveButton(
+            R.string.sign_out,
+            (dialog, which) -> {
+              EmailPasswordAuthService.signOut(this);
+              finish();
+            })
+        .setNegativeButton(R.string.stay_in, null)
+        .show();
+  }
 }
diff --git a/app/src/main/java/deakin/gopher/guardian/view/general/PatientProfileAddActivity.java b/app/src/main/java/deakin/gopher/guardian/view/general/PatientProfileAddActivity.java
index 6c7640a25..f3b2245b0 100644
--- a/app/src/main/java/deakin/gopher/guardian/view/general/PatientProfileAddActivity.java
+++ b/app/src/main/java/deakin/gopher/guardian/view/general/PatientProfileAddActivity.java
@@ -18,6 +18,7 @@
 import deakin.gopher.guardian.model.MedicalDiagnostic;
 import deakin.gopher.guardian.model.NextOfKin;
 import deakin.gopher.guardian.model.PatientOldArchive;
+import deakin.gopher.guardian.services.EmailPasswordAuthService;
 import deakin.gopher.guardian.util.DataListener;
 
 public class PatientProfileAddActivity extends BaseActivity implements DataListener {
@@ -47,6 +48,22 @@ protected void onCreate(final Bundle savedInstanceState) {
     customHeader.setHeaderTopImage(R.drawable.add_image_button);
 
     navigationView.setItemIconTintList(null);
+    navigationView.setNavigationItemSelectedListener(
+        item -> {
+          final int itemId = item.getItemId();
+          if (itemId == R.id.nav_home) {
+            startActivity(new Intent(PatientProfileAddActivity.this, Homepage4admin.class));
+            finish();
+            drawerLayout.closeDrawer(GravityCompat.START);
+            return true;
+          } else if (itemId == R.id.nav_signout) {
+            showSignOutConfirmationDialog();
+            drawerLayout.closeDrawer(GravityCompat.START);
+            return true;
+          }
+          drawerLayout.closeDrawer(GravityCompat.START);
+          return false;
+        });
 
     if (null != customHeader) {
       customHeader.menuButton.setOnClickListener(
@@ -251,4 +268,18 @@ private void createMedicalDiagnostic(final String patient_id) {
                         Toast.LENGTH_SHORT)
                     .show());
   }
+
+  private void showSignOutConfirmationDialog() {
+    final AlertDialog.Builder builder = new AlertDialog.Builder(this);
+    builder.setTitle(R.string.sign_out);
+    builder.setMessage(R.string.sign_out_confirmation_message);
+    builder.setPositiveButton(
+        R.string.sign_out,
+        (dialog, which) -> {
+          EmailPasswordAuthService.signOut(this);
+          finish();
+        });
+    builder.setNegativeButton(R.string.stay_in, null);
+    builder.show();
+  }
 }
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..0758614df 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
@@ -18,8 +18,8 @@
 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.services.EmailPasswordAuthService;
 
 public class Setting extends BaseActivity implements View.OnClickListener {
   ConstraintLayout settingsThemeButton;
@@ -94,22 +94,16 @@ private void configureNavigationDrawer(String userType) {
     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) {
+          int id = menuItem.getItemId();
+          if (id == R.id.nav_home) {
+            Intent intent =
+                new Intent(
+                    Setting.this,
+                    userType.equals("admin") ? Homepage4admin.class : Homepage4caretaker.class);
             startActivity(intent);
+            finish();
+          } else if (id == R.id.nav_signout) {
+            showSignOutConfirmationDialog();
           }
 
           DrawerLayout drawerLayout = findViewById(R.id.drawer_layout);
@@ -118,6 +112,20 @@ private void configureNavigationDrawer(String userType) {
         });
   }
 
+  private void showSignOutConfirmationDialog() {
+    new AlertDialog.Builder(this)
+        .setTitle(R.string.sign_out)
+        .setMessage(R.string.sign_out_confirmation_message)
+        .setPositiveButton(
+            R.string.sign_out,
+            (dialog, which) -> {
+              EmailPasswordAuthService.signOut(this);
+              finish();
+            })
+        .setNegativeButton(R.string.stay_in, null)
+        .show();
+  }
+
   private void handleThemeSwitch(final boolean isChecked) {
     final SharedPreferences sharedPreferences = getSharedPreferences("settings", MODE_PRIVATE);
     if (isChecked) {
diff --git a/app/src/main/java/deakin/gopher/guardian/view/gp/GPAddFragment.kt b/app/src/main/java/deakin/gopher/guardian/view/gp/GPAddFragment.kt
index b5218c6b9..047b8a840 100644
--- a/app/src/main/java/deakin/gopher/guardian/view/gp/GPAddFragment.kt
+++ b/app/src/main/java/deakin/gopher/guardian/view/gp/GPAddFragment.kt
@@ -42,9 +42,6 @@ class GPAddFragment(private var status: Int = 0) : Fragment() {
     ): View? {
         viewPager2 = requireActivity().findViewById(R.id.dataForViewViewPager)
         val rootView = inflater.inflate(R.layout.fragment_gp_add, container, false)
-
-        val leftButton: Button = rootView.findViewById(R.id.gp_add_polygon_left)
-        val rightButton: Button = rootView.findViewById(R.id.gp_add_polygon_right)
         val nextButton: Button = rootView.findViewById(R.id.gp_add_NextButton)
         val prevButton: Button = rootView.findViewById(R.id.gp_add_PrevButton)
 
@@ -106,31 +103,10 @@ class GPAddFragment(private var status: Int = 0) : Fragment() {
             }
         }
 
-        if (status == 2) {
-            leftButton.setBackgroundResource(R.drawable.polygon_3)
-            rightButton.setBackgroundResource(R.drawable.polygon_4)
-        } else {
+        if (status != 2) {
             nextButton.setText(R.string.next)
         }
 
-        rightButton.setOnClickListener {
-            if (status == 1) {
-                if (dataChecker()) {
-                    saveGp()
-                    scrollPage(true)
-                }
-            }
-        }
-
-        leftButton.setOnClickListener {
-            if (status == 2) {
-                if (dataChecker()) {
-                    saveGp()
-                    scrollPage(false)
-                }
-            }
-        }
-
         nextButton.setOnClickListener {
             if (dataChecker()) {
                 saveGp()
@@ -157,10 +133,8 @@ class GPAddFragment(private var status: Int = 0) : Fragment() {
         }
 
         prevButton.setOnClickListener {
-            if (dataChecker()) {
-                saveGp()
-                scrollPage(false)
-            }
+            // Allow navigating to the previous step even if required fields are empty
+            scrollPage(false)
         }
 
         return rootView
@@ -209,29 +183,26 @@ class GPAddFragment(private var status: Int = 0) : Fragment() {
         email = emailInput.text.toString()
         fax = faxInput.text.toString()
 
-        return when {
-            firstName.isNullOrEmpty() -> {
-                setErrorAndReturn(firstNameInput, "First name is Required.")
-                false
-            }
-
-            lastName.isNullOrEmpty() -> {
-                setErrorAndReturn(lastNameInput, "Last name is Required.")
-                false
-            }
-
-            clinicAddress.isNullOrEmpty() -> {
-                setErrorAndReturn(clinicAddressInput, "Clinic address is Required.")
-                false
-            }
+        var isValid = true
 
-            phoneNumber.isNullOrEmpty() -> {
-                setErrorAndReturn(phoneNumberInput, "Phone number is Required.")
-                false
-            }
-
-            else -> true
+        if (firstName.isNullOrEmpty()) {
+            setErrorAndReturn(firstNameInput, "First name is Required.")
+            isValid = false
+        }
+        if (lastName.isNullOrEmpty()) {
+            setErrorAndReturn(lastNameInput, "Last name is Required.")
+            isValid = false
         }
+        if (clinicAddress.isNullOrEmpty()) {
+            setErrorAndReturn(clinicAddressInput, "Clinic address is Required.")
+            isValid = false
+        }
+        if (phoneNumber.isNullOrEmpty()) {
+            setErrorAndReturn(phoneNumberInput, "Phone number is Required.")
+            isValid = false
+        }
+
+        return isValid
     }
 
     private fun setErrorAndReturn(
diff --git a/app/src/main/java/deakin/gopher/guardian/view/nextofkin/NoKAddFragment.kt b/app/src/main/java/deakin/gopher/guardian/view/nextofkin/NoKAddFragment.kt
index 7b1b9936a..3360d2cc3 100644
--- a/app/src/main/java/deakin/gopher/guardian/view/nextofkin/NoKAddFragment.kt
+++ b/app/src/main/java/deakin/gopher/guardian/view/nextofkin/NoKAddFragment.kt
@@ -45,8 +45,6 @@ class NoKAddFragment : Fragment {
     ): View? {
         viewPager2 = requireActivity().findViewById(R.id.dataForViewViewPager)
         val rootView = inflater.inflate(R.layout.fragment_nok_add, container, false)
-        val leftButton = rootView.findViewById<Button>(R.id.nok_add_polygon_left)
-        val rightButton = rootView.findViewById<Button>(R.id.nok_add_polygon_right)
         val nextButton = rootView.findViewById<Button>(R.id.nok_add_NextButton)
         val prevButton = rootView.findViewById<Button>(R.id.nok_add_PrevButton)
         firstNameInput = rootView.findViewById(R.id.input_nok_FirstName)
@@ -118,31 +116,6 @@ class NoKAddFragment : Fragment {
             }
         }
 
-        if (2 == status) {
-            leftButton.setBackgroundResource(R.drawable.polygon_3)
-            rightButton.setBackgroundResource(R.drawable.polygon_4)
-        }
-        rightButton.setOnClickListener { view: View? ->
-            if (1 == status) {
-                // for now I keep 2 next of kins and 2 gps waiting to be add
-                // but default adding 1 nok and 1gp, after alick right arrow the second one shows up
-                // is better
-                if (dataChecker()) {
-                    saveNextofKin()
-                    scrollPage(true)
-                }
-            }
-        }
-
-        leftButton.setOnClickListener { view: View? ->
-            if (2 == status) {
-                if (dataChecker()) {
-                    saveNextofKin()
-                    scrollPage(false)
-                }
-            }
-        }
-
         nextButton.setOnClickListener { view: View? ->
             if (dataChecker()) {
                 saveNextofKin()
@@ -151,10 +124,8 @@ class NoKAddFragment : Fragment {
         }
 
         prevButton.setOnClickListener { view: View? ->
-            if (dataChecker()) {
-                saveNextofKin()
-                scrollPage(false)
-            }
+            // Allow navigating to the previous step even if required fields are empty
+            scrollPage(false)
         }
 
         return rootView
@@ -205,24 +176,26 @@ class NoKAddFragment : Fragment {
         phoneNumber = phoneInput!!.text.toString()
         email = emailInput!!.text.toString()
 
+        var isValid = true
+
         if (TextUtils.isEmpty(firstName)) {
             setErrorAndReturn(firstNameInput, "First name is Required.")
-            return false
+            isValid = false
         }
         if (TextUtils.isEmpty(lastName)) {
             setErrorAndReturn(lastNameInput, "Last name is Required.")
-            return false
+            isValid = false
         }
         if (TextUtils.isEmpty(address)) {
             setErrorAndReturn(addressInput, "Address is Required.")
-            return false
+            isValid = false
         }
         if (TextUtils.isEmpty(phoneNumber)) {
             setErrorAndReturn(phoneInput, "Phone number is Required.")
-            return false
+            isValid = false
         }
 
-        return true
+        return isValid
     }
 
     private fun setErrorAndReturn(
diff --git a/app/src/main/java/deakin/gopher/guardian/view/patient/PatientAddFragment.java b/app/src/main/java/deakin/gopher/guardian/view/patient/PatientAddFragment.java
index c01bdfb19..8e5f74f2f 100644
--- a/app/src/main/java/deakin/gopher/guardian/view/patient/PatientAddFragment.java
+++ b/app/src/main/java/deakin/gopher/guardian/view/patient/PatientAddFragment.java
@@ -181,23 +181,25 @@ private boolean dataChecker() {
     lastName = last_name.getText().toString();
     medicareNo = medicare_no.getText().toString();
     westernAffairsNo = western_affairs_no.getText().toString();
+    boolean isValid = true;
+
     if (TextUtils.isEmpty(firstName)) {
       setErrorAndReturn(first_name, "First name is Required.");
-      return false;
+      isValid = false;
     }
     if (TextUtils.isEmpty(lastName)) {
       setErrorAndReturn(last_name, "Last name is Required.");
-      return false;
+      isValid = false;
     }
     if (TextUtils.isEmpty(dateOfBirth)) {
       setErrorAndReturn(date_of_birth, "Date of Birth is Required.");
-      return false;
+      isValid = false;
     }
     if (TextUtils.isEmpty(medicareNo)) {
       setErrorAndReturn(medicare_no, "Medicare number is Required.");
-      return false;
+      isValid = false;
     }
-    return true;
+    return isValid;
   }
 
   private void setErrorAndReturn(final EditText editText, final String s) {
diff --git a/app/src/main/java/deakin/gopher/guardian/view/patient/careplan/CarePlanActivity.java b/app/src/main/java/deakin/gopher/guardian/view/patient/careplan/CarePlanActivity.java
index 5d97ac573..3f62854b0 100644
--- a/app/src/main/java/deakin/gopher/guardian/view/patient/careplan/CarePlanActivity.java
+++ b/app/src/main/java/deakin/gopher/guardian/view/patient/careplan/CarePlanActivity.java
@@ -1,6 +1,7 @@
 package deakin.gopher.guardian.view.patient.careplan;
 
 import android.os.Bundle;
+import android.content.Intent;
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.ImageView;
@@ -18,6 +19,8 @@
 import com.google.firebase.database.FirebaseDatabase;
 import com.google.firebase.database.ValueEventListener;
 import deakin.gopher.guardian.R;
+import deakin.gopher.guardian.services.EmailPasswordAuthService;
+import deakin.gopher.guardian.view.general.Homepage4admin;
 import deakin.gopher.guardian.model.CarePlan;
 import java.util.HashMap;
 
@@ -65,6 +68,29 @@ protected void onCreate(final Bundle savedInstanceState) {
           drawerLayout.openDrawer(GravityCompat.START);
         });
 
+    navigationView.setNavigationItemSelectedListener(
+        item -> {
+          int id = item.getItemId();
+          if (id == R.id.nav_home) {
+            startActivity(new Intent(CarePlanActivity.this, Homepage4admin.class));
+            finish();
+          } else if (id == R.id.nav_signout) {
+            new AlertDialog.Builder(this)
+                .setTitle(R.string.sign_out)
+                .setMessage(R.string.sign_out_confirmation_message)
+                .setPositiveButton(
+                    R.string.sign_out,
+                    (dialog, which) -> {
+                      EmailPasswordAuthService.signOut(this);
+                      finish();
+                    })
+                .setNegativeButton(R.string.stay_in, null)
+                .show();
+          }
+          drawerLayout.closeDrawer(GravityCompat.START);
+          return true;
+        });
+
     // careplan type
     carePlanTypeRadioGroup = findViewById(R.id.carePlanTypeRGroup);
     carePlanTypesRadioButtons.put((RadioButton) findViewById(R.id.radioButton2), "Home");
diff --git a/app/src/main/java/deakin/gopher/guardian/view/patient/careplan/CarePlanSummaryActivity.java b/app/src/main/java/deakin/gopher/guardian/view/patient/careplan/CarePlanSummaryActivity.java
index 6ceab1203..e47e422e2 100644
--- a/app/src/main/java/deakin/gopher/guardian/view/patient/careplan/CarePlanSummaryActivity.java
+++ b/app/src/main/java/deakin/gopher/guardian/view/patient/careplan/CarePlanSummaryActivity.java
@@ -10,6 +10,8 @@
 import androidx.drawerlayout.widget.DrawerLayout;
 import com.google.android.material.navigation.NavigationView;
 import deakin.gopher.guardian.R;
+import deakin.gopher.guardian.services.EmailPasswordAuthService;
+import deakin.gopher.guardian.view.general.Homepage4admin;
 
 public class CarePlanSummaryActivity extends AppCompatActivity {
   Button prevButton;
@@ -34,5 +36,28 @@ protected void onCreate(final Bundle savedInstanceState) {
         v -> {
           drawerLayout.openDrawer(GravityCompat.START);
         });
+
+    navigationView.setNavigationItemSelectedListener(
+        item -> {
+          int id = item.getItemId();
+          if (id == R.id.nav_home) {
+            startActivity(new Intent(CarePlanSummaryActivity.this, Homepage4admin.class));
+            finish();
+          } else if (id == R.id.nav_signout) {
+            new androidx.appcompat.app.AlertDialog.Builder(this)
+                .setTitle(R.string.sign_out)
+                .setMessage(R.string.sign_out_confirmation_message)
+                .setPositiveButton(
+                    R.string.sign_out,
+                    (dialog, which) -> {
+                      EmailPasswordAuthService.signOut(this);
+                      finish();
+                    })
+                .setNegativeButton(R.string.stay_in, null)
+                .show();
+          }
+          drawerLayout.closeDrawer(GravityCompat.START);
+          return true;
+        });
   }
 }
diff --git a/app/src/main/java/deakin/gopher/guardian/view/patient/dailyreport/DailyReportActivity.java b/app/src/main/java/deakin/gopher/guardian/view/patient/dailyreport/DailyReportActivity.java
index 44b42c62a..6e14cb5e5 100644
--- a/app/src/main/java/deakin/gopher/guardian/view/patient/dailyreport/DailyReportActivity.java
+++ b/app/src/main/java/deakin/gopher/guardian/view/patient/dailyreport/DailyReportActivity.java
@@ -1,6 +1,7 @@
 package deakin.gopher.guardian.view.patient.dailyreport;
 
 import android.os.Bundle;
+import android.content.Intent;
 import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.appcompat.app.AppCompatActivity;
@@ -8,6 +9,8 @@
 import androidx.drawerlayout.widget.DrawerLayout;
 import com.google.android.material.navigation.NavigationView;
 import deakin.gopher.guardian.R;
+import deakin.gopher.guardian.services.EmailPasswordAuthService;
+import deakin.gopher.guardian.view.general.Homepage4admin;
 
 public class DailyReportActivity extends AppCompatActivity {
 
@@ -28,6 +31,29 @@ protected void onCreate(final Bundle savedInstanceState) {
           drawerLayout.openDrawer(GravityCompat.START);
         });
 
+    navigationView.setNavigationItemSelectedListener(
+        item -> {
+          int id = item.getItemId();
+          if (id == R.id.nav_home) {
+            startActivity(new Intent(DailyReportActivity.this, Homepage4admin.class));
+            finish();
+          } else if (id == R.id.nav_signout) {
+            new androidx.appcompat.app.AlertDialog.Builder(this)
+                .setTitle(R.string.sign_out)
+                .setMessage(R.string.sign_out_confirmation_message)
+                .setPositiveButton(
+                    R.string.sign_out,
+                    (dialog, which) -> {
+                      EmailPasswordAuthService.signOut(this);
+                      finish();
+                    })
+                .setNegativeButton(R.string.stay_in, null)
+                .show();
+          }
+          drawerLayout.closeDrawer(GravityCompat.START);
+          return true;
+        });
+
     final String patientNameExtra = getIntent().getStringExtra("patientName");
     final String patientName = patientNameExtra != null ? patientNameExtra.split(" ")[0] : "";
 
diff --git a/app/src/main/java/deakin/gopher/guardian/view/patient/dailyreport/DailyReportSummaryActivity.java b/app/src/main/java/deakin/gopher/guardian/view/patient/dailyreport/DailyReportSummaryActivity.java
index 712605861..65dcab5c7 100644
--- a/app/src/main/java/deakin/gopher/guardian/view/patient/dailyreport/DailyReportSummaryActivity.java
+++ b/app/src/main/java/deakin/gopher/guardian/view/patient/dailyreport/DailyReportSummaryActivity.java
@@ -11,6 +11,8 @@
 import androidx.drawerlayout.widget.DrawerLayout;
 import com.google.android.material.navigation.NavigationView;
 import deakin.gopher.guardian.R;
+import deakin.gopher.guardian.services.EmailPasswordAuthService;
+import deakin.gopher.guardian.view.general.Homepage4admin;
 import deakin.gopher.guardian.util.Util;
 import java.text.ParseException;
 import java.util.Date;
@@ -38,6 +40,29 @@ protected void onCreate(final Bundle savedInstanceState) {
           drawerLayout.openDrawer(GravityCompat.START);
         });
 
+    navigationView.setNavigationItemSelectedListener(
+        item -> {
+          int id = item.getItemId();
+          if (id == R.id.nav_home) {
+            startActivity(new Intent(DailyReportSummaryActivity.this, Homepage4admin.class));
+            finish();
+          } else if (id == R.id.nav_signout) {
+            new androidx.appcompat.app.AlertDialog.Builder(this)
+                .setTitle(R.string.sign_out)
+                .setMessage(R.string.sign_out_confirmation_message)
+                .setPositiveButton(
+                    R.string.sign_out,
+                    (dialog, which) -> {
+                      EmailPasswordAuthService.signOut(this);
+                      finish();
+                    })
+                .setNegativeButton(R.string.stay_in, null)
+                .show();
+          }
+          drawerLayout.closeDrawer(GravityCompat.START);
+          return true;
+        });
+
     final TextView currentStatusSummary = findViewById(R.id.currentStatusSummary);
     final TextView progressNotesSummary = findViewById(R.id.progressNotesSummary);
     final CalendarView patientReportSummaryCalendarView =
diff --git a/app/src/main/res/layout/fragment_gp_add.xml b/app/src/main/res/layout/fragment_gp_add.xml
index 0de5a9370..aab99f9f6 100644
--- a/app/src/main/res/layout/fragment_gp_add.xml
+++ b/app/src/main/res/layout/fragment_gp_add.xml
@@ -279,34 +279,6 @@
 
                 </LinearLayout>
 
-                <Button
-                    android:id="@+id/gp_add_polygon_left"
-                    android:layout_width="26dp"
-                    android:layout_height="26dp"
-                    android:layout_alignParentLeft="true"
-                    android:layout_alignParentTop="true"
-                    android:background="@drawable/polygon_2"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintHorizontal_bias="0.87"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintVertical_bias="0.27" />
-
-                <Button
-                    android:id="@+id/gp_add_polygon_right"
-                    android:layout_width="26dp"
-                    android:layout_height="26dp"
-                    android:layout_alignParentLeft="true"
-                    android:layout_alignParentTop="true"
-                    android:background="@drawable/polygon_1"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintHorizontal_bias="0.970"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintVertical_bias="0.27" />
-
             </androidx.constraintlayout.widget.ConstraintLayout>
 
             <TextView
diff --git a/app/src/main/res/layout/fragment_nok_add.xml b/app/src/main/res/layout/fragment_nok_add.xml
index c55f83016..26ec6483a 100644
--- a/app/src/main/res/layout/fragment_nok_add.xml
+++ b/app/src/main/res/layout/fragment_nok_add.xml
@@ -51,16 +51,16 @@
 
                             <Button
                                 android:id="@+id/step1"
-                                android:layout_width="26dp"
-                                android:layout_height="26dp"
+                                android:layout_width="32dp"
+                                android:layout_height="32dp"
                                 android:layout_marginLeft="25sp"
                                 android:layout_marginTop="0sp"
-                                android:layout_marginRight="2sp"
+                                android:layout_marginRight="4sp"
                                 android:background="@drawable/roundshapebtn"
                                 android:fontFamily="sans-serif-black"
                                 android:gravity="center"
                                 android:text="@string/_1"
-                                android:textSize="10sp" />
+                                android:textSize="12sp" />
 
                             <View
                                 android:layout_width="20dp"
@@ -99,16 +99,16 @@
 
                             <Button
                                 android:id="@+id/step2"
-                                android:layout_width="26dp"
-                                android:layout_height="26dp"
+                                android:layout_width="32dp"
+                                android:layout_height="32dp"
                                 android:layout_marginLeft="5sp"
                                 android:layout_marginTop="0sp"
-                                android:layout_marginRight="2sp"
+                                android:layout_marginRight="4sp"
                                 android:background="@drawable/roundshapeseletebtn"
                                 android:fontFamily="sans-serif-black"
                                 android:gravity="center"
                                 android:text="@string/_2"
-                                android:textSize="10sp" />
+                                android:textSize="12sp" />
 
                             <View
                                 android:layout_width="15dp"
@@ -148,16 +148,16 @@
 
                             <Button
                                 android:id="@+id/step3"
-                                android:layout_width="26dp"
-                                android:layout_height="26dp"
+                                android:layout_width="32dp"
+                                android:layout_height="32dp"
                                 android:layout_marginLeft="5sp"
                                 android:layout_marginTop="0sp"
-                                android:layout_marginRight="2sp"
+                                android:layout_marginRight="4sp"
                                 android:background="@drawable/roundshapebtn"
                                 android:fontFamily="sans-serif-black"
                                 android:gravity="center"
                                 android:text="@string/_3"
-                                android:textSize="10sp" />
+                                android:textSize="12sp" />
 
                             <View
                                 android:layout_width="15dp"
@@ -197,16 +197,16 @@
 
                             <Button
                                 android:id="@+id/step4"
-                                android:layout_width="26dp"
-                                android:layout_height="26dp"
+                                android:layout_width="32dp"
+                                android:layout_height="32dp"
                                 android:layout_marginLeft="5sp"
                                 android:layout_marginTop="0sp"
-                                android:layout_marginRight="2sp"
+                                android:layout_marginRight="4sp"
                                 android:background="@drawable/roundshapebtn"
                                 android:fontFamily="sans-serif-black"
                                 android:gravity="center"
                                 android:text="@string/_4"
-                                android:textSize="10sp" />
+                                android:textSize="12sp" />
 
                             <View
                                 android:layout_width="15dp"
@@ -246,16 +246,16 @@
 
                             <Button
                                 android:id="@+id/step5"
-                                android:layout_width="26dp"
-                                android:layout_height="26dp"
+                                android:layout_width="32dp"
+                                android:layout_height="32dp"
                                 android:layout_marginLeft="5sp"
                                 android:layout_marginTop="0sp"
-                                android:layout_marginRight="2sp"
+                                android:layout_marginRight="4sp"
                                 android:background="@drawable/roundshapebtn"
                                 android:fontFamily="sans-serif-black"
                                 android:gravity="center"
                                 android:text="@string/_5"
-                                android:textSize="10sp" />
+                                android:textSize="12sp" />
 
 
                         </LinearLayout>
@@ -279,34 +279,6 @@
 
                 </LinearLayout>
 
-                <Button
-                    android:id="@+id/nok_add_polygon_left"
-                    android:layout_width="26dp"
-                    android:layout_height="26dp"
-                    android:layout_alignParentLeft="true"
-                    android:layout_alignParentTop="true"
-                    android:background="@drawable/polygon_2"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintHorizontal_bias="0.87"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintVertical_bias="0.27" />
-
-                <Button
-                    android:id="@+id/nok_add_polygon_right"
-                    android:layout_width="26dp"
-                    android:layout_height="26dp"
-                    android:layout_alignParentLeft="true"
-                    android:layout_alignParentTop="true"
-                    android:background="@drawable/polygon_1"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintHorizontal_bias="0.97"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintVertical_bias="0.27" />
-
             </androidx.constraintlayout.widget.ConstraintLayout>
 
             <TextView
diff --git a/app/src/main/res/layout/fragment_patient_add.xml b/app/src/main/res/layout/fragment_patient_add.xml
index fe6d6cc4e..b04666c46 100644
--- a/app/src/main/res/layout/fragment_patient_add.xml
+++ b/app/src/main/res/layout/fragment_patient_add.xml
@@ -52,16 +52,16 @@
 
                             <Button
                                     android:id="@+id/step1"
-                                    android:layout_width="26dp"
-                                    android:layout_height="26dp"
+                                    android:layout_width="32dp"
+                                    android:layout_height="32dp"
                                     android:layout_marginLeft="25sp"
                                     android:layout_marginTop="0sp"
-                                    android:layout_marginRight="2sp"
+                                    android:layout_marginRight="4sp"
                                     android:background="@drawable/roundshapeseletebtn"
                                     android:fontFamily="sans-serif-black"
                                     android:gravity="center"
                                     android:text="@string/_1"
-                                    android:textSize="10sp" />
+                                    android:textSize="12sp" />
 
                             <View
                                     android:layout_width="20dp"
@@ -100,16 +100,16 @@
 
                             <Button
                                     android:id="@+id/step2"
-                                    android:layout_width="26dp"
-                                    android:layout_height="26dp"
+                                    android:layout_width="32dp"
+                                    android:layout_height="32dp"
                                     android:layout_marginLeft="5sp"
                                     android:layout_marginTop="0sp"
-                                    android:layout_marginRight="2sp"
+                                    android:layout_marginRight="4sp"
                                     android:background="@drawable/roundshapebtn"
                                     android:fontFamily="sans-serif-black"
                                     android:gravity="center"
                                     android:text="@string/_2"
-                                    android:textSize="10sp" />
+                                    android:textSize="12sp" />
 
                             <View
                                     android:layout_width="15dp"
@@ -149,16 +149,16 @@
 
                             <Button
                                     android:id="@+id/step3"
-                                    android:layout_width="26dp"
-                                    android:layout_height="26dp"
+                                    android:layout_width="32dp"
+                                    android:layout_height="32dp"
                                     android:layout_marginLeft="5sp"
                                     android:layout_marginTop="0sp"
-                                    android:layout_marginRight="2sp"
+                                    android:layout_marginRight="4sp"
                                     android:background="@drawable/roundshapebtn"
                                     android:fontFamily="sans-serif-black"
                                     android:gravity="center"
                                     android:text="@string/_3"
-                                    android:textSize="10sp" />
+                                    android:textSize="12sp" />
 
                             <View
                                     android:layout_width="15dp"
@@ -198,16 +198,16 @@
 
                             <Button
                                     android:id="@+id/step4"
-                                    android:layout_width="26dp"
-                                    android:layout_height="26dp"
+                                    android:layout_width="32dp"
+                                    android:layout_height="32dp"
                                     android:layout_marginLeft="5sp"
                                     android:layout_marginTop="0sp"
-                                    android:layout_marginRight="2sp"
+                                    android:layout_marginRight="4sp"
                                     android:background="@drawable/roundshapebtn"
                                     android:fontFamily="sans-serif-black"
                                     android:gravity="center"
                                     android:text="@string/_4"
-                                    android:textSize="10sp" />
+                                    android:textSize="12sp" />
 
                             <View
                                     android:layout_width="15dp"
@@ -247,16 +247,16 @@
 
                             <Button
                                     android:id="@+id/step5"
-                                    android:layout_width="26dp"
-                                    android:layout_height="26dp"
+                                    android:layout_width="32dp"
+                                    android:layout_height="32dp"
                                     android:layout_marginLeft="5sp"
                                     android:layout_marginTop="0sp"
-                                    android:layout_marginRight="2sp"
+                                    android:layout_marginRight="4sp"
                                     android:background="@drawable/roundshapebtn"
                                     android:fontFamily="sans-serif-black"
                                     android:gravity="center"
                                     android:text="@string/_5"
-                                    android:textSize="10sp" />
+                                    android:textSize="12sp" />
 
 
                         </LinearLayout>
@@ -280,35 +280,6 @@
 
                 </LinearLayout>
 
-                <Button
-                        android:id="@+id/gp_add_polygon_left"
-                        android:layout_width="26dp"
-                        android:layout_height="26dp"
-                        android:layout_alignParentLeft="true"
-                        android:layout_alignParentTop="true"
-                        android:background="@drawable/polygon_2"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintHorizontal_bias="0.87"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent"
-                        app:layout_constraintVertical_bias="0.27" />
-
-                <Button
-                        android:id="@+id/gp_add_polygon_right"
-                        android:layout_width="26dp"
-                        android:layout_height="26dp"
-                        android:layout_alignParentLeft="true"
-                        android:layout_alignParentTop="true"
-                        android:layout_marginRight="0dp"
-                        android:background="@drawable/polygon_1"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintHorizontal_bias="0.97"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent"
-                        app:layout_constraintVertical_bias="0.27" />
-
             </androidx.constraintlayout.widget.ConstraintLayout>
 
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9fe4ecab0..7ec31823e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -144,6 +144,8 @@
     <string name="working_at">Working at</string>
     <string name="st_vincent_s_public_hospital_melbourne">St. Vincent\'s Public Hospital Melbourne</string>
     <string name="sign_out">Sign Out</string>
+    <string name="sign_out_confirmation_message">Do you want to sign out?</string>
+    <string name="stay_in">Stay in</string>
     <string name="confirm_incident">Confirm Incident</string>
     <string name="confirm_false_alert">Confirm False Alert</string>
     <string name="alert">! Alert</string>