Prefs layout fixes
Refactor; Fancy UI; Settings persisted;