2 files changed, 39 insertions, 20 deletions
diff --git a/bin/templates/pkgset_details.mustache b/bin/templates/pkgset_details.mustache
index e767118b..d29576a2 100644
--- a/bin/templates/pkgset_details.mustache
+++ b/bin/templates/pkgset_details.mustache
@@ -1,17 +1,20 @@
 <p>
 {{#png}}
-  <a href="{{png}}"><img src="{{png}}" class="overview" alt="package set {{pkgset_name}} in {{suite}}/{{arch}}"></a>"
-{{/png}}
-
+  <a href="{{png}}">
+    <img src="{{png}}" class="overview"
+     title="Package set {{pkgset_name}} in {{suite}}/{{arch}}. (To switch suite and arch, see top left.)"
+     alt="package set {{pkgset_name}} in {{suite}}/{{arch}}">
+  </a>"
+  {{/png}}
   <br />
-  The package set '{{pkgset_name}}' in {{suite}}/{{arch}} consists of:
-  (see this package set on {{#other_archs}}<a href="{{link}}" title="See this packageset in unstable/{{arch}}">{{arch}}</a>
-{{/other_archs}})
-
+  The package set <span class="highlight">{{pkgset_name}}</span> in
+  <span class="highlight">{{suite}}/{{arch}}</span> consists of:
   <br />
   {{#status_details}}
-  {{{icon_html}}} {{status_count}} ({{status_percent}}%) packages {{description}}: {{{package_list_html}}}
+  {{{icon_html}}} {{status_count}} ({{status_percent}}%) packages
+  {{description}}:
+  {{{package_list_html}}}
   <br />
   {{/status_details}}
   {{{pkg_symbol_legend_html}}}
-</op>
+</p>
diff --git a/bin/templates/pkgset_navigation.mustache b/bin/templates/pkgset_navigation.mustache
index 40d19c18..81ee3386 100644
--- a/bin/templates/pkgset_navigation.mustache
+++ b/bin/templates/pkgset_navigation.mustache
@@ -1,14 +1,30 @@
-<ul>
-  <li>Tracked package sets in {{suite}}/{{arch}}: </li>
-<br/>
-{{#package_sets}}
+<ul><li>
+  <a href="/debian/{{suite}}/{{arch}}/index_pkg_sets.html"
+     title="To switch suite and arch, see top left">
+    All tracked package sets for <b>{{suite}}/{{arch}}</b>
+  </a>
+</li></ul>
+{{#package_set_sections}}
+<details {{^pkgset_page}}open{{/pkgset_page}}>
+  <summary>{{section}} package sets:</summary>
+  <ul class="pkgset-list">
+  {{#pkgsets}}
   <li class="{{class}}">
-	<a href="/debian/{{suite}}/{{arch}}/pkg_set_{{pkgset_name}}.html">{{pkgset_name}}</a>
-  {{#thumb}}
-	<a href="/debian/{{suite}}/{{arch}}/pkg_set_{{pkgset_name}}.html">
-	  <img src="{{thumb}}" class="setview" alt="Reproducibility status for packages un {{suite}}/{{arch}} from '{{pkg_name}}'" title="{{pkgset_name}}" name="{{pkgset_name}}">
-	</a>
-  {{/thumb}}
+    <a href="/debian/{{suite}}/{{arch}}/pkg_set_{{pkgset_name}}.html">
+      {{pkgset_name}}
+    </a>
+    {{#thumb}}
+    <a href="/debian/{{suite}}/{{arch}}/pkg_set_{{pkgset_name}}.html">
+      <img src="{{thumb}}" class="setview"
+           alt="Reproducibility status for packages in {{suite}}/{{arch}} from '{{pkg_name}}'"
+           title="{{pkgset_name}}" name="{{pkgset_name}}">
+    </a>
+    {{/thumb}}
   </li>
-{{/package_sets}}
+  {{/pkgsets}}
 </ul>
+</details>
+{{/package_set_sections}}
+{{#pkgset_page}}
+<hr id="footer_separator" />
+{{/pkgset_page}}