initial port of CSS tweaks