Fix form components
More refactoring