diff --git a/config/alfresco/templates/client/summary_panel.ftl b/config/alfresco/templates/client/summary_panel.ftl
index 711be6ec19..3bbfaf1c3d 100644
--- a/config/alfresco/templates/client/summary_panel.ftl
+++ b/config/alfresco/templates/client/summary_panel.ftl
@@ -16,9 +16,9 @@
          </table>
       </td>
    </tr>
-   <tr>
    
-      <td valign='middle'>
+   <tr>
+      <td valign='middle' align='center'>
          <#assign isImage=node.isDocument && (node.mimetype = "image/gif" || node.mimetype = "image/jpeg" || node.mimetype = "image/png")>
          <#assign isVideo=node.isDocument && node.mimetype?starts_with("video/")>
          <#if isImage>
@@ -36,7 +36,7 @@
                <tr>
                   <td>
                      <div style="border: thin solid #cccccc; padding:4px">
-                        <a href="${absurl(node.url)}" target="new"><img src="${absurl(node.icon32)}" width=32 height=32 border=0></a>
+                        <a href="${absurl(node.url)}" <#if node.isDocument>target="new"</#if>><img src="${absurl(node.icon32)}" width=32 height=32 border=0></a>
                      </div>
                   </td>
                   <td><img src="${absurl('/images/parts/rightSideShadow42.gif')}" width=6 height=42></td>
@@ -68,19 +68,22 @@
             </#if>
             <#if node.isDocument>
                <tr><td>&nbsp;Size:</td><td>${(node.size / 1000)?string("0.##")} KB</td></tr>
-               <#if !isImage && !isVideo>
-                  <#assign c=cropContent(node.properties.content, 512)>
-                  <#if c?length != 0>
-                     <tr>
-                        <td valign='top'>&nbsp;Preview:</td>
-                        <td>
-                           ${c?html?replace('$', '<br>', 'rm')}<#if (c?length >= 512)>...</#if>
-                        </td>
-                     </tr>
-                  </#if>
-               </#if>
             </#if>
          </table>
       </td>
    </tr>
+   
+   <#if node.isDocument && !isImage && !isVideo>
+      <#assign c=cropContent(node.properties.content, 512)>
+      <#if c?length != 0>
+         <tr>
+            <td colspan='2'>Preview:</td>
+         </tr>
+         <tr>
+            <td colspan='2'>
+               ${c?html?replace('$', '<br>', 'rm')}<#if (c?length >= 512)>...</#if>
+            </td>
+         </tr>
+      </#if>
+   </#if>
 </table>
diff --git a/source/web/scripts/ajax/node-info.js b/source/web/scripts/ajax/node-info.js
index 2399a91958..a69a1a4ded 100644
--- a/source/web/scripts/ajax/node-info.js
+++ b/source/web/scripts/ajax/node-info.js
@@ -6,6 +6,8 @@
 // NOTE: This script requires common.js - which needs to be loaded
 //       prior to this one on the containing HTML page.
 
+var zIndex = 99;
+
 /**
  * Node Info Manager constructor
  */
@@ -137,7 +139,6 @@ Alfresco.NodeInfoPanel.prototype =
       // NOTE: use className for IE
       div.setAttribute("className", "summaryPopupPanel");
       div.style.position = "absolute";
-      div.style.zIndex = 99;
       div.style.display = "none";
       div.style.left = 0;
       div.style.top = 0;
@@ -170,6 +171,7 @@ Alfresco.NodeInfoPanel.prototype =
             // set opacity in browser independant way
             YAHOO.util.Dom.setStyle(this.popupElement, "opacity", 0.0);
             this.popupElement.style.display = "block";
+            this.popupElement.style.zIndex = zIndex++;   // pop to front
             
             Alfresco.Dom.smartAlignElement(this.popupElement, this.launchElement, 700);