Feature/1770 new upgrade page