fixing item edition and removal