Changes to not display empty nav-headers