Refactoring of form builder again ..