CSS cleanup
CSS cleanup cont'd