Fix view bugs
Merge pull request #40 from cmanou/master

Fix groups