Removed icons, changed checkboxes