Moved edit form to template