diff --git a/cmd/cli/job/executions.go b/cmd/cli/job/executions.go
index d3c3f162ef..f3d27eb098 100644
--- a/cmd/cli/job/executions.go
+++ b/cmd/cli/job/executions.go
@@ -106,12 +106,18 @@ var (
 		Value:        func(e *models.Execution) string { return output.Elapsed(e.GetModifyTime()) },
 	}
 	executionColumnID = output.TableColumn[*models.Execution]{
-		ColumnConfig: table.ColumnConfig{Name: "ID", WidthMax: 10, WidthMaxEnforcer: text.WrapText},
-		Value:        func(e *models.Execution) string { return idgen.ShortUUID(e.ID) },
+		ColumnConfig: table.ColumnConfig{
+			Name:             "ID",
+			WidthMax:         idgen.ShortIDLengthWithPrefix,
+			WidthMaxEnforcer: func(col string, maxLen int) string { return idgen.ShortUUID(col) }},
+		Value: func(e *models.Execution) string { return e.ID },
 	}
 	executionColumnNodeID = output.TableColumn[*models.Execution]{
-		ColumnConfig: table.ColumnConfig{Name: "Node ID", WidthMax: 10, WidthMaxEnforcer: text.WrapText},
-		Value:        func(e *models.Execution) string { return idgen.ShortNodeID(e.NodeID) },
+		ColumnConfig: table.ColumnConfig{
+			Name:             "Node ID",
+			WidthMax:         idgen.ShortIDLengthWithPrefix,
+			WidthMaxEnforcer: func(col string, maxLen int) string { return idgen.ShortUUID(col) }},
+		Value: func(e *models.Execution) string { return e.NodeID },
 	}
 	executionColumnRev = output.TableColumn[*models.Execution]{
 		ColumnConfig: table.ColumnConfig{Name: "Rev.", WidthMax: 4, WidthMaxEnforcer: text.WrapText},
diff --git a/cmd/cli/job/history.go b/cmd/cli/job/history.go
index 90da87e6e8..13c55a9942 100644
--- a/cmd/cli/job/history.go
+++ b/cmd/cli/job/history.go
@@ -88,7 +88,7 @@ func NewHistoryCmd() *cobra.Command {
 }
 
 var historyColumns = []output.TableColumn[*models.JobHistory]{
-	cols.HistoryTime,
+	cols.HistoryDateTime,
 	cols.HistoryLevel,
 	cols.HistoryExecID,
 	cols.HistoryTopic,
diff --git a/cmd/cli/node/columns.go b/cmd/cli/node/columns.go
index 662bfa5a5b..589823e33a 100644
--- a/cmd/cli/node/columns.go
+++ b/cmd/cli/node/columns.go
@@ -17,8 +17,11 @@ import (
 
 var alwaysColumns = []output.TableColumn[*models.NodeState]{
 	{
-		ColumnConfig: table.ColumnConfig{Name: "id"},
-		Value:        func(node *models.NodeState) string { return idgen.ShortNodeID(node.Info.ID()) },
+		ColumnConfig: table.ColumnConfig{
+			Name:             "id",
+			WidthMax:         idgen.ShortIDLengthWithPrefix,
+			WidthMaxEnforcer: func(col string, maxLen int) string { return idgen.ShortNodeID(col) }},
+		Value: func(node *models.NodeState) string { return node.Info.ID() },
 	},
 	{
 		ColumnConfig: table.ColumnConfig{Name: "type"},
diff --git a/cmd/util/cols/history.go b/cmd/util/cols/history.go
index 072db5e60d..5553c40602 100644
--- a/cmd/util/cols/history.go
+++ b/cmd/util/cols/history.go
@@ -14,10 +14,6 @@ import (
 )
 
 var (
-	HistoryTime = output.TableColumn[*models.JobHistory]{
-		ColumnConfig: table.ColumnConfig{Name: "Time", WidthMax: len(time.StampMilli), WidthMaxEnforcer: output.ShortenTime},
-		Value:        func(j *models.JobHistory) string { return j.Occurred().Format(time.StampMilli) },
-	}
 	HistoryTimeOnly = output.TableColumn[*models.JobHistory]{
 		ColumnConfig: table.ColumnConfig{Name: "Time", WidthMax: len(TimeOnlyMilli), WidthMaxEnforcer: text.Trim},
 		Value:        func(j *models.JobHistory) string { return j.Occurred().Format(TimeOnlyMilli) },
@@ -31,12 +27,15 @@ var (
 		Value:        func(jwi *models.JobHistory) string { return jwi.Type.String() },
 	}
 	HistoryExecID = output.TableColumn[*models.JobHistory]{
-		ColumnConfig: table.ColumnConfig{Name: "Exec. ID", WidthMax: 10, WidthMaxEnforcer: text.WrapText},
+		ColumnConfig: table.ColumnConfig{
+			Name:             "Exec. ID",
+			WidthMax:         idgen.ShortIDLengthWithPrefix,
+			WidthMaxEnforcer: func(col string, maxLen int) string { return idgen.ShortUUID(col) }},
 		Value: func(j *models.JobHistory) string {
 			if j.ExecutionID == "" {
 				return ""
 			}
-			return idgen.ShortUUID(j.ExecutionID)
+			return j.ExecutionID
 		},
 	}
 	HistoryTopic = output.TableColumn[*models.JobHistory]{