fixed css conflicts