Merge the main menu and the gamecontroller

Now the master will have complete the mainmenu and everything from game controller