Final fixes of question grouping UI