Make wizard always end with same step. Improve text input fields