Wizard Widget Improvements

Closes #20