fix css conflicts