Big tidy up of the workspace and collection trees (Gather/Enrich panes). Still a few more changes and bug fixes to come.