Added generic class to validity label
Fixed a bug where incorrectly read activeIndex as steps