CSS organizational improvements cont.