Cont'd CSS fixes