diff --git a/src/server/gf-client.html b/src/server/gf-client.html
index b60940a54..86b2f828c 100644
--- a/src/server/gf-client.html
+++ b/src/server/gf-client.html
@@ -27,9 +27,9 @@
         var t = document.getElementById('toLang');
         for (var i in langs) {
           if (langs[i].canParse) {
-            addOption(f, i, i);
+            addOption(f, langs[i].lang, langs[i].lang);
           }
-          addOption(t, i, i);
+          addOption(t, langs[i].lang, langs[i].lang);
         }
       }
 
diff --git a/src/server/translator.css b/src/server/translator.css
index d4fb7be1f..6ca26d825 100644
--- a/src/server/translator.css
+++ b/src/server/translator.css
@@ -42,31 +42,22 @@ li {
   clear: both;   
 }
 
-dl.fromLang dt {
-  display: none;
+#translation dl {
+  border-width: 0 0 1px 0;
+  border-style: solid;
+  border-color: #c0c0c0;
 }
 
-dl.toLang {
+#translation dt {
+    display: none;
+}
+    
+#translation dd {
   border-width: 1px 0 0 0;
   border-style: solid;
   border-color: #c0c0c0;
 }
 
-dl.toLang dt {
-  color: #c0c0c0;
-  display: block;
-  float: left;
-  width: 5em;
-  font-size: 80%;
-  padding: 1px 0;
-}
-
-dl.toLang dd {
-  border-width: 0 0 1px 0;
-  border-style: solid;
-  border-color: #c0c0c0;
-  padding: 0.2em 0;
-}
 
 /* Completions */
 
@@ -78,10 +69,6 @@ dl.toLang dd {
    overflow: hidden;
 }
 
-#completion dt {
-  display: none;   
-}
-
 #completion li {
   display: inline;
   padding: 0 0.1em;
diff --git a/src/server/translator.js b/src/server/translator.js
index 96acd52d2..73c3dd5e2 100644
--- a/src/server/translator.js
+++ b/src/server/translator.js
@@ -1,32 +1,20 @@
 function formatTranslation (outputs) {
   var dl1 = document.createElement("dl");
-  dl1.className = "fromLang";
-  for (var fromLang in outputs) {
-    var ul = document.createElement("ul");
-    addDefinition(dl1, document.createTextNode(fromLang), ul);
-    for (var i in outputs[fromLang]) {
-      var dl2 = document.createElement("dl");
-      dl2.className = "toLang";
-      for (var toLang in outputs[fromLang][i]) {
-	addDefinition(dl2, document.createTextNode(toLang), document.createTextNode(outputs[fromLang][i][toLang]));
-      }
-      addItem(ul, dl2);
-    }
+  for (var i in outputs) {
+    var o = outputs[i];
+    addDefinition(dl1, document.createTextNode(o.to), document.createTextNode(o.text));
   }
 
   return dl1;
 }
 
 function formatCompletions (compls) {
-  var dl = document.createElement("dl");
-  for (var fromLang in compls) {
-    var ul = document.createElement("ul");
-    for (var i in compls[fromLang]) {
-      addItem(ul, document.createTextNode(compls[fromLang][i]));
-    }
-    addDefinition(dl, document.createTextNode(fromLang), ul);
+  var ul = document.createElement("ul");
+  for (var i in compls) {
+    var c = compls[i];
+    addItem(ul, document.createTextNode(c.text));
   }
-  return dl;
+  return ul;
 }
 
 /* DOM utilities for specific tags */