Hacked on views a bit
Merge pull request #1 from aspidites/master

Hacked on views a bit