Checkbox template and save improvements.