Fixed more method signature inconsistencies

Also added class functionality to ValidWizard buttons.