wizard, view completed

wizard, view completed
bug fixing

bug fixes