Revert "mostly-ineffective button refactor"

This reverts commit d315345f315c1ce84e4c192ea68120a8b2c67c6a.
Add Upgrades first-pass