Improvement to confirmation page

Tests improved too.