spacing and colour fixes