Put the submit button back inside the form

Change-Id: Ie995890bb190b020f9ff4f09b11e309097be4c33
Merge "Put the submit button back inside the form"