fixed confirmation page
Merge branch 'toph_branch'