Fixed upgrade bug/changed upgrade UI