Change InsertDiskView to ChoosePackageView.  Slight optimizations