Fixed upgrade bug and some info design
Merge branch 'Jonte'