Step related stuff removed. Tweaked the views