diff --git a/browser/common.py b/browser/common.py
index 5a750b8..de975f9 100644
--- a/browser/common.py
+++ b/browser/common.py
@@ -276,8 +276,8 @@ class BaseView(GenericView, I18NView):
         typeKey = util.renderingFactories.get(contentType, None)
         if typeKey is None:
             if contentType == u'text/html':
-                return text
-            return u'<pre>%s</pre>' % util.html_quote(text)
+                return util.toUnicode(text)
+            return u'<pre>%s</pre>' % util.html_quote(util.toUnicode(text))
         source = component.createObject(typeKey, text)
         view = component.getMultiAdapter((removeAllProxies(source), self.request))
         return view.render()
@@ -499,6 +499,8 @@ class BaseView(GenericView, I18NView):
         self.registerDojo()
         jsCall = 'dojo.require("dijit.Editor");'
         self.controller.macros.register('js-execute', jsCall, jsCall=jsCall)
+        jsCall = 'dojo.require("dijit._editor.plugins.LinkDialog");'
+        self.controller.macros.register('js-execute', jsCall, jsCall=jsCall)
 
 
 # vocabulary stuff
diff --git a/browser/form_macros.pt b/browser/form_macros.pt
index 45943ac..6750736 100644
--- a/browser/form_macros.pt
+++ b/browser/form_macros.pt
@@ -262,6 +262,7 @@
 <metal:html define-macro="input_html">
     <textarea name="field" rows="3" style="width: 450px"
            dojoType="dijit.Editor"
+           extraPlugins="['insertHorizontalRule','createLink']"
            tal:define="width field/width|nothing;
                        height field/height|python:3"
            tal:attributes="name name; id name;
diff --git a/browser/skin/body.pt b/browser/skin/body.pt
index f46de65..ee94cf9 100644
--- a/browser/skin/body.pt
+++ b/browser/skin/body.pt
@@ -15,9 +15,11 @@
         <a href="#"
            tal:attributes="href view/popupCreateObjectForm">Create loops Note</a>
       </div>
-      Powered by <b><a href="http://www.python.org">Python</a></b> &middot;
+      Powered by
+      <b><a href="http://loops.cy55.de">loops</a></b> &middot;
       <b><a href="http://wiki.zope.org/zope3">Zope 3</a></b> &middot;
-      <b><a href="http://loops.cy55.de">loops</a></b>.
+      <b><a href="http://www.python.org">Python</a></b> &middot;
+      <b><a href="http://www.dojotoolkit.org">Dojo</a></b>.
     </metal:footer>