merged base.css. minor fixes