cleaned up code
blah
blah
blah
blah
NO
Merge remote-tracking branch 'origin/master'
Adjusted main menu layout