Cart and typography fixes