Add form flexibility
Fix bug
Fix wizard initializer