Revert "Changes so that buttons can be clicked without Spyral exploding."

This reverts commit c6e0d6e87a68f59f771dee0ce149ec882cd3f47f.
Revert "Revert "Changes so that buttons can be clicked without Spyral exploding.""

This reverts commit 24d5f815b8f24f7facbf2f3b645638f4b969d066.