nav improvements

mark 30