--- a/zpt/viewer_index.zpt	Mon Jul 30 19:41:48 2012 +0200
+++ b/zpt/viewer_index.zpt	Wed Aug 15 16:59:45 2012 +0200
@@ -30,6 +30,7 @@
 
     <div class="col">
       <div class="index-info">
+        <h2>Bibliographical information</h2>
         <table border="0"
           tal:define="formattedData python:here.metadata.getBibFormattedMetaDataExtended(bibdata=docinfo.get('bib', None))">
           <tal:x condition="python:formattedData">
@@ -65,7 +66,9 @@
           <!-- ende kein template fuer die daten -->
         </table>
 
-        <table tal:define="dri docinfo/DRI | nothing" tal:condition="dri">
+        <tal:block tal:define="dri docinfo/DRI | nothing" tal:condition="dri">
+        <h2>Permanent URL</h2>
+        <table>
           <tr>
             <td class="type">Document ID:</td>
             <td class="content" tal:content="dri" />
@@ -76,15 +79,22 @@
               tal:content="string:http://echo.mpiwg-berlin.mpg.de/$dri" /></td>
           </tr>
         </table>
+        </tal:block>
 
-        <table border="0">
+        <tal:block tal:define="attribution docinfo/attribution | nothing; copyright docinfo/copyright | nothing">
+        <h2>Copyright information</h2>
+        <table border="0" tal:condition="attribution | copyright">
           <!-- attribution -->
-          <tr tal:condition="exists:docinfo/attribution"
-            tal:replace="structure python:here.metadataService.getAttributionFormatted('metadata_template', data=docinfo['attribution'])" />
+          <tr tal:condition="attribution"
+            tal:replace="structure python:here.metadataService.getAttributionFormatted('metadata_template', data=attribution)" />
           <!-- copyright -->
-          <tr tal:condition="exists:docinfo/copyright"
-            tal:replace="structure python:here.metadataService.getCopyrightFormatted('metadata_template', data=docinfo['copyright'])" />
+          <tr tal:condition="copyright"
+            tal:replace="structure python:here.metadataService.getCopyrightFormatted('metadata_template', data=copyright)" />
         </table>
+        <table border="0" tal:condition="not:attribution | copyright">
+          <tr><td></td></tr>
+        </table>        
+        </tal:block>
       </div>
 
       <div class="index-actions">