Minor refactor of app mode selection switch.