Develop buttonfix

fixes 2 issue:
* #2389
* Buttons