Added cart page and many changes