Revert "Revert "button changes""

This reverts commit 12c482c9d334bdbecee5fe8c36b945657893024a.