diff --git a/lib/test-driver/log2html.xsl b/lib/test-driver/log2html.xsl
index cf7f8f8c057..d41584f6b90 100644
--- a/lib/test-driver/log2html.xsl
+++ b/lib/test-driver/log2html.xsl
@@ -16,8 +16,11 @@
         <title>Log File</title>
       </head>
       <body>
-        [<a href="javascript:" class="logTreeExpandAll">Expand all</a>]
-        [<a href="javascript:" class="logTreeCollapseAll">Collapse all</a>]
+        <h1>VM build log</h1>
+        <p>
+          <a href="javascript:" class="logTreeExpandAll">Expand all</a> |
+          <a href="javascript:" class="logTreeCollapseAll">Collapse all</a>
+        </p>
         <ul class='toplevel'>
           <xsl:for-each select='line|nest'>
             <li>
@@ -25,6 +28,16 @@
             </li>
           </xsl:for-each>
         </ul>
+
+        <xsl:if test=".//*[@image]">
+          <h1>Screenshots</h1>
+          <ul class="vmScreenshots">
+            <xsl:for-each select='.//*[@image]'>
+              <li><a href="{@image}"><xsl:value-of select="@image" /></a></li>
+            </xsl:for-each>
+          </ul>
+        </xsl:if>
+        
       </body>
     </html>
   </xsl:template>
diff --git a/lib/test-driver/logfile.css b/lib/test-driver/logfile.css
index a7f83b4c925..a54d8504a86 100644
--- a/lib/test-driver/logfile.css
+++ b/lib/test-driver/logfile.css
@@ -3,6 +3,16 @@ body {
     background: white;
 }
 
+h1
+{
+    color: #005aa0;
+    font-size: 180%;
+}
+
+a {
+    text-decoration: none;
+}
+
 
 ul.nesting, ul.toplevel {
     padding: 0;
@@ -108,3 +118,12 @@ code {
     color: #002399;
     font-style: italic;
 }
+
+ul.vmScreenshots {
+    padding-left: 1em;
+}
+
+ul.vmScreenshots li {
+    font-family: monospace;
+    list-style: square;
+}
diff --git a/lib/test-driver/treebits.js b/lib/test-driver/treebits.js
index d88ac075fd9..271ec9e4031 100644
--- a/lib/test-driver/treebits.js
+++ b/lib/test-driver/treebits.js
@@ -23,7 +23,7 @@ $(document).ready(function() {
 
     /* Implementation of the expand all link. */
     $(".logTreeExpandAll").click(function() {
-        $(".logTreeToggle", $(this).siblings(".toplevel")).map(function() {
+        $(".logTreeToggle", $(this).parent().siblings(".toplevel")).map(function() {
             $(this).siblings("ul").show();
             $(this).text("-");
         });
@@ -31,7 +31,7 @@ $(document).ready(function() {
 
     /* Implementation of the collapse all link. */
     $(".logTreeCollapseAll").click(function() {
-        $(".logTreeToggle", $(this).siblings(".toplevel")).map(function() {
+        $(".logTreeToggle", $(this).parent().siblings(".toplevel")).map(function() {
             $(this).siblings("ul").hide();
             $(this).text("+");
         });
