cart view and minor cleanups