add handling show edit
Merge templating
handling