diff --git a/include/Game/Systems/MainMenuSystem.h b/include/Game/Systems/MainMenuSystem.h
index 341bc7cd..7a51f4f0 100644
--- a/include/Game/Systems/MainMenuSystem.h
+++ b/include/Game/Systems/MainMenuSystem.h
@@ -23,8 +23,6 @@ public:
 
 private:
     IRenderer* m_Renderer;
-    void OnPlay(const Events::InputCommand& e);
-    void OnOptions(const Events::InputCommand& e);
     void OpenSubMenu(const Events::InputCommand& e);
 
     EventRelay<MainMenuSystem, Events::ButtonClicked> m_EClicked;
diff --git a/resources/Schema/Entities/OptionMenu.xml b/resources/Schema/Entities/OptionMenu.xml
index c1c4b517..600dc49b 100644
--- a/resources/Schema/Entities/OptionMenu.xml
+++ b/resources/Schema/Entities/OptionMenu.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="OptionsOrigin" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+<Entity name="Options" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
 
   <Components>
     <c:Transform/>
diff --git a/resources/Schema/Entities/ServerList.xml b/resources/Schema/Entities/ServerList.xml
index f9a601f5..79f50c09 100644
--- a/resources/Schema/Entities/ServerList.xml
+++ b/resources/Schema/Entities/ServerList.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="ServerList" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+<Entity name="Play" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
 
   <Components>
     <c:ServerList>
@@ -12,7 +12,7 @@
     <Entity name="Identities_Origin">
       <Components>
         <c:Transform>
-          <Position X="0" Y="0.181182757" Z="0"/>
+          <Position X="0" Y="0.172000006" Z="0"/>
         </c:Transform>
       </Components>
       <Children>
@@ -33,9 +33,10 @@
     <Entity name="Background">
       <Components>
         <c:Sprite>
+          <Model>Models/Core/UnitQuad.mesh</Model>
+          <GlowMap></GlowMap>
           <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
           <BlurBackground>true</BlurBackground>
-          <GlowMap></GlowMap>
           <Color A="0.196078435" B="0" G="0" R="0"/>
         </c:Sprite>
         <c:Transform>
@@ -48,9 +49,10 @@
       <Components>
         <c:Button/>
         <c:Sprite>
+          <Model>Models/Core/UnitQuad.mesh</Model>
+          <GlowMap></GlowMap>
           <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
           <BlurBackground>true</BlurBackground>
-          <GlowMap></GlowMap>
           <Color A="0.588235319" B="1" G="1" R="1"/>
         </c:Sprite>
         <c:InputCmdButton>
@@ -66,8 +68,9 @@
         <Entity name="RefreshIcon">
           <Components>
             <c:Sprite>
-              <DiffuseTexture>Textures/Icons/rotate.png</DiffuseTexture>
+              <Model>Models/Core/UnitQuad.mesh</Model>
               <GlowMap></GlowMap>
+              <DiffuseTexture>Textures/Icons/rotate.png</DiffuseTexture>
               <Color A="1" B="1" G="0" R="1"/>
             </c:Sprite>
             <c:Transform>
@@ -79,6 +82,43 @@
         </Entity>
       </Children>
     </Entity>
+    <Entity name="Title_Origin">
+      <Components>
+        <c:Transform/>
+      </Components>
+      <Children>
+        <Entity name="UnderLine">
+          <Components>
+            <c:Sprite>
+              <Model>Models/Core/UnitQuad.mesh</Model>
+              <GlowMap></GlowMap>
+              <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
+            </c:Sprite>
+            <c:Transform>
+              <Position X="0.00500000035" Y="0.198000014" Z="0.0199999996"/>
+              <Scale X="0.270000011" Y="0.00100000005" Z="1"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Text">
+          <Components>
+            <c:Text>
+              <Content>Servers</Content>
+              <Resource>Fonts/DroidSans.ttf,64</Resource>
+              <Alignment>
+                <Left/>
+              </Alignment>
+            </c:Text>
+            <c:Transform>
+              <Position X="-0.131999999" Y="0.202000007" Z="0.0199999996"/>
+              <Scale X="0.0320000015" Y="0.0310000014" Z="1"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
   </Children>
 
 </Entity>
diff --git a/src/Game/Systems/MainMenuSystem.cpp b/src/Game/Systems/MainMenuSystem.cpp
index 1f0d3cf6..ff2e2981 100644
--- a/src/Game/Systems/MainMenuSystem.cpp
+++ b/src/Game/Systems/MainMenuSystem.cpp
@@ -16,7 +16,7 @@ void MainMenuSystem::Update(double dt)
 
 }
 
-void MainMenuSystem::OnPlay(const Events::InputCommand& e)
+void MainMenuSystem::OpenSubMenu(const Events::InputCommand& e)
 {
     auto menus = m_World->GetComponents("Menu");
     if (menus == nullptr) {
@@ -37,7 +37,7 @@ void MainMenuSystem::OnPlay(const Events::InputCommand& e)
             break;
         }
 
-    } else if (!m_OpenSubMenu.HasComponent("ServerList")) {
+    } else if (m_OpenSubMenu.Name().compare(e.Command) != 0) {
         //Menu is open, but not the right one, delete the old one and open a new one.
         m_World->DeleteEntity(m_OpenSubMenu.ID);
         m_OpenSubMenu = EntityWrapper::Invalid;
@@ -60,21 +60,10 @@ void MainMenuSystem::OnPlay(const Events::InputCommand& e)
     }
 }
 
-
-void MainMenuSystem::OnOptions(const Events::InputCommand& e)
-{
-
-}
-
-void MainMenuSystem::OpenSubMenu(const Events::InputCommand& e)
-{
-  
-}
-
 bool MainMenuSystem::OnButtonClick(const Events::ButtonClicked& e)
 {
-    if (e.EntityName == "ServerIdentityConnect") {
-        EntityWrapper entity = e.Entity;
+    EntityWrapper entity = e.Entity;
+    if (entity.Name() == "ServerIdentityConnect") {
         EntityWrapper serverIdentityEntity = entity.FirstParentWithComponent("ServerIdentity");
         if(serverIdentityEntity.Valid()) {
             Events::ConnectRequest event;
@@ -83,6 +72,9 @@ bool MainMenuSystem::OnButtonClick(const Events::ButtonClicked& e)
             printf("\n ----Request Server Connect----\nIP: %s\nPort: %i\n ------------------------------", event.IP, event.Port);
             m_EventBroker->Publish(event);
         }
+    } else if (entity.HasComponent("ConfigBtnResolution")) {
+        
+        m_Renderer->SetResolution(Rectangle((int)entity["ConfigBtnResolution"]["Width"], (int)entity["ConfigBtnResolution"]["Height"]));
     }
     return true;
 }
@@ -100,12 +92,12 @@ bool MainMenuSystem::OnButtonPress(const Events::ButtonPressed& e)
 bool MainMenuSystem::OnInputCommand(const Events::InputCommand& e)
 {
     if(e.Command == "Play" && e.Value == 1) {
-        OnPlay(e);
+        OpenSubMenu(e);
     } else if (e.Command == "RefreshServerList" && e.Value == 1){
         Events::SearchForServers event;
         m_EventBroker->Publish(event);
     } else if (e.Command == "Options" && e.Value == 1) {
-        OnOptions(e);
+        OpenSubMenu(e);
     }
     return true;
 }
\ No newline at end of file