Change style + little fix for grouped_data