More changes to ViewWorkgroups