diff --git a/GIS Base Map/Gun Run.qgs b/GIS Base Map/Gun Run.qgs
index 587943c..70656d5 100644
--- a/GIS Base Map/Gun Run.qgs	
+++ b/GIS Base Map/Gun Run.qgs	
@@ -1,5 +1,5 @@
 <!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
-<qgis saveUser="tim" saveDateTime="2022-09-06T15:22:52" version="3.26.2-Buenos Aires" saveUserFull="Timothy Allen" projectname="Gun Run">
+<qgis saveUser="tim" saveDateTime="2022-09-06T21:35:51" version="3.26.2-Buenos Aires" saveUserFull="Timothy Allen" projectname="Gun Run">
   <homePath path=""/>
   <title>Gun Run</title>
   <transaction mode="Disabled"/>
@@ -28,7 +28,6 @@
       <layer-tree-layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" expanded="1" legend_split_behavior="0" source="./marshal_positions.shp|layername=marshal_positions" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Unchecked" name="marshal_positions">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="marshal_positions" name="cached_name"/>
             <Option type="invalid" name="expandedLegendNodes"/>
             <Option type="QString" value="" name="legend/expressionFilter"/>
             <Option type="QString" value="false" name="legend/expressionFilterEnabled"/>
@@ -45,9 +44,7 @@
       </layer-tree-layer>
       <layer-tree-layer id="marshals_by_position20161003112326575" expanded="1" legend_split_behavior="0" source="./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" legend_exp="" providerKey="delimitedtext" patch_size="0,0" checked="Qt::Unchecked" name="marshals_by_position">
         <customproperties>
-          <Option type="Map">
-            <Option type="QString" value="marshals_by_position" name="cached_name"/>
-          </Option>
+          <Option/>
         </customproperties>
       </layer-tree-layer>
       <layer-tree-layer id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" expanded="1" legend_split_behavior="0" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" legend_exp="" providerKey="virtual" patch_size="0,0" checked="Qt::Unchecked" name="complete_marshal_overview">
@@ -64,21 +61,20 @@
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="1" groupLayer="" checked="Qt::Unchecked" name="Fencing and Cones">
+    <layer-tree-group expanded="1" groupLayer="" checked="Qt::Checked" name="Fencing and Cones">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" legend_split_behavior="0" source="./fencing.shp|layername=fencing" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Unchecked" name="fencing">
+      <layer-tree-layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" legend_split_behavior="0" source="./fencing.shp|layername=fencing" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Checked" name="fencing">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="fencing" name="cached_name"/>
             <Option type="QString" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" name="expandedLegendNodes"/>
             <Option type="QString" value="" name="legend/expressionFilter"/>
             <Option type="QString" value="false" name="legend/expressionFilterEnabled"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" expanded="1" legend_split_behavior="0" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" legend_exp="" providerKey="virtual" patch_size="0,0" checked="Qt::Unchecked" name="fence_groups">
+      <layer-tree-layer id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" expanded="1" legend_split_behavior="0" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" legend_exp="" providerKey="virtual" patch_size="-1,-1" checked="Qt::Unchecked" name="fence_groups">
         <customproperties>
           <Option/>
         </customproperties>
@@ -103,7 +99,6 @@
       <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" legend_split_behavior="0" source="./all_routes.shp|layername=all_routes" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Checked" name="all_routes">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="all_routes" name="cached_name"/>
             <Option type="invalid" name="expandedLegendNodes"/>
             <Option type="int" value="0" name="showFeatureCount"/>
           </Option>
@@ -112,19 +107,16 @@
     </layer-tree-group>
     <layer-tree-layer id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" expanded="0" legend_split_behavior="0" source="./timelapse.shp|layername=timelapse|subset=&quot;first_runn&quot; &lt; '06:59:45.000000' AND &quot;last_runne&quot; >= '06:59:35.000000' " legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Unchecked" name="timelapse">
       <customproperties>
-        <Option type="Map">
-          <Option type="QString" value="timelapse" name="cached_name"/>
-        </Option>
+        <Option/>
       </customproperties>
     </layer-tree-layer>
-    <layer-tree-group expanded="1" groupLayer="" checked="Qt::Checked" name="Feeding Stations">
+    <layer-tree-group expanded="1" groupLayer="" checked="Qt::Unchecked" name="Feeding Stations">
       <customproperties>
         <Option/>
       </customproperties>
       <layer-tree-layer id="water_tables20170921142016467" expanded="1" legend_split_behavior="0" source="./water_tables.shp" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Checked" name="water_tables">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="water_tables" name="cached_name"/>
             <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
@@ -136,16 +128,12 @@
       </customproperties>
       <layer-tree-layer id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" expanded="1" legend_split_behavior="0" source="./poi_labels.shp|layername=poi_labels" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Unchecked" name="poi_labels">
         <customproperties>
-          <Option type="Map">
-            <Option type="QString" value="poi_labels" name="cached_name"/>
-          </Option>
+          <Option/>
         </customproperties>
       </layer-tree-layer>
       <layer-tree-layer id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" expanded="1" legend_split_behavior="0" source="./directions_to_start.shp|layername=directions_to_start" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Unchecked" name="directions_to_start">
         <customproperties>
-          <Option type="Map">
-            <Option type="QString" value="directions_to_start" name="cached_name"/>
-          </Option>
+          <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
@@ -155,15 +143,12 @@
       </customproperties>
       <layer-tree-layer id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" expanded="1" legend_split_behavior="0" source="./mayor.shp" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Unchecked" name="mayor">
         <customproperties>
-          <Option type="Map">
-            <Option type="QString" value="mayor" name="cached_name"/>
-          </Option>
+          <Option/>
         </customproperties>
       </layer-tree-layer>
       <layer-tree-layer id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" expanded="1" legend_split_behavior="0" source="./viplabels.shp" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Unchecked" name="viplabels">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="viplabels" name="cached_name"/>
             <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
@@ -171,7 +156,6 @@
       <layer-tree-layer id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" expanded="1" legend_split_behavior="0" source="./vipaccess.shp" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Unchecked" name="vipaccess">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="vipaccess" name="cached_name"/>
             <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
@@ -184,7 +168,6 @@
       <layer-tree-layer id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" expanded="1" legend_split_behavior="0" source="./residents_access_roads.shp|layername=residents_access_roads" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Unchecked" name="residents_access_roads">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="residents_access_roads" name="cached_name"/>
             <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
@@ -202,7 +185,6 @@
       <layer-tree-layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" legend_split_behavior="0" source="./osm_roads.shp" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Checked" name="osm_roads">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="osm_roads [3887]" name="cached_name"/>
             <Option type="invalid" name="expandedLegendNodes"/>
             <Option type="QString" value="1" name="showFeatureCount"/>
           </Option>
@@ -211,7 +193,6 @@
       <layer-tree-layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1" legend_split_behavior="0" source="./osm_places.shp|layername=osm_places" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Checked" name="osm_places">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="osm_places [7]" name="cached_name"/>
             <Option type="invalid" name="expandedLegendNodes"/>
             <Option type="QString" value="1" name="showFeatureCount"/>
           </Option>
@@ -253,10 +234,9 @@
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" expanded="0" legend_split_behavior="0" source="./GDAL-City of Cape Town 2015 Aerial.xml" legend_exp="" providerKey="gdal" patch_size="0,0" checked="Qt::Unchecked" name="GDAL-City of Cape Town 2015 Aerial">
+      <layer-tree-layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" expanded="0" legend_split_behavior="0" source="./GDAL-City of Cape Town 2015 Aerial.xml" legend_exp="" providerKey="gdal" patch_size="0,0" checked="Qt::Checked" name="GDAL-City of Cape Town 2015 Aerial">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="GDAL-City of Cape Town 2015 Aerial" name="cached_name"/>
             <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
@@ -264,7 +244,6 @@
       <layer-tree-layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1" legend_split_behavior="0" source="contextualWMSLegend=0&amp;crs=EPSG:3857&amp;dpiMode=7&amp;featureCount=10&amp;format=image/png&amp;layers=ciry26ojy003tgynmznkc1a6q&amp;styles=default&amp;tileMatrixSet=GoogleMapsCompatible&amp;url=https://api.mapbox.com/styles/v1/ragtagtag/ciry26ojy003tgynmznkc1a6q/wmts?access_token%3Dpk.eyJ1IjoicmFndGFndGFnIiwiYSI6ImNpcnh3bnowbTAwMDUyemw1enBtbm50bTgifQ.WXKQzAfdJjsuQ6P6-BLZhg%2314.88/-33.91505/18.39137" legend_exp="" providerKey="wms" patch_size="0,0" checked="Qt::Checked" name="Outlines">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="Outlines" name="cached_name"/>
             <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
@@ -293,9 +272,9 @@
       <item>golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d</item>
       <item>vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea</item>
       <item>viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0</item>
-      <item>fence_groups_cbaea960_3348_4aea_b155_46e5d310f792</item>
       <item>mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea</item>
       <item>route_markers_4e92bf25_f500_4b5f_bf49_9dd0b475a0c9</item>
+      <item>fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb</item>
     </custom-order>
   </layer-tree-group>
   <snapping-settings self-snapping="1" minScale="0" unit="1" intersection-snapping="1" tolerance="10" scaleDependencyMode="0" type="1" maxScale="0" enabled="0" mode="3">
@@ -308,12 +287,12 @@
       <layer-setting id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" minScale="0" tolerance="12" type="1" maxScale="0" units="1" enabled="0"/>
       <layer-setting id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" minScale="0" tolerance="12" type="2" maxScale="0" units="1" enabled="0"/>
       <layer-setting id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" minScale="0" tolerance="20" type="2" maxScale="0" units="1" enabled="1"/>
+      <layer-setting id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" minScale="0" tolerance="12" type="0" maxScale="0" units="1" enabled="0"/>
       <layer-setting id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" minScale="0" tolerance="12" type="2" maxScale="0" units="1" enabled="0"/>
       <layer-setting id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" minScale="0" tolerance="12" type="2" maxScale="0" units="1" enabled="0"/>
       <layer-setting id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" minScale="0" tolerance="12" type="2" maxScale="0" units="1" enabled="0"/>
       <layer-setting id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" minScale="0" tolerance="12" type="2" maxScale="0" units="1" enabled="0"/>
       <layer-setting id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" minScale="0" tolerance="12" type="2" maxScale="0" units="1" enabled="0"/>
-      <layer-setting id="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" minScale="0" tolerance="12" type="2" maxScale="0" units="1" enabled="0"/>
       <layer-setting id="water_tables20170921142016467" minScale="0" tolerance="0" type="2" maxScale="0" units="2" enabled="0"/>
       <layer-setting id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" minScale="0" tolerance="12" type="2" maxScale="0" units="1" enabled="0"/>
       <layer-setting id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" minScale="0" tolerance="12" type="2" maxScale="0" units="1" enabled="0"/>
@@ -330,10 +309,10 @@
   <mapcanvas annotationsVisible="1" name="theMapCanvas">
     <units>degrees</units>
     <extent>
-      <xmin>18.38106081301657824</xmin>
-      <ymin>-33.94563030202068887</ymin>
-      <xmax>18.41792461455543517</xmax>
-      <ymax>-33.90225422560713753</ymax>
+      <xmin>18.40626131859488979</xmin>
+      <ymin>-33.90140571747127751</ymin>
+      <xmax>18.4099621475558628</xmax>
+      <ymax>-33.8994149759300285</ymax>
     </extent>
     <rotation>0</rotation>
     <destinationsrs>
@@ -381,15 +360,15 @@
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" checked="Qt::Unchecked" name="Fencing and Cones">
-      <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="fencing">
+    <legendgroup open="true" checked="Qt::Checked" name="Fencing and Cones">
+      <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1" name="fencing">
         <filegroup open="true" hidden="false">
-          <legendlayerfile layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" isInOverview="0" visible="0"/>
+          <legendlayerfile layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" isInOverview="0" visible="1"/>
         </filegroup>
       </legendlayer>
       <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="fence_groups">
         <filegroup open="true" hidden="false">
-          <legendlayerfile layerid="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" isInOverview="0" visible="0"/>
+          <legendlayerfile layerid="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
@@ -412,10 +391,10 @@
         <legendlayerfile layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" isInOverview="0" visible="0"/>
       </filegroup>
     </legendlayer>
-    <legendgroup open="true" checked="Qt::Checked" name="Feeding Stations">
+    <legendgroup open="true" checked="Qt::Unchecked" name="Feeding Stations">
       <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1" name="water_tables">
         <filegroup open="true" hidden="false">
-          <legendlayerfile layerid="water_tables20170921142016467" isInOverview="0" visible="1"/>
+          <legendlayerfile layerid="water_tables20170921142016467" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
@@ -495,9 +474,9 @@
       </legendlayer>
     </legendgroup>
     <legendgroup open="true" checked="Qt::Checked" name="Map">
-      <legendlayer open="false" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="GDAL-City of Cape Town 2015 Aerial">
+      <legendlayer open="false" showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1" name="GDAL-City of Cape Town 2015 Aerial">
         <filegroup open="false" hidden="false">
-          <legendlayerfile layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" isInOverview="0" visible="0"/>
+          <legendlayerfile layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" isInOverview="0" visible="1"/>
         </filegroup>
       </legendlayer>
       <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1" name="Outlines">
@@ -10609,17 +10588,17 @@ def my_form_open(dialog, layer, feature):
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
-        <xmax>18.42000731752843734</xmax>
-        <ymax>-33.89963095188647912</ymax>
+        <xmax>18.42224231378492405</xmax>
+        <ymax>-33.89963911218388404</ymax>
       </extent>
       <wgs84extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
-        <xmax>18.42000731752843734</xmax>
-        <ymax>-33.89963095188647912</ymax>
+        <xmax>18.42224231378492405</xmax>
+        <ymax>-33.89963911218388404</ymax>
       </wgs84extent>
-      <id>fence_groups_cbaea960_3348_4aea_b155_46e5d310f792</id>
-      <datasource>?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22</datasource>
+      <id>fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb</id>
+      <datasource>?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -10662,7 +10641,7 @@ def my_form_open(dialog, layer, feature):
         </crs>
         <extent/>
       </resourceMetadata>
-      <provider encoding="UTF-8">virtual</provider>
+      <provider encoding="">virtual</provider>
       <vectorjoins/>
       <layerDependencies>
         <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
@@ -10928,7 +10907,9 @@ def my_form_open(dialog, layer, feature):
           <Option type="QString" value="no_action" name="QFieldSync/action"/>
           <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
           <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
-          <Option type="QString" value="name" name="dualview/previewExpressions"/>
+          <Option type="List" name="dualview/previewExpressions">
+            <Option type="QString" value="&quot;name&quot;"/>
+          </Option>
           <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
@@ -11030,7 +11011,13 @@ def my_form_open(dialog, layer, feature):
       </DiagramLayerSettings>
       <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
-        <checkConfiguration/>
+        <checkConfiguration type="Map">
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option type="double" value="0" name="allowedGapsBuffer"/>
+            <Option type="bool" value="false" name="allowedGapsEnabled"/>
+            <Option type="QString" value="" name="allowedGapsLayer"/>
+          </Option>
+        </checkConfiguration>
       </geometryOptions>
       <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
@@ -11050,6 +11037,13 @@ def my_form_open(dialog, layer, feature):
           </editWidget>
         </field>
         <field configurationFlags="None" name="type">
+          <editWidget type="TextEdit">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field configurationFlags="None" name="day">
           <editWidget type="">
             <config>
               <Option/>
@@ -11057,14 +11051,14 @@ def my_form_open(dialog, layer, feature):
           </editWidget>
         </field>
         <field configurationFlags="None" name="cone_len">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
         <field configurationFlags="None" name="fence_len">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
@@ -11075,13 +11069,15 @@ def my_form_open(dialog, layer, feature):
         <alias index="0" field="name" name=""/>
         <alias index="1" field="group" name=""/>
         <alias index="2" field="type" name=""/>
-        <alias index="3" field="cone_len" name=""/>
-        <alias index="4" field="fence_len" name=""/>
+        <alias index="3" field="day" name=""/>
+        <alias index="4" field="cone_len" name=""/>
+        <alias index="5" field="fence_len" name=""/>
       </aliases>
       <defaults>
         <default applyOnUpdate="0" field="name" expression=""/>
         <default applyOnUpdate="0" field="group" expression=""/>
         <default applyOnUpdate="0" field="type" expression=""/>
+        <default applyOnUpdate="0" field="day" expression=""/>
         <default applyOnUpdate="0" field="cone_len" expression=""/>
         <default applyOnUpdate="0" field="fence_len" expression=""/>
       </defaults>
@@ -11089,6 +11085,7 @@ def my_form_open(dialog, layer, feature):
         <constraint exp_strength="0" field="name" notnull_strength="0" constraints="0" unique_strength="0"/>
         <constraint exp_strength="0" field="group" notnull_strength="0" constraints="0" unique_strength="0"/>
         <constraint exp_strength="0" field="type" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="day" notnull_strength="0" constraints="0" unique_strength="0"/>
         <constraint exp_strength="0" field="cone_len" notnull_strength="0" constraints="0" unique_strength="0"/>
         <constraint exp_strength="0" field="fence_len" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
@@ -11096,6 +11093,7 @@ def my_form_open(dialog, layer, feature):
         <constraint exp="" field="name" desc=""/>
         <constraint exp="" field="group" desc=""/>
         <constraint exp="" field="type" desc=""/>
+        <constraint exp="" field="day" desc=""/>
         <constraint exp="" field="cone_len" desc=""/>
         <constraint exp="" field="fence_len" desc=""/>
       </constraintExpressions>
@@ -11105,11 +11103,12 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" type="field" hidden="0" name="name"/>
+          <column width="415" type="field" hidden="0" name="name"/>
           <column width="-1" type="field" hidden="0" name="group"/>
           <column width="-1" type="actions" hidden="1"/>
           <column width="-1" type="field" hidden="0" name="type"/>
           <column width="-1" type="field" hidden="0" name="cone_len"/>
+          <column width="-1" type="field" hidden="0" name="day"/>
           <column width="-1" type="field" hidden="0" name="fence_len"/>
         </columns>
       </attributetableconfig>
@@ -11142,31 +11141,43 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
+        <field editable="1" name="cone_len"/>
+        <field editable="1" name="fence_len"/>
         <field editable="1" name="group"/>
         <field editable="1" name="name"/>
+        <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
+        <field labelOnTop="0" name="cone_len"/>
+        <field labelOnTop="0" name="fence_len"/>
         <field labelOnTop="0" name="group"/>
         <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
-      <reuseLastValue/>
+      <reuseLastValue>
+        <field reuseLastValue="0" name="cone_len"/>
+        <field reuseLastValue="0" name="fence_len"/>
+        <field reuseLastValue="0" name="group"/>
+        <field reuseLastValue="0" name="name"/>
+        <field reuseLastValue="0" name="type"/>
+      </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
-      <previewExpression>name</previewExpression>
+      <previewExpression>"name"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
     <maplayer simplifyLocal="1" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" type="vector" autoRefreshTime="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" styleCategories="AllStyleCategories" geometry="Line" autoRefreshEnabled="0" wkbType="MultiLineString">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
-        <xmax>18.42000731752843734</xmax>
-        <ymax>-33.89963095188647912</ymax>
+        <xmax>18.42224231378492405</xmax>
+        <ymax>-33.89963911218388404</ymax>
       </extent>
       <wgs84extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
-        <xmax>18.42000731752843734</xmax>
-        <ymax>-33.89963095188647912</ymax>
+        <xmax>18.42224231378492405</xmax>
+        <ymax>-33.89963911218388404</ymax>
       </wgs84extent>
       <id>fencing_70522fe0_a771_4170_98b2_d5843f62a7ab</id>
       <datasource>./fencing.shp|layername=fencing</datasource>
@@ -11234,9 +11245,9 @@ def my_form_open(dialog, layer, feature):
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field precision="0" comment="" type="6" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" length="-1" subType="0" typeName="double precision" name="fence_len"/>
+        <field precision="0" comment="" type="6" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" length="-1" subType="0" typeName="double precision" name="fence_len"/>
         <field precision="0" comment="" type="6" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" length="-1" subType="0" typeName="double precision" name="fence_len"/>
-        <field precision="0" comment="" type="6" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" length="-1" subType="0" typeName="double precision" name="cone_len"/>
+        <field precision="0" comment="" type="6" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" length="-1" subType="0" typeName="double precision" name="cone_len"/>
       </expressionfields>
       <map-layer-style-manager current="Fencing">
         <map-layer-style name="Fencing"/>
@@ -11799,14 +11810,14 @@ def my_form_open(dialog, layer, feature):
       </elevation>
       <renderer-v2 enableorderby="0" type="RuleRenderer" symbollevels="1" referencescale="-1" forceraster="0">
         <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-          <rule label="Show in fencing maps" key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)')">
-            <rule symbol="0" label="Cones" key="{55e15f58-d121-44dd-9fec-2e77eb26097f}" filter="regexp_match(&quot;type&quot;, '^cone')"/>
-            <rule symbol="1" label="Moveable fences" key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}" filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1'"/>
-            <rule symbol="2" label="Fixed fences" key="{070da3c0-926e-4be7-b593-17a3235a88fa}" filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1'"/>
-            <rule symbol="3" label="Construction" key="{7be11354-6d79-48d0-a650-aea5f58c1846}" filter="regexp_match(&quot;type&quot;, '^constr')" checkstate="0"/>
+          <rule label="Show in fencing maps" key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )">
+            <rule symbol="0" label="Cones" key="{55e15f58-d121-44dd-9fec-2e77eb26097f}" filter="regexp_match(&quot;type&quot;, '^cone') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
+            <rule symbol="1" label="Moveable fences" key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}" filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
+            <rule symbol="2" label="Fixed fences" key="{070da3c0-926e-4be7-b593-17a3235a88fa}" filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
+            <rule symbol="3" label="Construction" key="{7be11354-6d79-48d0-a650-aea5f58c1846}" filter="regexp_match(&quot;type&quot;, '^constr') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
           </rule>
-          <rule symbol="4" label="Is Visible" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" checkstate="0"/>
-          <rule symbol="5" key="{29865286-9e35-459b-929c-beb87e7538de}"/>
+          <rule symbol="4" label="Is Visible" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" checkstate="0"/>
+          <rule symbol="5" key="{29865286-9e35-459b-929c-beb87e7538de}" checkstate="0"/>
         </rules>
         <symbols>
           <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="0">
@@ -12280,8 +12291,8 @@ def my_form_open(dialog, layer, feature):
         </symbols>
       </renderer-v2>
       <labeling type="rule-based">
-        <rules key="{75ef682c-4a85-4fe1-962a-6082490a3c19}">
-          <rule key="{05a5f0dd-6b57-4866-8227-d1dd0f4dfdf5}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;">
+        <rules key="{39bfb314-1cf0-4ad7-9317-85df81083977}">
+          <rule key="{95ff248f-4d20-4914-90b5-ff48b94b38a0}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;">
             <settings calloutType="simple">
               <text-style textOpacity="0.80000000000000004" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="Regular" fontUnderline="0" fieldName="comment" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" useSubstitutions="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="11" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" isExpression="0" legendString="Aa" textOrientation="horizontal">
                 <families/>
@@ -12399,13 +12410,71 @@ def my_form_open(dialog, layer, feature):
               </callout>
             </settings>
           </rule>
-          <rule key="{226e1338-ed15-4fc8-a035-fefee03c38d6}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^(fenc|cone)')">
+          <rule key="{ef0e96b4-ef80-4bde-9260-81fbd496b3f7}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^(fenc|cone)')">
             <settings calloutType="simple">
-              <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="Semibold" fontUnderline="0" fieldName="round( $length, 1) || 'm'" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" useSubstitutions="0" fontWeight="63" fontStrikeout="0" fontItalic="0" fontSize="11" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" isExpression="1" legendString="Aa" textOrientation="horizontal">
+              <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="Semibold" fontUnderline="0" fieldName="round( $length * 100 * 1000, 1) || 'm'" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" useSubstitutions="0" fontWeight="63" fontStrikeout="0" fontItalic="0" fontSize="11" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" isExpression="1" legendString="Aa" textOrientation="horizontal">
                 <families/>
                 <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
                 <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskType="0"/>
                 <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+                  <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="markerSymbol">
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option type="QString" value="" name="name"/>
+                        <Option name="properties"/>
+                        <Option type="QString" value="collection" name="type"/>
+                      </Option>
+                    </data_defined_properties>
+                    <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                      <Option type="Map">
+                        <Option type="QString" value="0" name="angle"/>
+                        <Option type="QString" value="square" name="cap_style"/>
+                        <Option type="QString" value="196,60,57,255" name="color"/>
+                        <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="circle" name="name"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="diameter" name="scale_method"/>
+                        <Option type="QString" value="2" name="size"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="size_unit"/>
+                        <Option type="QString" value="1" name="vertical_anchor_point"/>
+                      </Option>
+                      <prop k="angle" v="0"/>
+                      <prop k="cap_style" v="square"/>
+                      <prop k="color" v="196,60,57,255"/>
+                      <prop k="horizontal_anchor_point" v="1"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="name" v="circle"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="35,35,35,255"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="scale_method" v="diameter"/>
+                      <prop k="size" v="2"/>
+                      <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="size_unit" v="MM"/>
+                      <prop k="vertical_anchor_point" v="1"/>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option type="QString" value="" name="name"/>
+                          <Option name="properties"/>
+                          <Option type="QString" value="collection" name="type"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
                   <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
@@ -12453,30 +12522,184 @@ def my_form_open(dialog, layer, feature):
                 <dd_properties>
                   <Option type="Map">
                     <Option type="QString" value="" name="name"/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="AlwaysShow">
-                        <Option type="bool" value="false" name="active"/>
-                        <Option type="QString" value="1" name="expression"/>
-                        <Option type="int" value="3" name="type"/>
-                      </Option>
-                      <Option type="Map" name="PositionX">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="auxiliary_storage_labeling_positionx" name="field"/>
-                        <Option type="int" value="2" name="type"/>
-                      </Option>
-                      <Option type="Map" name="PositionY">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="auxiliary_storage_labeling_positiony" name="field"/>
-                        <Option type="int" value="2" name="type"/>
-                      </Option>
-                    </Option>
+                    <Option name="properties"/>
                     <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format wrapChar="" rightDirectionSymbol=">" plussign="0" leftDirectionSymbol="&lt;" formatNumbers="0" decimals="3" multilineAlign="4294967295" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
-              <placement offsetUnits="MM" xOffset="0" maxCurvedCharAngleOut="-25" layerType="UnknownGeometry" allowDegraded="1" yOffset="0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" quadOffset="4" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" overrunDistance="0" overrunDistanceUnit="MM" centroidInside="0" placement="2" geometryGenerator="" priority="6" distUnits="MM" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" dist="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorTextPoint="CenterOfText" polygonPlacementFlags="2" rotationUnit="AngleDegrees" offsetType="0" placementFlags="14" repeatDistance="0"/>
+              <text-format wrapChar="" rightDirectionSymbol=">" plussign="0" leftDirectionSymbol="&lt;" formatNumbers="0" decimals="3" multilineAlign="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
+              <placement offsetUnits="MM" xOffset="0" maxCurvedCharAngleOut="-25" layerType="LineGeometry" allowDegraded="1" yOffset="0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" quadOffset="4" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" overrunDistance="0" overrunDistanceUnit="MM" centroidInside="0" placement="2" geometryGenerator="" priority="6" distUnits="MM" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" dist="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorTextPoint="CenterOfText" polygonPlacementFlags="2" rotationUnit="AngleDegrees" offsetType="0" placementFlags="14" repeatDistance="0"/>
+              <rendering limitNumLabels="0" obstacleType="0" obstacle="1" scaleMax="0" maxNumLabels="2000" labelPerPart="0" scaleMin="0" upsidedownLabels="0" zIndex="0" unplacedVisibility="0" fontLimitPixelSize="0" minFeatureSize="0" fontMaxPixelSize="10000" scaleVisibility="0" fontMinPixelSize="3" drawLabels="1" mergeLines="0" obstacleFactor="1"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option type="QString" value="" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="AlwaysShow">
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="QString" value="1" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
+                    </Option>
+                    <Option type="Map" name="PositionX">
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="auxiliary_storage_labeling_positionx" name="field"/>
+                      <Option type="int" value="2" name="type"/>
+                    </Option>
+                    <Option type="Map" name="PositionY">
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="auxiliary_storage_labeling_positiony" name="field"/>
+                      <Option type="int" value="2" name="type"/>
+                    </Option>
+                  </Option>
+                  <Option type="QString" value="collection" name="type"/>
+                </Option>
+              </dd_properties>
+              <callout type="simple">
+                <Option type="Map">
+                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="int" value="0" name="blendMode"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" value="" name="name"/>
+                    <Option name="properties"/>
+                    <Option type="QString" value="collection" name="type"/>
+                  </Option>
+                  <Option type="bool" value="false" name="drawToAllParts"/>
+                  <Option type="QString" value="0" name="enabled"/>
+                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                  <Option type="QString" value="&lt;symbol alpha=&quot;1&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                  <Option type="double" value="0" name="minLength"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                  <Option type="QString" value="MM" name="minLengthUnit"/>
+                  <Option type="double" value="0" name="offsetFromAnchor"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                  <Option type="double" value="0" name="offsetFromLabel"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
+                </Option>
+              </callout>
+            </settings>
+          </rule>
+          <rule active="0" key="{20c54c85-a61c-42da-a678-6dc9932e9e61}" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL">
+            <settings calloutType="simple">
+              <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="Semibold" fontUnderline="0" fieldName="round( $length * 100 * 1000, 1) || 'm'" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" useSubstitutions="0" fontWeight="63" fontStrikeout="0" fontItalic="0" fontSize="11" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" isExpression="1" legendString="Aa" textOrientation="horizontal">
+                <families/>
+                <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskType="0"/>
+                <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+                  <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="markerSymbol">
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option type="QString" value="" name="name"/>
+                        <Option name="properties"/>
+                        <Option type="QString" value="collection" name="type"/>
+                      </Option>
+                    </data_defined_properties>
+                    <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                      <Option type="Map">
+                        <Option type="QString" value="0" name="angle"/>
+                        <Option type="QString" value="square" name="cap_style"/>
+                        <Option type="QString" value="196,60,57,255" name="color"/>
+                        <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="circle" name="name"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="diameter" name="scale_method"/>
+                        <Option type="QString" value="2" name="size"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="size_unit"/>
+                        <Option type="QString" value="1" name="vertical_anchor_point"/>
+                      </Option>
+                      <prop k="angle" v="0"/>
+                      <prop k="cap_style" v="square"/>
+                      <prop k="color" v="196,60,57,255"/>
+                      <prop k="horizontal_anchor_point" v="1"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="name" v="circle"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="35,35,35,255"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="scale_method" v="diameter"/>
+                      <prop k="size" v="2"/>
+                      <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="size_unit" v="MM"/>
+                      <prop k="vertical_anchor_point" v="1"/>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option type="QString" value="" name="name"/>
+                          <Option name="properties"/>
+                          <Option type="QString" value="collection" name="type"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                  <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option type="QString" value="" name="name"/>
+                        <Option name="properties"/>
+                        <Option type="QString" value="collection" name="type"/>
+                      </Option>
+                    </data_defined_properties>
+                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                      <Option type="Map">
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="255,255,255,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                        <Option type="QString" value="no" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
+                      </Option>
+                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color" v="255,255,255,255"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="128,128,128,255"/>
+                      <prop k="outline_style" v="no"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option type="QString" value="" name="name"/>
+                          <Option name="properties"/>
+                          <Option type="QString" value="collection" name="type"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                </background>
+                <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
+                <dd_properties>
+                  <Option type="Map">
+                    <Option type="QString" value="" name="name"/>
+                    <Option name="properties"/>
+                    <Option type="QString" value="collection" name="type"/>
+                  </Option>
+                </dd_properties>
+                <substitutions/>
+              </text-style>
+              <text-format wrapChar="" rightDirectionSymbol=">" plussign="0" leftDirectionSymbol="&lt;" formatNumbers="0" decimals="3" multilineAlign="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
+              <placement offsetUnits="MM" xOffset="0" maxCurvedCharAngleOut="-25" layerType="LineGeometry" allowDegraded="1" yOffset="0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" quadOffset="4" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" overrunDistance="0" overrunDistanceUnit="MM" centroidInside="0" placement="2" geometryGenerator="" priority="6" distUnits="MM" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" dist="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorTextPoint="CenterOfText" polygonPlacementFlags="2" rotationUnit="AngleDegrees" offsetType="0" placementFlags="14" repeatDistance="0"/>
               <rendering limitNumLabels="0" obstacleType="0" obstacle="1" scaleMax="0" maxNumLabels="2000" labelPerPart="0" scaleMin="0" upsidedownLabels="0" zIndex="0" unplacedVisibility="0" fontLimitPixelSize="0" minFeatureSize="0" fontMaxPixelSize="10000" scaleVisibility="0" fontMinPixelSize="3" drawLabels="1" mergeLines="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
@@ -12534,7 +12757,9 @@ def my_form_open(dialog, layer, feature):
           <Option type="QString" value="copy" name="QFieldSync/action"/>
           <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
           <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
-          <Option type="QString" value="id" name="dualview/previewExpressions"/>
+          <Option type="List" name="dualview/previewExpressions">
+            <Option type="QString" value="&quot;id&quot;"/>
+          </Option>
           <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
@@ -12690,6 +12915,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field configurationFlags="None" name="day">
+          <editWidget type="Range">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field configurationFlags="None" name="fence_len">
           <editWidget type="Hidden">
             <config>
@@ -12713,8 +12945,9 @@ def my_form_open(dialog, layer, feature):
         <alias index="4" field="type" name=""/>
         <alias index="5" field="name" name=""/>
         <alias index="6" field="hidden" name=""/>
-        <alias index="7" field="fence_len" name=""/>
-        <alias index="8" field="cone_len" name=""/>
+        <alias index="7" field="day" name=""/>
+        <alias index="8" field="fence_len" name=""/>
+        <alias index="9" field="cone_len" name=""/>
       </aliases>
       <defaults>
         <default applyOnUpdate="0" field="id" expression=""/>
@@ -12724,6 +12957,7 @@ def my_form_open(dialog, layer, feature):
         <default applyOnUpdate="0" field="type" expression=""/>
         <default applyOnUpdate="0" field="name" expression=""/>
         <default applyOnUpdate="0" field="hidden" expression=""/>
+        <default applyOnUpdate="0" field="day" expression=""/>
         <default applyOnUpdate="0" field="fence_len" expression=""/>
         <default applyOnUpdate="0" field="cone_len" expression=""/>
       </defaults>
@@ -12735,6 +12969,7 @@ def my_form_open(dialog, layer, feature):
         <constraint exp_strength="0" field="type" notnull_strength="0" constraints="0" unique_strength="0"/>
         <constraint exp_strength="0" field="name" notnull_strength="0" constraints="0" unique_strength="0"/>
         <constraint exp_strength="0" field="hidden" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="day" notnull_strength="0" constraints="0" unique_strength="0"/>
         <constraint exp_strength="0" field="fence_len" notnull_strength="0" constraints="0" unique_strength="0"/>
         <constraint exp_strength="0" field="cone_len" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
@@ -12746,13 +12981,14 @@ def my_form_open(dialog, layer, feature):
         <constraint exp="" field="type" desc=""/>
         <constraint exp="" field="name" desc=""/>
         <constraint exp="" field="hidden" desc=""/>
+        <constraint exp="" field="day" desc=""/>
         <constraint exp="" field="fence_len" desc=""/>
         <constraint exp="" field="cone_len" desc=""/>
       </constraintExpressions>
       <expressionfields>
-        <field precision="0" comment="" type="6" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" length="-1" subType="0" typeName="double precision" name="fence_len"/>
+        <field precision="0" comment="" type="6" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" length="-1" subType="0" typeName="double precision" name="fence_len"/>
         <field precision="0" comment="" type="6" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" length="-1" subType="0" typeName="double precision" name="fence_len"/>
-        <field precision="0" comment="" type="6" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" length="-1" subType="0" typeName="double precision" name="cone_len"/>
+        <field precision="0" comment="" type="6" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" length="-1" subType="0" typeName="double precision" name="cone_len"/>
       </expressionfields>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
@@ -12768,6 +13004,7 @@ def my_form_open(dialog, layer, feature):
           <column width="692" type="field" hidden="0" name="name"/>
           <column width="-1" type="field" hidden="0" name="hidden"/>
           <column width="-1" type="field" hidden="0" name="fence_len"/>
+          <column width="-1" type="field" hidden="0" name="day"/>
           <column width="-1" type="field" hidden="0" name="cone_len"/>
         </columns>
       </attributetableconfig>
@@ -12804,6 +13041,7 @@ def my_form_open(dialog, layer, feature):
         <field editable="0" name="auxiliary_storage_labeling_positiony"/>
         <field editable="1" name="comment"/>
         <field editable="0" name="cone_len"/>
+        <field editable="1" name="day"/>
         <field editable="0" name="fence_len"/>
         <field editable="1" name="group"/>
         <field editable="1" name="hidden"/>
@@ -12818,6 +13056,7 @@ def my_form_open(dialog, layer, feature):
         <field labelOnTop="0" name="auxiliary_storage_labeling_positiony"/>
         <field labelOnTop="0" name="comment"/>
         <field labelOnTop="0" name="cone_len"/>
+        <field labelOnTop="0" name="day"/>
         <field labelOnTop="0" name="fence_len"/>
         <field labelOnTop="0" name="group"/>
         <field labelOnTop="0" name="hidden"/>
@@ -12827,10 +13066,21 @@ def my_form_open(dialog, layer, feature):
         <field labelOnTop="0" name="name"/>
         <field labelOnTop="0" name="type"/>
       </labelOnTop>
-      <reuseLastValue/>
+      <reuseLastValue>
+        <field reuseLastValue="0" name="comment"/>
+        <field reuseLastValue="0" name="cone_len"/>
+        <field reuseLastValue="0" name="day"/>
+        <field reuseLastValue="0" name="fence_len"/>
+        <field reuseLastValue="0" name="group"/>
+        <field reuseLastValue="0" name="hidden"/>
+        <field reuseLastValue="0" name="id"/>
+        <field reuseLastValue="0" name="moveable"/>
+        <field reuseLastValue="0" name="name"/>
+        <field reuseLastValue="0" name="type"/>
+      </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
-      <previewExpression>id</previewExpression>
+      <previewExpression>"id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
     <maplayer simplifyLocal="1" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" type="vector" autoRefreshTime="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="0" styleCategories="AllStyleCategories" geometry="Line" autoRefreshEnabled="0" wkbType="MultiLineString">
@@ -13693,6 +13943,7 @@ def my_form_open(dialog, layer, feature):
             <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
             <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
             <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
           </Option>
           <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
@@ -27037,9 +27288,9 @@ def my_form_open(dialog, layer, feature):
     <layer id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d"/>
     <layer id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
     <layer id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
-    <layer id="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792"/>
     <layer id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea"/>
     <layer id="route_markers_4e92bf25_f500_4b5f_bf49_9dd0b475a0c9"/>
+    <layer id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb"/>
   </layerorder>
   <properties>
     <DefaultStyles/>
@@ -27208,7 +27459,7 @@ def my_form_open(dialog, layer, feature):
       <disabledLayers type="QStringList"/>
     </Identify>
     <Layouts>
-      <lastLayoutExportDir type="QString">/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/Routes</lastLayoutExportDir>
+      <lastLayoutExportDir type="QString">/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/Fencing/Gun Run 2020 - Fencing rev 1.0.pdf</lastLayoutExportDir>
     </Layouts>
     <Legend>
       <filterByMap type="bool">false</filterByMap>
@@ -27415,35 +27666,48 @@ def my_form_open(dialog, layer, feature):
         <expanded-group-node id="Feeding Stations"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset has-expanded-info="1" name="Fencing">
-      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" expanded="1" visible="1"/>
-      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{ca3590cd-5839-41e2-824b-eca47a2b7a14}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" expanded="1" visible="1"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" expanded="1" visible="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer id="water_tables20170921142016467" style="default" expanded="1" visible="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
+    <visibility-preset has-checked-group-info="1" has-expanded-info="1" name="Fencing">
       <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing" expanded="1" visible="1"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
         <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
         <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
+        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
         <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
+      <layer id="route_markers_4e92bf25_f500_4b5f_bf49_9dd0b475a0c9" style="default" expanded="1" visible="1"/>
+      <expanded-legend-nodes id="route_markers_4e92bf25_f500_4b5f_bf49_9dd0b475a0c9"/>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" expanded="1" visible="1"/>
+      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
+        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer id="water_tables20170921142016467" style="default" expanded="1" visible="0"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
       <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0" visible="1"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" expanded="1" visible="1"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" expanded="0" visible="1"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" expanded="1" visible="1"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <checked-group-nodes>
+        <checked-group-node id="Routes"/>
+        <checked-group-node id="Map"/>
+        <checked-group-node id="Fencing and Cones"/>
+        <checked-group-node id="OSM data"/>
+        <checked-group-node id="Routes/Markers"/>
+      </checked-group-nodes>
       <expanded-group-nodes>
         <expanded-group-node id="Routes"/>
         <expanded-group-node id="Map"/>
         <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Feeding Stations"/>
@@ -29402,7 +29666,77 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="6.76779,190.27,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" background="false" size="148.46,7.36972,mm" labelText="FENCING: [% &quot;name&quot; %]" zValue="11" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" opacity="1" position="6.76779,190.27,mm" marginX="1" halign="1" valign="64" excludeFromExports="0">
+      <LayoutItem splitLayer="0" size="38.1563,67.2879,mm" legendFilterByAtlas="0" boxSpace="2" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" blendMode="0" maxSymbolSize="0" position="256.808,5.21277,mm" groupUuid="" wrapChar="" minSymbolSize="0" referencePoint="0" symbolAlignment="1" itemRotation="0" title="" equalColumnWidth="1" resizeToContents="0" wmsLegendHeight="25" columnCount="1" outlineWidthM="0.3,mm" rasterBorder="1" background="true" visibility="1" symbolHeight="4" fontColor="#000000" positionLock="true" zValue="11" titleAlignment="1" lineSpacing="1" columnSpace="2" id="" rasterBorderColor="0,0,0,255" positionOnPage="256.808,5.21277,mm" excludeFromExports="0" rasterBorderWidth="0" type="65642" wmsLegendWidth="50" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" opacity="1" frame="true" symbolWidth="7" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" frameJoinStyle="miter">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option type="QString" value="" name="name"/>
+              <Option name="properties"/>
+              <Option type="QString" value="collection" name="type"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <styles>
+          <style indent="0" alignment="1" name="title">
+            <styleFont style="Bold" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold" strikethrough="0" italic="0" underline="0" bold="1"/>
+          </style>
+          <style marginTop="3" indent="0" alignment="1" name="group">
+            <styleFont style="Semibold" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0" bold="1"/>
+          </style>
+          <style marginTop="3" indent="0" alignment="1" name="subgroup">
+            <styleFont style="Semibold" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0" bold="1"/>
+          </style>
+          <style marginTop="2.5" indent="0" alignment="1" name="symbol">
+            <styleFont style="" description="Myriad Pro,9,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0" bold="0"/>
+          </style>
+          <style marginTop="2" marginLeft="2" indent="0" alignment="1" name="symbolLabel">
+            <styleFont style="Regular" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" strikethrough="0" italic="0" underline="0" bold="0"/>
+          </style>
+        </styles>
+        <layer-tree-group>
+          <customproperties>
+            <Option/>
+          </customproperties>
+          <layer-tree-group expanded="1" groupLayer="" checked="Qt::Checked" name="Fencing and Cones">
+            <customproperties>
+              <Option/>
+            </customproperties>
+            <layer-tree-layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" legend_split_behavior="0" source="./fencing.shp|layername=fencing" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Checked" name="fencing">
+              <customproperties>
+                <Option type="Map">
+                  <Option type="QString" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" name="expandedLegendNodes"/>
+                  <Option type="QString" value="" name="legend/expressionFilter"/>
+                  <Option type="QString" value="false" name="legend/expressionFilterEnabled"/>
+                  <Option type="QString" value="1,2,3,4" name="legend/node-order"/>
+                  <Option type="QString" value="hidden" name="legend/title-style"/>
+                </Option>
+              </customproperties>
+            </layer-tree-layer>
+          </layer-tree-group>
+          <layer-tree-group expanded="1" groupLayer="" checked="Qt::Checked" name="Routes">
+            <customproperties>
+              <Option/>
+            </customproperties>
+            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" legend_split_behavior="0" source="./all_routes.shp|layername=all_routes" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Checked" name="all_routes">
+              <customproperties>
+                <Option type="Map">
+                  <Option type="invalid" name="expandedLegendNodes"/>
+                  <Option type="QString" value="1,2,3,4" name="legend/node-order"/>
+                  <Option type="QString" value="hidden" name="legend/title-style"/>
+                  <Option type="int" value="0" name="showFeatureCount"/>
+                </Option>
+              </customproperties>
+            </layer-tree-layer>
+          </layer-tree-group>
+          <custom-order enabled="0"/>
+        </layer-tree-group>
+      </LayoutItem>
+      <LayoutItem marginY="0" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="6.76779,191.188,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" background="false" size="148.46,6.45211,mm" labelText="FENCING: [% &quot;name&quot; %]" zValue="10" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" opacity="1" position="6.76779,191.188,mm" marginX="0" halign="1" valign="32" excludeFromExports="0">
         <FrameColor alpha="255" red="0" blue="0" green="0"/>
         <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
@@ -29475,7 +29809,7 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="211.295,197.64,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" background="false" size="27.7839,7.51682,mm" labelText="REVISION 1.0" zValue="10" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" opacity="1" position="211.295,197.64,mm" marginX="1" halign="2" valign="32" excludeFromExports="0">
+      <LayoutItem marginY="0" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="1" groupUuid="" positionOnPage="182.723,191.188,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" background="false" size="56.3557,6.45237,mm" labelText="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]&lt;/strong>" zValue="9" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" opacity="1" position="182.723,191.188,mm" marginX="0" halign="2" valign="64" excludeFromExports="0">
         <FrameColor alpha="255" red="0" blue="0" green="0"/>
         <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
@@ -29548,7 +29882,7 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="115.637,198.083,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" background="false" size="67.0856,7.80192,mm" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" zValue="9" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" opacity="1" position="115.637,198.083,mm" marginX="1" halign="1" valign="32" excludeFromExports="0">
+      <LayoutItem marginY="0" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="209.146,198.083,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" background="false" size="26.8205,6.82826,mm" labelText="REVISION 1.0" zValue="8" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" opacity="1" position="209.146,198.083,mm" marginX="0" halign="2" valign="32" excludeFromExports="0">
         <FrameColor alpha="255" red="0" blue="0" green="0"/>
         <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
@@ -29621,7 +29955,7 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="59.5581,198.083,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" background="false" size="53.0017,7.80192,mm" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" zValue="8" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" opacity="1" position="59.5581,198.083,mm" marginX="1" halign="1" valign="32" excludeFromExports="0">
+      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="62.6706,198.083,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" background="false" size="51.1638,7.07327,mm" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" zValue="7" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" opacity="1" position="62.6706,198.083,mm" marginX="1" halign="1" valign="32" excludeFromExports="0">
         <FrameColor alpha="255" red="0" blue="0" green="0"/>
         <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
@@ -29694,7 +30028,7 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="6.76779,198.083,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" background="false" size="52.7903,7.80192,mm" labelText="Page [% @atlas_featurenumber %]" zValue="7" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" opacity="1" position="6.76779,198.083,mm" marginX="1" halign="1" valign="32" excludeFromExports="0">
+      <LayoutItem marginY="0" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="116.805,198.083,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" background="false" size="64.7594,7.10512,mm" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" zValue="6" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" opacity="1" position="116.805,198.083,mm" marginX="0" halign="1" valign="32" excludeFromExports="0">
         <FrameColor alpha="255" red="0" blue="0" green="0"/>
         <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
@@ -29767,7 +30101,80 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" mapUuid="" svgBorderWidth="0.2" pictureHeight="29.8354" groupUuid="" positionOnPage="243.098,175.353,mm" positionLock="true" frameJoinStyle="miter" mode="1" frame="false" type="65640" outlineWidthM="0.3,mm" resizeMode="0" file="../Gun_Run_Logo.png" northOffset="0" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" background="false" svgFillColor="255,255,255,255" pictureRotation="0" size="49.3143,29.8354,mm" zValue="6" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" svgBorderColor="0,0,0,255" northMode="0" opacity="1" position="243.098,175.353,mm" excludeFromExports="0" pictureWidth="29.6535" anchorPoint="8">
+      <LayoutItem marginY="0" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="6.76779,198.083,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" background="false" size="52.7903,7.07327,mm" labelText="Page [% @atlas_featurenumber %]" zValue="5" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" opacity="1" position="6.76779,198.083,mm" marginX="0" halign="1" valign="32" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option type="QString" value="" name="name"/>
+              <Option name="properties"/>
+              <Option type="QString" value="collection" name="type"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="12" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
+          <families/>
+          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" value="" name="name"/>
+                  <Option name="properties"/>
+                  <Option type="QString" value="collection" name="type"/>
+                </Option>
+              </data_defined_properties>
+              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                <Option type="Map">
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
+                </Option>
+                <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="color" v="255,255,255,255"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="offset" v="0,0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="outline_color" v="128,128,128,255"/>
+                <prop k="outline_style" v="no"/>
+                <prop k="outline_width" v="0"/>
+                <prop k="outline_width_unit" v="MM"/>
+                <prop k="style" v="solid"/>
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option type="QString" value="" name="name"/>
+                    <Option name="properties"/>
+                    <Option type="QString" value="collection" name="type"/>
+                  </Option>
+                </data_defined_properties>
+              </layer>
+            </symbol>
+          </background>
+          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
+          <dd_properties>
+            <Option type="Map">
+              <Option type="QString" value="" name="name"/>
+              <Option name="properties"/>
+              <Option type="QString" value="collection" name="type"/>
+            </Option>
+          </dd_properties>
+        </text-style>
+      </LayoutItem>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" mapUuid="" svgBorderWidth="0.2" pictureHeight="26.4325" groupUuid="" positionOnPage="243.098,175.353,mm" positionLock="true" frameJoinStyle="miter" mode="1" frame="false" type="65640" outlineWidthM="0.3,mm" resizeMode="0" file="../GunRun2022_250.png" northOffset="0" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" background="false" svgFillColor="255,255,255,255" pictureRotation="0" size="49.3143,29.8354,mm" zValue="4" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" svgBorderColor="0,0,0,255" northMode="0" opacity="1" position="243.098,175.353,mm" excludeFromExports="0" pictureWidth="49.3143" anchorPoint="8">
         <FrameColor alpha="255" red="0" blue="0" green="0"/>
         <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
@@ -29789,80 +30196,7 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="182.723,190.271,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" background="false" size="56.3557,7.36902,mm" labelText="Sunday, 20 September 2020" zValue="5" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" opacity="1" position="182.723,190.271,mm" marginX="1" halign="2" valign="64" excludeFromExports="0">
-        <FrameColor alpha="255" red="0" blue="0" green="0"/>
-        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="12" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
-          <families/>
-          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
-          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-                <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
-                </Option>
-                <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="color" v="255,255,255,255"/>
-                <prop k="joinstyle" v="bevel"/>
-                <prop k="offset" v="0,0"/>
-                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="offset_unit" v="MM"/>
-                <prop k="outline_color" v="128,128,128,255"/>
-                <prop k="outline_style" v="no"/>
-                <prop k="outline_width" v="0"/>
-                <prop k="outline_width_unit" v="MM"/>
-                <prop k="style" v="solid"/>
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
-                    <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </background>
-          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
-          <dd_properties>
-            <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
-            </Option>
-          </dd_properties>
-        </text-style>
-      </LayoutItem>
-      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" groupUuid="" positionOnPage="6.91779,197.79,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65643" outlineWidthM="0.3,mm" shapeType="1" cornerRadiusMeasure="0,mm" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" background="false" size="232.01,0.14328,mm" zValue="4" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" opacity="1" position="6.91779,197.79,mm" excludeFromExports="0">
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" groupUuid="" positionOnPage="6.91779,197.79,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65643" outlineWidthM="0.3,mm" shapeType="1" cornerRadiusMeasure="0,mm" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" background="false" size="232.01,0.14328,mm" zValue="3" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" opacity="1" position="6.91779,197.79,mm" excludeFromExports="0">
         <FrameColor alpha="255" red="0" blue="0" green="0"/>
         <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
@@ -29920,7 +30254,7 @@ def my_form_open(dialog, layer, feature):
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" alignment="0" size="95.0404,15.8378,mm" unitLabel="m" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" blendMode="0" labelBarSpace="1" position="6.76779,2.8482,mm" groupUuid="" referencePoint="0" unitType="meters" lineCapStyle="square" itemRotation="0" maxBarWidth="100" numMapUnitsPerScaleBarUnit="1" subdivisionsHeight="1.5" outlineWidthM="0.3,mm" labelHorizontalPlacement="0" outlineWidth="0.2" background="false" numSubdivisions="1" visibility="1" numSegments="2" segmentSizeMode="1" numUnitsPerSegment="10" lineJoinStyle="round" positionLock="true" zValue="3" id="" labelVerticalPlacement="0" positionOnPage="6.76779,2.8482,mm" excludeFromExports="0" style="Double Box" segmentMillimeters="28.4264" type="65646" minBarWidth="25" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" opacity="1" boxContentSpace="0.2" frame="false" frameJoinStyle="miter" numSegmentsLeft="2" height="2">
+      <LayoutItem mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" alignment="0" size="103.733,15.8378,mm" unitLabel="m" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" blendMode="0" labelBarSpace="1" position="6.76779,2.8482,mm" groupUuid="" referencePoint="0" unitType="meters" lineCapStyle="square" itemRotation="0" maxBarWidth="100" numMapUnitsPerScaleBarUnit="1" subdivisionsHeight="1.5" outlineWidthM="0.3,mm" labelHorizontalPlacement="0" outlineWidth="0.2" background="false" numSubdivisions="1" visibility="1" numSegments="2" segmentSizeMode="1" numUnitsPerSegment="40" lineJoinStyle="round" positionLock="true" zValue="2" id="" labelVerticalPlacement="0" positionOnPage="6.76779,2.8482,mm" excludeFromExports="0" style="Double Box" segmentMillimeters="31.3239" type="65646" minBarWidth="25" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" opacity="1" boxContentSpace="0.2" frame="false" frameJoinStyle="miter" numSegmentsLeft="2" height="2">
         <FrameColor alpha="255" red="0" blue="0" green="0"/>
         <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
@@ -30323,75 +30657,6 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem splitLayer="0" size="38.1563,54.9504,mm" legendFilterByAtlas="0" boxSpace="2" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" blendMode="0" maxSymbolSize="0" position="256.808,2.9982,mm" groupUuid="" wrapChar="" minSymbolSize="0" referencePoint="0" symbolAlignment="1" itemRotation="0" title="" equalColumnWidth="1" resizeToContents="0" wmsLegendHeight="25" columnCount="1" outlineWidthM="0.3,mm" rasterBorder="1" background="true" visibility="1" symbolHeight="4" fontColor="#000000" positionLock="true" zValue="2" titleAlignment="1" lineSpacing="1" columnSpace="2" id="" rasterBorderColor="0,0,0,255" positionOnPage="256.808,2.9982,mm" excludeFromExports="0" rasterBorderWidth="0" type="65642" wmsLegendWidth="50" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" opacity="1" frame="true" symbolWidth="7" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" frameJoinStyle="miter">
-        <FrameColor alpha="255" red="0" blue="0" green="0"/>
-        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <styles>
-          <style indent="0" alignment="1" name="title">
-            <styleFont style="Bold" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold" strikethrough="0" italic="0" underline="0" bold="1"/>
-          </style>
-          <style marginTop="3" indent="0" alignment="1" name="group">
-            <styleFont style="Semibold" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0" bold="1"/>
-          </style>
-          <style marginTop="3" indent="0" alignment="1" name="subgroup">
-            <styleFont style="Semibold" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0" bold="1"/>
-          </style>
-          <style marginTop="2.5" indent="0" alignment="1" name="symbol">
-            <styleFont style="" description="Myriad Pro,9,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0" bold="0"/>
-          </style>
-          <style marginTop="2" marginLeft="2" indent="0" alignment="1" name="symbolLabel">
-            <styleFont style="Regular" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" strikethrough="0" italic="0" underline="0" bold="0"/>
-          </style>
-        </styles>
-        <layer-tree-group>
-          <customproperties>
-            <Option/>
-          </customproperties>
-          <layer-tree-group expanded="1" groupLayer="" checked="Qt::Checked" name="Fencing and Cones">
-            <customproperties>
-              <Option/>
-            </customproperties>
-            <layer-tree-layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" legend_split_behavior="0" source="./fencing.shp|layername=fencing" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Checked" name="fencing">
-              <customproperties>
-                <Option type="Map">
-                  <Option type="QString" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" name="expandedLegendNodes"/>
-                  <Option type="QString" value="" name="legend/expressionFilter"/>
-                  <Option type="QString" value="false" name="legend/expressionFilterEnabled"/>
-                  <Option type="QString" value="1,2,3" name="legend/node-order"/>
-                  <Option type="QString" value="hidden" name="legend/title-style"/>
-                </Option>
-              </customproperties>
-            </layer-tree-layer>
-          </layer-tree-group>
-          <layer-tree-group expanded="1" groupLayer="" checked="Qt::Checked" name="Routes">
-            <customproperties>
-              <Option/>
-            </customproperties>
-            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" legend_split_behavior="0" source="./all_routes.shp|layername=all_routes" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Checked" name="all_routes">
-              <customproperties>
-                <Option type="Map">
-                  <Option type="invalid" name="expandedLegendNodes"/>
-                  <Option type="QString" value="1,2,3" name="legend/node-order"/>
-                  <Option type="QString" value="hidden" name="legend/title-style"/>
-                </Option>
-              </customproperties>
-            </layer-tree-layer>
-          </layer-tree-group>
-          <custom-order enabled="0"/>
-        </layer-tree-group>
-      </LayoutItem>
       <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" drawCanvasItems="false" mapRotation="0" mapFlags="0" groupUuid="" positionOnPage="6.76779,9.35102,mm" positionLock="true" frameJoinStyle="miter" followPresetName="Fencing" frame="false" type="65639" outlineWidthM="0.3,mm" labelMargin="0,mm" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" background="false" size="283.418,180.92,mm" zValue="1" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" opacity="0.9" position="6.76779,9.35102,mm" keepLayerSet="false" excludeFromExports="0" isTemporal="0" followPreset="true">
         <FrameColor alpha="255" red="0" blue="0" green="0"/>
         <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
@@ -30429,7 +30694,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.90364055490629625" xmin="18.41635400827248503" ymin="-33.90421228789515595" xmax="18.4172496509604926"/>
+        <Extent ymax="-33.90484653250251768" xmin="18.39639749962876181" ymin="-33.90692191953385759" xmax="18.39964867676157212"/>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -30672,26 +30937,29 @@ def my_form_open(dialog, layer, feature):
       <customproperties>
         <Option type="Map">
           <Option type="QString" value="png" name="atlasRasterFormat"/>
-          <Option type="QString" value="0" name="forceVector"/>
+          <Option type="int" value="0" name="forceVector"/>
           <Option type="QString" value="true" name="imageAntialias"/>
           <Option type="QString" value="0" name="imageCropMarginBottom"/>
           <Option type="QString" value="0" name="imageCropMarginLeft"/>
           <Option type="QString" value="0" name="imageCropMarginRight"/>
           <Option type="QString" value="0" name="imageCropMarginTop"/>
           <Option type="QString" value="false" name="imageCropToContents"/>
-          <Option type="QString" value="1" name="pdfAppendGeoreference"/>
-          <Option type="QString" value="0" name="pdfCreateGeoPdf"/>
-          <Option type="QString" value="0" name="pdfDisableRasterTiles"/>
+          <Option type="int" value="1" name="pdfAppendGeoreference"/>
+          <Option type="int" value="0" name="pdfCreateGeoPdf"/>
+          <Option type="int" value="0" name="pdfDisableRasterTiles"/>
           <Option type="QString" value="0" name="pdfExportGeoPdfFeatures"/>
           <Option type="QString" value="" name="pdfExportThemes"/>
-          <Option type="QString" value="1" name="pdfIncludeMetadata"/>
-          <Option type="QString" value="0" name="pdfOgcBestPracticeFormat"/>
-          <Option type="QString" value="1" name="pdfSimplify"/>
-          <Option type="QString" value="0" name="pdfTextFormat"/>
+          <Option type="int" value="1" name="pdfIncludeMetadata"/>
+          <Option type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~route_markers_4e92bf25_f500_4b5f_bf49_9dd0b475a0c9~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" name="pdfLayerOrder"/>
+          <Option type="int" value="0" name="pdfLosslessImages"/>
+          <Option type="int" value="0" name="pdfOgcBestPracticeFormat"/>
+          <Option type="int" value="1" name="pdfSimplify"/>
+          <Option type="int" value="0" name="pdfTextFormat"/>
           <Option type="QString" value="true" name="rasterize"/>
+          <Option type="bool" value="true" name="singleFile"/>
         </Option>
       </customproperties>
-      <Atlas sortKey="group" sortAscending="1" filenamePattern="'output_'||@atlas_featurenumber" coverageLayer="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" filterFeatures="0" hideCoverage="1" enabled="1" coverageLayerProvider="virtual" pageNameExpression="&quot;name&quot;" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" coverageLayerName="fence_groups" sortFeatures="1"/>
+      <Atlas sortKey="&quot;group&quot;" sortAscending="1" filenamePattern="'output_'||@atlas_featurenumber" coverageLayer="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" filterFeatures="0" hideCoverage="1" enabled="1" coverageLayerProvider="virtual" pageNameExpression="&quot;name&quot;" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" coverageLayerName="fence_groups" sortFeatures="1"/>
     </Layout>
     <Layout units="mm" printResolution="144" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" name="Ask Me">
       <Snapper snapToGuides="1" tolerance="5" snapToGrid="0" snapToItems="1"/>
@@ -32193,7 +32461,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.89975491900727889" xmin="18.36400000000000077" ymin="-33.95900000000000318" xmax="18.45389078049076304"/>
+        <Extent ymax="-33.89234978035227641" xmin="18.37199999999999989" ymin="-33.92600000000000193" xmax="18.42305646675023922"/>
         <LayerSet/>
         <ComposerMapGrid bottomAnnotationPosition="1" frameFillColor2="0,0,0,255" blendMode="0" bottomAnnotationDisplay="0" name="Grid 1" frameFillColor1="255,255,255,255" position="3" bottomFrameDivisions="0" topAnnotationPosition="1" crossLength="3" leftAnnotationDisplay="0" intervalY="0" rotatedAnnotationsMarginToCorner="0" gridFrameStyle="0" annotationFormat="0" topAnnotationDirection="0" leftFrameDivisions="0" topFrameDivisions="0" annotationPrecision="3" rotatedTicksMinimumAngle="0" rightFrameDivisions="0" maximumIntervalWidth="100" unit="0" rotatedTicksEnabled="0" topAnnotationDisplay="0" leftAnnotationPosition="1" show="0" rotatedTicksMarginToCorner="0" rotatedTicksLengthMode="0" gridStyle="0" rotatedAnnotationsMinimumAngle="0" minimumIntervalWidth="50" bottomAnnotationDirection="0" annotationExpression="" intervalX="0" offsetY="0" offsetX="0" gridFramePenColor="0,0,0,255" gridFrameMargin="0" gridFrameWidth="2" rightAnnotationDisplay="0" rotatedAnnotationsEnabled="0" leftAnnotationDirection="0" rightAnnotationDirection="0" gridFrameSideFlags="15" gridFramePenThickness="0.5" showAnnotation="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rightAnnotationPosition="1" frameAnnotationDistance="1" rotatedAnnotationsLengthMode="0">
           <lineStyle>
@@ -35371,7 +35639,7 @@ def my_form_open(dialog, layer, feature):
   <Bookmarks/>
   <ProjectViewSettings UseProjectScales="0">
     <Scales/>
-    <DefaultViewExtent ymax="-33.90225422560713753" xmin="18.35917421026181984" ymin="-33.94563030202068887" xmax="18.43981121731019357">
+    <DefaultViewExtent ymax="-33.89941497592933928" xmin="18.40626131859488979" ymin="-33.90140571747196674" xmax="18.4099621475558628">
       <spatialrefsys nativeFormat="Wkt">
         <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
         <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
diff --git a/GIS Base Map/Gun Run.qgs~ b/GIS Base Map/Gun Run.qgs~
index d03b8d5..fd85ce6 100644
--- a/GIS Base Map/Gun Run.qgs~	
+++ b/GIS Base Map/Gun Run.qgs~	
@@ -1,5 +1,5 @@
 <!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
-<qgis saveUser="tim" saveDateTime="2022-09-06T15:22:23" version="3.26.2-Buenos Aires" saveUserFull="Timothy Allen" projectname="Gun Run">
+<qgis saveUser="tim" saveDateTime="2022-09-06T21:35:46" version="3.26.2-Buenos Aires" saveUserFull="Timothy Allen" projectname="Gun Run">
   <homePath path=""/>
   <title>Gun Run</title>
   <transaction mode="Disabled"/>
@@ -28,7 +28,6 @@
       <layer-tree-layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" expanded="1" legend_split_behavior="0" source="./marshal_positions.shp|layername=marshal_positions" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Unchecked" name="marshal_positions">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="marshal_positions" name="cached_name"/>
             <Option type="invalid" name="expandedLegendNodes"/>
             <Option type="QString" value="" name="legend/expressionFilter"/>
             <Option type="QString" value="false" name="legend/expressionFilterEnabled"/>
@@ -45,9 +44,7 @@
       </layer-tree-layer>
       <layer-tree-layer id="marshals_by_position20161003112326575" expanded="1" legend_split_behavior="0" source="./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" legend_exp="" providerKey="delimitedtext" patch_size="0,0" checked="Qt::Unchecked" name="marshals_by_position">
         <customproperties>
-          <Option type="Map">
-            <Option type="QString" value="marshals_by_position" name="cached_name"/>
-          </Option>
+          <Option/>
         </customproperties>
       </layer-tree-layer>
       <layer-tree-layer id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" expanded="1" legend_split_behavior="0" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" legend_exp="" providerKey="virtual" patch_size="0,0" checked="Qt::Unchecked" name="complete_marshal_overview">
@@ -64,21 +61,20 @@
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="1" groupLayer="" checked="Qt::Unchecked" name="Fencing and Cones">
+    <layer-tree-group expanded="1" groupLayer="" checked="Qt::Checked" name="Fencing and Cones">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" legend_split_behavior="0" source="./fencing.shp|layername=fencing" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Unchecked" name="fencing">
+      <layer-tree-layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" legend_split_behavior="0" source="./fencing.shp|layername=fencing" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Checked" name="fencing">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="fencing" name="cached_name"/>
             <Option type="QString" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" name="expandedLegendNodes"/>
             <Option type="QString" value="" name="legend/expressionFilter"/>
             <Option type="QString" value="false" name="legend/expressionFilterEnabled"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" expanded="1" legend_split_behavior="0" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" legend_exp="" providerKey="virtual" patch_size="0,0" checked="Qt::Unchecked" name="fence_groups">
+      <layer-tree-layer id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" expanded="1" legend_split_behavior="0" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" legend_exp="" providerKey="virtual" patch_size="-1,-1" checked="Qt::Unchecked" name="fence_groups">
         <customproperties>
           <Option/>
         </customproperties>
@@ -103,7 +99,6 @@
       <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" legend_split_behavior="0" source="./all_routes.shp|layername=all_routes" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Checked" name="all_routes">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="all_routes" name="cached_name"/>
             <Option type="invalid" name="expandedLegendNodes"/>
             <Option type="int" value="0" name="showFeatureCount"/>
           </Option>
@@ -112,19 +107,16 @@
     </layer-tree-group>
     <layer-tree-layer id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" expanded="0" legend_split_behavior="0" source="./timelapse.shp|layername=timelapse|subset=&quot;first_runn&quot; &lt; '06:59:45.000000' AND &quot;last_runne&quot; >= '06:59:35.000000' " legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Unchecked" name="timelapse">
       <customproperties>
-        <Option type="Map">
-          <Option type="QString" value="timelapse" name="cached_name"/>
-        </Option>
+        <Option/>
       </customproperties>
     </layer-tree-layer>
-    <layer-tree-group expanded="1" groupLayer="" checked="Qt::Checked" name="Feeding Stations">
+    <layer-tree-group expanded="1" groupLayer="" checked="Qt::Unchecked" name="Feeding Stations">
       <customproperties>
         <Option/>
       </customproperties>
       <layer-tree-layer id="water_tables20170921142016467" expanded="1" legend_split_behavior="0" source="./water_tables.shp" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Checked" name="water_tables">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="water_tables" name="cached_name"/>
             <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
@@ -136,16 +128,12 @@
       </customproperties>
       <layer-tree-layer id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" expanded="1" legend_split_behavior="0" source="./poi_labels.shp|layername=poi_labels" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Unchecked" name="poi_labels">
         <customproperties>
-          <Option type="Map">
-            <Option type="QString" value="poi_labels" name="cached_name"/>
-          </Option>
+          <Option/>
         </customproperties>
       </layer-tree-layer>
       <layer-tree-layer id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" expanded="1" legend_split_behavior="0" source="./directions_to_start.shp|layername=directions_to_start" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Unchecked" name="directions_to_start">
         <customproperties>
-          <Option type="Map">
-            <Option type="QString" value="directions_to_start" name="cached_name"/>
-          </Option>
+          <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
@@ -155,15 +143,12 @@
       </customproperties>
       <layer-tree-layer id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" expanded="1" legend_split_behavior="0" source="./mayor.shp" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Unchecked" name="mayor">
         <customproperties>
-          <Option type="Map">
-            <Option type="QString" value="mayor" name="cached_name"/>
-          </Option>
+          <Option/>
         </customproperties>
       </layer-tree-layer>
       <layer-tree-layer id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" expanded="1" legend_split_behavior="0" source="./viplabels.shp" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Unchecked" name="viplabels">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="viplabels" name="cached_name"/>
             <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
@@ -171,7 +156,6 @@
       <layer-tree-layer id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" expanded="1" legend_split_behavior="0" source="./vipaccess.shp" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Unchecked" name="vipaccess">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="vipaccess" name="cached_name"/>
             <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
@@ -184,7 +168,6 @@
       <layer-tree-layer id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" expanded="1" legend_split_behavior="0" source="./residents_access_roads.shp|layername=residents_access_roads" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Unchecked" name="residents_access_roads">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="residents_access_roads" name="cached_name"/>
             <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
@@ -202,7 +185,6 @@
       <layer-tree-layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" legend_split_behavior="0" source="./osm_roads.shp" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Checked" name="osm_roads">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="osm_roads [3887]" name="cached_name"/>
             <Option type="invalid" name="expandedLegendNodes"/>
             <Option type="QString" value="1" name="showFeatureCount"/>
           </Option>
@@ -211,7 +193,6 @@
       <layer-tree-layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1" legend_split_behavior="0" source="./osm_places.shp|layername=osm_places" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Checked" name="osm_places">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="osm_places [7]" name="cached_name"/>
             <Option type="invalid" name="expandedLegendNodes"/>
             <Option type="QString" value="1" name="showFeatureCount"/>
           </Option>
@@ -253,10 +234,9 @@
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" expanded="0" legend_split_behavior="0" source="./GDAL-City of Cape Town 2015 Aerial.xml" legend_exp="" providerKey="gdal" patch_size="0,0" checked="Qt::Unchecked" name="GDAL-City of Cape Town 2015 Aerial">
+      <layer-tree-layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" expanded="0" legend_split_behavior="0" source="./GDAL-City of Cape Town 2015 Aerial.xml" legend_exp="" providerKey="gdal" patch_size="0,0" checked="Qt::Checked" name="GDAL-City of Cape Town 2015 Aerial">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="GDAL-City of Cape Town 2015 Aerial" name="cached_name"/>
             <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
@@ -264,7 +244,6 @@
       <layer-tree-layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1" legend_split_behavior="0" source="contextualWMSLegend=0&amp;crs=EPSG:3857&amp;dpiMode=7&amp;featureCount=10&amp;format=image/png&amp;layers=ciry26ojy003tgynmznkc1a6q&amp;styles=default&amp;tileMatrixSet=GoogleMapsCompatible&amp;url=https://api.mapbox.com/styles/v1/ragtagtag/ciry26ojy003tgynmznkc1a6q/wmts?access_token%3Dpk.eyJ1IjoicmFndGFndGFnIiwiYSI6ImNpcnh3bnowbTAwMDUyemw1enBtbm50bTgifQ.WXKQzAfdJjsuQ6P6-BLZhg%2314.88/-33.91505/18.39137" legend_exp="" providerKey="wms" patch_size="0,0" checked="Qt::Checked" name="Outlines">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="Outlines" name="cached_name"/>
             <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
@@ -293,9 +272,9 @@
       <item>golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d</item>
       <item>vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea</item>
       <item>viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0</item>
-      <item>fence_groups_cbaea960_3348_4aea_b155_46e5d310f792</item>
       <item>mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea</item>
       <item>route_markers_4e92bf25_f500_4b5f_bf49_9dd0b475a0c9</item>
+      <item>fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb</item>
     </custom-order>
   </layer-tree-group>
   <snapping-settings self-snapping="1" minScale="0" unit="1" intersection-snapping="1" tolerance="10" scaleDependencyMode="0" type="1" maxScale="0" enabled="0" mode="3">
@@ -308,12 +287,12 @@
       <layer-setting id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" minScale="0" tolerance="12" type="1" maxScale="0" units="1" enabled="0"/>
       <layer-setting id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" minScale="0" tolerance="12" type="2" maxScale="0" units="1" enabled="0"/>
       <layer-setting id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" minScale="0" tolerance="20" type="2" maxScale="0" units="1" enabled="1"/>
+      <layer-setting id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" minScale="0" tolerance="12" type="0" maxScale="0" units="1" enabled="0"/>
       <layer-setting id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" minScale="0" tolerance="12" type="2" maxScale="0" units="1" enabled="0"/>
       <layer-setting id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" minScale="0" tolerance="12" type="2" maxScale="0" units="1" enabled="0"/>
       <layer-setting id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" minScale="0" tolerance="12" type="2" maxScale="0" units="1" enabled="0"/>
       <layer-setting id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" minScale="0" tolerance="12" type="2" maxScale="0" units="1" enabled="0"/>
       <layer-setting id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" minScale="0" tolerance="12" type="2" maxScale="0" units="1" enabled="0"/>
-      <layer-setting id="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" minScale="0" tolerance="12" type="2" maxScale="0" units="1" enabled="0"/>
       <layer-setting id="water_tables20170921142016467" minScale="0" tolerance="0" type="2" maxScale="0" units="2" enabled="0"/>
       <layer-setting id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" minScale="0" tolerance="12" type="2" maxScale="0" units="1" enabled="0"/>
       <layer-setting id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" minScale="0" tolerance="12" type="2" maxScale="0" units="1" enabled="0"/>
@@ -330,10 +309,10 @@
   <mapcanvas annotationsVisible="1" name="theMapCanvas">
     <units>degrees</units>
     <extent>
-      <xmin>18.38106081301657824</xmin>
-      <ymin>-33.94563030202068887</ymin>
-      <xmax>18.41792461455543517</xmax>
-      <ymax>-33.90225422560713753</ymax>
+      <xmin>18.40626131859488979</xmin>
+      <ymin>-33.90140571747127751</ymin>
+      <xmax>18.4099621475558628</xmax>
+      <ymax>-33.8994149759300285</ymax>
     </extent>
     <rotation>0</rotation>
     <destinationsrs>
@@ -381,15 +360,15 @@
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" checked="Qt::Unchecked" name="Fencing and Cones">
-      <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="fencing">
+    <legendgroup open="true" checked="Qt::Checked" name="Fencing and Cones">
+      <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1" name="fencing">
         <filegroup open="true" hidden="false">
-          <legendlayerfile layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" isInOverview="0" visible="0"/>
+          <legendlayerfile layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" isInOverview="0" visible="1"/>
         </filegroup>
       </legendlayer>
       <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="fence_groups">
         <filegroup open="true" hidden="false">
-          <legendlayerfile layerid="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" isInOverview="0" visible="0"/>
+          <legendlayerfile layerid="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
@@ -412,10 +391,10 @@
         <legendlayerfile layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" isInOverview="0" visible="0"/>
       </filegroup>
     </legendlayer>
-    <legendgroup open="true" checked="Qt::Checked" name="Feeding Stations">
+    <legendgroup open="true" checked="Qt::Unchecked" name="Feeding Stations">
       <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1" name="water_tables">
         <filegroup open="true" hidden="false">
-          <legendlayerfile layerid="water_tables20170921142016467" isInOverview="0" visible="1"/>
+          <legendlayerfile layerid="water_tables20170921142016467" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
@@ -495,9 +474,9 @@
       </legendlayer>
     </legendgroup>
     <legendgroup open="true" checked="Qt::Checked" name="Map">
-      <legendlayer open="false" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="GDAL-City of Cape Town 2015 Aerial">
+      <legendlayer open="false" showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1" name="GDAL-City of Cape Town 2015 Aerial">
         <filegroup open="false" hidden="false">
-          <legendlayerfile layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" isInOverview="0" visible="0"/>
+          <legendlayerfile layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" isInOverview="0" visible="1"/>
         </filegroup>
       </legendlayer>
       <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1" name="Outlines">
@@ -10609,17 +10588,17 @@ def my_form_open(dialog, layer, feature):
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
-        <xmax>18.42000731752843734</xmax>
-        <ymax>-33.89963095188647912</ymax>
+        <xmax>18.42224231378492405</xmax>
+        <ymax>-33.89963911218388404</ymax>
       </extent>
       <wgs84extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
-        <xmax>18.42000731752843734</xmax>
-        <ymax>-33.89963095188647912</ymax>
+        <xmax>18.42224231378492405</xmax>
+        <ymax>-33.89963911218388404</ymax>
       </wgs84extent>
-      <id>fence_groups_cbaea960_3348_4aea_b155_46e5d310f792</id>
-      <datasource>?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22</datasource>
+      <id>fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb</id>
+      <datasource>?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -10662,7 +10641,7 @@ def my_form_open(dialog, layer, feature):
         </crs>
         <extent/>
       </resourceMetadata>
-      <provider encoding="UTF-8">virtual</provider>
+      <provider encoding="">virtual</provider>
       <vectorjoins/>
       <layerDependencies>
         <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
@@ -10928,7 +10907,9 @@ def my_form_open(dialog, layer, feature):
           <Option type="QString" value="no_action" name="QFieldSync/action"/>
           <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
           <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
-          <Option type="QString" value="name" name="dualview/previewExpressions"/>
+          <Option type="List" name="dualview/previewExpressions">
+            <Option type="QString" value="&quot;name&quot;"/>
+          </Option>
           <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
@@ -11030,7 +11011,13 @@ def my_form_open(dialog, layer, feature):
       </DiagramLayerSettings>
       <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
-        <checkConfiguration/>
+        <checkConfiguration type="Map">
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option type="double" value="0" name="allowedGapsBuffer"/>
+            <Option type="bool" value="false" name="allowedGapsEnabled"/>
+            <Option type="QString" value="" name="allowedGapsLayer"/>
+          </Option>
+        </checkConfiguration>
       </geometryOptions>
       <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
@@ -11050,6 +11037,13 @@ def my_form_open(dialog, layer, feature):
           </editWidget>
         </field>
         <field configurationFlags="None" name="type">
+          <editWidget type="TextEdit">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field configurationFlags="None" name="day">
           <editWidget type="">
             <config>
               <Option/>
@@ -11057,14 +11051,14 @@ def my_form_open(dialog, layer, feature):
           </editWidget>
         </field>
         <field configurationFlags="None" name="cone_len">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
         <field configurationFlags="None" name="fence_len">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
@@ -11075,13 +11069,15 @@ def my_form_open(dialog, layer, feature):
         <alias index="0" field="name" name=""/>
         <alias index="1" field="group" name=""/>
         <alias index="2" field="type" name=""/>
-        <alias index="3" field="cone_len" name=""/>
-        <alias index="4" field="fence_len" name=""/>
+        <alias index="3" field="day" name=""/>
+        <alias index="4" field="cone_len" name=""/>
+        <alias index="5" field="fence_len" name=""/>
       </aliases>
       <defaults>
         <default applyOnUpdate="0" field="name" expression=""/>
         <default applyOnUpdate="0" field="group" expression=""/>
         <default applyOnUpdate="0" field="type" expression=""/>
+        <default applyOnUpdate="0" field="day" expression=""/>
         <default applyOnUpdate="0" field="cone_len" expression=""/>
         <default applyOnUpdate="0" field="fence_len" expression=""/>
       </defaults>
@@ -11089,6 +11085,7 @@ def my_form_open(dialog, layer, feature):
         <constraint exp_strength="0" field="name" notnull_strength="0" constraints="0" unique_strength="0"/>
         <constraint exp_strength="0" field="group" notnull_strength="0" constraints="0" unique_strength="0"/>
         <constraint exp_strength="0" field="type" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="day" notnull_strength="0" constraints="0" unique_strength="0"/>
         <constraint exp_strength="0" field="cone_len" notnull_strength="0" constraints="0" unique_strength="0"/>
         <constraint exp_strength="0" field="fence_len" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
@@ -11096,6 +11093,7 @@ def my_form_open(dialog, layer, feature):
         <constraint exp="" field="name" desc=""/>
         <constraint exp="" field="group" desc=""/>
         <constraint exp="" field="type" desc=""/>
+        <constraint exp="" field="day" desc=""/>
         <constraint exp="" field="cone_len" desc=""/>
         <constraint exp="" field="fence_len" desc=""/>
       </constraintExpressions>
@@ -11105,11 +11103,12 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" type="field" hidden="0" name="name"/>
+          <column width="415" type="field" hidden="0" name="name"/>
           <column width="-1" type="field" hidden="0" name="group"/>
           <column width="-1" type="actions" hidden="1"/>
           <column width="-1" type="field" hidden="0" name="type"/>
           <column width="-1" type="field" hidden="0" name="cone_len"/>
+          <column width="-1" type="field" hidden="0" name="day"/>
           <column width="-1" type="field" hidden="0" name="fence_len"/>
         </columns>
       </attributetableconfig>
@@ -11142,31 +11141,43 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
+        <field editable="1" name="cone_len"/>
+        <field editable="1" name="fence_len"/>
         <field editable="1" name="group"/>
         <field editable="1" name="name"/>
+        <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
+        <field labelOnTop="0" name="cone_len"/>
+        <field labelOnTop="0" name="fence_len"/>
         <field labelOnTop="0" name="group"/>
         <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
-      <reuseLastValue/>
+      <reuseLastValue>
+        <field reuseLastValue="0" name="cone_len"/>
+        <field reuseLastValue="0" name="fence_len"/>
+        <field reuseLastValue="0" name="group"/>
+        <field reuseLastValue="0" name="name"/>
+        <field reuseLastValue="0" name="type"/>
+      </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
-      <previewExpression>name</previewExpression>
+      <previewExpression>"name"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
     <maplayer simplifyLocal="1" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" type="vector" autoRefreshTime="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" styleCategories="AllStyleCategories" geometry="Line" autoRefreshEnabled="0" wkbType="MultiLineString">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
-        <xmax>18.42000731752843734</xmax>
-        <ymax>-33.89963095188647912</ymax>
+        <xmax>18.42224231378492405</xmax>
+        <ymax>-33.89963911218388404</ymax>
       </extent>
       <wgs84extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
-        <xmax>18.42000731752843734</xmax>
-        <ymax>-33.89963095188647912</ymax>
+        <xmax>18.42224231378492405</xmax>
+        <ymax>-33.89963911218388404</ymax>
       </wgs84extent>
       <id>fencing_70522fe0_a771_4170_98b2_d5843f62a7ab</id>
       <datasource>./fencing.shp|layername=fencing</datasource>
@@ -11234,9 +11245,9 @@ def my_form_open(dialog, layer, feature):
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field precision="0" comment="" type="6" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" length="-1" subType="0" typeName="double precision" name="fence_len"/>
+        <field precision="0" comment="" type="6" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" length="-1" subType="0" typeName="double precision" name="fence_len"/>
         <field precision="0" comment="" type="6" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" length="-1" subType="0" typeName="double precision" name="fence_len"/>
-        <field precision="0" comment="" type="6" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" length="-1" subType="0" typeName="double precision" name="cone_len"/>
+        <field precision="0" comment="" type="6" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" length="-1" subType="0" typeName="double precision" name="cone_len"/>
       </expressionfields>
       <map-layer-style-manager current="Fencing">
         <map-layer-style name="Fencing"/>
@@ -11799,14 +11810,14 @@ def my_form_open(dialog, layer, feature):
       </elevation>
       <renderer-v2 enableorderby="0" type="RuleRenderer" symbollevels="1" referencescale="-1" forceraster="0">
         <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-          <rule label="Show in fencing maps" key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)')">
-            <rule symbol="0" label="Cones" key="{55e15f58-d121-44dd-9fec-2e77eb26097f}" filter="regexp_match(&quot;type&quot;, '^cone')"/>
-            <rule symbol="1" label="Moveable fences" key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}" filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1'"/>
-            <rule symbol="2" label="Fixed fences" key="{070da3c0-926e-4be7-b593-17a3235a88fa}" filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1'"/>
-            <rule symbol="3" label="Construction" key="{7be11354-6d79-48d0-a650-aea5f58c1846}" filter="regexp_match(&quot;type&quot;, '^constr')" checkstate="0"/>
+          <rule label="Show in fencing maps" key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )">
+            <rule symbol="0" label="Cones" key="{55e15f58-d121-44dd-9fec-2e77eb26097f}" filter="regexp_match(&quot;type&quot;, '^cone') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
+            <rule symbol="1" label="Moveable fences" key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}" filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
+            <rule symbol="2" label="Fixed fences" key="{070da3c0-926e-4be7-b593-17a3235a88fa}" filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
+            <rule symbol="3" label="Construction" key="{7be11354-6d79-48d0-a650-aea5f58c1846}" filter="regexp_match(&quot;type&quot;, '^constr') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
           </rule>
-          <rule symbol="4" label="Is Visible" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" checkstate="0"/>
-          <rule symbol="5" key="{29865286-9e35-459b-929c-beb87e7538de}"/>
+          <rule symbol="4" label="Is Visible" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" checkstate="0"/>
+          <rule symbol="5" key="{29865286-9e35-459b-929c-beb87e7538de}" checkstate="0"/>
         </rules>
         <symbols>
           <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="0">
@@ -12280,8 +12291,8 @@ def my_form_open(dialog, layer, feature):
         </symbols>
       </renderer-v2>
       <labeling type="rule-based">
-        <rules key="{75ef682c-4a85-4fe1-962a-6082490a3c19}">
-          <rule key="{05a5f0dd-6b57-4866-8227-d1dd0f4dfdf5}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;">
+        <rules key="{39bfb314-1cf0-4ad7-9317-85df81083977}">
+          <rule key="{95ff248f-4d20-4914-90b5-ff48b94b38a0}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;">
             <settings calloutType="simple">
               <text-style textOpacity="0.80000000000000004" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="Regular" fontUnderline="0" fieldName="comment" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" useSubstitutions="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="11" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" isExpression="0" legendString="Aa" textOrientation="horizontal">
                 <families/>
@@ -12399,13 +12410,71 @@ def my_form_open(dialog, layer, feature):
               </callout>
             </settings>
           </rule>
-          <rule key="{226e1338-ed15-4fc8-a035-fefee03c38d6}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^(fenc|cone)')">
+          <rule key="{ef0e96b4-ef80-4bde-9260-81fbd496b3f7}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^(fenc|cone)')">
             <settings calloutType="simple">
-              <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="Semibold" fontUnderline="0" fieldName="round( $length, 1) || 'm'" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" useSubstitutions="0" fontWeight="63" fontStrikeout="0" fontItalic="0" fontSize="11" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" isExpression="1" legendString="Aa" textOrientation="horizontal">
+              <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="Semibold" fontUnderline="0" fieldName="round( $length * 100 * 1000, 1) || 'm'" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" useSubstitutions="0" fontWeight="63" fontStrikeout="0" fontItalic="0" fontSize="11" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" isExpression="1" legendString="Aa" textOrientation="horizontal">
                 <families/>
                 <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
                 <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskType="0"/>
                 <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+                  <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="markerSymbol">
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option type="QString" value="" name="name"/>
+                        <Option name="properties"/>
+                        <Option type="QString" value="collection" name="type"/>
+                      </Option>
+                    </data_defined_properties>
+                    <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                      <Option type="Map">
+                        <Option type="QString" value="0" name="angle"/>
+                        <Option type="QString" value="square" name="cap_style"/>
+                        <Option type="QString" value="196,60,57,255" name="color"/>
+                        <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="circle" name="name"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="diameter" name="scale_method"/>
+                        <Option type="QString" value="2" name="size"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="size_unit"/>
+                        <Option type="QString" value="1" name="vertical_anchor_point"/>
+                      </Option>
+                      <prop k="angle" v="0"/>
+                      <prop k="cap_style" v="square"/>
+                      <prop k="color" v="196,60,57,255"/>
+                      <prop k="horizontal_anchor_point" v="1"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="name" v="circle"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="35,35,35,255"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="scale_method" v="diameter"/>
+                      <prop k="size" v="2"/>
+                      <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="size_unit" v="MM"/>
+                      <prop k="vertical_anchor_point" v="1"/>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option type="QString" value="" name="name"/>
+                          <Option name="properties"/>
+                          <Option type="QString" value="collection" name="type"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
                   <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
@@ -12453,30 +12522,184 @@ def my_form_open(dialog, layer, feature):
                 <dd_properties>
                   <Option type="Map">
                     <Option type="QString" value="" name="name"/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="AlwaysShow">
-                        <Option type="bool" value="false" name="active"/>
-                        <Option type="QString" value="1" name="expression"/>
-                        <Option type="int" value="3" name="type"/>
-                      </Option>
-                      <Option type="Map" name="PositionX">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="auxiliary_storage_labeling_positionx" name="field"/>
-                        <Option type="int" value="2" name="type"/>
-                      </Option>
-                      <Option type="Map" name="PositionY">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="auxiliary_storage_labeling_positiony" name="field"/>
-                        <Option type="int" value="2" name="type"/>
-                      </Option>
-                    </Option>
+                    <Option name="properties"/>
                     <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format wrapChar="" rightDirectionSymbol=">" plussign="0" leftDirectionSymbol="&lt;" formatNumbers="0" decimals="3" multilineAlign="4294967295" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
-              <placement offsetUnits="MM" xOffset="0" maxCurvedCharAngleOut="-25" layerType="UnknownGeometry" allowDegraded="1" yOffset="0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" quadOffset="4" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" overrunDistance="0" overrunDistanceUnit="MM" centroidInside="0" placement="2" geometryGenerator="" priority="6" distUnits="MM" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" dist="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorTextPoint="CenterOfText" polygonPlacementFlags="2" rotationUnit="AngleDegrees" offsetType="0" placementFlags="14" repeatDistance="0"/>
+              <text-format wrapChar="" rightDirectionSymbol=">" plussign="0" leftDirectionSymbol="&lt;" formatNumbers="0" decimals="3" multilineAlign="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
+              <placement offsetUnits="MM" xOffset="0" maxCurvedCharAngleOut="-25" layerType="LineGeometry" allowDegraded="1" yOffset="0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" quadOffset="4" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" overrunDistance="0" overrunDistanceUnit="MM" centroidInside="0" placement="2" geometryGenerator="" priority="6" distUnits="MM" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" dist="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorTextPoint="CenterOfText" polygonPlacementFlags="2" rotationUnit="AngleDegrees" offsetType="0" placementFlags="14" repeatDistance="0"/>
+              <rendering limitNumLabels="0" obstacleType="0" obstacle="1" scaleMax="0" maxNumLabels="2000" labelPerPart="0" scaleMin="0" upsidedownLabels="0" zIndex="0" unplacedVisibility="0" fontLimitPixelSize="0" minFeatureSize="0" fontMaxPixelSize="10000" scaleVisibility="0" fontMinPixelSize="3" drawLabels="1" mergeLines="0" obstacleFactor="1"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option type="QString" value="" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="AlwaysShow">
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="QString" value="1" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
+                    </Option>
+                    <Option type="Map" name="PositionX">
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="auxiliary_storage_labeling_positionx" name="field"/>
+                      <Option type="int" value="2" name="type"/>
+                    </Option>
+                    <Option type="Map" name="PositionY">
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="auxiliary_storage_labeling_positiony" name="field"/>
+                      <Option type="int" value="2" name="type"/>
+                    </Option>
+                  </Option>
+                  <Option type="QString" value="collection" name="type"/>
+                </Option>
+              </dd_properties>
+              <callout type="simple">
+                <Option type="Map">
+                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="int" value="0" name="blendMode"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" value="" name="name"/>
+                    <Option name="properties"/>
+                    <Option type="QString" value="collection" name="type"/>
+                  </Option>
+                  <Option type="bool" value="false" name="drawToAllParts"/>
+                  <Option type="QString" value="0" name="enabled"/>
+                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                  <Option type="QString" value="&lt;symbol alpha=&quot;1&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                  <Option type="double" value="0" name="minLength"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                  <Option type="QString" value="MM" name="minLengthUnit"/>
+                  <Option type="double" value="0" name="offsetFromAnchor"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                  <Option type="double" value="0" name="offsetFromLabel"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
+                </Option>
+              </callout>
+            </settings>
+          </rule>
+          <rule active="0" key="{20c54c85-a61c-42da-a678-6dc9932e9e61}" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL">
+            <settings calloutType="simple">
+              <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="Semibold" fontUnderline="0" fieldName="round( $length * 100 * 1000, 1) || 'm'" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" useSubstitutions="0" fontWeight="63" fontStrikeout="0" fontItalic="0" fontSize="11" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" isExpression="1" legendString="Aa" textOrientation="horizontal">
+                <families/>
+                <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskType="0"/>
+                <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+                  <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="markerSymbol">
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option type="QString" value="" name="name"/>
+                        <Option name="properties"/>
+                        <Option type="QString" value="collection" name="type"/>
+                      </Option>
+                    </data_defined_properties>
+                    <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                      <Option type="Map">
+                        <Option type="QString" value="0" name="angle"/>
+                        <Option type="QString" value="square" name="cap_style"/>
+                        <Option type="QString" value="196,60,57,255" name="color"/>
+                        <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="circle" name="name"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="diameter" name="scale_method"/>
+                        <Option type="QString" value="2" name="size"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="size_unit"/>
+                        <Option type="QString" value="1" name="vertical_anchor_point"/>
+                      </Option>
+                      <prop k="angle" v="0"/>
+                      <prop k="cap_style" v="square"/>
+                      <prop k="color" v="196,60,57,255"/>
+                      <prop k="horizontal_anchor_point" v="1"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="name" v="circle"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="35,35,35,255"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="scale_method" v="diameter"/>
+                      <prop k="size" v="2"/>
+                      <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="size_unit" v="MM"/>
+                      <prop k="vertical_anchor_point" v="1"/>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option type="QString" value="" name="name"/>
+                          <Option name="properties"/>
+                          <Option type="QString" value="collection" name="type"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                  <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option type="QString" value="" name="name"/>
+                        <Option name="properties"/>
+                        <Option type="QString" value="collection" name="type"/>
+                      </Option>
+                    </data_defined_properties>
+                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                      <Option type="Map">
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="255,255,255,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                        <Option type="QString" value="no" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
+                      </Option>
+                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color" v="255,255,255,255"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="128,128,128,255"/>
+                      <prop k="outline_style" v="no"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option type="QString" value="" name="name"/>
+                          <Option name="properties"/>
+                          <Option type="QString" value="collection" name="type"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                </background>
+                <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
+                <dd_properties>
+                  <Option type="Map">
+                    <Option type="QString" value="" name="name"/>
+                    <Option name="properties"/>
+                    <Option type="QString" value="collection" name="type"/>
+                  </Option>
+                </dd_properties>
+                <substitutions/>
+              </text-style>
+              <text-format wrapChar="" rightDirectionSymbol=">" plussign="0" leftDirectionSymbol="&lt;" formatNumbers="0" decimals="3" multilineAlign="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
+              <placement offsetUnits="MM" xOffset="0" maxCurvedCharAngleOut="-25" layerType="LineGeometry" allowDegraded="1" yOffset="0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" quadOffset="4" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" overrunDistance="0" overrunDistanceUnit="MM" centroidInside="0" placement="2" geometryGenerator="" priority="6" distUnits="MM" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" dist="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorTextPoint="CenterOfText" polygonPlacementFlags="2" rotationUnit="AngleDegrees" offsetType="0" placementFlags="14" repeatDistance="0"/>
               <rendering limitNumLabels="0" obstacleType="0" obstacle="1" scaleMax="0" maxNumLabels="2000" labelPerPart="0" scaleMin="0" upsidedownLabels="0" zIndex="0" unplacedVisibility="0" fontLimitPixelSize="0" minFeatureSize="0" fontMaxPixelSize="10000" scaleVisibility="0" fontMinPixelSize="3" drawLabels="1" mergeLines="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
@@ -12534,7 +12757,9 @@ def my_form_open(dialog, layer, feature):
           <Option type="QString" value="copy" name="QFieldSync/action"/>
           <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
           <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
-          <Option type="QString" value="id" name="dualview/previewExpressions"/>
+          <Option type="List" name="dualview/previewExpressions">
+            <Option type="QString" value="&quot;id&quot;"/>
+          </Option>
           <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
@@ -12690,6 +12915,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field configurationFlags="None" name="day">
+          <editWidget type="Range">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field configurationFlags="None" name="fence_len">
           <editWidget type="Hidden">
             <config>
@@ -12713,8 +12945,9 @@ def my_form_open(dialog, layer, feature):
         <alias index="4" field="type" name=""/>
         <alias index="5" field="name" name=""/>
         <alias index="6" field="hidden" name=""/>
-        <alias index="7" field="fence_len" name=""/>
-        <alias index="8" field="cone_len" name=""/>
+        <alias index="7" field="day" name=""/>
+        <alias index="8" field="fence_len" name=""/>
+        <alias index="9" field="cone_len" name=""/>
       </aliases>
       <defaults>
         <default applyOnUpdate="0" field="id" expression=""/>
@@ -12724,6 +12957,7 @@ def my_form_open(dialog, layer, feature):
         <default applyOnUpdate="0" field="type" expression=""/>
         <default applyOnUpdate="0" field="name" expression=""/>
         <default applyOnUpdate="0" field="hidden" expression=""/>
+        <default applyOnUpdate="0" field="day" expression=""/>
         <default applyOnUpdate="0" field="fence_len" expression=""/>
         <default applyOnUpdate="0" field="cone_len" expression=""/>
       </defaults>
@@ -12735,6 +12969,7 @@ def my_form_open(dialog, layer, feature):
         <constraint exp_strength="0" field="type" notnull_strength="0" constraints="0" unique_strength="0"/>
         <constraint exp_strength="0" field="name" notnull_strength="0" constraints="0" unique_strength="0"/>
         <constraint exp_strength="0" field="hidden" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="day" notnull_strength="0" constraints="0" unique_strength="0"/>
         <constraint exp_strength="0" field="fence_len" notnull_strength="0" constraints="0" unique_strength="0"/>
         <constraint exp_strength="0" field="cone_len" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
@@ -12746,13 +12981,14 @@ def my_form_open(dialog, layer, feature):
         <constraint exp="" field="type" desc=""/>
         <constraint exp="" field="name" desc=""/>
         <constraint exp="" field="hidden" desc=""/>
+        <constraint exp="" field="day" desc=""/>
         <constraint exp="" field="fence_len" desc=""/>
         <constraint exp="" field="cone_len" desc=""/>
       </constraintExpressions>
       <expressionfields>
-        <field precision="0" comment="" type="6" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" length="-1" subType="0" typeName="double precision" name="fence_len"/>
+        <field precision="0" comment="" type="6" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" length="-1" subType="0" typeName="double precision" name="fence_len"/>
         <field precision="0" comment="" type="6" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" length="-1" subType="0" typeName="double precision" name="fence_len"/>
-        <field precision="0" comment="" type="6" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" length="-1" subType="0" typeName="double precision" name="cone_len"/>
+        <field precision="0" comment="" type="6" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" length="-1" subType="0" typeName="double precision" name="cone_len"/>
       </expressionfields>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
@@ -12768,6 +13004,7 @@ def my_form_open(dialog, layer, feature):
           <column width="692" type="field" hidden="0" name="name"/>
           <column width="-1" type="field" hidden="0" name="hidden"/>
           <column width="-1" type="field" hidden="0" name="fence_len"/>
+          <column width="-1" type="field" hidden="0" name="day"/>
           <column width="-1" type="field" hidden="0" name="cone_len"/>
         </columns>
       </attributetableconfig>
@@ -12804,6 +13041,7 @@ def my_form_open(dialog, layer, feature):
         <field editable="0" name="auxiliary_storage_labeling_positiony"/>
         <field editable="1" name="comment"/>
         <field editable="0" name="cone_len"/>
+        <field editable="1" name="day"/>
         <field editable="0" name="fence_len"/>
         <field editable="1" name="group"/>
         <field editable="1" name="hidden"/>
@@ -12818,6 +13056,7 @@ def my_form_open(dialog, layer, feature):
         <field labelOnTop="0" name="auxiliary_storage_labeling_positiony"/>
         <field labelOnTop="0" name="comment"/>
         <field labelOnTop="0" name="cone_len"/>
+        <field labelOnTop="0" name="day"/>
         <field labelOnTop="0" name="fence_len"/>
         <field labelOnTop="0" name="group"/>
         <field labelOnTop="0" name="hidden"/>
@@ -12827,10 +13066,21 @@ def my_form_open(dialog, layer, feature):
         <field labelOnTop="0" name="name"/>
         <field labelOnTop="0" name="type"/>
       </labelOnTop>
-      <reuseLastValue/>
+      <reuseLastValue>
+        <field reuseLastValue="0" name="comment"/>
+        <field reuseLastValue="0" name="cone_len"/>
+        <field reuseLastValue="0" name="day"/>
+        <field reuseLastValue="0" name="fence_len"/>
+        <field reuseLastValue="0" name="group"/>
+        <field reuseLastValue="0" name="hidden"/>
+        <field reuseLastValue="0" name="id"/>
+        <field reuseLastValue="0" name="moveable"/>
+        <field reuseLastValue="0" name="name"/>
+        <field reuseLastValue="0" name="type"/>
+      </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
-      <previewExpression>id</previewExpression>
+      <previewExpression>"id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
     <maplayer simplifyLocal="1" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" type="vector" autoRefreshTime="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="0" styleCategories="AllStyleCategories" geometry="Line" autoRefreshEnabled="0" wkbType="MultiLineString">
@@ -13693,6 +13943,7 @@ def my_form_open(dialog, layer, feature):
             <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
             <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
             <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
           </Option>
           <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
@@ -27037,9 +27288,9 @@ def my_form_open(dialog, layer, feature):
     <layer id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d"/>
     <layer id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
     <layer id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
-    <layer id="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792"/>
     <layer id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea"/>
     <layer id="route_markers_4e92bf25_f500_4b5f_bf49_9dd0b475a0c9"/>
+    <layer id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb"/>
   </layerorder>
   <properties>
     <DefaultStyles/>
@@ -27208,7 +27459,7 @@ def my_form_open(dialog, layer, feature):
       <disabledLayers type="QStringList"/>
     </Identify>
     <Layouts>
-      <lastLayoutExportDir type="QString">/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/Routes/Gun Run 2022 - Routes rev 3.1.pdf</lastLayoutExportDir>
+      <lastLayoutExportDir type="QString">/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/Fencing/Gun Run 2020 - Fencing rev 1.0.pdf</lastLayoutExportDir>
     </Layouts>
     <Legend>
       <filterByMap type="bool">false</filterByMap>
@@ -27415,35 +27666,48 @@ def my_form_open(dialog, layer, feature):
         <expanded-group-node id="Feeding Stations"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset has-expanded-info="1" name="Fencing">
-      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" expanded="1" visible="1"/>
-      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{ca3590cd-5839-41e2-824b-eca47a2b7a14}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" expanded="1" visible="1"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" expanded="1" visible="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer id="water_tables20170921142016467" style="default" expanded="1" visible="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
+    <visibility-preset has-checked-group-info="1" has-expanded-info="1" name="Fencing">
       <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing" expanded="1" visible="1"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
         <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
         <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
+        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
         <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
+      <layer id="route_markers_4e92bf25_f500_4b5f_bf49_9dd0b475a0c9" style="default" expanded="1" visible="1"/>
+      <expanded-legend-nodes id="route_markers_4e92bf25_f500_4b5f_bf49_9dd0b475a0c9"/>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" expanded="1" visible="1"/>
+      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
+        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer id="water_tables20170921142016467" style="default" expanded="1" visible="0"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
       <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0" visible="1"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" expanded="1" visible="1"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" expanded="0" visible="1"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" expanded="1" visible="1"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <checked-group-nodes>
+        <checked-group-node id="Routes"/>
+        <checked-group-node id="Map"/>
+        <checked-group-node id="Fencing and Cones"/>
+        <checked-group-node id="OSM data"/>
+        <checked-group-node id="Routes/Markers"/>
+      </checked-group-nodes>
       <expanded-group-nodes>
         <expanded-group-node id="Routes"/>
         <expanded-group-node id="Map"/>
         <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Feeding Stations"/>
@@ -29402,7 +29666,77 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="6.76779,190.27,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" background="false" size="148.46,7.36972,mm" labelText="FENCING: [% &quot;name&quot; %]" zValue="11" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" opacity="1" position="6.76779,190.27,mm" marginX="1" halign="1" valign="64" excludeFromExports="0">
+      <LayoutItem splitLayer="0" size="38.1563,67.2879,mm" legendFilterByAtlas="0" boxSpace="2" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" blendMode="0" maxSymbolSize="0" position="256.808,5.21277,mm" groupUuid="" wrapChar="" minSymbolSize="0" referencePoint="0" symbolAlignment="1" itemRotation="0" title="" equalColumnWidth="1" resizeToContents="0" wmsLegendHeight="25" columnCount="1" outlineWidthM="0.3,mm" rasterBorder="1" background="true" visibility="1" symbolHeight="4" fontColor="#000000" positionLock="true" zValue="11" titleAlignment="1" lineSpacing="1" columnSpace="2" id="" rasterBorderColor="0,0,0,255" positionOnPage="256.808,5.21277,mm" excludeFromExports="0" rasterBorderWidth="0" type="65642" wmsLegendWidth="50" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" opacity="1" frame="true" symbolWidth="7" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" frameJoinStyle="miter">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option type="QString" value="" name="name"/>
+              <Option name="properties"/>
+              <Option type="QString" value="collection" name="type"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <styles>
+          <style indent="0" alignment="1" name="title">
+            <styleFont style="Bold" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold" strikethrough="0" italic="0" underline="0" bold="1"/>
+          </style>
+          <style marginTop="3" indent="0" alignment="1" name="group">
+            <styleFont style="Semibold" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0" bold="1"/>
+          </style>
+          <style marginTop="3" indent="0" alignment="1" name="subgroup">
+            <styleFont style="Semibold" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0" bold="1"/>
+          </style>
+          <style marginTop="2.5" indent="0" alignment="1" name="symbol">
+            <styleFont style="" description="Myriad Pro,9,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0" bold="0"/>
+          </style>
+          <style marginTop="2" marginLeft="2" indent="0" alignment="1" name="symbolLabel">
+            <styleFont style="Regular" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" strikethrough="0" italic="0" underline="0" bold="0"/>
+          </style>
+        </styles>
+        <layer-tree-group>
+          <customproperties>
+            <Option/>
+          </customproperties>
+          <layer-tree-group expanded="1" groupLayer="" checked="Qt::Checked" name="Fencing and Cones">
+            <customproperties>
+              <Option/>
+            </customproperties>
+            <layer-tree-layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" legend_split_behavior="0" source="./fencing.shp|layername=fencing" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Checked" name="fencing">
+              <customproperties>
+                <Option type="Map">
+                  <Option type="QString" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" name="expandedLegendNodes"/>
+                  <Option type="QString" value="" name="legend/expressionFilter"/>
+                  <Option type="QString" value="false" name="legend/expressionFilterEnabled"/>
+                  <Option type="QString" value="1,2,3,4" name="legend/node-order"/>
+                  <Option type="QString" value="hidden" name="legend/title-style"/>
+                </Option>
+              </customproperties>
+            </layer-tree-layer>
+          </layer-tree-group>
+          <layer-tree-group expanded="1" groupLayer="" checked="Qt::Checked" name="Routes">
+            <customproperties>
+              <Option/>
+            </customproperties>
+            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" legend_split_behavior="0" source="./all_routes.shp|layername=all_routes" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Checked" name="all_routes">
+              <customproperties>
+                <Option type="Map">
+                  <Option type="invalid" name="expandedLegendNodes"/>
+                  <Option type="QString" value="1,2,3,4" name="legend/node-order"/>
+                  <Option type="QString" value="hidden" name="legend/title-style"/>
+                  <Option type="int" value="0" name="showFeatureCount"/>
+                </Option>
+              </customproperties>
+            </layer-tree-layer>
+          </layer-tree-group>
+          <custom-order enabled="0"/>
+        </layer-tree-group>
+      </LayoutItem>
+      <LayoutItem marginY="0" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="6.76779,191.188,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" background="false" size="148.46,6.45211,mm" labelText="FENCING: [% &quot;name&quot; %]" zValue="10" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" opacity="1" position="6.76779,191.188,mm" marginX="0" halign="1" valign="32" excludeFromExports="0">
         <FrameColor alpha="255" red="0" blue="0" green="0"/>
         <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
@@ -29475,7 +29809,7 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="211.295,197.64,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" background="false" size="27.7839,7.51682,mm" labelText="REVISION 1.0" zValue="10" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" opacity="1" position="211.295,197.64,mm" marginX="1" halign="2" valign="32" excludeFromExports="0">
+      <LayoutItem marginY="0" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="1" groupUuid="" positionOnPage="182.723,191.188,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" background="false" size="56.3557,6.45237,mm" labelText="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]&lt;/strong>" zValue="9" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" opacity="1" position="182.723,191.188,mm" marginX="0" halign="2" valign="64" excludeFromExports="0">
         <FrameColor alpha="255" red="0" blue="0" green="0"/>
         <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
@@ -29548,7 +29882,7 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="115.637,198.083,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" background="false" size="67.0856,7.80192,mm" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" zValue="9" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" opacity="1" position="115.637,198.083,mm" marginX="1" halign="1" valign="32" excludeFromExports="0">
+      <LayoutItem marginY="0" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="209.146,198.083,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" background="false" size="26.8205,6.82826,mm" labelText="REVISION 1.0" zValue="8" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" opacity="1" position="209.146,198.083,mm" marginX="0" halign="2" valign="32" excludeFromExports="0">
         <FrameColor alpha="255" red="0" blue="0" green="0"/>
         <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
@@ -29621,7 +29955,7 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="59.5581,198.083,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" background="false" size="53.0017,7.80192,mm" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" zValue="8" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" opacity="1" position="59.5581,198.083,mm" marginX="1" halign="1" valign="32" excludeFromExports="0">
+      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="62.6706,198.083,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" background="false" size="51.1638,7.07327,mm" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" zValue="7" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" opacity="1" position="62.6706,198.083,mm" marginX="1" halign="1" valign="32" excludeFromExports="0">
         <FrameColor alpha="255" red="0" blue="0" green="0"/>
         <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
@@ -29694,7 +30028,7 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="6.76779,198.083,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" background="false" size="52.7903,7.80192,mm" labelText="Page [% @atlas_featurenumber %]" zValue="7" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" opacity="1" position="6.76779,198.083,mm" marginX="1" halign="1" valign="32" excludeFromExports="0">
+      <LayoutItem marginY="0" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="116.805,198.083,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" background="false" size="64.7594,7.10512,mm" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" zValue="6" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" opacity="1" position="116.805,198.083,mm" marginX="0" halign="1" valign="32" excludeFromExports="0">
         <FrameColor alpha="255" red="0" blue="0" green="0"/>
         <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
@@ -29767,7 +30101,80 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" mapUuid="" svgBorderWidth="0.2" pictureHeight="29.8354" groupUuid="" positionOnPage="243.098,175.353,mm" positionLock="true" frameJoinStyle="miter" mode="1" frame="false" type="65640" outlineWidthM="0.3,mm" resizeMode="0" file="../Gun_Run_Logo.png" northOffset="0" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" background="false" svgFillColor="255,255,255,255" pictureRotation="0" size="49.3143,29.8354,mm" zValue="6" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" svgBorderColor="0,0,0,255" northMode="0" opacity="1" position="243.098,175.353,mm" excludeFromExports="0" pictureWidth="29.6535" anchorPoint="8">
+      <LayoutItem marginY="0" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="6.76779,198.083,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" background="false" size="52.7903,7.07327,mm" labelText="Page [% @atlas_featurenumber %]" zValue="5" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" opacity="1" position="6.76779,198.083,mm" marginX="0" halign="1" valign="32" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option type="QString" value="" name="name"/>
+              <Option name="properties"/>
+              <Option type="QString" value="collection" name="type"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="12" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
+          <families/>
+          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" value="" name="name"/>
+                  <Option name="properties"/>
+                  <Option type="QString" value="collection" name="type"/>
+                </Option>
+              </data_defined_properties>
+              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                <Option type="Map">
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
+                </Option>
+                <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="color" v="255,255,255,255"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="offset" v="0,0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="outline_color" v="128,128,128,255"/>
+                <prop k="outline_style" v="no"/>
+                <prop k="outline_width" v="0"/>
+                <prop k="outline_width_unit" v="MM"/>
+                <prop k="style" v="solid"/>
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option type="QString" value="" name="name"/>
+                    <Option name="properties"/>
+                    <Option type="QString" value="collection" name="type"/>
+                  </Option>
+                </data_defined_properties>
+              </layer>
+            </symbol>
+          </background>
+          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
+          <dd_properties>
+            <Option type="Map">
+              <Option type="QString" value="" name="name"/>
+              <Option name="properties"/>
+              <Option type="QString" value="collection" name="type"/>
+            </Option>
+          </dd_properties>
+        </text-style>
+      </LayoutItem>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" mapUuid="" svgBorderWidth="0.2" pictureHeight="26.4325" groupUuid="" positionOnPage="243.098,175.353,mm" positionLock="true" frameJoinStyle="miter" mode="1" frame="false" type="65640" outlineWidthM="0.3,mm" resizeMode="0" file="../GunRun2022_250.png" northOffset="0" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" background="false" svgFillColor="255,255,255,255" pictureRotation="0" size="49.3143,29.8354,mm" zValue="4" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" svgBorderColor="0,0,0,255" northMode="0" opacity="1" position="243.098,175.353,mm" excludeFromExports="0" pictureWidth="49.3143" anchorPoint="8">
         <FrameColor alpha="255" red="0" blue="0" green="0"/>
         <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
@@ -29789,80 +30196,7 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="182.723,190.271,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" background="false" size="56.3557,7.36902,mm" labelText="Sunday, 20 September 2020" zValue="5" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" opacity="1" position="182.723,190.271,mm" marginX="1" halign="2" valign="64" excludeFromExports="0">
-        <FrameColor alpha="255" red="0" blue="0" green="0"/>
-        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="12" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
-          <families/>
-          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
-          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-                <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
-                </Option>
-                <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="color" v="255,255,255,255"/>
-                <prop k="joinstyle" v="bevel"/>
-                <prop k="offset" v="0,0"/>
-                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="offset_unit" v="MM"/>
-                <prop k="outline_color" v="128,128,128,255"/>
-                <prop k="outline_style" v="no"/>
-                <prop k="outline_width" v="0"/>
-                <prop k="outline_width_unit" v="MM"/>
-                <prop k="style" v="solid"/>
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
-                    <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </background>
-          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
-          <dd_properties>
-            <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
-            </Option>
-          </dd_properties>
-        </text-style>
-      </LayoutItem>
-      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" groupUuid="" positionOnPage="6.91779,197.79,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65643" outlineWidthM="0.3,mm" shapeType="1" cornerRadiusMeasure="0,mm" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" background="false" size="232.01,0.14328,mm" zValue="4" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" opacity="1" position="6.91779,197.79,mm" excludeFromExports="0">
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" groupUuid="" positionOnPage="6.91779,197.79,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65643" outlineWidthM="0.3,mm" shapeType="1" cornerRadiusMeasure="0,mm" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" background="false" size="232.01,0.14328,mm" zValue="3" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" opacity="1" position="6.91779,197.79,mm" excludeFromExports="0">
         <FrameColor alpha="255" red="0" blue="0" green="0"/>
         <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
@@ -29920,7 +30254,7 @@ def my_form_open(dialog, layer, feature):
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" alignment="0" size="95.0404,15.8378,mm" unitLabel="m" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" blendMode="0" labelBarSpace="1" position="6.76779,2.8482,mm" groupUuid="" referencePoint="0" unitType="meters" lineCapStyle="square" itemRotation="0" maxBarWidth="100" numMapUnitsPerScaleBarUnit="1" subdivisionsHeight="1.5" outlineWidthM="0.3,mm" labelHorizontalPlacement="0" outlineWidth="0.2" background="false" numSubdivisions="1" visibility="1" numSegments="2" segmentSizeMode="1" numUnitsPerSegment="10" lineJoinStyle="round" positionLock="true" zValue="3" id="" labelVerticalPlacement="0" positionOnPage="6.76779,2.8482,mm" excludeFromExports="0" style="Double Box" segmentMillimeters="28.4264" type="65646" minBarWidth="25" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" opacity="1" boxContentSpace="0.2" frame="false" frameJoinStyle="miter" numSegmentsLeft="2" height="2">
+      <LayoutItem mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" alignment="0" size="103.733,15.8378,mm" unitLabel="m" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" blendMode="0" labelBarSpace="1" position="6.76779,2.8482,mm" groupUuid="" referencePoint="0" unitType="meters" lineCapStyle="square" itemRotation="0" maxBarWidth="100" numMapUnitsPerScaleBarUnit="1" subdivisionsHeight="1.5" outlineWidthM="0.3,mm" labelHorizontalPlacement="0" outlineWidth="0.2" background="false" numSubdivisions="1" visibility="1" numSegments="2" segmentSizeMode="1" numUnitsPerSegment="40" lineJoinStyle="round" positionLock="true" zValue="2" id="" labelVerticalPlacement="0" positionOnPage="6.76779,2.8482,mm" excludeFromExports="0" style="Double Box" segmentMillimeters="31.3239" type="65646" minBarWidth="25" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" opacity="1" boxContentSpace="0.2" frame="false" frameJoinStyle="miter" numSegmentsLeft="2" height="2">
         <FrameColor alpha="255" red="0" blue="0" green="0"/>
         <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
@@ -30323,75 +30657,6 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem splitLayer="0" size="38.1563,54.9504,mm" legendFilterByAtlas="0" boxSpace="2" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" blendMode="0" maxSymbolSize="0" position="256.808,2.9982,mm" groupUuid="" wrapChar="" minSymbolSize="0" referencePoint="0" symbolAlignment="1" itemRotation="0" title="" equalColumnWidth="1" resizeToContents="0" wmsLegendHeight="25" columnCount="1" outlineWidthM="0.3,mm" rasterBorder="1" background="true" visibility="1" symbolHeight="4" fontColor="#000000" positionLock="true" zValue="2" titleAlignment="1" lineSpacing="1" columnSpace="2" id="" rasterBorderColor="0,0,0,255" positionOnPage="256.808,2.9982,mm" excludeFromExports="0" rasterBorderWidth="0" type="65642" wmsLegendWidth="50" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" opacity="1" frame="true" symbolWidth="7" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" frameJoinStyle="miter">
-        <FrameColor alpha="255" red="0" blue="0" green="0"/>
-        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <styles>
-          <style indent="0" alignment="1" name="title">
-            <styleFont style="Bold" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold" strikethrough="0" italic="0" underline="0" bold="1"/>
-          </style>
-          <style marginTop="3" indent="0" alignment="1" name="group">
-            <styleFont style="Semibold" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0" bold="1"/>
-          </style>
-          <style marginTop="3" indent="0" alignment="1" name="subgroup">
-            <styleFont style="Semibold" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0" bold="1"/>
-          </style>
-          <style marginTop="2.5" indent="0" alignment="1" name="symbol">
-            <styleFont style="" description="Myriad Pro,9,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0" bold="0"/>
-          </style>
-          <style marginTop="2" marginLeft="2" indent="0" alignment="1" name="symbolLabel">
-            <styleFont style="Regular" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" strikethrough="0" italic="0" underline="0" bold="0"/>
-          </style>
-        </styles>
-        <layer-tree-group>
-          <customproperties>
-            <Option/>
-          </customproperties>
-          <layer-tree-group expanded="1" groupLayer="" checked="Qt::Checked" name="Fencing and Cones">
-            <customproperties>
-              <Option/>
-            </customproperties>
-            <layer-tree-layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" legend_split_behavior="0" source="./fencing.shp|layername=fencing" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Checked" name="fencing">
-              <customproperties>
-                <Option type="Map">
-                  <Option type="QString" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" name="expandedLegendNodes"/>
-                  <Option type="QString" value="" name="legend/expressionFilter"/>
-                  <Option type="QString" value="false" name="legend/expressionFilterEnabled"/>
-                  <Option type="QString" value="1,2,3" name="legend/node-order"/>
-                  <Option type="QString" value="hidden" name="legend/title-style"/>
-                </Option>
-              </customproperties>
-            </layer-tree-layer>
-          </layer-tree-group>
-          <layer-tree-group expanded="1" groupLayer="" checked="Qt::Checked" name="Routes">
-            <customproperties>
-              <Option/>
-            </customproperties>
-            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" legend_split_behavior="0" source="./all_routes.shp|layername=all_routes" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Checked" name="all_routes">
-              <customproperties>
-                <Option type="Map">
-                  <Option type="invalid" name="expandedLegendNodes"/>
-                  <Option type="QString" value="1,2,3" name="legend/node-order"/>
-                  <Option type="QString" value="hidden" name="legend/title-style"/>
-                </Option>
-              </customproperties>
-            </layer-tree-layer>
-          </layer-tree-group>
-          <custom-order enabled="0"/>
-        </layer-tree-group>
-      </LayoutItem>
       <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" drawCanvasItems="false" mapRotation="0" mapFlags="0" groupUuid="" positionOnPage="6.76779,9.35102,mm" positionLock="true" frameJoinStyle="miter" followPresetName="Fencing" frame="false" type="65639" outlineWidthM="0.3,mm" labelMargin="0,mm" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" background="false" size="283.418,180.92,mm" zValue="1" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" opacity="0.9" position="6.76779,9.35102,mm" keepLayerSet="false" excludeFromExports="0" isTemporal="0" followPreset="true">
         <FrameColor alpha="255" red="0" blue="0" green="0"/>
         <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
@@ -30429,7 +30694,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.90364055490629625" xmin="18.41635400827248503" ymin="-33.90421228789515595" xmax="18.4172496509604926"/>
+        <Extent ymax="-33.90484653250251768" xmin="18.39639749962876181" ymin="-33.90692191953385759" xmax="18.39964867676157212"/>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -30672,26 +30937,29 @@ def my_form_open(dialog, layer, feature):
       <customproperties>
         <Option type="Map">
           <Option type="QString" value="png" name="atlasRasterFormat"/>
-          <Option type="QString" value="0" name="forceVector"/>
+          <Option type="int" value="0" name="forceVector"/>
           <Option type="QString" value="true" name="imageAntialias"/>
           <Option type="QString" value="0" name="imageCropMarginBottom"/>
           <Option type="QString" value="0" name="imageCropMarginLeft"/>
           <Option type="QString" value="0" name="imageCropMarginRight"/>
           <Option type="QString" value="0" name="imageCropMarginTop"/>
           <Option type="QString" value="false" name="imageCropToContents"/>
-          <Option type="QString" value="1" name="pdfAppendGeoreference"/>
-          <Option type="QString" value="0" name="pdfCreateGeoPdf"/>
-          <Option type="QString" value="0" name="pdfDisableRasterTiles"/>
+          <Option type="int" value="1" name="pdfAppendGeoreference"/>
+          <Option type="int" value="0" name="pdfCreateGeoPdf"/>
+          <Option type="int" value="0" name="pdfDisableRasterTiles"/>
           <Option type="QString" value="0" name="pdfExportGeoPdfFeatures"/>
           <Option type="QString" value="" name="pdfExportThemes"/>
-          <Option type="QString" value="1" name="pdfIncludeMetadata"/>
-          <Option type="QString" value="0" name="pdfOgcBestPracticeFormat"/>
-          <Option type="QString" value="1" name="pdfSimplify"/>
-          <Option type="QString" value="0" name="pdfTextFormat"/>
+          <Option type="int" value="1" name="pdfIncludeMetadata"/>
+          <Option type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~route_markers_4e92bf25_f500_4b5f_bf49_9dd0b475a0c9~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" name="pdfLayerOrder"/>
+          <Option type="int" value="0" name="pdfLosslessImages"/>
+          <Option type="int" value="0" name="pdfOgcBestPracticeFormat"/>
+          <Option type="int" value="1" name="pdfSimplify"/>
+          <Option type="int" value="0" name="pdfTextFormat"/>
           <Option type="QString" value="true" name="rasterize"/>
+          <Option type="bool" value="true" name="singleFile"/>
         </Option>
       </customproperties>
-      <Atlas sortKey="group" sortAscending="1" filenamePattern="'output_'||@atlas_featurenumber" coverageLayer="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" filterFeatures="0" hideCoverage="1" enabled="1" coverageLayerProvider="virtual" pageNameExpression="&quot;name&quot;" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" coverageLayerName="fence_groups" sortFeatures="1"/>
+      <Atlas sortKey="&quot;group&quot;" sortAscending="1" filenamePattern="'output_'||@atlas_featurenumber" coverageLayer="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" filterFeatures="0" hideCoverage="1" enabled="1" coverageLayerProvider="virtual" pageNameExpression="&quot;name&quot;" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" coverageLayerName="fence_groups" sortFeatures="1"/>
     </Layout>
     <Layout units="mm" printResolution="144" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" name="Ask Me">
       <Snapper snapToGuides="1" tolerance="5" snapToGrid="0" snapToItems="1"/>
@@ -32193,7 +32461,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.89234816783005044" xmin="18.37199999999999989" ymin="-33.92600000000000193" xmax="18.42305891338173041"/>
+        <Extent ymax="-33.89234978035227641" xmin="18.37199999999999989" ymin="-33.92600000000000193" xmax="18.42305646675023922"/>
         <LayerSet/>
         <ComposerMapGrid bottomAnnotationPosition="1" frameFillColor2="0,0,0,255" blendMode="0" bottomAnnotationDisplay="0" name="Grid 1" frameFillColor1="255,255,255,255" position="3" bottomFrameDivisions="0" topAnnotationPosition="1" crossLength="3" leftAnnotationDisplay="0" intervalY="0" rotatedAnnotationsMarginToCorner="0" gridFrameStyle="0" annotationFormat="0" topAnnotationDirection="0" leftFrameDivisions="0" topFrameDivisions="0" annotationPrecision="3" rotatedTicksMinimumAngle="0" rightFrameDivisions="0" maximumIntervalWidth="100" unit="0" rotatedTicksEnabled="0" topAnnotationDisplay="0" leftAnnotationPosition="1" show="0" rotatedTicksMarginToCorner="0" rotatedTicksLengthMode="0" gridStyle="0" rotatedAnnotationsMinimumAngle="0" minimumIntervalWidth="50" bottomAnnotationDirection="0" annotationExpression="" intervalX="0" offsetY="0" offsetX="0" gridFramePenColor="0,0,0,255" gridFrameMargin="0" gridFrameWidth="2" rightAnnotationDisplay="0" rotatedAnnotationsEnabled="0" leftAnnotationDirection="0" rightAnnotationDirection="0" gridFrameSideFlags="15" gridFramePenThickness="0.5" showAnnotation="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rightAnnotationPosition="1" frameAnnotationDistance="1" rotatedAnnotationsLengthMode="0">
           <lineStyle>
@@ -32486,7 +32754,7 @@ def my_form_open(dialog, layer, feature):
           <Option type="int" value="0" name="pdfDisableRasterTiles"/>
           <Option type="QString" value="" name="pdfExportThemes"/>
           <Option type="int" value="1" name="pdfIncludeMetadata"/>
-          <Option type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_cbaea960_3348_4aea_b155_46e5d310f792~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~route_markers_d58f7174_b6d0_4e1c_80ed_0d74635b8ca6" name="pdfLayerOrder"/>
+          <Option type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_cbaea960_3348_4aea_b155_46e5d310f792~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~route_markers_4e92bf25_f500_4b5f_bf49_9dd0b475a0c9" name="pdfLayerOrder"/>
           <Option type="int" value="0" name="pdfLosslessImages"/>
           <Option type="int" value="0" name="pdfOgcBestPracticeFormat"/>
           <Option type="int" value="1" name="pdfSimplify"/>
@@ -35371,7 +35639,7 @@ def my_form_open(dialog, layer, feature):
   <Bookmarks/>
   <ProjectViewSettings UseProjectScales="0">
     <Scales/>
-    <DefaultViewExtent ymax="-33.90225422560713753" xmin="18.35917421026181984" ymin="-33.94563030202068887" xmax="18.43981121731019357">
+    <DefaultViewExtent ymax="-33.89941497592933928" xmin="18.40626131859488979" ymin="-33.90140571747196674" xmax="18.4099621475558628">
       <spatialrefsys nativeFormat="Wkt">
         <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
         <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
diff --git a/GIS Base Map/all_routes.shp b/GIS Base Map/all_routes.shp
index ab8fa9a..a6daa5e 100644
Binary files a/GIS Base Map/all_routes.shp and b/GIS Base Map/all_routes.shp differ
diff --git a/GIS Base Map/all_routes.shx b/GIS Base Map/all_routes.shx
index b291c44..ac1b9e2 100644
Binary files a/GIS Base Map/all_routes.shx and b/GIS Base Map/all_routes.shx differ
diff --git a/GIS Base Map/fencing.dbf b/GIS Base Map/fencing.dbf
index ab26d45..c2edd92 100644
Binary files a/GIS Base Map/fencing.dbf and b/GIS Base Map/fencing.dbf differ
diff --git a/GIS Base Map/fencing.shp b/GIS Base Map/fencing.shp
index 2fcda56..b5e92df 100644
Binary files a/GIS Base Map/fencing.shp and b/GIS Base Map/fencing.shp differ
diff --git a/GIS Base Map/fencing.shx b/GIS Base Map/fencing.shx
index df9088f..b99f0d1 100644
Binary files a/GIS Base Map/fencing.shx and b/GIS Base Map/fencing.shx differ