diff --git a/tpl_Taskinfo.go b/tpl_Taskinfo.go
index 90674ce..21927b5 100644
--- a/tpl_Taskinfo.go
+++ b/tpl_Taskinfo.go
@@ -24,10 +24,8 @@ func (this *App) Serve_TaskInfo(w http.ResponseWriter, task_ref string) {
 
 	fmt.Fprintf(w, `
 		<ul>
-			<li>Type: %s</li>
 			<li>Start time: %s</li>
 	`,
-		"???",
 		hesc(time.Unix(taskinfo.started, 0).Format(time.RFC822Z)),
 	)
 
@@ -39,6 +37,8 @@ func (this *App) Serve_TaskInfo(w http.ResponseWriter, task_ref string) {
 			hesc(time.Unix(taskinfo.stopped, 0).Format(time.RFC822Z)),
 			taskinfo.exitCode,
 		)
+	} else {
+		fmt.Fprint(w, `<li>Currently running</li>`)
 	}
 
 	fmt.Fprint(w, `
@@ -69,13 +69,18 @@ func (this *App) Serve_TaskInfo(w http.ResponseWriter, task_ref string) {
 	fmt.Fprintf(w, `
 			</tbody>
 		</table>
+	`)
+
+	if !taskinfo.Finished() {
+		fmt.Fprintf(w, `
 		<form method="POST" action="/x-abandon-task">
 			<input type="hidden" name="task_ref" value="%s">
 			<input type="submit" value="Cancel &raquo;">
 		</form>
-	`,
-		hesc(task_ref),
-	)
+		`,
+			hesc(task_ref),
+		)
+	}
 
 	this.ServePartial_Footer(w)
 }