logging fixes and edit button add