New settings style & tweaks, old settings cleanup