refactored the current state on main controller
adding fill-badge-name state/step
cleaning up typos and useless variables
icon for ajax loading for steps