[arctic-wolf] - Fix navigation menu active issue.
[arctic-wolf] - Refactor code
[arctic-wolf] -  Refactor code.