cmd/sgblog/main.go | 19 +++++++++++--------
 common.go          |  2 +-

diff --git a/cmd/sgblog/main.go b/cmd/sgblog/main.go
index a80d3647f07e93c4bf08e060e8485393144277bc90da549604b4282f0c759568..3e4ccaaf8ee17f7a5bce76bda3d1319749eb2da079505c09e3b4a08ecd65bdb4 100644
--- a/cmd/sgblog/main.go
+++ b/cmd/sgblog/main.go
@@ -380,12 +380,13 @@ 		checkETag(etagHash)
 
 		var table bytes.Buffer
 		table.WriteString(
-			"<table border=1>\n<tr>" +
+			"<table border=1>\n" +
+				"<caption>Comments</caption>\n<tr>" +
 				"<th>N</th>" +
 				"<th>When</th>" +
 				"<th>Title</th>" +
-				"<th size=\"5%\">L</th>" +
-				"<th size=\"5%\">C</th>" +
+				`<th size="5%"><a title="Lines">L</a></th>` +
+				`<th size="5%"><a title="Comments">C</a></th>` +
 				"<th>Linked to</th></tr>\n")
 		for _, entry := range entries {
 			commentN++
@@ -428,12 +429,12 @@ 			} else {
 				href = cfg.URLPrefix + "/"
 			}
 			links = append(links, `<link rel="prev" href="`+href+`" title="newer">`)
-			refs.WriteString(makeA(href, "&nbsp;[prev]"))
+			refs.WriteString("\n" + makeA(href, "[prev]"))
 		}
 		if !logEnded {
 			href = cfg.URLPrefix + "/?offset=" + strconv.Itoa(offset+PageEntries)
 			links = append(links, `<link rel="next" href="`+href+`" title="older">`)
-			refs.WriteString(makeA(href, "&nbsp;[next]"))
+			refs.WriteString("\n" + makeA(href, "[next]"))
 		}
 
 		os.Stdout.Write([]byte(startHeader(etagHash, gzipWriter != nil)))
@@ -549,16 +550,18 @@ 			links = append(links, `<link rel="prev" href="`+cfg.URLPrefix+"/"+parent+`" title="older">`)
 		}
 		out.Write([]byte(startHTML(fmt.Sprintf("%s (%s)", title, when), links)))
 		if cfg.AboutURL != "" {
-			out.Write([]byte(fmt.Sprintf("[%s]&nbsp;", makeA(cfg.AboutURL, "about"))))
+			out.Write([]byte(fmt.Sprintf("[%s]\n", makeA(cfg.AboutURL, "about"))))
 		}
 		if parent != "" {
 			out.Write([]byte(fmt.Sprintf(
-				"[%s]&nbsp;",
+				"[%s]\n",
 				makeA(cfg.URLPrefix+"/"+parent, "older"),
 			)))
 		}
 		out.Write([]byte(fmt.Sprintf(
-			"[<tt>%s</tt>]&nbsp;[<tt>%s</tt>]<hr/>\n<h2>%s</h2>\n<pre>\n",
+			"[<tt><a title=\"When\">%s</a></tt>]\n"+
+				"[<tt><a title=\"Hash\">%s</a></tt>]\n"+
+				"<hr/>\n<h2>%s</h2>\n<pre>\n",
 			when, commit.Hash.String(), title,
 		)))
 		for _, line := range lines[2:] {
diff --git a/common.go b/common.go
index 708fe305914dba86d595a3c007a60df09c01d973e4be346a62fc7bd80f858020..4db0310dbdb0549fd7fcb26a5f6725c04d84ceff0334079c50bf907cb7f67c05 100644
--- a/common.go
+++ b/common.go
@@ -3,5 +3,5 @@ package sgblog
 
 const (
 	WhenFmt = "2006-01-02 15:04:05Z07:00"
-	Version = "0.3.2"
+	Version = "0.3.3"
 )