Revert "Button changes"

This reverts commit b9383de6f2c72ec9d544c99ae336e8bfdb60a100.