Fixed the navigation not changing active state consistently
Merge pull request #83 from EnzoMartin78/master

Updated nav active state