diff --git a/controllers/gui_controller.py b/controllers/gui_controller.py
index 631d30e..839d57d 100644
--- a/controllers/gui_controller.py
+++ b/controllers/gui_controller.py
@@ -10,7 +10,7 @@ class GUIController:
         self.settings_button.set_action(lambda: self.callback_function("settings_menu"))
 
         self.back_button = gui_renderer.back_button
-        self.back_button.set_action(lambda: self.callback_function(previous_states.pop()))
+        self.back_button.set_action(lambda: self.callback_function("start_menu"))
 
     def update(self, event):
         self.slider.handle_event(event)
diff --git a/main.py b/main.py
index 0661d4e..3c25467 100644
--- a/main.py
+++ b/main.py
@@ -19,7 +19,8 @@ def main():
         "small_font": pygame.font.Font(None, 15),
         "options": {
             "show_yaw": True,
-            "show_health": True
+            "show_health": True,
+            "show_names": True
         }
     }
 
diff --git a/render/player_renderer.py b/render/player_renderer.py
index 418c749..6b8378b 100644
--- a/render/player_renderer.py
+++ b/render/player_renderer.py
@@ -78,7 +78,9 @@ class PlayerRenderer:
                     continue
 
                 self._render_circle(player, team)
-                self._render_text(player)
+
+                if self.options["show_names"]:
+                    self._render_text(player)
 
                 if self.options["show_yaw"]:
                     self._render_yaw(player, team)
diff --git a/states/settings_menu.py b/states/settings_menu.py
index a5f925d..efc2ab3 100644
--- a/states/settings_menu.py
+++ b/states/settings_menu.py
@@ -13,6 +13,7 @@ class SettingsMenu(GameState):
         # Text
         self.show_yaw_text = self.font.render("Show Yaw: ", True, (255, 255, 255))
         self.show_health_text = self.font.render("Show Health: ", True, (255, 255, 255))
+        self.show_names_text = self.font.render("Show Names: ", True, (255, 255, 255))
 
         # Buttons
         self.back_button = Button(10, 10, 50, 50, lambda: self.switch_state(self.context["previous_states"].pop()))   
@@ -21,6 +22,7 @@ class SettingsMenu(GameState):
         # Switches
         self.show_yaw_button = Switch(self.widget_start_x, 100, 100, self.show_yaw_text.get_rect().height, self.options["show_yaw"])
         self.show_health_button = Switch(self.widget_start_x, 150, 100, self.show_health_text.get_rect().height, self.options["show_health"])
+        self.show_names_button = Switch(self.widget_start_x, 200, 100, self.show_names_text.get_rect().height, self.options["show_names"])
 
     def handle_events(self, events):
         """Handles user inputs."""
@@ -29,6 +31,7 @@ class SettingsMenu(GameState):
                 self.switch_state("start_menu")
             self.show_yaw_button.handle_event(event)
             self.show_health_button.handle_event(event)
+            self.show_names_button.handle_event(event)
             self.back_button.handle_event(event)
 
     def update(self):
@@ -43,6 +46,11 @@ class SettingsMenu(GameState):
         else:
             self.options["show_health"] = False
 
+        if self.show_names_button.get_is_toggled():
+            self.options["show_names"] = True
+        else:
+            self.options["show_names"] = False
+
         # Save settings to context
         self.context["options"] = self.options
 
@@ -55,6 +63,9 @@ class SettingsMenu(GameState):
         self.screen.blit(self.show_health_text, (self.text_start_x, self.show_health_button.y))
         self.show_health_button.draw(self.screen)
 
+        self.screen.blit(self.show_names_text, (self.text_start_x, self.show_names_button.y))
+        self.show_names_button.draw(self.screen)
+
         self.back_button.draw(self.screen)