Added in edit button in toolbar and basic logic