Revert "Push changes to buttons and things"

This reverts commit 83f3b0e6bbb5c18bfd31f2f082d0f97a4f477dcd.