Mostly done, first cut

web/templates/info.html

@@ -4,15 +4,14 @@
         <h5>System information</h5>
         <table>
             <tr><th>Memory in use</th><td>{{ meminfo }}</td></tr>
-            <tr><th>Database disk size</th><td>{{ niceSizeMB .stats.FileSize }}Mb</td></tr>
+            <tr><th>Bookmarks DB  size</th><td>{{ niceSizeMB .stats.FileSize }}Mb</td></tr>
+            <tr><th>Bookmarks index size</th><td>{{ niceSizeMB .stats.IndexSize }}Mb</td></tr>
             <tr><th>Bookmarks</th><td>{{ .stats.MostRecentBookmarkInfo.Bookmarks }}</td></tr>
-            <tr><th>Words in index</th><td>{{ .stats.MostRecentBookmarkInfo.IndexedWords }}</td></tr>
             <tr><th>Total searches</th><td>{{ .stats.Searches }}</td></tr>
         </table>
 
         <h5>Database information</h5>
         <img src="/graph/bookmarks">
-        <img src="/graph/indexed_words">
 
     </div>
     <div class="large-6 medium-12 cell">

web/templates/manage_results.html

@@ -2,29 +2,29 @@
         <table id="manage-results">
             <tr>
                 <th>&nbsp;</th>
-                {{ template "manage_results_column_header.html" .column.title }}
+                <th>title</th>
                 <th>tags</th>
-                {{ template "manage_results_column_header.html" .column.created }}
-                {{ template "manage_results_column_header.html" .column.scraped }}
+                <th>created</th>
+                <th>scraped</th>
             </tr>
-            {{ range .bookmarks }}
+            {{ range .results }}
             <tr>
-                <th><a class="button" href="/edit/{{ .ID }}">edit</a></th>
+                <th><a class="button" href="/edit/{{ .Bookmark.ID }}">edit</a></th>
                 <td>
-                    <a href="{{ .URL }}">{{ .Info.Title }}</a>
+                    <a href="{{ .Bookmark.URL }}">{{ .Bookmark.Info.Title }}</a>
                     <br>
-                    <a href="{{ .URL }}">{{ niceURL .URL }}</a>
+                    <a href="{{ .Bookmark.URL }}">{{ niceURL .Bookmark.URL }}</a>
                 </td>
                 <td>
-                    {{ range .Tags }}
+                    {{ range .Bookmark.Tags }}
                     <span class="label primary">{{ . }}</span>
                     {{ end }}
                 </td>
-                <td class="show-for-large">{{ (nicetime .TimestampCreated).HumanDuration }} ago</td>
-                <td class="show-for-large">{{ (nicetime .TimestampLastScraped).HumanDuration }} ago</td>
+                <td class="show-for-large">{{ (nicetime .Bookmark.TimestampCreated).HumanDuration }} ago</td>
+                <td class="show-for-large">{{ (nicetime .Bookmark.TimestampLastScraped).HumanDuration }} ago</td>
 
                 <td>
-                    <a class="button" hx-swap="outerHTML" hx-post="/scrape/{{ .ID }}">scrape</button>
+                    <a class="button" hx-swap="outerHTML" hx-post="/scrape/{{ .Bookmark.ID }}">scrape</button>
                 </td>
             </tr>
             {{ end }}

web/templates/manage_results_column_header.html

@@ -1,3 +0,0 @@
-
-<th class="{{ .Class }}" hx-post="/manage/results?sort={{ .URLString }}" hx-target="#manage-results">{{ .Name }}&nbsp;{{ .TitleArrow }}
-</th>

web/templates/search_results.html

@@ -1,5 +1,8 @@
 <ul>
     {{ range .results }}
-    <li><a href="{{ .URL }}">{{ .Info.Title }}</a> - {{ .URL }}</li>
+    <li>
+         <a href="{{ .Bookmark.URL }}">{{ .Bookmark.Info.Title }}</a><br>
+         {{ .Highlight }}
+        </li>
     {{ end }}
 </ul>