Small review of settings menu - fixes #38