Updated cart, various UI fixes