css update and code sync with the master branch.