Update window handling for Marc Editor feature/steps