Improve naming in Wizard
Used more layout as name instead of render