diff --git a/postgresql-details-html.lsp b/postgresql-details-html.lsp
index 78db8081af7eea7eec802c4d1bc2f4b132a07533..831e9f3b02fefe0ae127c3e35d8d10b8a12eab42 100644
--- a/postgresql-details-html.lsp
+++ b/postgresql-details-html.lsp
@@ -1,11 +1,10 @@
-<% local data, viewlibrary = ... 
+<% local data, viewlibrary, page_info, session = ... 
 htmlviewfunctions = require("htmlviewfunctions")
 html = require("acf.html")
 %>
 
 <% viewlibrary.dispatch_component("status") %>
 
-<h2><%= html.html_escape(data.label) %></h2>
-<%
-htmlviewfunctions.displayitem(data)
-%>
+<% local header_level = htmlviewfunctions.displaysectionstart(data, page_info) %>
+<% htmlviewfunctions.displayitem(data) %>
+<% htmlviewfunctions.displaysectionend(header_level) %>
diff --git a/postgresql-listfiles-html.lsp b/postgresql-listfiles-html.lsp
index 41849e2913aa587c0431688d716c47f6e23a2af7..c571b48e447522a81dec1ced08fb79b3dc142f02 100644
--- a/postgresql-listfiles-html.lsp
+++ b/postgresql-listfiles-html.lsp
@@ -31,7 +31,7 @@ end
 
 <script type="text/javascript">
 	$(document).ready(function() {
-		$("#list").tablesorter({widgets: ['zebra']});
+		$("#list").tablesorter({headers: {0:{sorter: false}}, widgets: ['zebra']});
 	});
 </script>
 
@@ -41,19 +41,27 @@ end
 	viewlibrary.dispatch_component("status")
 end %>
 
-<h1><%= html.html_escape(data.label) %></h1>
+<% local header_level = htmlviewfunctions.displaysectionstart(data, page_info) %>
 <table id="list" class="tablesorter"><thead>
 	<tr>
+		<th>Action</th>
 		<th>File</th>
 		<th>Size</th>
 		<th>Last Modified</th>
 	</tr>
 </thead><tbody>
+<% local filename = cfe({ type="hidden", value="" }) %>
+<% local redir = cfe({ type="hidden", value=page_info.orig_action }) %>
 <% for i,file in ipairs(data.value) do %>
 	<tr>
-		<td><%=  html.link{value = "expert?filename=" .. file.filename.."&redir="..page_info.orig_action, label=file.filename} %></td>
+		<td><%
+		filename.value = file.filename
+		htmlviewfunctions.displayitem(cfe({type="link", value={filename=filename, redir=redir}, label="", option="Edit", action="expert"}), page_info, -1)
+		%></td>
+		<td><%=  html.html_escape(file.filename) %></td>
 		<td><span style="display:none"><%= convertsize(file.filesize) %>b</span><%= html.html_escape(file.filesize) %></td>
 		<td><%= html.html_escape(file.mtime) %></td>
 	</tr>
 <% end %>
 </tbody></table>
+<% htmlviewfunctions.displaysectionend(header_level) %>