fixed labels in qr code windows
merged site fixes