Mode selection redesigned.