add dock
css
menu
fix some view
Merge remote-tracking branch 'origin/master'