Merge pull request #39 from cmanou/master

Fixes bad urls
Fix view bugs