cleaned up view router