changed navigation and qrcode_scanner