BZ-12960 Fixing css conflict