diff --git a/public/template/journey.html b/public/template/journey.html
index 15a95c6..e4af203 100644
--- a/public/template/journey.html
+++ b/public/template/journey.html
@@ -75,9 +75,17 @@
                                         <div v-html="generate_icon(item.hotel,'darkblue')"></div>
                                     </l-icon>
                                     <l-popup>
-                                      <div>
-                                        Hotel: {{item.hotel.display_name}}
-                                      </div>
+                                        <h1 class="row text-medium text-center">{{item.hotel.sname}}</h1>
+                                        <span class="row text-small text-gray">{{item.hotel.display_name}}</span>
+                                        <div class="row">
+                                            <textarea-autosize
+                                                class="col-12 col-sm-10"
+                                                placeholder="Notes"
+                                                v-model="item.hotel.notes"
+                                                :min-height="30"
+                                                :max-height="350"
+                                            />
+                                        </div>
                                     </l-popup>
 
                                     <!-- <l-tooltip :options="{ permanent: true, interactive: true }">
@@ -91,9 +99,17 @@
                                         <div v-html="generate_icon(place,'cadetblue')"></div>
                                     </l-icon>
                                     <l-popup>
-                                      <div>
-                                        Restaurant: {{place.display_name}}
-                                      </div>
+                                        <h1 class="row text-medium text-center">{{place.sname}}</h1>
+                                        <span class="row text-small text-gray">{{place.display_name}}</span>
+                                        <div class="row">
+                                            <textarea-autosize
+                                                class="col-12 col-sm-10"
+                                                placeholder="Notes"
+                                                v-model="place.notes"
+                                                :min-height="30"
+                                                :max-height="350"
+                                            />
+                                        </div>
                                     </l-popup>
                                 </l-marker>
                                 <l-marker v-for="place in item.places.activities" :lat-lng.sync="place.latlon">
@@ -101,9 +117,17 @@
                                         <div v-html="generate_icon(place)"></div>
                                     </l-icon>
                                     <l-popup>
-                                      <div>
-                                        Activity: {{place.display_name}}
-                                      </div>
+                                        <h1 class="row text-medium text-center">{{place.sname}}</h1>
+                                        <span class="row text-small text-gray">{{place.display_name}}</span>
+                                        <div class="row">
+                                            <textarea-autosize
+                                                class="col-12 col-sm-10"
+                                                placeholder="Notes"
+                                                v-model="place.notes"
+                                                :min-height="30"
+                                                :max-height="350"
+                                            />
+                                        </div>
                                     </l-popup>
                                 </l-marker>
                             </l-map>
@@ -187,18 +211,17 @@
                                         <div v-html="generate_icon(journey_data.main[journey_step_data.section].hotel,'darkblue')"></div>
                                     </l-icon>
                                     <l-popup>
-                                      <h1 class="row text-medium text-center">{{journey_data.main[journey_step_data.section].hotel.sname}}</h1>
-                                            <span class="row text-small text-gray">{{journey_data.main[journey_step_data.section].hotel.display_name}}</span>
-                                            <div class="row">
-                                                <textarea-autosize
-                                                    class="col-12 col-sm-10"
-                                                    placeholder="Notes"
-                                                    v-model="journey_data.main[journey_step_data.section].hotel.notes"
-                                                    :min-height="30"
-                                                    :max-height="350"
-                                                />
-                                            </div>
-                                      </div>
+                                        <h1 class="row text-medium text-center">{{journey_data.main[journey_step_data.section].hotel.sname}}</h1>
+                                        <span class="row text-small text-gray">{{journey_data.main[journey_step_data.section].hotel.display_name}}</span>
+                                        <div class="row">
+                                            <textarea-autosize
+                                                class="col-12 col-sm-10"
+                                                placeholder="Notes"
+                                                v-model="journey_data.main[journey_step_data.section].hotel.notes"
+                                                :min-height="30"
+                                                :max-height="350"
+                                            />
+                                        </div>
                                     </l-popup>
                                 </l-marker>
                                 <l-marker v-for="place in journey_data.main[journey_step_data.section].places.activities" :lat-lng="place.latlon">