add checkboxes to all categories
fix merge conflict