Merge Patch 1

Merge Patch 1 branch: Set active LI element in Menu