Get these term and terms templates right

layouts/_default/terms.html

@@ -4,23 +4,19 @@
 
 {{ define "main" }}
 <header class="page">
-  <h1>Terms: {{ .Page.Title }}</h1>
+  <h1>{{ .Title }}</h1>
 </header>
 
-<h2>Pages</h2>
+{{ .Content }}
+
+{{- range .Data.Terms.Alphabetical -}}
+<h2>{{ .Name | title }}</h2>
 <ul>
-  {{- range .Data.Pages -}}
+  {{- range .WeightedPages -}}
   <li><a href="{{ .RelPermalink }}">{{ .Title }}</a></li>
   {{- end -}}
 </ul>
-
-<h2>Terms</h2>
-<ul>
-  {{- range $term, $page := .Data.Terms.Alphabetical -}}
-  <li>{{ $term }} -- {{ $page }}</li>
-  {{- end -}}
-</ul>
-
+{{- end -}}
 {{ end }}
 
 {{ define "footer" }}