More tweaks to settings panel