changed around views
Merge pull request #39 from albreyb/master

changed around views