Navigation bar improvements