code clean up, qr-codes fixed
revision variants ui continued
revision variants ui continued