Added support for top nav bar