Implemented EditItem and fixed Add Item