Changes to make the states change in the wizard. Existing bug when changing the step (e.g. on step 4 and click step 1... step 1 is not selected as active) need to fix