active state half way
merged curr sprint into branch
nav bar active state is fixed