New UX for switch context