fix form rendering
Merge pull request #139 from strobelm/cms

fix field generation and form rendering