CLC-2973 CSS & JS fixes from review