cleaned up views
fixing merge
Merge pull request #27 from natalie03/master

cleaned up views - fixed merge