Add navigation-with-heading idiomatic structure