add timeout for base navigation; edit BaseStepMarker