Add QR code & some cleanup