Make forms modular