Cart is half working - and fixed some design