Navigation enhancements for topbar