Little refactor of UpgradeUI but job still need to be done