fixed a few issue for next step button