Clean up views for beta release
Merge pull request #153 from amitburst/cleanup

Clean up views for beta release