step3 markup fix, step 2 toggle icon
js conflict resolved