Optimize font-size of tooltip
Merge branch 'layout' into develop