diff --git a/pandora/templates/api.html b/pandora/templates/api.html
index f4d37c9ef..4523e86bc 100644
--- a/pandora/templates/api.html
+++ b/pandora/templates/api.html
@@ -30,7 +30,7 @@
         <noscript>
             <h1>{{title}}</h1>
             <p>{{text|safe}}</p>
-            <p>{{settings.SITENAME}} requires JavaScript</p>
+            <p style="font-style: italic">{{settings.SITENAME}} requires JavaScript</p>
         </noscript>
     </body>
 </html>
diff --git a/pandora/templates/index.html b/pandora/templates/index.html
index f016b1085..624ce3c5a 100644
--- a/pandora/templates/index.html
+++ b/pandora/templates/index.html
@@ -32,7 +32,7 @@
                 <img src="/static/png/logo.png"/ style="width: 256px; padding-top: 128px; -moz-user-drag: none; -o-user-drag: none; -webkit-user-drag: none">
                 <div style="position: absolute; width: 512px; left: 0; right: 0; margin: auto; -moz-user-select: text; -o-user-select: text; -webkit-user-select: text">
                     <div style="padding-top: 16px; text-align: justify">{{text|safe}}</div>
-                    <div style="padding-top: 16px">{{settings.SITENAME}} requires JavaScript.</div>
+                    <div style="padding-top: 16px; font-style: italic">{{settings.SITENAME}} requires JavaScript.</div>
                 </div>
             </div>
         </noscript>
diff --git a/pandora/templates/item.html b/pandora/templates/item.html
index b1df15164..549bc29e4 100644
--- a/pandora/templates/item.html
+++ b/pandora/templates/item.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <html>
     <head>
-        <meta charset="utf-8" />
+        <meta charset="utf-8"/>
         <title>{{head_title}}</title>
-        <link rel="icon" type="image/png" href="/static/png/icon.png" />
+        <link rel="icon" type="image/png" href="/static/png/icon.png"/>
         <meta name="application-name" content="{{settings.SITENAME}}"/>
         <meta name="application-url" content="{{base_url}}"/>
-        <link rel="alternate" type="application/json+oembed" href="{{base_url}}oembed?url={{current_url|urlencode}}" title="oEmbed Profile" />
-        <link rel="search" type="application/opensearchdescription+xml" href="/opensearch.xml" title="{{settings.SITENAME}}" />
+        <link rel="alternate" type="application/json+oembed" href="{{base_url}}oembed?url={{current_url|urlencode}}" title="oEmbed Profile"/>
+        <link rel="search" type="application/opensearchdescription+xml" href="/opensearch.xml" title="{{settings.SITENAME}}"/>
         <script>
             try {
                 if (localStorage && !localStorage['Ox.theme']) {
@@ -16,7 +16,7 @@
             } catch(e) {}
         </script>
         <script type="text/javascript" src="/static/js/pandora.js?{{settings.CONFIG.site.version}}"></script>
-        <meta name="title" content="{{title}}" />
+        <meta name="title" content="{{title}}"/>
         {%if description %}<meta name="description" content="{{description|safe}}"/> {%endif%}
         {%if keywords %}<meta name="keywords" content="{{keywords|safe}}"/> {%endif%}
         <meta content="{{url}}/96p.jpg" name="thumbnail"/>
@@ -33,21 +33,17 @@
         <noscript>
             <div style="position: fixed; left: 0; top: 0; right: 0; bottom: 0; background-color: rgb(144, 144, 144);"></div>
             <div style="position: absolute; left: 0; top: 0; right: 0; bottom: 0; text-align: center; font-family: Lucida Grande, Segoe UI, DejaVu Sans, Lucida Sans Unicode, Helvetica, Arial, sans-serif; font-size: 11px; color: rgb(0, 0, 0); -moz-user-select: none; -o-user-select: none; -webkit-user-select: none">
-                <img src="/{{id}}/{{icon}}128.jpg" alt="" style="padding-top: 128px; -moz-user-drag: none; -o-user-drag: none; -webkit-user-drag: none">
+                <img src="/{{id}}/{{icon}}128.jpg" alt="" style="padding-top: 64px; -moz-user-drag: none; -o-user-drag: none; -webkit-user-drag: none">
                 <div style="position: absolute; width: 512px; left: 0; right: 0; margin: auto; -moz-user-select: text; -o-user-select: text; -webkit-user-select: text">            
                     <div style="padding: 16px 0 8px 0; font-weight: bold; font-size: 13px">{{title}}</div>
-                    {% for i in data %}
-                        <div style="text-align: justify">
-                            <b>{{i.title}}</b>: {{i.value|safe}}
-                        </div>
-                    {% endfor %}
+                    <div>{{description_html|safe}}</div>
                     {% for c in clips %}
-                        <div style="clear:both;padding-top: 4px">
+                        <div style="clear:both; padding-top: 4px">
                             <img src="/{{id}}/96p{{c.in}}.jpg" alt="" style="float: left; margin-right: 8px">
                             {{c.annotations|safe}}
                         </div>
                     {% endfor %}
-                    <div style="clear: both;padding-top: 16px;padding-bottom: 16px">{{settings.SITENAME}} requires JavaScript.</div>
+                    <div style="clear: both; padding-top: 16px; padding-bottom: 16px; font-style: italic">{{settings.SITENAME}} requires JavaScript.</div>
                 </div>
             </div>
         </noscript>
