diff --git a/app/Models/WorkflowTimestamp.php b/app/Models/WorkflowTimestamp.php
index bb189afb..5cc6a17d 100644
--- a/app/Models/WorkflowTimestamp.php
+++ b/app/Models/WorkflowTimestamp.php
@@ -22,6 +22,8 @@ class WorkflowTimestamp extends Model
      * @var array
      */
     protected $fillable = [
+        'current_node',
+        'next_node',
         'node',
         'seconds',
         'userId',
diff --git a/database/migrations/2024_07_21_222302_create_workflow_timestamps_table.php b/database/migrations/2024_07_21_222302_create_workflow_timestamps_table.php
index 5a166ffd..3d8d29bb 100644
--- a/database/migrations/2024_07_21_222302_create_workflow_timestamps_table.php
+++ b/database/migrations/2024_07_21_222302_create_workflow_timestamps_table.php
@@ -15,7 +15,8 @@ class CreateWorkflowTimestampsTable extends Migration
     {
         Schema::create('workflow_timestamps', function (Blueprint $table) {
             $table->id();
-            $table->string('node');
+            $table->string('current_node');
+            $table->string('next_node');
             $table->integer('seconds');
             $table->unsignedBigInteger('userId');
             $table->string('session_id');
diff --git a/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue b/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
index d0a25c9b..8a629664 100644
--- a/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
+++ b/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
@@ -98,11 +98,10 @@
                         <div class="row" v-if="currentQuestion.answers">
                             <div class="col">
                                 <div class="w-100 d-block text-center">
-                                    <button @click="goBack()"
-                                        v-if="questionIds.length"
-                                        class="btn btn-lg btn-primary d-inline-block rounded fs-20"
+                                    <button @click="goBack()" v-if="questionIds.length"
+                                        class="btn btn-lg btn-default b-a b-grey d-inline-block rounded fs-20"
                                         style="margin: 15px; padding: 15px 40px; min-width: 210px;">
-                                        Back
+                                        Go Back
                                     </button>
                                     <button v-for="(answer, index) in currentQuestion.answers" :key="index"
                                         @click="selectAnswer(answer.next)"
@@ -138,7 +137,7 @@ export default {
         return {
             section: 'initial_section',
             questions: {
-                "0": {
+                "node_0": {
                     "text": "Are you ready to work today?",
                     "answers": [
                         { "text": "Yes", "next": "start_work" },
@@ -321,39 +320,51 @@ export default {
         }
     },
     mounted() {
-        this.currentQuestionId = 0;
+        this.currentQuestionId = 'node_0';
         if (this.sessionId == null) {
             this.sessionId = this.generateSessionId();
         }
     },
     methods: {
-        startTimer() { 
-            this.timer = setInterval(() => {
-                this.elapsedTime++;
-                this.stepTime++;
-            }, this.interval); 
+        startTimer() {
+            if (!this.timer) {
+                this.timer = setInterval(() => {
+                    this.elapsedTime++;
+                    this.stepTime++;
+                }, this.interval);
+            } else {
+                console.log("time has already started");
+            }
         },
         stopTimer() { clearInterval(this.timer); this.timer = null; },
-        startWork() { this.startTimer(); console.log("work is started"); },
+        startWork() { this.startTimer(); },
         endWork() { this.stopTimer(); console.log("work is ended"); },
         selectAnswer(nextQuestionId) {
             if (nextQuestionId === 'refresh_page') return window.location.reload();
             if (!Object.keys(this.questions[nextQuestionId]).length) this.endWork();
             if (nextQuestionId === 'start_work') this.startWork();
             if (nextQuestionId === 'stop_working') this.stopTimer();
-            this.questionIds.push(this.currentQuestionId);
-            this.currentQuestionId = nextQuestionId;
 
+            // exclude some node to click back
+            if (!['node_0'].includes(this.currentQuestionId)) {
+                this.questionIds.push(this.currentQuestionId);
+                this.callLogApi(this.currentQuestionId, nextQuestionId);
+            }
+
+            if (this.questions[nextQuestionId]?.load_api) this.callApi(this.questions[nextQuestionId].load_api, 'get', 'section');
+            this.currentQuestionId = nextQuestionId;
+        },
+        callLogApi(currentNode, nextNode) {
             // call api to recorrd timestamp
             var logBody = {
-                'node': nextQuestionId,
+                'current_node': currentNode,
+                'next_node': nextNode,
                 'seconds': this.stepTime,
                 'userId': this.$store.getters.getUserId,
                 'session_id': this.sessionId,
             };
             this.callApi(this.route('api.admin_work_flow.add_workflow_timestamp'), 'post', 'section', logBody, false, false);
             this.stepTime = 0;
-            if (this.questions[nextQuestionId]?.load_api) this.callApi(this.questions[nextQuestionId].load_api, 'get', 'section');
         },
         goBack() {
             this.currentQuestionId = this.questionIds.pop();
diff --git a/routes/admin_work_flow.php b/routes/admin_work_flow.php
index 64de2c8a..83f71110 100644
--- a/routes/admin_work_flow.php
+++ b/routes/admin_work_flow.php
@@ -39,7 +39,8 @@ Route::group(['prefix' => 'admin-work-flow', 'as' => 'admin_work_flow.', 'namesp
 
     Route::post('/add-workflow-timestamp', function (Request $request) {
         $validator = Validator::make($request->all(), [
-            'node' => 'required|string',
+            'current_node' => 'required|string',
+            'next_node' => 'required|string',
             'seconds' => 'required|integer',
             'userId' => 'required|integer|exists:users,id',
             'session_id' => 'required|string',
@@ -47,7 +48,7 @@ Route::group(['prefix' => 'admin-work-flow', 'as' => 'admin_work_flow.', 'namesp
 
         if ($validator->fails()) throw new RequestValidationException($validator->messages()->first());
 
-        $workflowTimestamp = WorkflowTimestamp::create($request->only('node', 'seconds', 'userId', 'session_id'));
+        $workflowTimestamp = WorkflowTimestamp::create($request->only('current_node', 'next_node', 'seconds', 'userId', 'session_id'));
 
         return response()->json([
             'message' => 'Workflow timestamp created successfully',