V2.0.1 upgrade wizard impr

latest and greatest :)
Based on feedback in issue 1580 and your post in the forum