Put the form inside the html instead of the previous hardcoded version
Fixing merge