diff --git a/edit-mode/function/function.js b/edit-mode/function/function.js
index 1847960..760dfda 100644
--- a/edit-mode/function/function.js
+++ b/edit-mode/function/function.js
@@ -538,7 +538,11 @@ function setUpForShowHideColumn(data) {
 	columns.map((val, index) => {
 		configColumn[val.column_name] = val.show
 	});
-
+    if (!isBaselineSet) {
+        configColumn.planned_start = undefined;
+        configColumn.planned_end = undefined;
+        configColumn.planned_duration = undefined;
+    }   
 	gantt.config.columns = createColumnsConfig(configColumn);
 
 	gantt.render();
diff --git a/edit-mode/function/ganttConfig.js b/edit-mode/function/ganttConfig.js
index 4370aa7..ccc5457 100644
--- a/edit-mode/function/ganttConfig.js
+++ b/edit-mode/function/ganttConfig.js
@@ -282,7 +282,7 @@ var allColumns = [
 			return text.planned_start;
 		}
 	},
-	{ name: "start_date", label: "Actual Start", align: "center", min_width: 80, editor: editor.start_date, resize: true },
+	{ name: "start_date", label: "Early Start", align: "center", min_width: 80, editor: editor.start_date, resize: true },
 	{
 		name: "planned_end", label: "Baseline Finish", align: "center", min_width: 80, editor: editor.planned_end, resize: true, template: function (text) {
 			if (!text.planned_end) {
@@ -291,7 +291,7 @@ var allColumns = [
 			return text.planned_end;
 		}
 	},
-	{ name: "end_date", label: "Actual Finish", align: "center", min_width: 80, editor: editor.end_date, resize: true },
+	{ name: "end_date", label: "Early Finish", align: "center", min_width: 80, editor: editor.end_date, resize: true },
 
 	{
 		name: "bobot_planning", label: "Bobot (%)", align: "center", editor: editor.bobot_planning, resize: true, min_width: 115, template: function (text) {
@@ -349,7 +349,7 @@ var allColumns = [
 		})
 		return plannedDuration;
 	}},
-	{ name: "duration", label: "Actual Duration (Day)", align: "center", min_width: 50, resize: true, editor: editor.duration },
+	{ name: "duration", label: "Early Duration (Day)", align: "center", min_width: 50, resize: true, editor: editor.duration },
 	{
 		name: "rencana_biaya", label: "Cost Planning", align: "right", min_width: 100, resize: true, template: function (text) {
 			if (!text.rencana_biaya) {