improve confirmation page and fix various issues