fix some qr code scan, page flow issues