Merge branch 'feature/better-cart-order-totals-styling' into develop