Updated viewcart and minor files