Merge css fixes from ST3 branch