Added SimpleForm components. Form refactoring