UHM-169 - Custom templates to improve look of confirmation section