Feat/04 nav part2