modified wizard to separate controller and view