Clean-up view switching & active highlighting