Fix #53, fix #54; Add dynamic form for prerequisite steps