Fix css conflict