Rikesh, Kent & Dave: Added patch to highlight active link in submenu