Spacing fixes
Fixes from template checklist
Basket summary new markup style fixes