Shop formatting complete
Update cart and checkout formatting
Merge remote-tracking branch 'github/master'