Fix connect bug
Fix up transfer/modal flow