fixed views a bit
up to date with groups view fixes
Merge branch 'users'