Revert eed3fec..b6d6f6a

This rolls back to commit eed3fec8bb44ef97fd4e74b587b4c2b89e341f0f.
redid button naming method, wip