Added support for secondary navigation