menu item edit and delete
Merge remote-tracking branch 'origin'