Updated views
Merge pull request #19 from jtorraca/master

Updated views