Redraw bug fixed
Working on group jobs