Add ID to markup to have the checkboxes in the right position