Button class - bug fix
Button class  - button size improvements