Merge pull request #4211 from Thejas775/navigation-menus