Started work on cleaning up view lifecycle