More changes and edit item almost finished