Improve rendering of steps in single event mode
Fix incorrect import