Some first fixes in the GroupSet and side panel