Refine navbar list
Fix the navbar selectors