Add generic item edit option dialogs

And some comments