Cleaned up the form builder for checkboxes to make the labels cleaner