Navigate: memory improvements