- added validation entities exist
- added missing constraint rendering statements
- minor template improvements
- code cleanup