Changes to support navigation control over iframe