diff --git a/tools/scan-view/ScanView.py b/tools/scan-view/ScanView.py
index b001973..41e5a51 100644
--- a/tools/scan-view/ScanView.py
+++ b/tools/scan-view/ScanView.py
@@ -238,9 +238,16 @@
             return self.send_internal_error('Invalid report.')
 
         initialTitle = keys.get('DESC','')
-        initialDescription = 'Bug generated by the clang static analyzer.'
+        initialDescription = """\
+Bug generated by the clang static analyzer.
 
-        keysAndValues = '\n'.join(['<b>%s</b>: %s<br>'%(k,v) for k,v in keys.items()])
+Description: %s
+File: %s
+Line: %s
+"""%(initialTitle,
+     keys.get('FILE','<unknown>'),
+     keys.get('LINE','<unknown>'))
+
         reporterSelections = []
         reporterOptions = []
         
@@ -276,7 +283,6 @@
 </script>
 <body>
 <h1>File Report</h1>
-%(keysAndValues)s
 <hr>
 <form name="form" action="/report_submit" method="post">
 Title:
@@ -295,6 +301,12 @@
 <hr>
 <input type="submit" name="Submit" value="Submit">
 </form>
+
+<iframe src="/report-%(report)s.html#EndPath" width="100%%" height="40%%"
+        scrolling="auto" frameborder="1">
+  <a href="/report-%(report)s.html#EndPath">View Bug Report</a>
+</iframe>
+
 </body>
 </html>"""%locals()
         return self.send_string(result)