Added new wizard pages and command line parsing