Redone view switching and entity management.