Fixed the bug identified by Apple. Improved Upgrade view.