Update test app
Better implementation of Grouped table view