Form fields now have own templates