Fix template block naming issue
Fix naming issue
Add the missed closing form tag