NXS-604: CSS fixes