diff --git a/project/project.go b/project/project.go
index fd89965..265f27f 100644
--- a/project/project.go
+++ b/project/project.go
@@ -172,12 +172,19 @@ func Track(dbConn *sql.DB, mu *sync.Mutex, manualRefresh *chan struct{}, name, u
 }
 
 func Untrack(dbConn *sql.DB, mu *sync.Mutex, id string) {
-	err := db.DeleteProject(dbConn, mu, id)
+	proj, err := db.GetProject(dbConn, id)
+	if err != nil {
+		fmt.Println("Error getting project:", err)
+	}
+
+	err = db.DeleteProject(dbConn, mu, proj["id"])
 	if err != nil {
 		fmt.Println("Error deleting project:", err)
 	}
 
-	err = git.RemoveRepo(id)
+	// TODO: before removing, check whether other tracked projects use the same
+	// repo
+	err = git.RemoveRepo(proj["url"])
 	if err != nil {
 		log.Println(err)
 	}
diff --git a/ws/static/home.html b/ws/static/home.html
index 0a91a6d..13baf99 100644
--- a/ws/static/home.html
+++ b/ws/static/home.html
@@ -34,7 +34,7 @@
                 {{- range . -}}
                 {{- if ne .Running (index .Releases 0).Tag -}}
                 <div id="{{ .ID }}" class="project card">
-                    <h3><a href="{{ .URL }}">{{ .Name }}</a>&nbsp;&nbsp;&nbsp;<span class="delete"><a href="/new?action=delete&url={{ .URL }}">Delete?</a></span></h3>
+                    <h3><a href="{{ .URL }}">{{ .Name }}</a>&nbsp;&nbsp;&nbsp;<span class="delete"><a href="/new?action=delete&id={{ .ID }}">Delete?</a></span></h3>
                     <p>You've selected {{ .Running }}. <a href="/new?action=update&url={{ .URL }}&forge={{ .Forge }}&name={{ .Name }}">Modify?</a></p>
                     <p>Latest: <a href="{{ (index .Releases 0).URL }}">{{ (index .Releases 0).Tag }}</a></p>
                     <p><a href="#{{ (index .Releases 0).ID }}">View release notes</a></p>
@@ -52,7 +52,7 @@
                 {{- range . -}}
                 {{- if eq .Running (index .Releases 0).Tag -}}
                 <div class="project card">
-                    <h3><a href="{{ .URL }}">{{ .Name }}</a>&nbsp;&nbsp;&nbsp;<span class="delete"><a href="/new?action=delete&url={{ .URL }}">Delete?</a></span></h3>
+                    <h3><a href="{{ .URL }}">{{ .Name }}</a>&nbsp;&nbsp;&nbsp;<span class="delete"><a href="/new?action=delete&id={{ .ID }}">Delete?</a></span></h3>
                     <p>You've selected <a href="#{{ (index .Releases 0).ID }}">{{ .Running }}</a>. <a href="/new?action=update&url={{ .URL }}&forge={{ .Forge }}&name={{ .Name }}">Modify?</a></p>
                 </div>
                 {{- end -}}