Expanded the rendering of forms