diff --git a/src/com/annimon/turrets/Main.java b/src/com/annimon/turrets/Main.java
index 9adda6a..ee57294 100644
--- a/src/com/annimon/turrets/Main.java
+++ b/src/com/annimon/turrets/Main.java
@@ -22,17 +22,24 @@ public class Main extends JFrame {
         if (instance == null) instance = new Main();
         return instance;
     }
+    
+    private final Component mainMenu;
 
     public Main() {
         super("Turrets");
         setResizable(Constants.RESIZABLE);
         setLocationByPlatform(true);
-        setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
+        setDefaultCloseOperation(EXIT_ON_CLOSE);
         
-        add(new JLayer<>(new MenuPanel(), new GuiUtil.PlanetBackground()));
+        mainMenu = new JLayer<>(new MenuPanel(), new GuiUtil.PlanetBackground());
+        add(mainMenu);
         pack();
     }
     
+    public Component getMainMenu() {
+        return mainMenu;
+    }
+    
     public void switchLayout(Component component) {
         getContentPane().removeAll();
         getContentPane().add(component);
diff --git a/src/com/annimon/turrets/MenuPanel.java b/src/com/annimon/turrets/MenuPanel.java
index 95b0a81..eefb6d3 100644
--- a/src/com/annimon/turrets/MenuPanel.java
+++ b/src/com/annimon/turrets/MenuPanel.java
@@ -69,7 +69,7 @@ public class MenuPanel extends JPanel {
             
             final int index = menuList.getSelectedIndex();
             switch (index) {
-                case 0: // Create sever
+                case 0: // Create server
                 case 1: // Join client
                     GameCanvas canvas = new GameCanvas(index == 0);
                     Main.getInstance().switchLayout(canvas);