Visuals in cart + misc fixes and cleanup