Some work on upgrade menu