Martin/css fixes

This closes a fair few display bugs with ZA