[imp] moved form fields markup to layouts
[imp] moved form fields markup to layouts