diff --git a/glossary.csv b/glossary-en-de.csv
similarity index 100%
rename from glossary.csv
rename to glossary-en-de.csv
diff --git a/web/edit.css b/web/edit.css
index b0f37f28c5591e5888678150cc7653c660f200d0..60b65de5ebeaed2590b6dd479412fc58e02df29e 100644
--- a/web/edit.css
+++ b/web/edit.css
@@ -3,9 +3,14 @@
   border-bottom: 1px solid black;
 }
 
+div#editor button[title="copy"],
 div#editor button[title="save"],
 div#editor button[title="cancel"] {
   width: 70px;
+  background-color: white;
+  padding: 0px 3px;
+  margin: 0px 3px;
+  cursor: pointer;
 }
 div#editor {
   display: none;
@@ -34,17 +39,24 @@ div#editor-inner input {
 div#markup {
   font-family: courier;
 }
+div#original p, div#auto p, div#undo p {
+    margin:3px 8px;
+}
 div#original {
-    margin:10px;
+    margin:2px 3px;
+    max-height: 100px;
+    overflow-y: auto;
+    font-size: 100%;
 }
 div#auto {
-    margin:10px;
-}
-div#original:before {
-    content: "Original: "
-}
-div#auto:before {
-    content: "Google-Translate: "
+    margin:2px 3px;
+    max-height: 100px;
+    overflow-y: auto;
+}
+div#undo {
+    margin:2px 3px;
+    max-height: 100px;
+    overflow-y: auto;
 }
 
 styleguide nav, styleguide *[source] {
diff --git a/web/edit.html b/web/edit.html
index c0d98d9f2f9d19f8d26fa2b0bd6e7aa546ea4d45..e8e815535a56d9484ed07f663218f3de1dbe2cba 100644
--- a/web/edit.html
+++ b/web/edit.html
@@ -84,8 +84,12 @@
     <div id="editor">
       <div id="editor-inner">
         <p>Editing <span id="editstyleid">-</span> "<span id="editstylename">-</span>", element: <span id="editelemname">-</span>, last change: <span id="lastdate">-</span> by <span id="lastauthor">-</span></p>
+	<div>Original text:</div>
         <div id="original">-</div>
+	<div>Auto translated text <button id="copy-auto" name="copy-auto" title="copy" onclick="copy_to_edit('auto')">copy</button> :</div>
         <div id="auto">-</div>
+	<div>Undo buffer <button id="copy-undo" name="copy-undo" title="copy" onclick="copy_to_edit('undo')">copy</button> :</div>
+        <div id="undo">-</div>
         <p>Your short name (e.g. from hobbybrauer): <input type="text" name="author" id="author"/></p>
         <div id="pelleditor"> </div>
       </div>
diff --git a/web/edit.js b/web/edit.js
index fd48124d6e440ac5f1629b1cfbf7811307898d70..1cff0b2e28548d1cd044800ef2806b658c0ebef6 100644
--- a/web/edit.js
+++ b/web/edit.js
@@ -4,6 +4,7 @@ const pell = window.pell;
 const pelleditor = document.getElementById("pelleditor");
 const original = document.getElementById("original");
 const auto = document.getElementById("auto");
+const undo = document.getElementById("undo");
 const markup = document.getElementById("markup");
 const render = document.getElementById("render");
 const author = document.getElementById("author");
@@ -43,7 +44,7 @@ pell.init({
 	},
 	{
 	    name: 'save',
-	    icon: '<div style="background-color:pink;">save</div>',
+	    icon: 'save',
 	    title: 'save',
 	    result: () => {
 
@@ -84,7 +85,7 @@ pell.init({
 	},
 	{
 	    name: 'cancel',
-	    icon: '<div style="background-color:pink;">cancel</div>',
+	    icon: 'cancel',
 	    title: 'cancel',
 	    result: () => {
 		editor.style.display = "none";
@@ -220,12 +221,15 @@ function renderStyleguide(styleguide) {
 	    editelemname.innerText = element_name ? element_name : "-";
 	    lastdate.innerText = editlastdate ? editlastdate : "original";
 	    lastauthor.innerText = editlastauthor ? editlastauthor : "original";
-	    if (orig_element) {
+	    if (orig_element && original) {
 		original.innerHTML = orig_element.innerHTML;
 	    }
-	    if (auto_element) {
+	    if (auto_element && auto) {
 		auto.innerHTML = auto_element.innerHTML;
 	    }
+	    if (undo) {
+		undo.innerHTML = edit_element.innerHTML;
+	    }
 	    if (markup) {
 		markup.innerText = edit_element.innerHTML;
 	    }
@@ -268,3 +272,8 @@ function renderStyleguide(styleguide) {
     recalcTodo();
 }
 
+
+function copy_to_edit(id) {
+    pelleditor.content.innerHTML = document.getElementById(id).innerHTML;
+}
+