Improve Groups (fixes, better views)
FIx views, fix groups