Refactoring form rendering
Refactoring forms