Bug fix of button size by Wu.
Merge branch 'bugFixOfButtonSize' into develop