Add navId back into all the required files.