diff --git a/Assets/Scripts/UI/Pages/PopUp/InstructionsPopup.cs b/Assets/Scripts/UI/Pages/PopUp/InstructionsPopup.cs
index 71839cb..9ee3f0e 100644
--- a/Assets/Scripts/UI/Pages/PopUp/InstructionsPopup.cs
+++ b/Assets/Scripts/UI/Pages/PopUp/InstructionsPopup.cs
@@ -21,7 +21,7 @@ public class InstructionsPopup : PopupBase
     private void OnClick_closeBtn()
     {
         ScreenManager screenManager = InterfaceManager.Instance?.GetInterfaceInstance<ScreenManager>();
-        screenManager.ShowScreen(ScreenType.MenuScreen);
+        screenManager.ShowScreen(ScreenType.MainMenuScreen);
 
         soundManager = soundManager == null ? InterfaceManager.Instance?.GetInterfaceInstance<SoundManager>() : soundManager;
         soundManager?.PlayGameSoundClip(SoundType.ButtonClick);
diff --git a/Assets/Scripts/UI/Pages/PopUp/OptionsPopup.cs b/Assets/Scripts/UI/Pages/PopUp/OptionsPopup.cs
index c612f58..2e9c27e 100644
--- a/Assets/Scripts/UI/Pages/PopUp/OptionsPopup.cs
+++ b/Assets/Scripts/UI/Pages/PopUp/OptionsPopup.cs
@@ -11,27 +11,28 @@ public class OptionsPopup : PopupBase
 
     private void OnEnable()
     {
-        closeBtn.onClick.AddListener(OnClick_closeBtn);
+        closeBtn.onClick.AddListener(OnClick_CloseButton);
         mainVolSlider.onValueChanged.AddListener(OnMainVolChanged);
         musicVolSlider.onValueChanged.AddListener(OnBGMVolChanged);
         sfxVolSlider.onValueChanged.AddListener(OnSFXVolChanged);
+
         InitializeSliders();
     }
 
     private void OnDisable()
     {
-        closeBtn.onClick.RemoveListener(OnClick_closeBtn);
+        closeBtn.onClick.RemoveListener(OnClick_CloseButton);
         mainVolSlider.onValueChanged.RemoveListener(OnMainVolChanged);
         musicVolSlider.onValueChanged.RemoveListener(OnBGMVolChanged);
         sfxVolSlider.onValueChanged.RemoveListener(OnSFXVolChanged);
     }
 
-    private void OnClick_closeBtn()
+    private void OnClick_CloseButton()
     {
-        ScreenManager screenManager = InterfaceManager.Instance?.GetInterfaceInstance<ScreenManager>();
-        screenManager.ShowScreen(ScreenType.MenuScreen);
+        popupManager.HidePopup(PopupType);
 
-        Hide();
+        ScreenManager screenManager = InterfaceManager.Instance?.GetInterfaceInstance<ScreenManager>();
+        screenManager.ShowScreen(ScreenType.MainMenuScreen);
     }
 
     public void OnMainVolChanged(float value)
@@ -70,7 +71,6 @@ public class OptionsPopup : PopupBase
         mainVolSlider.value = mainVol;
         musicVolSlider.value = bgmVol;
         sfxVolSlider.value = sfxVol;
-
     }
 }
 
diff --git a/Assets/Scripts/UI/Pages/PopUp/PvAIModePopup.cs b/Assets/Scripts/UI/Pages/PopUp/PvAIModePopup.cs
index 04adc2e..61c9b68 100644
--- a/Assets/Scripts/UI/Pages/PopUp/PvAIModePopup.cs
+++ b/Assets/Scripts/UI/Pages/PopUp/PvAIModePopup.cs
@@ -117,12 +117,13 @@ public class PvAIModePopup : PopupBase
 
     private void OnClick_CloseButton()
     {
+        popupManager.HidePopup(popupType);
+
         screenManager = screenManager == null ? InterfaceManager.Instance?.GetInterfaceInstance<ScreenManager>() : screenManager;
-        screenManager.ShowScreen(ScreenType.MenuScreen);
+        screenManager.ShowScreen(ScreenType.MainMenuScreen);
 
         soundManager = soundManager == null ? InterfaceManager.Instance?.GetInterfaceInstance<SoundManager>() : soundManager;
         soundManager?.PlayGameSoundClip(SoundType.ButtonClick);
-        Hide();
     }
 
     private void OnColorSelected(PlayerType type, Button button)
diff --git a/Assets/Scripts/UI/Pages/PopUp/PvPModePopup.cs b/Assets/Scripts/UI/Pages/PopUp/PvPModePopup.cs
index 2b01ace..a724caa 100644
--- a/Assets/Scripts/UI/Pages/PopUp/PvPModePopup.cs
+++ b/Assets/Scripts/UI/Pages/PopUp/PvPModePopup.cs
@@ -247,12 +247,12 @@ public class PvPModePopup : PopupBase
 
     private void OnClick_CloseButton()
     {
+        popupManager.HidePopup(popupType);
+
         screenManager = screenManager == null ? InterfaceManager.Instance?.GetInterfaceInstance<ScreenManager>() : screenManager;
-        screenManager.ShowScreen(ScreenType.MenuScreen);
+        screenManager.ShowScreen(ScreenType.MainMenuScreen);
 
         soundManager = soundManager == null ? InterfaceManager.Instance?.GetInterfaceInstance<SoundManager>() : soundManager;
         soundManager?.PlayGameSoundClip(SoundType.ButtonClick);
-
-        Hide();
     }
 }
diff --git a/Assets/Scripts/UI/Pages/Screens/MenuHUDScreen.cs b/Assets/Scripts/UI/Pages/Screens/MenuHUDScreen.cs
index 9c3a560..0d4f7e6 100644
--- a/Assets/Scripts/UI/Pages/Screens/MenuHUDScreen.cs
+++ b/Assets/Scripts/UI/Pages/Screens/MenuHUDScreen.cs
@@ -17,23 +17,23 @@ public class MenuHUDScreen : ScreenBase
 
     private void OnEnable()
     {
-        pvpModeBtn.onClick.AddListener(OnClick_pvpModeBtn);
-        pvaiModeBtn.onClick.AddListener(OnClick_pvaiModeBtn);
-        optionsBtn.onClick.AddListener(OnClick_optionsBtn);
-        instructionsBtn.onClick.AddListener(OnClick_instructionsBtn);
-        exitBtn.onClick.AddListener(OnClick_exitBtn);
+        pvpModeBtn.onClick.AddListener(OnClick_PVPModeButton);
+        pvaiModeBtn.onClick.AddListener(OnClick_PvAIModeButton);
+        optionsBtn.onClick.AddListener(OnClick_OptionsButton);
+        instructionsBtn.onClick.AddListener(OnClick_InstructionsButton);
+        exitBtn.onClick.AddListener(OnClick_ExitButton);
     }
 
     private void OnDisable()
     {
-        pvpModeBtn.onClick.RemoveListener(OnClick_pvpModeBtn);
-        pvaiModeBtn.onClick.RemoveListener(OnClick_pvaiModeBtn);
-        optionsBtn.onClick.RemoveListener(OnClick_optionsBtn);
-        instructionsBtn.onClick.RemoveListener(OnClick_instructionsBtn);
-        exitBtn.onClick.RemoveListener(OnClick_exitBtn);
+        pvpModeBtn.onClick.RemoveListener(OnClick_PVPModeButton);
+        pvaiModeBtn.onClick.RemoveListener(OnClick_PvAIModeButton);
+        optionsBtn.onClick.RemoveListener(OnClick_OptionsButton);
+        instructionsBtn.onClick.RemoveListener(OnClick_InstructionsButton);
+        exitBtn.onClick.RemoveListener(OnClick_ExitButton);
     }
 
-    private void OnClick_pvpModeBtn()
+    private void OnClick_PVPModeButton()
     {
         popupManager = popupManager == null ? InterfaceManager.Instance?.GetInterfaceInstance<PopupManager>() : popupManager;
         popupManager.ShowPopup(PopupType.PvPModePopup);
@@ -41,12 +41,10 @@ public class MenuHUDScreen : ScreenBase
         soundManager = soundManager == null ? InterfaceManager.Instance?.GetInterfaceInstance<SoundManager>() : soundManager;
         soundManager?.PlayGameSoundClip(SoundType.ButtonClick);
 
-        Hide();
-        // screenManager = screenManager == null ? InterfaceManager.Instance?.GetInterfaceInstance<ScreenManager>() : screenManager;
-        // screenManager.HideScreen(ScreenType.MenuHUDScreen);
+        HideScreen();
     }
 
-    private void OnClick_pvaiModeBtn()
+    private void OnClick_PvAIModeButton()
     {
         popupManager = popupManager == null ? InterfaceManager.Instance?.GetInterfaceInstance<PopupManager>() : popupManager;
         popupManager.ShowPopup(PopupType.PvAIModePopup);
@@ -54,10 +52,10 @@ public class MenuHUDScreen : ScreenBase
         soundManager = soundManager == null ? InterfaceManager.Instance?.GetInterfaceInstance<SoundManager>() : soundManager;
         soundManager?.PlayGameSoundClip(SoundType.ButtonClick);
 
-        Hide();
+        HideScreen();
     }
 
-    private void OnClick_optionsBtn()
+    private void OnClick_OptionsButton()
     {
         popupManager = popupManager == null ? InterfaceManager.Instance?.GetInterfaceInstance<PopupManager>() : popupManager;
         popupManager.ShowPopup(PopupType.OptionsPopup);
@@ -65,10 +63,10 @@ public class MenuHUDScreen : ScreenBase
         soundManager = soundManager == null ? InterfaceManager.Instance?.GetInterfaceInstance<SoundManager>() : soundManager;
         soundManager?.PlayGameSoundClip(SoundType.ButtonClick);
 
-        Hide();
+        HideScreen();
     }
 
-    private void OnClick_instructionsBtn()
+    private void OnClick_InstructionsButton()
     {
         popupManager = popupManager == null ? InterfaceManager.Instance?.GetInterfaceInstance<PopupManager>() : popupManager;
         popupManager.ShowPopup(PopupType.InstructionsPopup);
@@ -76,10 +74,15 @@ public class MenuHUDScreen : ScreenBase
         soundManager = soundManager == null ? InterfaceManager.Instance?.GetInterfaceInstance<SoundManager>() : soundManager;
         soundManager?.PlayGameSoundClip(SoundType.ButtonClick);
 
-        Hide();
+        HideScreen();
     }
 
-    private void OnClick_exitBtn()
+    private void HideScreen()
+    {
+        screenManager.HideScreen(ScreenType);
+    }
+
+    private void OnClick_ExitButton()
     {
         soundManager = soundManager == null ? InterfaceManager.Instance?.GetInterfaceInstance<SoundManager>() : soundManager;
         soundManager?.PlayGameSoundClip(SoundType.ButtonClick);