Another round of stylesheet refinements