More nav bar improvements