UpgradeButton implemented
Resolved conflicts