Highlight current menu item improved.