Various tweaks to the new pages as per the the feedback in the
provisioning meeting. And a fix to the query for the reset page.