move container into constructor
fix change current step behavior