Updated menu structure

Created a state system for the menu and updated a few button positions.