refactored new wallet wizard