Further CSS refinements