cleanup edge cases for finish page, add separate domain for default vs ui url
cleanup edge cases for finish page, add separate domain for default vs ui url