Issue 506 editing wizard view