diff --git a/static/css/default_light/trigger_edit.css b/static/css/default_light/trigger_edit.css
index 5192604..959c7cf 100644
--- a/static/css/default_light/trigger_edit.css
+++ b/static/css/default_light/trigger_edit.css
@@ -13,17 +13,24 @@
 .widgets .datapoints {
   font: "Roboto Mono", monospace;
   display: grid;
-  grid-template-columns: min-content min-content 1fr;
+  grid-template-columns: repeat(4, min-content);
   gap: 6px 8px;
   margin-bottom: 8px;
   white-space: nowrap;
 }
+.widgets .datapoints div {
+  white-space: nowrap;
+}
 .widgets .datapoints .invalid {
   color: #c83737;
 }
 .widgets .datapoints .delete img {
   height: 16px;
 }
+.widgets .datapoints .values img {
+  height: 16px;
+  width: 16px;
+}
 .widgets .action {
   display: grid;
   grid-template-columns: min-content min-content 1fr;
diff --git a/static/css/gruvbox/trigger_edit.css b/static/css/gruvbox/trigger_edit.css
index 711dc17..ee5b1fc 100644
--- a/static/css/gruvbox/trigger_edit.css
+++ b/static/css/gruvbox/trigger_edit.css
@@ -13,17 +13,24 @@
 .widgets .datapoints {
   font: "Roboto Mono", monospace;
   display: grid;
-  grid-template-columns: min-content min-content 1fr;
+  grid-template-columns: repeat(4, min-content);
   gap: 6px 8px;
   margin-bottom: 8px;
   white-space: nowrap;
 }
+.widgets .datapoints div {
+  white-space: nowrap;
+}
 .widgets .datapoints .invalid {
   color: #c83737;
 }
 .widgets .datapoints .delete img {
   height: 16px;
 }
+.widgets .datapoints .values img {
+  height: 16px;
+  width: 16px;
+}
 .widgets .action {
   display: grid;
   grid-template-columns: min-content min-content 1fr;
diff --git a/static/js/trigger_edit.mjs b/static/js/trigger_edit.mjs
index 826afd4..e74c2e3 100644
--- a/static/js/trigger_edit.mjs
+++ b/static/js/trigger_edit.mjs
@@ -19,9 +19,10 @@ export class UI {
 		let html = Object.keys(this.trigger.datapoints).sort().map(dpName => {
 			const dp = this.trigger.datapoints[dpName]
 			return `
-				<div class="datapoint delete"><a href="#" onclick="_ui.deleteDatapoint('${dp.Name}')"><img src="/images/${this.version}/${this.theme}/delete.svg"></a></div>
 				<div class="datapoint name ${dp.Found ? 'valid' : 'invalid'}"><b>${dp.Name}</b></div>
 				<div class="datapoint value">${dp.Found ? dp.LastDatapointValue.TemplateValue : ''}</div>
+				<div class="daatpoint values"><a href="/datapoint/values/${dp.ID}"><img src="/images/${this.version}/${this.theme}/values.svg"></a></div>
+				<div class="datapoint delete"><a href="#" onclick="_ui.deleteDatapoint('${dp.Name}')"><img src="/images/${this.version}/${this.theme}/delete.svg"></a></div>
 			`
 		}).join('')
 		datapoints.innerHTML += html
@@ -84,7 +85,7 @@ export class UI {
 			})
 	}//}}}
 	deleteDatapoint(name) {//{{{
-		if (!confirm(`Delete ${name}?`)) {
+		if (!confirm(`Remove datapoint ${name} from this trigger?`)) {
 			return
 		}
 
diff --git a/static/less/trigger_edit.less b/static/less/trigger_edit.less
index 4e3f0e2..ee1c616 100644
--- a/static/less/trigger_edit.less
+++ b/static/less/trigger_edit.less
@@ -19,11 +19,15 @@
 	.datapoints {
 		font: "Roboto Mono", monospace;
 		display: grid;
-		grid-template-columns: min-content min-content 1fr;
+		grid-template-columns: repeat(4, min-content);
 		gap: 6px 8px;
 		margin-bottom: 8px;
 		white-space: nowrap;
 
+		div {
+			white-space: nowrap;
+		}
+
 		.invalid {
 			color: #c83737;
 		}
@@ -31,6 +35,11 @@
 		.delete img {
 			height: 16px;
 		}
+
+		.values img {
+			height: 16px;
+			width: 16px;
+		}
 	}
 
 	.action {