Html fixes
Updating forms