Added support for nav menus