Fix texts
Add the qrcode return activity