add active class on navigation
merged master fixed conflict