diff --git a/kml/TeAraroaTrail_simplified.kml b/kml/TeAraroaTrail_simplified.kml
index fb78406..53daa48 100644
--- a/kml/TeAraroaTrail_simplified.kml
+++ b/kml/TeAraroaTrail_simplified.kml
@@ -3641,6 +3641,20 @@
 					</coordinates>
 				</LineString>
 			</Placemark>
+			
+			<Placemark>
+      			<visibility>0</visibility>
+				<open>0</open>
+				<styleUrl>#green</styleUrl>
+      			<name>Rangitata River Crossing</name>
+      			<description>Rangitata River Hazard Zone</description>
+				<LineString>
+          			<extrude>true</extrude>
+          			<tessellate>true</tessellate>
+          			<altitudeMode>clampToGround</altitudeMode>
+          			<coordinates> 170.8810734122802,-43.62438973209024,0 170.8825330002127,-43.62394350082731,0 170.8835484997945,-43.62396920127561,0 170.8840033003614,-43.62381800113781,0 170.8852845993606,-43.62400930140132,0 170.8857526687622,-43.62388539180063,0 170.8870751997143,-43.62370480080698,0 170.8880245999735,-43.62369690112092,0 170.8896711997328,-43.62350900123693,0 170.8911852998255,-43.62354770084058,0 170.8918581999541,-43.62350160147111,0 170.8928057585705,-43.62332197964371,0 170.8947579035862,-43.62305002338047,0 170.8914810845274,-43.61802422960281,0 170.9006072912935,-43.60987278297846,0 170.9046328622241,-43.60558341612935,0 170.8996935360435,-43.60118471379043,0 170.8961652040798,-43.59775071134376,0 170.8969632307584,-43.59413392483498,0 170.9013363001509,-43.59149167466315,0 170.9077057141034,-43.58784862472412,0 170.9173006017231,-43.58374544569199,0 170.9261812851475,-43.57962849666048,0 170.9438023507715,-43.57540914880694,0 170.9530873660724,-43.57505723220113,0 170.9532169147261,-43.57724939635732,0 170.9536821001709,-43.57722980113544,0</coordinates>
+        		</LineString>
+    		</Placemark>
 
 			<Placemark>
 				<visibility>0</visibility>
@@ -5689,28 +5703,6 @@
 					</coordinates>
 				</LineString>
 			</Placemark>
-			
-			<Placemark>
-				<visibility>0</visibility>
-				<open>0</open>
-				<styleUrl>#green</styleUrl>
-				<name>Lake Wakatipu Hazard Zone</name>
-				<description>Wakatipu Track - Track no. 410b
-				</description>
-				<LineString>
-					<extrude>true</extrude>
-					<tessellate>true</tessellate>
-					<altitudeMode>clampToGround</altitudeMode>
-					<coordinates>
-						168.66082680118123,-45.03336899197172
-						168.646708,-45.041824
-						168.603792,-45.074200
-						168.459940,-45.092260
-						168.372221,-44.924291
-						168.35864084682356,-44.924741179502512
-					</coordinates>
-				</LineString>
-			</Placemark>
 
 			<Placemark>
 				<visibility>0</visibility>
diff --git a/masks/messages.html b/masks/messages.html
index b1aaf22..1502e84 100755
--- a/masks/messages.html
+++ b/masks/messages.html
@@ -54,7 +54,7 @@ oSpot.pageInit = function(asHash)
 			{
 				options:
 				{
-					url:'http://spot.lutran.fr/kml/TeAraroaTrail_simplified.kml',
+					url:'http://spot.lutran.fr/kml/TeAraroaTrail_simplified.kml?v3',
 					opts:{preserveViewport: true}
 				}
 			},
@@ -124,7 +124,7 @@ function updateFeed()
 					break;
 				case 'picture':
 					var $Image = $('<img>', {'src':asPost.path/*, 'style':'transform:rotate('+asPost.rotate+'deg);'*/});
-					$Body = $('<a>', {href:asPost.path, 'data-lightbox':'image-'+asPost.id, 'data-title':asPost.formatted_time}).append($Image);
+					$Body = $('<a>', {href:asPost.path, 'data-lightbox':'Te Araroa', 'data-title':asPost.formatted_time}).append($Image);
 					sClass = 'image';
 					break;
 				case 'post':