(Another) CSS tidyup