[nav] Continued work on nav