Redid menu systems and GUI's

Controls are up next and should be much easier to add now
Merge remote-tracking branch 'upstream/master'