Tested Settings menu working good again
Tidy up code
Merge remote-tracking branch 'origin/master'