Selected menu item now highlighting correctly