Fixed the submenus active when on the same page and changed the design to match the other menus.
Merge branch 'bsingh'