Fixed the navigation not changing active state consistently