Updated view management
Merge pull request #10 from narwhaljames/master

Updated view management