Rework upgrade UI, still not satisfied