styled the show page
styled cart page
fix merge, fix tests