Moved Settings to main menu instead of dropdown
Some cleanup
Merge remote-tracking branch 'origin/master'