Last minute fixes. Split up context. Should add category otherwise barcode scanning does not work.