Added remove button to control groups, fixed little things