Merge pull request #28 from Empters/shop_cart

Shop cart
new design changes