css conflict fixes