diff --git a/template/module/journey_step.pug b/template/module/journey_step.pug
index 10281da..94e06da 100644
--- a/template/module/journey_step.pug
+++ b/template/module/journey_step.pug
@@ -1,19 +1,19 @@
-div(v-for="(e, idx) in journey_data.main", :key="idx")
-  .bg-dark.text-white(v-if="journey_step_data.section == idx")
+div(v-for="(e, idx) in journey.data.main", :key="idx")
+  .bg-dark.text-white(v-if="journey.sel_leg == idx")
     .container.section
       .row.text-center
         .input.col-sm-2
-          input(v-model="journey_data.main[idx].title")
+          input(v-model="journey.leg_get(idx).title")
         .input.col-sm-2
           input(
             placeholder="Day title",
-            v-model="journey_data.main[idx].step_title[journey_step_data.day]"
+            v-model="journey.leg_get(idx).step_title[journey.sel_day]"
           )
         .col-sm-3
         .right.input.col-sm-2
           input(
             disabled="",
-            :value="active_date() + ' (' + journey_step_data.day + ')'"
+            :value="journey.date_sel() + ' (' + journey.sel_day + ')'"
           )
       .row
         .col-9.col-ssm-12
@@ -21,21 +21,21 @@ div(v-for="(e, idx) in journey_data.main", :key="idx")
         .col-3.col-ssm-12
           .row.text-center
             div
-              label Date Range ({{ step_len(idx) }})
+              label Date Range ({{ journey.leg_len(idx) }})
             .input.text-dark
               date-picker(
                 :lang="lang",
-                v-model="journey_data.main[idx].dateRange",
+                v-model="journey.data.main[idx].date_range",
                 range="",
                 format="ddd D MMM",
                 placeholder="Date Range",
-                v-on:change="update_date(idx)"
+                v-on:change="journey.date_update(idx)"
               )
           .row.text-center
             div
               label Hotel
             multiselect#ajax(
-              v-model="journey_data.main[idx].hotel",
+              v-model="journey.data.main[idx].hotel",
               label="sname",
               track-by="place_id",
               placeholder="Type to search",
@@ -54,7 +54,7 @@ div(v-for="(e, idx) in journey_data.main", :key="idx")
             div
               label Restoration
             multiselect#ajax(
-              v-model="journey_data.main[idx].places.restaurants",
+              v-model="journey.data.main[idx].places.restaurants",
               label="sname",
               track-by="place_id",
               placeholder="Type to search",
@@ -74,7 +74,7 @@ div(v-for="(e, idx) in journey_data.main", :key="idx")
             div
               label Activities
             multiselect#ajax(
-              v-model="journey_data.main[idx].places.activities",
+              v-model="journey.data.main[idx].places.activities",
               label="sname",
               track-by="place_id",
               placeholder="Type to search",
@@ -95,7 +95,7 @@ div(v-for="(e, idx) in journey_data.main", :key="idx")
               label Notes
             .input.text-dark(style="width: 100%")
               textarea-autosize.text-small(
-                v-model="journey_data.main[idx].notes",
+                v-model="journey.data.main[idx].notes",
                 placeholder="Notes",
                 :min-height="30",
                 :max-height="350"