Tweaks to css
Resolve styling merge conflicts
Fix big-mac spacing issue