More CSS simplifications