Refactor Next Step form

* use referer hidden field instead of referer header