Modernize thin-wrappers nav.