update style scroll bar
Fix scroll
Merge branch 'develop'