changed: code cleanup (labels, checkboxes...)