WL-3605 : Move recaptcha to above Submit button

And fix some indentation