More subnavbar changes