Added validation code, redesigned wizard pages