fixing css conflicts