AI-512 : fixed css conflicts