FIXED: XCC Preferences Coherency

This patch fixes various UX weirdness with preferences and makes everything aligned.