Fixed QR Scanner crash on 'back'; tidied up