Bug 1089572 - Use consistent style of menu items and add highlight back