modify for new navigation bar