Removed commented out code and fixed indentation based on PR feedback.
Fixed top nav highlight problem.
Fixed reference sub menu highlighting bug.