More confirm page fixes

Fixes some bugs introduced by the last PR, and adds the badge number display to the confirmation page.