Finishing up work on fixing new wizard page problems