Revert "Better Buttons"

This reverts commit 9a4dc8875345870e27fb196807055fb87affde1f.