Fixed issues with menu items.