Cleanup up templates and docs for forms

Change-Id: Ib800bd5340474991841800aaff0668c7369ca933