Made some further changes to how forms work and are rendered.