Updated navigation to show active state