Merge pull request #121 from boersmamarcel/updateviews

Updated views and some more
Fixes issues
Merge branch 'reviewchallenge' of github.com:boersmamarcel/challengesplatform into reviewchallenge
Fixes cucumber tests
Merge branch 'reviewchallenge' of https://github.com/boersmamarcel/challengesplatform into newbrand