Fixed navigation active states with new helpers file