OZP-16: dashboard switcher refactor/cleanup