Fix save
Fix checkboxes layout