Preference Settings minor changes

TBR, part of breaking up #3389