form2, html_controls big refactoring and removed repeated code