Shopping cart redesign

Many changes related to shopping cart redesign.