Moved Menu into class and added to main game