Added no reactivation upgrade process; tighter upgrade screens