Confirmation page fixes
merge