Issue #22 TabGroup refactor