Minor start on CSS Style cleanup

See #4107