Fixed upgrade bug and some info design