Add/Fix cart display and empty cart button
Merge branch 'master' of https://github.com/ibu2002/depo