diff --git a/html/func.go b/html/func.go
index 89986841..63995c9e 100644
--- a/html/func.go
+++ b/html/func.go
@@ -27,6 +27,7 @@ func addFuncMap(t *template.Template) {
 		"duration":            duration,
 		"hasPassed":           hasPassed,
 		"html":                unescapeHTML,
+		"iconUploadStatus":    iconUploadStatus,
 		"json":                unescapeJS,
 		"GISStatement":        gisStatement,
 		"latLngDisplay":       latLngDisplay,
@@ -140,6 +141,19 @@ func hasPassed(t time.Time) bool {
 	return t.Before(time.Now())
 }
 
+func iconUploadStatus(s string) string {
+	switch s {
+	case "error":
+		return "bi-exclamation"
+	case "parsed":
+		return "bi-check-circle"
+	case "uploaded":
+		return "bi-arrow-clockwise"
+	default:
+		return "bi-question"
+	}
+}
+
 // FormatTimeDuration returns a human-readable string representing a time.Duration
 // as "X units early" or "X units late"
 func timeDelta(d time.Duration) string {
diff --git a/html/template/sync/pool-by-id.html b/html/template/sync/pool-by-id.html
index f7bd5a15..382a0649 100644
--- a/html/template/sync/pool-by-id.html
+++ b/html/template/sync/pool-by-id.html
@@ -8,7 +8,7 @@
 	></script>
 	<script src="/static/js/map-libre-test.js"></script>
 	<script>
-const CSV_FILE_ID={{.CSVFileID}};
+const CSV_FILE_ID={{.C.CSVFileID}};
 const ORG_ID={{.Organization.ID}};
 function handleShowIssuesOnly() {
 	const checkboxShowIssuesOnly = document.getElementById("showIssuesOnly");
@@ -68,31 +68,20 @@ document.addEventListener('DOMContentLoaded', onLoad);
 {{ define "content" }}
 	<div class="container mt-4 results-container">
 		<div class="d-flex justify-content-between align-items-center mb-4">
-			<h2>Upload Results: {{ .Upload.Name }}</h2>
-			{{ if eq .Upload.Status "parsed" }}
-				<span class="badge bg-success rounded-pill">
-					<i class="bi bi-check-circle me-1"></i> File Parsed Successfully
-				</span>
-			{{ else if eq .Upload.Status "error" }}
-				<span class="badge bg-danger rounded-pill">
-					<i class="bi bi-exclamation me-1"></i> File Has Problems
-				</span>
-			{{ else if eq .Upload.Status "uploaded" }}
-				<span class="badge bg-info rounded-pill">
-					<i class="bi bi-arrow-clockwise me-1"></i> File Is Processing
-				</span>
-			{{ else }}
-				<span class="badge bg-warning rounded-pill">
-					<i class="bi bi-question me-1"></i> Unknown status
-				</span>
-			{{ end }}
+			<h2>Upload Results: {{ .C.Upload.Name }}</h2>
+			<span class="badge rounded-pill {{ .C.Upload.Status }}">
+				<i class="bi {{ .C.Upload.Status|iconUploadStatus }} me-1"></i
+				>{{ .C.Upload.Status|displayUploadStatus }}
+			</span>
 		</div>
 
 		<div class="row mb-4">
 			<div class="col-md-4">
 				<div class="card summary-card h-100 border-primary">
 					<div class="card-body text-center">
-						<h1 class="display-4 text-primary">{{ .Upload.CountExisting }}</h1>
+						<h1 class="display-4 text-primary">
+							{{ .C.Upload.CountExisting }}
+						</h1>
 						<h5>Existing Pools</h5>
 						<p class="text-muted">Matches found in previous records</p>
 					</div>
@@ -101,7 +90,7 @@ document.addEventListener('DOMContentLoaded', onLoad);
 			<div class="col-md-4">
 				<div class="card summary-card h-100 border-success">
 					<div class="card-body text-center">
-						<h1 class="display-4 text-success">{{ .Upload.CountNew }}</h1>
+						<h1 class="display-4 text-success">{{ .C.Upload.CountNew }}</h1>
 						<h5>New Pools</h5>
 						<p class="text-muted">Not found in existing records</p>
 					</div>
@@ -110,7 +99,7 @@ document.addEventListener('DOMContentLoaded', onLoad);
 			<div class="col-md-4">
 				<div class="card summary-card h-100 border-warning">
 					<div class="card-body text-center">
-						<h1 class="display-4 text-warning">{{ .Upload.CountOutside }}</h1>
+						<h1 class="display-4 text-warning">{{ .C.Upload.CountOutside }}</h1>
 						<h5>Outside District</h5>
 						<p class="text-muted">Potential geocoding errors</p>
 					</div>
@@ -143,20 +132,20 @@ document.addEventListener('DOMContentLoaded', onLoad);
 				</div>
 			</div>
 			<div class="card-body">
-				{{ range .Upload.Errors }}
+				{{ range .C.Upload.Errors }}
 					<div class="alert alert-danger" role="alert">
 						<i class="bi bi-exclamation-triangle me-2"></i>
 						<strong>Error:</strong>{{ .Message }}
 					</div>
 				{{ end }}
-				{{ if eq .Upload.Status "uploaded" }}
+				{{ if eq .C.Upload.Status "uploaded" }}
 					<div class="alert alert-info" role="alert">
 						<i class="bi bi-exclamation-triangle me-2"></i>
 						<strong>Working:</strong> File is still processing... refresh this
 						page in a bit to see updates.
 					</div>
 				{{ else }}
-					{{ if eq (len .Upload.Pools) 0 }}
+					{{ if eq (len .C.Upload.Pools) 0 }}
 						<div class="alert alert-warning" role="alert">
 							<i class="bi bi-exclamation-triangle me-2"></i>
 							<strong>Warning:</strong> No pools could be understood from your
@@ -177,7 +166,7 @@ document.addEventListener('DOMContentLoaded', onLoad);
 									</tr>
 								</thead>
 								<tbody>
-									{{ range .Upload.Pools }}
+									{{ range .C.Upload.Pools }}
 										<tr {{ if gt (len .Errors) 0 }}class="has-error"{{ end }}>
 											<td>
 												{{ if gt (len .Errors) 0 }}
diff --git a/sync/routes.go b/sync/routes.go
index ddaf1a63..ac036d26 100644
--- a/sync/routes.go
+++ b/sync/routes.go
@@ -77,7 +77,7 @@ func Router() chi.Router {
 	r.Method("GET", "/upload/pool", authenticatedHandler(getUploadPoolList))
 	r.Method("GET", "/upload/pool/create", authenticatedHandler(getUploadPoolCreate))
 	r.Method("POST", "/upload/pool/create", authenticatedHandlerPostMultipart(postUploadPoolCreate))
-	r.Method("GET", "/upload/pool/upload/{id}", authenticatedHandler(getUploadPoolByID))
+	r.Method("GET", "/upload/{id}", authenticatedHandler(getUploadByID))
 
 	html.AddStaticRoute(r, "/static")
 	return r
diff --git a/sync/upload.go b/sync/upload.go
index 8020d32c..d5ca8d10 100644
--- a/sync/upload.go
+++ b/sync/upload.go
@@ -50,7 +50,7 @@ func getUploadPoolCreate(ctx context.Context, r *http.Request, org *models.Organ
 	data := contentUploadPoolCreate{}
 	return newResponse("sync/pool-csv-upload.html", data), nil
 }
-func getUploadPoolByID(ctx context.Context, r *http.Request, org *models.Organization, u *models.User) (*response[contentPoolDetail], *errorWithStatus) {
+func getUploadByID(ctx context.Context, r *http.Request, org *models.Organization, u *models.User) (*response[contentPoolDetail], *errorWithStatus) {
 	org, err := u.Organization().One(ctx, db.PGInstance.BobDB)
 	if err != nil {
 		return nil, newError("Failed to get organization: %w", err)