reorganize and tidy up CSS