Add wysiwyg options for saving
Fix $general options
Fix toolbar to use catalog-defined options
Fix spacing
Reorder and restructure fields