POPS-303 | Confirmation page had different UI components, refactored both pages, updated conditionals