changes done by dev20 for buttons
Merge pull request #154 from raviosc/developer20

changes done by dev20 for buttons