Preferences + design fixes