Marriage abroad v2 updates

Change to logic and copy. Should have been a V2 but this is already a V2...