Refactor/style for wizard flow