CSS fixes from yaniv