menus before gui
Merge branch 'master' into menus
Settings w/ GUI
Merge branch 'master' into menus
Resize Settings GUI
Merge branch 'menus'