Cleanup stuff, added QR Tag