Reworks some of the layouts and adds the capability to add items with quantity
Fixes merge conflicts