Upgrade window improvements

Taking stones back out of the upgrade window, Cancel buttons that actually cancel, and clearer rules for how many stones you can add.