fixes of CSS together with shlomit and aya