diff --git a/app/src/main/java/com/example/hpostesting/presentation/main_base/SettingsFragment.kt b/app/src/main/java/com/example/hpostesting/presentation/main_base/SettingsFragment.kt
index 7c32aa7..26b18a9 100644
--- a/app/src/main/java/com/example/hpostesting/presentation/main_base/SettingsFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/main_base/SettingsFragment.kt
@@ -134,7 +134,7 @@ class PrefsFragment : PreferenceFragmentCompat() {
         autoSmbtValue = sharedPreference.getBoolean("AutSmbt", false)
         val preferenceScreen = preferenceManager.createPreferenceScreen(requireContext())
         val currentServer = firebaseManager.getLastSelectedServer().serverName
-
+        val arWeAdmin =sharedPreference.getString(Constants.USER_ID, "").toString() == "ADMIN"
 
         // Language Preference
         val languagePreference = ListPreference(requireContext()).apply {
@@ -206,7 +206,7 @@ class PrefsFragment : PreferenceFragmentCompat() {
             title = "Auto submit"
             summary = "Enable or disable Auto submit"
             icon =
-                ContextCompat.getDrawable(requireContext(), R.drawable.baseline_developer_mode_24)
+                ContextCompat.getDrawable(requireContext(), R.drawable.baseline_motion_auto_24)
             key = "auto_submit_key" // Unique key for SharedPreferences
 
             // Load toggle state from SharedPreferences
@@ -228,32 +228,34 @@ class PrefsFragment : PreferenceFragmentCompat() {
 
             setOnPreferenceClickListener {
                 tapManager.registerTap {
-                   firebaseManager.setDevModeOn(true)
-
+                    if (arWeAdmin) {
+                        firebaseManager.setDevModeOn(true)
 
                     if (firebaseManager.getDevMode()  && currentServer != "dev") {
                         Toast.makeText(requireContext(), "Now you are a Developer", Toast.LENGTH_SHORT).show()
-                        Toast.makeText(requireContext(), "Setting Up developer Environmnet", Toast.LENGTH_SHORT).show()
+                        Toast.makeText(requireContext(), "Setting Up developer Environment", Toast.LENGTH_SHORT).show()
                     }
 
                     if (preferenceScreen.findPreference<SwitchPreferenceCompat>("developer_options") == null) {
                         preferenceScreen.addPreference(developerToggle)
-                        preferenceScreen.addPreference(autosmbt)
-
+                            preferenceScreen.addPreference(autosmbt)
                     }
+
                     if (preferenceScreen.findPreference<ListPreference>("server_preference") == null) {
                         preferenceScreen.addPreference(serverSelectorPreference)
                     }
-
                     developerToggle.isChecked = true
                     updateServerPreference(currentServer)
+                }else{
+                        Toast.makeText(requireContext(), "Works Only On Admin Mode", Toast.LENGTH_SHORT).show()
+                    }
                 }
                 true
             }
         }
 
         preferenceScreen.addPreference(appVersionPreference)
-        if (firebaseManager.getDevMode()) {
+        if (firebaseManager.getDevMode() && arWeAdmin) {
             developerToggle.isChecked = true // Ensure it's checked
             preferenceScreen.addPreference(developerToggle)
             preferenceScreen.addPreference(autosmbt)
diff --git a/app/src/main/java/com/example/hpostesting/presentation/trueheme_test/TrueHemeTestFragment.kt b/app/src/main/java/com/example/hpostesting/presentation/trueheme_test/TrueHemeTestFragment.kt
index 152cfd3..99c5065 100644
--- a/app/src/main/java/com/example/hpostesting/presentation/trueheme_test/TrueHemeTestFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/trueheme_test/TrueHemeTestFragment.kt
@@ -201,7 +201,9 @@ class TrueHemeTestFragment : Fragment() {
     private fun initViews() {
         binding.tvSubtitle4.movementMethod = ScrollingMovementMethod()
         binding.tvDeviceMessages.movementMethod = ScrollingMovementMethod()
-
+        binding.btnGoback.setOnClickListener{
+            goback()
+        }
         binding.btnSubmit.setOnClickListener {
 //            with(sharedPreferences.edit()) {
 //                putBoolean(Constants.QUICK_CAPTURE, false)
@@ -248,6 +250,7 @@ class TrueHemeTestFragment : Fragment() {
         binding.nameEditText.visibility = View.GONE
         binding.tvTitle.visibility = View.GONE
         binding.btnGo.visibility = View.GONE
+        binding.btnGoback.visibility = View.GONE
 //        binding.btnPlacebuffer.visibility = View.GONE
         val cuvetteSize = sharedPreferences.getString(Constants.CUVETTE_SIZE,"10mm")
         val cuvetteText = "Cuvette Size: $cuvetteSize"
@@ -400,6 +403,7 @@ class TrueHemeTestFragment : Fragment() {
                         Toast.makeText(context, "Gooing back 2", Toast.LENGTH_SHORT).show()
                         startActivity(Intent(requireActivity(), DashboardActivity::class.java))
                     }else{
+                        makeRetryButtonVisible()
                         Toast.makeText(context, "Remove Cuvette", Toast.LENGTH_SHORT).show()
                     }
                 }else{
@@ -415,6 +419,7 @@ class TrueHemeTestFragment : Fragment() {
                         Toast.makeText(context, "Gooing back", Toast.LENGTH_SHORT).show()
                         startActivity(Intent(requireActivity(), DashboardActivity::class.java))
                     }else{
+                        makeRetryButtonVisible()
                         Toast.makeText(context, "Remove Cuvette", Toast.LENGTH_SHORT).show()
                     }
                 }else{
@@ -470,6 +475,7 @@ class TrueHemeTestFragment : Fragment() {
                         Toast.makeText(context, "Gooing back 3", Toast.LENGTH_SHORT).show()
                         startActivity(i)
                     }else{
+                        makeRetryButtonVisible()
                         Toast.makeText(context, "Remove Cuvette", Toast.LENGTH_SHORT).show()
                     }
                 }else {
@@ -1776,6 +1782,13 @@ class TrueHemeTestFragment : Fragment() {
            startActivity(Intent(requireActivity(), DashboardActivity::class.java))
        }
    }
+
+    fun makeRetryButtonVisible(){
+        activity?.runOnUiThread {
+            binding.btnGoback.visibility = View.VISIBLE
+
+        }
+    }
     private fun startSampleProcess() {
             trueHemeTestViewModel.progressBar.postValue(true)
 
diff --git a/app/src/main/res/drawable/baseline_motion_auto_24.xml b/app/src/main/res/drawable/baseline_motion_auto_24.xml
new file mode 100644
index 0000000..03770a5
--- /dev/null
+++ b/app/src/main/res/drawable/baseline_motion_auto_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M2.88,7.88l1.54,1.54C4.15,10.23 4,11.1 4,12c0,4.41 3.59,8 8,8s8,-3.59 8,-8s-3.59,-8 -8,-8c-0.9,0 -1.77,0.15 -2.58,0.42L7.89,2.89C9.15,2.32 10.54,2 12,2c5.52,0 10,4.48 10,10s-4.48,10 -10,10S2,17.52 2,12C2,10.53 2.32,9.14 2.88,7.88zM7,5.5C7,6.33 6.33,7 5.5,7S4,6.33 4,5.5S4.67,4 5.5,4S7,4.67 7,5.5zM12.03,8.99h-0.07l-1.16,3.31h2.39L12.03,8.99zM12,18c3.31,0 6,-2.69 6,-6s-2.69,-6 -6,-6s-6,2.69 -6,6S8.69,18 12,18zM11.29,7.5h1.43l3.01,8h-1.39l-0.72,-2.04h-3.23L9.66,15.5H8.28L11.29,7.5z"/>
+    
+</vector>
diff --git a/app/src/main/res/layout/fragment_hemo_cube_reference.xml b/app/src/main/res/layout/fragment_hemo_cube_reference.xml
index 38e547e..457f857 100644
--- a/app/src/main/res/layout/fragment_hemo_cube_reference.xml
+++ b/app/src/main/res/layout/fragment_hemo_cube_reference.xml
@@ -225,6 +225,19 @@
                 app:cornerRadius="16dp"
                  />
 
+            <Button
+            android:id="@+id/btn_goback"
+            android:visibility="gone"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="16dp"
+            android:layout_marginTop="24dp"
+            android:clickable="false"
+            android:text="Go back"
+            android:textColor="@color/white"
+            app:cornerRadius="16dp"
+            />
+
         </LinearLayout>
 
         <TextView
diff --git a/app/src/main/res/layout/fragment_report.xml b/app/src/main/res/layout/fragment_report.xml
index 1db7b78..2664ba4 100644
--- a/app/src/main/res/layout/fragment_report.xml
+++ b/app/src/main/res/layout/fragment_report.xml
@@ -10,7 +10,7 @@
         android:id="@+id/searchBar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:hint="Search by kitno or result"
+        android:hint="Search by Sample ID or result"
         android:imeOptions="actionSearch"
         android:inputType="text" />