Refactoring to use table cell as group header