Adjusted remove ELGA button, fixed checkboxes