Added color and checkboxes