Improve more checkboxes