fix form and widget templates