Editing menu items fixes