fixing some views and stuff
final touches on shipping addresses
Merge branch 'carts_and_charges'