modify styles
last grunt
Merge branch 'toolbar' into dev