Cleaned up forms with checkboxes