Changed slot name for commercial components
Tidy up
Wrapped form elements in fieldset