finally fix the navigation bar