Few more tweaks to shopping cart