cleaned up view switchers