adjust line length
update css
Merge remote-tracking branch 'upstream/master'