re-arranging and updating preferences
Merge branch 'preferences-makeover'