Revert "fixed bug with buttons"

This reverts commit 2f9a93838e3f411404fbde126960c8c07aeac29f.
Revert "Revert "fixed bug with buttons""

This reverts commit 16c687d15ed6f1f0a9ec5445e70388a17178dd07.