Fixed issue #163: Cleaned up ChooseGroupViewController