Moved the form out to _form.html, so we can use it on the edit page as well

Moved the form out to _form.html, so we can use it on the edit page as
well