nav improvements

mark 31