Converted part of navs to use headers