Group view develop

Commits from #740 now onto ```origin/develop```