Updated billing and viewcart