Added edit button and edit popover