fix zero grouping click and adjust UI to fit assignment