Merge "Revert changes to move submit button into header."