diff --git a/ui-commit.c b/ui-commit.c
index 59eeb1d..6b135aa 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -103,7 +103,7 @@ void print_fileinfo(struct fileinfo *info)
 	      info->removed * 100.0 / max_changes);
 	htmlf("<td class='none' style='width: %.1f%%;'/>",
 	      (max_changes - info->removed - info->added) * 100.0 / max_changes);
-	html("</tr></table></a></td></tr>\n");
+	html("</tr></table></td></tr>\n");
 }
 
 void cgit_count_diff_lines(char *line, int len)
diff --git a/ui-diff.c b/ui-diff.c
index 3ed0a46..e6b957c 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -38,7 +38,6 @@ static void header(unsigned char *sha1, char *path1, int mode1,
 	int subproject;
 
 	subproject = (S_ISDIRLNK(mode1) || S_ISDIRLNK(mode2));
-	html("<tr><td>");
 	html("<div class='head'>");
 	html("diff --git a/");
 	html_txt(path1);
@@ -102,8 +101,10 @@ void cgit_print_diff(const char *head, const char *old_hex, const char *new_hex,
 		commit = lookup_commit_reference(sha1);
 		if (commit && !parse_commit(commit)) {
 			html("<table class='diff'>");
+			html("<tr><td>");
 			cgit_diff_commit(commit, filepair_cb);
-			html("</td></tr></table>");
+			html("</td></tr>");
+			html("</table>");
 		}
 		return;
 	}
@@ -127,7 +128,7 @@ void cgit_print_diff(const char *head, const char *old_hex, const char *new_hex,
 		header(sha1, path, 0644, sha2, path, 0644);
 		if (cgit_diff_files(sha1, sha2, print_line))
 			cgit_print_error("Error running diff");
-		html("</tr></td>");
+		html("</td></tr>");
 		break;
 	case OBJ_TREE:
 		cgit_diff_tree(sha1, sha2, filepair_cb);
@@ -137,5 +138,5 @@ void cgit_print_diff(const char *head, const char *old_hex, const char *new_hex,
 				     typename(type)));
 		break;
 	}
-	html("</td></tr></table>");
+	html("</table>");
 }
diff --git a/ui-tree.c b/ui-tree.c
index 032a966..006ca47 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -50,7 +50,7 @@ static int print_entry(const unsigned char *sha1, const char *base,
 					  cgit_query_path ? cgit_query_path : "",
 					  pathname)));
 	}
-	htmlf("'>%s</a></div></td>", name);
+	htmlf("'>%s</a></td>", name);
 	htmlf("<td class='filesize'>%li</td>", size);
 
 	html("<td class='links'><a href='");