Card #146 - fix for garbage collection and groups, some ui text