Removing parts from Cart, style fixes for Cart