#396 Combined name and edit button
#396 Added metadata to dto