Change warning for grouped_data + fix close margin