fixed css conflict issues