fixing some views and stuff
Merge branch 'carts_and_charges'