Created main menu & added preferences
Merge remote-tracking branch 'origin/master'