split preferences into two panels
Tweaks & minor refactoring