diff --git a/app_data/sheets/contents.json b/app_data/sheets/contents.json
index a4a8ba4..0d5f8c1 100644
--- a/app_data/sheets/contents.json
+++ b/app_data/sheets/contents.json
@@ -312,17 +312,6 @@
         }
       }
     },
-    "comp_title_params": {
-      "flow_type": "data_list",
-      "flow_name": "comp_title_params",
-      "flow_subtype": "component_demo",
-      "_xlsxPath": "component_sheets/component_title_test.xlsx",
-      "_metadata": {
-        "required": {
-          "type": "boolean"
-        }
-      }
-    },
     "debug_accordion_data": {
       "flow_type": "data_list",
       "flow_name": "debug_accordion_data",
@@ -1571,7 +1560,7 @@
       "flow_type": "template",
       "flow_name": "comp_title",
       "flow_subtype": "component_demo",
-      "_xlsxPath": "component_sheets/component_title_test.xlsx"
+      "_xlsxPath": "component_sheets/component_title.xlsx"
     },
     "comp_toggle_bar": {
       "flow_type": "template",
@@ -3404,27 +3393,27 @@
       "flow_subtype": "example_sheet_defaults",
       "_xlsxPath": "example_sheets/to_be_sorted/example_sheet_defaults.xlsx"
     },
-    "feat_app_layout_custom_header": {
+    "feat_app_layout_custom_footer": {
       "flow_type": "template",
-      "flow_name": "feat_app_layout_custom_header",
+      "flow_name": "feat_app_layout_custom_footer",
       "parameter_list": {
         "app_config": {
-          "APP_HEADER_DEFAULTS": {
-            "template": "feat_custom_header",
-            "should_show_back_button": "() => false"
+          "APP_FOOTER_DEFAULTS": {
+            "templateName": "feat_custom_footer",
+            "background": "none"
           }
         }
       },
       "_xlsxPath": "feature_sheets/feature_app_layout.xlsx"
     },
-    "feat_app_layout_footer": {
+    "feat_app_layout_custom_header": {
       "flow_type": "template",
-      "flow_name": "feat_app_layout_footer",
+      "flow_name": "feat_app_layout_custom_header",
       "parameter_list": {
         "app_config": {
-          "APP_FOOTER_DEFAULTS": {
-            "templateName": "feat_custom_footer",
-            "background": "none"
+          "APP_HEADER_DEFAULTS": {
+            "template": "feat_custom_header",
+            "should_show_back_button": false
           }
         }
       },
@@ -3450,7 +3439,9 @@
       "flow_name": "feat_app_layout_no_header",
       "parameter_list": {
         "app_config": {
-          "APP_HEADER_DEFAULTS": {}
+          "APP_HEADER_DEFAULTS": {
+            "show": false
+          }
         }
       },
       "_xlsxPath": "feature_sheets/feature_app_layout.xlsx"
diff --git a/app_data/sheets/data_list/component_demo/comp_data_items_list.json b/app_data/sheets/data_list/component_demo/comp_data_items_list.json
index ecf247b..28b3d31 100644
--- a/app_data/sheets/data_list/component_demo/comp_data_items_list.json
+++ b/app_data/sheets/data_list/component_demo/comp_data_items_list.json
@@ -8,7 +8,8 @@
       "id": "id_1",
       "label": "Task 1",
       "completed": false,
-      "type": "type_a"
+      "type": "type_a",
+      "_app_meta_field": "example metadata"
     },
     {
       "id": "id_2",
diff --git a/app_data/sheets/data_list/component_demo/comp_title_params.json b/app_data/sheets/data_list/component_demo/comp_title_params.json
deleted file mode 100644
index e290c6b..0000000
--- a/app_data/sheets/data_list/component_demo/comp_title_params.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "flow_type": "data_list",
-  "flow_name": "comp_title_params",
-  "status": "released",
-  "flow_subtype": "component_demo",
-  "rows": [
-    {
-      "id": "help",
-      "required": false,
-      "description": "Any string for help tooltip"
-    },
-    {
-      "id": "tooltip_position",
-      "required": false,
-      "description": "Tooltip positioning"
-    },
-    {
-      "id": "text_align",
-      "required": false,
-      "description": "Text alignment"
-    },
-    {
-      "id": "style",
-      "required": false,
-      "description": "Text formatting"
-    }
-  ],
-  "_xlsxPath": "component_sheets/component_title_test.xlsx",
-  "_metadata": {
-    "required": {
-      "type": "boolean"
-    }
-  }
-}
\ No newline at end of file
diff --git a/app_data/sheets/template/component_demo/comp_carousel.json b/app_data/sheets/template/component_demo/comp_carousel.json
index aa733f9..448d3ce 100644
--- a/app_data/sheets/template/component_demo/comp_carousel.json
+++ b/app_data/sheets/template/component_demo/comp_carousel.json
@@ -1613,7 +1613,7 @@
     },
     {
       "type": "title",
-      "value": "[Not Working] Example using data_items",
+      "value": "Example using data_items",
       "_translations": {
         "value": {}
       },
diff --git a/app_data/sheets/template/component_demo/comp_display_grid.json b/app_data/sheets/template/component_demo/comp_display_grid.json
index 1c16795..983ad48 100644
--- a/app_data/sheets/template/component_demo/comp_display_grid.json
+++ b/app_data/sheets/template/component_demo/comp_display_grid.json
@@ -514,6 +514,198 @@
         ]
       }
     },
+    {
+      "type": "subtitle",
+      "name": "example_2",
+      "value": "Example 1b - Using data_items",
+      "_translations": {
+        "value": {}
+      },
+      "_nested_name": "example_2"
+    },
+    {
+      "type": "display_grid",
+      "name": "grid_2",
+      "parameter_list": {
+        "item_width": "@local.item_width_input",
+        "item_border": "@local.item_border_input",
+        "grid_width": "@local.grid_width_input",
+        "grid_gap": "@local.grid_gap_input"
+      },
+      "exclude_from_translation": true,
+      "rows": [
+        {
+          "type": "data_items",
+          "value": "@data.comp_display_grid_data",
+          "rows": [
+            {
+              "type": "display_group",
+              "parameter_list": {
+                "style": "column"
+              },
+              "rows": [
+                {
+                  "type": "text",
+                  "name": "{@item.id}_id",
+                  "value": "@item.id",
+                  "_translations": {
+                    "value": {}
+                  },
+                  "_nested_name": "grid_2.data_items_1.display_group_1.{@item.id}_id",
+                  "_dynamicFields": {
+                    "name": [
+                      {
+                        "fullExpression": "{@item.id}_id",
+                        "matchedExpression": "@item.id",
+                        "type": "item",
+                        "fieldName": "id"
+                      }
+                    ],
+                    "value": [
+                      {
+                        "fullExpression": "@item.id",
+                        "matchedExpression": "@item.id",
+                        "type": "item",
+                        "fieldName": "id"
+                      }
+                    ],
+                    "_nested_name": [
+                      {
+                        "fullExpression": "grid_2.data_items_1.display_group_1.{@item.id}_id",
+                        "matchedExpression": "@item.id",
+                        "type": "item",
+                        "fieldName": "id"
+                      }
+                    ]
+                  },
+                  "_dynamicDependencies": {
+                    "@item.id": [
+                      "name",
+                      "value",
+                      "_nested_name"
+                    ]
+                  }
+                },
+                {
+                  "type": "text",
+                  "name": "{@item.id}_text",
+                  "value": "@item.text",
+                  "_translations": {
+                    "value": {}
+                  },
+                  "_nested_name": "grid_2.data_items_1.display_group_1.{@item.id}_text",
+                  "_dynamicFields": {
+                    "name": [
+                      {
+                        "fullExpression": "{@item.id}_text",
+                        "matchedExpression": "@item.id",
+                        "type": "item",
+                        "fieldName": "id"
+                      }
+                    ],
+                    "value": [
+                      {
+                        "fullExpression": "@item.text",
+                        "matchedExpression": "@item.text",
+                        "type": "item",
+                        "fieldName": "text"
+                      }
+                    ],
+                    "_nested_name": [
+                      {
+                        "fullExpression": "grid_2.data_items_1.display_group_1.{@item.id}_text",
+                        "matchedExpression": "@item.id",
+                        "type": "item",
+                        "fieldName": "id"
+                      }
+                    ]
+                  },
+                  "_dynamicDependencies": {
+                    "@item.id": [
+                      "name",
+                      "_nested_name"
+                    ],
+                    "@item.text": [
+                      "value"
+                    ]
+                  }
+                }
+              ],
+              "name": "display_group_1",
+              "_nested_name": "grid_2.data_items_1.display_group_1"
+            }
+          ],
+          "name": "data_items_1",
+          "_nested_name": "grid_2.data_items_1",
+          "_dynamicFields": {
+            "value": [
+              {
+                "fullExpression": "@data.comp_display_grid_data",
+                "matchedExpression": "@data.comp_display_grid_data",
+                "type": "data",
+                "fieldName": "comp_display_grid_data"
+              }
+            ]
+          },
+          "_dynamicDependencies": {
+            "@data.comp_display_grid_data": [
+              "value"
+            ]
+          }
+        }
+      ],
+      "_nested_name": "grid_2",
+      "_dynamicFields": {
+        "parameter_list": {
+          "item_width": [
+            {
+              "fullExpression": "@local.item_width_input",
+              "matchedExpression": "@local.item_width_input",
+              "type": "local",
+              "fieldName": "item_width_input"
+            }
+          ],
+          "item_border": [
+            {
+              "fullExpression": "@local.item_border_input",
+              "matchedExpression": "@local.item_border_input",
+              "type": "local",
+              "fieldName": "item_border_input"
+            }
+          ],
+          "grid_width": [
+            {
+              "fullExpression": "@local.grid_width_input",
+              "matchedExpression": "@local.grid_width_input",
+              "type": "local",
+              "fieldName": "grid_width_input"
+            }
+          ],
+          "grid_gap": [
+            {
+              "fullExpression": "@local.grid_gap_input",
+              "matchedExpression": "@local.grid_gap_input",
+              "type": "local",
+              "fieldName": "grid_gap_input"
+            }
+          ]
+        }
+      },
+      "_dynamicDependencies": {
+        "@local.item_width_input": [
+          "parameter_list.item_width"
+        ],
+        "@local.item_border_input": [
+          "parameter_list.item_border"
+        ],
+        "@local.grid_width_input": [
+          "parameter_list.grid_width"
+        ],
+        "@local.grid_gap_input": [
+          "parameter_list.grid_gap"
+        ]
+      }
+    },
     {
       "type": "subtitle",
       "name": "example_2",
diff --git a/app_data/sheets/template/component_demo/comp_plh_module_details_header.json b/app_data/sheets/template/component_demo/comp_plh_module_details_header.json
index 5c3c40a..6243359 100644
--- a/app_data/sheets/template/component_demo/comp_plh_module_details_header.json
+++ b/app_data/sheets/template/component_demo/comp_plh_module_details_header.json
@@ -5,24 +5,17 @@
   "flow_subtype": "component_demo",
   "rows": [
     {
-      "type": "display_group",
-      "rows": [
-        {
-          "type": "plh_module_details_header",
-          "value": "Module Title: Taking Care of Yourself",
-          "_translations": {
-            "value": {}
-          },
-          "parameter_list": {
-            "background_image_asset": "images/bg_illustration.png",
-            "module_image_asset": "images/module-1.png"
-          },
-          "name": "plh_module_details_header_1",
-          "_nested_name": "display_group_2.plh_module_details_header_1"
-        }
-      ],
-      "name": "display_group_2",
-      "_nested_name": "display_group_2"
+      "type": "plh_module_details_header",
+      "value": "Module Title: Taking Care of Yourself",
+      "_translations": {
+        "value": {}
+      },
+      "parameter_list": {
+        "background_image_asset": "images/bg_illustration.png",
+        "module_image_asset": "images/module-1.png"
+      },
+      "name": "plh_module_details_header_2",
+      "_nested_name": "plh_module_details_header_2"
     },
     {
       "type": "plh_module_details_header",
@@ -32,10 +25,11 @@
       },
       "parameter_list": {
         "background_image_asset": "images/bg_illustration.png",
-        "module_image_asset": "images/module-1.png"
+        "module_image_asset": "images/module-1.png",
+        "hide_back_button": "true"
       },
-      "name": "plh_module_details_header_4",
-      "_nested_name": "plh_module_details_header_4"
+      "name": "plh_module_details_header_3",
+      "_nested_name": "plh_module_details_header_3"
     },
     {
       "type": "plh_module_details_header",
@@ -47,8 +41,8 @@
         "background_image_asset": "images/bg_illustration.png",
         "module_image_asset": "images/Noura.png"
       },
-      "name": "plh_module_details_header_5",
-      "_nested_name": "plh_module_details_header_5"
+      "name": "plh_module_details_header_4",
+      "_nested_name": "plh_module_details_header_4"
     }
   ],
   "_xlsxPath": "component_sheets/component_plh_module_details_header.xlsx"
diff --git a/app_data/sheets/template/component_demo/comp_title.json b/app_data/sheets/template/component_demo/comp_title.json
index da91021..ec00226 100644
--- a/app_data/sheets/template/component_demo/comp_title.json
+++ b/app_data/sheets/template/component_demo/comp_title.json
@@ -6,502 +6,61 @@
   "rows": [
     {
       "type": "title",
-      "name": "title_1",
-      "value": "Title",
+      "value": "This a title",
       "_translations": {
         "value": {}
       },
-      "exclude_from_translation": true,
-      "_nested_name": "title_1"
+      "name": "title_2",
+      "_nested_name": "title_2"
     },
     {
-      "type": "subtitle",
-      "name": "title_value",
-      "value": "Value",
+      "type": "title",
+      "value": "Title with a tooltip",
       "_translations": {
         "value": {}
       },
-      "_nested_name": "title_value"
-    },
-    {
-      "type": "display_group",
-      "rows": [
-        {
-          "type": "text",
-          "name": "text_value",
-          "value": "value",
-          "_translations": {
-            "value": {}
-          },
-          "_nested_name": "display_group_4.text_value"
-        },
-        {
-          "type": "text_box",
-          "name": "text_box_value",
-          "action_list": [
-            {
-              "trigger": "changed",
-              "action_id": "emit",
-              "args": [
-                "force_reprocess"
-              ],
-              "_raw": "changed | emit:force_reprocess",
-              "_cleaned": "changed | emit:force_reprocess"
-            }
-          ],
-          "_nested_name": "display_group_4.text_box_value"
-        },
-        {
-          "type": "text",
-          "name": "description_value",
-          "value": "String to display as title",
-          "_translations": {
-            "value": {}
-          },
-          "_nested_name": "display_group_4.description_value"
-        }
-      ],
-      "name": "display_group_4",
-      "_nested_name": "display_group_4"
+      "parameter_list": {
+        "help": "Hi, I'm a tooltip!"
+      },
+      "name": "title_3",
+      "_nested_name": "title_3"
     },
     {
-      "type": "subtitle",
-      "name": "parameters",
-      "value": "Parameters",
+      "type": "title",
+      "value": "Title centre-aligned",
       "_translations": {
         "value": {}
       },
-      "exclude_from_translation": true,
-      "_nested_name": "parameters"
-    },
-    {
-      "type": "display_group",
-      "rows": [
-        {
-          "type": "text",
-          "name": "text_help",
-          "value": "help",
-          "_translations": {
-            "value": {}
-          },
-          "_nested_name": "display_group_7.text_help"
-        },
-        {
-          "type": "text_box",
-          "name": "text_box_help",
-          "action_list": [
-            {
-              "trigger": "changed",
-              "action_id": "emit",
-              "args": [
-                "force_reprocess"
-              ],
-              "_raw": "changed | emit:force_reprocess",
-              "_cleaned": "changed | emit:force_reprocess"
-            }
-          ],
-          "_nested_name": "display_group_7.text_box_help"
-        },
-        {
-          "type": "text",
-          "name": "description_value",
-          "value": "Any string for help tooltip",
-          "_translations": {
-            "value": {}
-          },
-          "_nested_name": "display_group_7.description_value"
-        }
-      ],
-      "name": "display_group_7",
-      "_nested_name": "display_group_7"
-    },
-    {
-      "type": "items",
-      "value": "@data.comp_title_params",
-      "rows": [
-        {
-          "type": "display_group",
-          "name": "@item.id",
-          "rows": [
-            {
-              "type": "text",
-              "name": "{@item.id}_name",
-              "value": "@item.id",
-              "_translations": {
-                "value": {}
-              },
-              "style_list": [
-                "width: 150px"
-              ],
-              "_nested_name": "items_9.@item.id.{@item.id}_name",
-              "_dynamicFields": {
-                "name": [
-                  {
-                    "fullExpression": "{@item.id}_name",
-                    "matchedExpression": "@item.id",
-                    "type": "item",
-                    "fieldName": "id"
-                  }
-                ],
-                "value": [
-                  {
-                    "fullExpression": "@item.id",
-                    "matchedExpression": "@item.id",
-                    "type": "item",
-                    "fieldName": "id"
-                  }
-                ],
-                "_nested_name": [
-                  {
-                    "fullExpression": "items_9.@item.id.{@item.id}_name",
-                    "matchedExpression": "@item.id",
-                    "type": "item",
-                    "fieldName": "id"
-                  },
-                  {
-                    "fullExpression": "items_9.@item.id.{@item.id}_name",
-                    "matchedExpression": "@item.id",
-                    "type": "item",
-                    "fieldName": "id"
-                  }
-                ]
-              },
-              "_dynamicDependencies": {
-                "@item.id": [
-                  "name",
-                  "value",
-                  "_nested_name",
-                  "_nested_name"
-                ]
-              }
-            },
-            {
-              "type": "combo_box",
-              "name": "{@item.id}_input",
-              "value": "@item.default_value",
-              "_translations": {
-                "value": {}
-              },
-              "condition": "@item.default_value",
-              "style_list": [
-                "width: 100px"
-              ],
-              "action_list": [
-                {
-                  "trigger": "changed",
-                  "action_id": "emit",
-                  "args": [
-                    "force_reprocess"
-                  ],
-                  "_raw": "changed | emit:force_reprocess",
-                  "_cleaned": "changed | emit:force_reprocess"
-                }
-              ],
-              "exclude_from_translation": true,
-              "_nested_name": "items_9.@item.id.{@item.id}_input",
-              "_dynamicFields": {
-                "name": [
-                  {
-                    "fullExpression": "{@item.id}_input",
-                    "matchedExpression": "@item.id",
-                    "type": "item",
-                    "fieldName": "id"
-                  }
-                ],
-                "value": [
-                  {
-                    "fullExpression": "@item.default_value",
-                    "matchedExpression": "@item.default_value",
-                    "type": "item",
-                    "fieldName": "default_value"
-                  }
-                ],
-                "condition": [
-                  {
-                    "fullExpression": "@item.default_value",
-                    "matchedExpression": "@item.default_value",
-                    "type": "item",
-                    "fieldName": "default_value"
-                  }
-                ],
-                "_nested_name": [
-                  {
-                    "fullExpression": "items_9.@item.id.{@item.id}_input",
-                    "matchedExpression": "@item.id",
-                    "type": "item",
-                    "fieldName": "id"
-                  },
-                  {
-                    "fullExpression": "items_9.@item.id.{@item.id}_input",
-                    "matchedExpression": "@item.id",
-                    "type": "item",
-                    "fieldName": "id"
-                  }
-                ]
-              },
-              "_dynamicDependencies": {
-                "@item.id": [
-                  "name",
-                  "_nested_name",
-                  "_nested_name"
-                ],
-                "@item.default_value": [
-                  "value",
-                  "condition"
-                ]
-              }
-            },
-            {
-              "type": "text",
-              "name": "{@item.id}_input",
-              "condition": "!@item.default_value",
-              "style_list": [
-                "width: 100px"
-              ],
-              "_nested_name": "items_9.@item.id.{@item.id}_input",
-              "_dynamicFields": {
-                "name": [
-                  {
-                    "fullExpression": "{@item.id}_input",
-                    "matchedExpression": "@item.id",
-                    "type": "item",
-                    "fieldName": "id"
-                  }
-                ],
-                "condition": [
-                  {
-                    "fullExpression": "!@item.default_value",
-                    "matchedExpression": "!@item.default_value",
-                    "type": "item",
-                    "fieldName": "default_value"
-                  }
-                ],
-                "_nested_name": [
-                  {
-                    "fullExpression": "items_9.@item.id.{@item.id}_input",
-                    "matchedExpression": "@item.id",
-                    "type": "item",
-                    "fieldName": "id"
-                  },
-                  {
-                    "fullExpression": "items_9.@item.id.{@item.id}_input",
-                    "matchedExpression": "@item.id",
-                    "type": "item",
-                    "fieldName": "id"
-                  }
-                ]
-              },
-              "_dynamicDependencies": {
-                "@item.id": [
-                  "name",
-                  "_nested_name",
-                  "_nested_name"
-                ],
-                "!@item.default_value": [
-                  "condition"
-                ]
-              }
-            },
-            {
-              "type": "text",
-              "name": "{@item.id}_description",
-              "value": "@item.description",
-              "_translations": {
-                "value": {}
-              },
-              "style_list": [
-                "flex: 1"
-              ],
-              "_nested_name": "items_9.@item.id.{@item.id}_description",
-              "_dynamicFields": {
-                "name": [
-                  {
-                    "fullExpression": "{@item.id}_description",
-                    "matchedExpression": "@item.id",
-                    "type": "item",
-                    "fieldName": "id"
-                  }
-                ],
-                "value": [
-                  {
-                    "fullExpression": "@item.description",
-                    "matchedExpression": "@item.description",
-                    "type": "item",
-                    "fieldName": "description"
-                  }
-                ],
-                "_nested_name": [
-                  {
-                    "fullExpression": "items_9.@item.id.{@item.id}_description",
-                    "matchedExpression": "@item.id",
-                    "type": "item",
-                    "fieldName": "id"
-                  },
-                  {
-                    "fullExpression": "items_9.@item.id.{@item.id}_description",
-                    "matchedExpression": "@item.id",
-                    "type": "item",
-                    "fieldName": "id"
-                  }
-                ]
-              },
-              "_dynamicDependencies": {
-                "@item.id": [
-                  "name",
-                  "_nested_name",
-                  "_nested_name"
-                ],
-                "@item.description": [
-                  "value"
-                ]
-              }
-            }
-          ],
-          "_nested_name": "items_9.@item.id",
-          "_dynamicFields": {
-            "name": [
-              {
-                "fullExpression": "@item.id",
-                "matchedExpression": "@item.id",
-                "type": "item",
-                "fieldName": "id"
-              }
-            ],
-            "_nested_name": [
-              {
-                "fullExpression": "items_9.@item.id",
-                "matchedExpression": "@item.id",
-                "type": "item",
-                "fieldName": "id"
-              }
-            ]
-          },
-          "_dynamicDependencies": {
-            "@item.id": [
-              "name",
-              "_nested_name"
-            ]
-          }
-        }
-      ],
-      "name": "items_9",
-      "_nested_name": "items_9",
-      "_dynamicFields": {
-        "value": [
-          {
-            "fullExpression": "@data.comp_title_params",
-            "matchedExpression": "@data.comp_title_params",
-            "type": "data",
-            "fieldName": "comp_title_params"
-          }
-        ]
+      "parameter_list": {
+        "text_align": "center"
       },
-      "_dynamicDependencies": {
-        "@data.comp_title_params": [
-          "value"
-        ]
-      }
+      "name": "title_4",
+      "_nested_name": "title_4"
     },
     {
-      "type": "subtitle",
-      "name": "output",
-      "value": "Output",
+      "type": "title",
+      "value": "Title right-aligned",
       "_translations": {
         "value": {}
       },
-      "_nested_name": "output"
+      "parameter_list": {
+        "text_align": "right"
+      },
+      "name": "title_5",
+      "_nested_name": "title_5"
     },
     {
       "type": "title",
-      "name": "output_text",
-      "value": "Selected: @local.output_title",
+      "value": "Title with header variant",
       "_translations": {
         "value": {}
       },
-      "_nested_name": "output_text",
-      "_dynamicFields": {
-        "value": [
-          {
-            "fullExpression": "Selected: @local.output_title",
-            "matchedExpression": "@local.output_title",
-            "type": "local",
-            "fieldName": "output_title"
-          }
-        ]
-      },
-      "_dynamicDependencies": {
-        "@local.output_title": [
-          "value"
-        ]
-      }
-    },
-    {
-      "type": "title",
-      "name": "output_title",
-      "action_list": [
-        {
-          "trigger": "changed",
-          "action_id": "emit",
-          "args": [
-            "force_reprocess"
-          ],
-          "_raw": "changed | emit:force_reprocess",
-          "_cleaned": "changed | emit:force_reprocess"
-        }
-      ],
       "parameter_list": {
-        "help": "@data.comp_title_data_test",
-        "tooltip_position": "@data.comp_title_data_test",
-        "text_align": "@data.comp_title_data_test",
-        "style": "@data.comp_title_data_test"
-      },
-      "exclude_from_translation": true,
-      "_nested_name": "output_title",
-      "_dynamicFields": {
-        "parameter_list": {
-          "help": [
-            {
-              "fullExpression": "@data.comp_title_data_test",
-              "matchedExpression": "@data.comp_title_data_test",
-              "type": "data",
-              "fieldName": "comp_title_data_test"
-            }
-          ],
-          "tooltip_position": [
-            {
-              "fullExpression": "@data.comp_title_data_test",
-              "matchedExpression": "@data.comp_title_data_test",
-              "type": "data",
-              "fieldName": "comp_title_data_test"
-            }
-          ],
-          "text_align": [
-            {
-              "fullExpression": "@data.comp_title_data_test",
-              "matchedExpression": "@data.comp_title_data_test",
-              "type": "data",
-              "fieldName": "comp_title_data_test"
-            }
-          ],
-          "style": [
-            {
-              "fullExpression": "@data.comp_title_data_test",
-              "matchedExpression": "@data.comp_title_data_test",
-              "type": "data",
-              "fieldName": "comp_title_data_test"
-            }
-          ]
-        }
+        "variant": "header"
       },
-      "_dynamicDependencies": {
-        "@data.comp_title_data_test": [
-          "parameter_list.help",
-          "parameter_list.tooltip_position",
-          "parameter_list.text_align",
-          "parameter_list.style"
-        ]
-      }
+      "name": "title_6",
+      "_nested_name": "title_6"
     }
   ],
-  "_xlsxPath": "component_sheets/component_title_test.xlsx"
+  "_xlsxPath": "component_sheets/component_title.xlsx"
 }
\ No newline at end of file
diff --git a/app_data/sheets/template/debug/example_google_auth.json b/app_data/sheets/template/debug/example_google_auth.json
index de6eb9b..2d7ce98 100644
--- a/app_data/sheets/template/debug/example_google_auth.json
+++ b/app_data/sheets/template/debug/example_google_auth.json
@@ -58,9 +58,71 @@
           ],
           "_raw": "click | auth: sign_out",
           "_cleaned": "click | auth: sign_out"
+        },
+        {
+          "trigger": "click",
+          "action_id": "emit",
+          "args": [
+            "force_reprocess"
+          ],
+          "_raw": "click | emit: force_reprocess",
+          "_cleaned": "click | emit: force_reprocess"
         }
       ],
       "_nested_name": "sign_out"
+    },
+    {
+      "type": "text",
+      "value": "Currently signed in user:",
+      "_translations": {
+        "value": {}
+      },
+      "name": "text_6",
+      "_nested_name": "text_6"
+    },
+    {
+      "type": "text",
+      "value": "@fields._app_auth_user",
+      "_translations": {
+        "value": {}
+      },
+      "name": "text_7",
+      "_nested_name": "text_7",
+      "_dynamicFields": {
+        "value": [
+          {
+            "fullExpression": "@fields._app_auth_user",
+            "matchedExpression": "@fields._app_auth_user",
+            "type": "fields",
+            "fieldName": "_app_auth_user"
+          }
+        ]
+      },
+      "_dynamicDependencies": {
+        "@fields._app_auth_user": [
+          "value"
+        ]
+      }
+    },
+    {
+      "type": "button",
+      "value": "Refresh",
+      "_translations": {
+        "value": {}
+      },
+      "action_list": [
+        {
+          "trigger": "click",
+          "action_id": "emit",
+          "args": [
+            "force_reprocess"
+          ],
+          "_raw": "click | emit: force_reprocess",
+          "_cleaned": "click | emit: force_reprocess"
+        }
+      ],
+      "name": "button_8",
+      "_nested_name": "button_8"
     }
   ],
   "_xlsxPath": "example_sheets/example_google_auth.xlsx"
diff --git a/app_data/sheets/template/debug/example_pop_ups.json b/app_data/sheets/template/debug/example_pop_ups.json
index 4dc6fcb..ae10110 100644
--- a/app_data/sheets/template/debug/example_pop_ups.json
+++ b/app_data/sheets/template/debug/example_pop_ups.json
@@ -226,16 +226,48 @@
       "exclude_from_translation": true,
       "_nested_name": "button_pop_up_6"
     },
+    {
+      "type": "title",
+      "value": "Completion Modal",
+      "_translations": {
+        "value": {}
+      },
+      "name": "title_16",
+      "_nested_name": "title_16"
+    },
+    {
+      "type": "button",
+      "name": "button_pop_up_7",
+      "value": "Complete",
+      "_translations": {
+        "value": {}
+      },
+      "action_list": [
+        {
+          "trigger": "click",
+          "action_id": "pop_up",
+          "args": [
+            "example_text"
+          ],
+          "_raw": "click | pop_up: example_text | variant:plh_completion",
+          "_cleaned": "click | pop_up: example_text | variant:plh_completion",
+          "params": {
+            "variant": "plh_completion"
+          }
+        }
+      ],
+      "_nested_name": "button_pop_up_7"
+    },
     {
       "action_list": [
         {
           "trigger": "click",
           "action_id": "pop_up",
           "args": [
-            "my_template"
+            "example_text"
           ],
-          "_raw": "click | pop_up: my_template | variant: plh_completion, background_image: confetti.svg",
-          "_cleaned": "click | pop_up: my_template | variant: plh_completion, background_image: confetti.svg",
+          "_raw": "click | pop_up: example_text | variant: plh_completion, background_image: confetti.svg",
+          "_cleaned": "click | pop_up: example_text | variant: plh_completion, background_image: confetti.svg",
           "params": {
             "variant": "plh_completion",
             "background_image": "confetti.svg"
@@ -243,8 +275,8 @@
         }
       ],
       "type": "set_variable",
-      "name": "set_variable_16",
-      "_nested_name": "set_variable_16"
+      "name": "set_variable_18",
+      "_nested_name": "set_variable_18"
     }
   ],
   "_xlsxPath": "example_sheets/to_be_sorted/example_actions.xlsx"
diff --git a/app_data/sheets/template/debug/example_text.json b/app_data/sheets/template/debug/example_text.json
index dc90344..2471a9e 100644
--- a/app_data/sheets/template/debug/example_text.json
+++ b/app_data/sheets/template/debug/example_text.json
@@ -7,7 +7,7 @@
     {
       "type": "text",
       "name": "text",
-      "value": "This is the example text template 2",
+      "value": "This is the example text template used on pop-up components",
       "_translations": {
         "value": {}
       },
diff --git a/app_data/sheets/template/debug_data_items_local.json b/app_data/sheets/template/debug_data_items_local.json
index f77398a..6399f42 100644
--- a/app_data/sheets/template/debug_data_items_local.json
+++ b/app_data/sheets/template/debug_data_items_local.json
@@ -14,17 +14,74 @@
     },
     {
       "name": "local_var",
-      "value": "Some local variable",
+      "value": true,
+      "type": "set_variable",
+      "_nested_name": "local_var"
+    },
+    {
+      "type": "button",
+      "value": "Toggle var value",
       "_translations": {
         "value": {}
       },
-      "type": "set_variable",
-      "_nested_name": "local_var"
+      "action_list": [
+        {
+          "trigger": "click",
+          "action_id": "set_local",
+          "args": [
+            "local_var",
+            "!@local.local_var"
+          ],
+          "_raw": "click | set_local: local_var: !@local.local_var",
+          "_cleaned": "click | set_local: local_var: !@local.local_var"
+        }
+      ],
+      "name": "button_4",
+      "_nested_name": "button_4",
+      "_dynamicFields": {
+        "action_list": {
+          "0": {
+            "args": {
+              "1": [
+                {
+                  "fullExpression": "!@local.local_var",
+                  "matchedExpression": "!@local.local_var",
+                  "type": "local",
+                  "fieldName": "local_var"
+                }
+              ]
+            },
+            "_raw": [
+              {
+                "fullExpression": "click | set_local: local_var: !@local.local_var",
+                "matchedExpression": "!@local.local_var",
+                "type": "local",
+                "fieldName": "local_var"
+              }
+            ],
+            "_cleaned": [
+              {
+                "fullExpression": "click | set_local: local_var: !@local.local_var",
+                "matchedExpression": "!@local.local_var",
+                "type": "local",
+                "fieldName": "local_var"
+              }
+            ]
+          }
+        }
+      },
+      "_dynamicDependencies": {
+        "!@local.local_var": [
+          "action_list.0.args.1",
+          "action_list.0._raw",
+          "action_list.0._cleaned"
+        ]
+      }
     },
     {
       "type": "text",
       "name": "text_1",
-      "value": "Value of local_var: @local.local_var",
+      "value": "[1] local_var: @local.local_var",
       "_translations": {
         "value": {}
       },
@@ -32,7 +89,7 @@
       "_dynamicFields": {
         "value": [
           {
-            "fullExpression": "Value of local_var: @local.local_var",
+            "fullExpression": "[1] local_var: @local.local_var",
             "matchedExpression": "@local.local_var",
             "type": "local",
             "fieldName": "local_var"
@@ -53,7 +110,7 @@
         {
           "type": "text",
           "name": "text_2",
-          "value": "Value of local_var: @local.local_var",
+          "value": "[2] local_var: @local.local_var",
           "_translations": {
             "value": {}
           },
@@ -61,7 +118,7 @@
           "_dynamicFields": {
             "value": [
               {
-                "fullExpression": "Value of local_var: @local.local_var",
+                "fullExpression": "[2] local_var: @local.local_var",
                 "matchedExpression": "@local.local_var",
                 "type": "local",
                 "fieldName": "local_var"
@@ -81,7 +138,7 @@
           "rows": [
             {
               "name": "title",
-              "value": "Value of local_var: @local.local_var",
+              "value": "[3] local_var: @local.local_var",
               "_translations": {
                 "value": {}
               },
@@ -90,7 +147,7 @@
               "_dynamicFields": {
                 "value": [
                   {
-                    "fullExpression": "Value of local_var: @local.local_var",
+                    "fullExpression": "[3] local_var: @local.local_var",
                     "matchedExpression": "@local.local_var",
                     "type": "local",
                     "fieldName": "local_var"
diff --git a/app_data/sheets/template/feat_app_layout_custom_footer.json b/app_data/sheets/template/feat_app_layout_custom_footer.json
new file mode 100644
index 0000000..fb230e2
--- /dev/null
+++ b/app_data/sheets/template/feat_app_layout_custom_footer.json
@@ -0,0 +1,154 @@
+{
+  "flow_type": "template",
+  "flow_name": "feat_app_layout_custom_footer",
+  "status": "released",
+  "parameter_list": {
+    "app_config": {
+      "APP_FOOTER_DEFAULTS": {
+        "templateName": "feat_custom_footer",
+        "background": "none"
+      }
+    }
+  },
+  "rows": [
+    {
+      "type": "title",
+      "value": "Template-level app config layout overrides",
+      "_translations": {
+        "value": {}
+      },
+      "name": "title_2",
+      "_nested_name": "title_2"
+    },
+    {
+      "type": "title",
+      "value": "Custom footer",
+      "_translations": {
+        "value": {}
+      },
+      "name": "title_3",
+      "_nested_name": "title_3"
+    },
+    {
+      "type": "button",
+      "value": "Compact header, no footer",
+      "_translations": {
+        "value": {}
+      },
+      "action_list": [
+        {
+          "trigger": "click",
+          "action_id": "go_to",
+          "args": [
+            "feat_app_layout_header_compact"
+          ],
+          "_raw": "click | go_to: feat_app_layout_header_compact",
+          "_cleaned": "click | go_to: feat_app_layout_header_compact"
+        }
+      ],
+      "name": "button_4",
+      "_nested_name": "button_4"
+    },
+    {
+      "type": "button",
+      "value": "Custom header, no back button",
+      "_translations": {
+        "value": {}
+      },
+      "action_list": [
+        {
+          "trigger": "click",
+          "action_id": "go_to",
+          "args": [
+            "feat_app_layout_custom_header"
+          ],
+          "_raw": "click | go_to: feat_app_layout_custom_header",
+          "_cleaned": "click | go_to: feat_app_layout_custom_header"
+        }
+      ],
+      "name": "button_5",
+      "_nested_name": "button_5"
+    },
+    {
+      "type": "button",
+      "value": "No header",
+      "_translations": {
+        "value": {}
+      },
+      "action_list": [
+        {
+          "trigger": "click",
+          "action_id": "go_to",
+          "args": [
+            "feat_app_layout_no_header"
+          ],
+          "_raw": "click | go_to: feat_app_layout_no_header",
+          "_cleaned": "click | go_to: feat_app_layout_no_header"
+        }
+      ],
+      "name": "button_6",
+      "_nested_name": "button_6"
+    },
+    {
+      "type": "button",
+      "value": "Custom footer",
+      "_translations": {
+        "value": {}
+      },
+      "action_list": [
+        {
+          "trigger": "click",
+          "action_id": "go_to",
+          "args": [
+            "feat_app_layout_custom_footer"
+          ],
+          "_raw": "click | go_to: feat_app_layout_custom_footer",
+          "_cleaned": "click | go_to: feat_app_layout_custom_footer"
+        }
+      ],
+      "name": "button_7",
+      "_nested_name": "button_7"
+    },
+    {
+      "type": "button",
+      "value": "No page padding",
+      "_translations": {
+        "value": {}
+      },
+      "action_list": [
+        {
+          "trigger": "click",
+          "action_id": "go_to",
+          "args": [
+            "feat_app_layout_padding"
+          ],
+          "_raw": "click | go_to: feat_app_layout_padding",
+          "_cleaned": "click | go_to: feat_app_layout_padding"
+        }
+      ],
+      "name": "button_8",
+      "_nested_name": "button_8"
+    },
+    {
+      "type": "button",
+      "value": "Go home",
+      "_translations": {
+        "value": {}
+      },
+      "action_list": [
+        {
+          "trigger": "click",
+          "action_id": "go_to",
+          "args": [
+            "home_screen"
+          ],
+          "_raw": "click | go_to: home_screen",
+          "_cleaned": "click | go_to: home_screen"
+        }
+      ],
+      "name": "button_9",
+      "_nested_name": "button_9"
+    }
+  ],
+  "_xlsxPath": "feature_sheets/feature_app_layout.xlsx"
+}
\ No newline at end of file
diff --git a/app_data/sheets/template/feat_app_layout_custom_header.json b/app_data/sheets/template/feat_app_layout_custom_header.json
index 957ec69..9a7369a 100644
--- a/app_data/sheets/template/feat_app_layout_custom_header.json
+++ b/app_data/sheets/template/feat_app_layout_custom_header.json
@@ -6,14 +6,14 @@
     "app_config": {
       "APP_HEADER_DEFAULTS": {
         "template": "feat_custom_header",
-        "should_show_back_button": "() => false"
+        "should_show_back_button": false
       }
     }
   },
   "rows": [
     {
       "type": "title",
-      "value": "Template-level app config overrides",
+      "value": "Template-level app config layout overrides",
       "_translations": {
         "value": {}
       },
@@ -21,13 +21,133 @@
       "_nested_name": "title_2"
     },
     {
-      "type": "text",
-      "value": "header template: feat_custom_header",
+      "type": "title",
+      "value": "Custom header, no back button",
+      "_translations": {
+        "value": {}
+      },
+      "name": "title_3",
+      "_nested_name": "title_3"
+    },
+    {
+      "type": "button",
+      "value": "Compact header, no footer",
+      "_translations": {
+        "value": {}
+      },
+      "action_list": [
+        {
+          "trigger": "click",
+          "action_id": "go_to",
+          "args": [
+            "feat_app_layout_header_compact"
+          ],
+          "_raw": "click | go_to: feat_app_layout_header_compact",
+          "_cleaned": "click | go_to: feat_app_layout_header_compact"
+        }
+      ],
+      "name": "button_4",
+      "_nested_name": "button_4"
+    },
+    {
+      "type": "button",
+      "value": "Custom header, no back button",
+      "_translations": {
+        "value": {}
+      },
+      "action_list": [
+        {
+          "trigger": "click",
+          "action_id": "go_to",
+          "args": [
+            "feat_app_layout_custom_header"
+          ],
+          "_raw": "click | go_to: feat_app_layout_custom_header",
+          "_cleaned": "click | go_to: feat_app_layout_custom_header"
+        }
+      ],
+      "name": "button_5",
+      "_nested_name": "button_5"
+    },
+    {
+      "type": "button",
+      "value": "No header",
+      "_translations": {
+        "value": {}
+      },
+      "action_list": [
+        {
+          "trigger": "click",
+          "action_id": "go_to",
+          "args": [
+            "feat_app_layout_no_header"
+          ],
+          "_raw": "click | go_to: feat_app_layout_no_header",
+          "_cleaned": "click | go_to: feat_app_layout_no_header"
+        }
+      ],
+      "name": "button_6",
+      "_nested_name": "button_6"
+    },
+    {
+      "type": "button",
+      "value": "Custom footer",
+      "_translations": {
+        "value": {}
+      },
+      "action_list": [
+        {
+          "trigger": "click",
+          "action_id": "go_to",
+          "args": [
+            "feat_app_layout_custom_footer"
+          ],
+          "_raw": "click | go_to: feat_app_layout_custom_footer",
+          "_cleaned": "click | go_to: feat_app_layout_custom_footer"
+        }
+      ],
+      "name": "button_7",
+      "_nested_name": "button_7"
+    },
+    {
+      "type": "button",
+      "value": "No page padding",
+      "_translations": {
+        "value": {}
+      },
+      "action_list": [
+        {
+          "trigger": "click",
+          "action_id": "go_to",
+          "args": [
+            "feat_app_layout_padding"
+          ],
+          "_raw": "click | go_to: feat_app_layout_padding",
+          "_cleaned": "click | go_to: feat_app_layout_padding"
+        }
+      ],
+      "name": "button_8",
+      "_nested_name": "button_8"
+    },
+    {
+      "type": "button",
+      "value": "Go home",
       "_translations": {
         "value": {}
       },
-      "name": "text_3",
-      "_nested_name": "text_3"
+      "action_list": [
+        {
+          "trigger": "click",
+          "action_id": "go_to",
+          "args": [
+            "home_screen"
+          ],
+          "_raw": "click | go_to: home_screen",
+          "_cleaned": "click | go_to: home_screen"
+        }
+      ],
+      "name": "button_9",
+      "_nested_name": "button_9"
     }
   ],
   "_xlsxPath": "feature_sheets/feature_app_layout.xlsx"
diff --git a/app_data/sheets/template/feat_app_layout_footer.json b/app_data/sheets/template/feat_app_layout_footer.json
deleted file mode 100644
index 29d5db3..0000000
--- a/app_data/sheets/template/feat_app_layout_footer.json
+++ /dev/null
@@ -1,74 +0,0 @@
-{
-  "flow_type": "template",
-  "flow_name": "feat_app_layout_footer",
-  "status": "released",
-  "parameter_list": {
-    "app_config": {
-      "APP_FOOTER_DEFAULTS": {
-        "templateName": "feat_custom_footer",
-        "background": "none"
-      }
-    }
-  },
-  "rows": [
-    {
-      "type": "title",
-      "value": "Template-level app config overrides",
-      "_translations": {
-        "value": {}
-      },
-      "name": "title_2",
-      "_nested_name": "title_2"
-    },
-    {
-      "type": "text",
-      "value": "footer template: feat_custom_footer",
-      "_translations": {
-        "value": {}
-      },
-      "name": "text_3",
-      "_nested_name": "text_3"
-    },
-    {
-      "type": "button",
-      "value": "Go to template with compact header and no footer",
-      "_translations": {
-        "value": {}
-      },
-      "action_list": [
-        {
-          "trigger": "click",
-          "action_id": "go_to",
-          "args": [
-            "feat_app_layout_header_compact"
-          ],
-          "_raw": "click | go_to: feat_app_layout_header_compact",
-          "_cleaned": "click | go_to: feat_app_layout_header_compact"
-        }
-      ],
-      "name": "button_4",
-      "_nested_name": "button_4"
-    },
-    {
-      "type": "button",
-      "value": "Go home",
-      "_translations": {
-        "value": {}
-      },
-      "action_list": [
-        {
-          "trigger": "click",
-          "action_id": "go_to",
-          "args": [
-            "home_screen"
-          ],
-          "_raw": "click | go_to: home_screen",
-          "_cleaned": "click | go_to: home_screen"
-        }
-      ],
-      "name": "button_5",
-      "_nested_name": "button_5"
-    }
-  ],
-  "_xlsxPath": "feature_sheets/feature_app_layout.xlsx"
-}
\ No newline at end of file
diff --git a/app_data/sheets/template/feat_app_layout_header_compact.json b/app_data/sheets/template/feat_app_layout_header_compact.json
index 1e567f5..37fc24d 100644
--- a/app_data/sheets/template/feat_app_layout_header_compact.json
+++ b/app_data/sheets/template/feat_app_layout_header_compact.json
@@ -15,7 +15,7 @@
   "rows": [
     {
       "type": "title",
-      "value": "Template-level app config overrides",
+      "value": "Template-level app config layout overrides",
       "_translations": {
         "value": {}
       },
@@ -23,17 +23,17 @@
       "_nested_name": "title_2"
     },
     {
-      "type": "text",
+      "type": "title",
       "value": "header variant: compact,\nfooter disabled",
       "_translations": {
         "value": {}
       },
-      "name": "text_3",
-      "_nested_name": "text_3"
+      "name": "title_3",
+      "_nested_name": "title_3"
     },
     {
       "type": "button",
-      "value": "Go to template with custom footer",
+      "value": "Compact header, no footer",
       "_translations": {
         "value": {}
       },
@@ -42,15 +42,95 @@
           "trigger": "click",
           "action_id": "go_to",
           "args": [
-            "feat_app_layout_footer"
+            "feat_app_layout_header_compact"
           ],
-          "_raw": "click | go_to: feat_app_layout_footer",
-          "_cleaned": "click | go_to: feat_app_layout_footer"
+          "_raw": "click | go_to: feat_app_layout_header_compact",
+          "_cleaned": "click | go_to: feat_app_layout_header_compact"
         }
       ],
       "name": "button_4",
       "_nested_name": "button_4"
     },
+    {
+      "type": "button",
+      "value": "Custom header, no back button",
+      "_translations": {
+        "value": {}
+      },
+      "action_list": [
+        {
+          "trigger": "click",
+          "action_id": "go_to",
+          "args": [
+            "feat_app_layout_custom_header"
+          ],
+          "_raw": "click | go_to: feat_app_layout_custom_header",
+          "_cleaned": "click | go_to: feat_app_layout_custom_header"
+        }
+      ],
+      "name": "button_5",
+      "_nested_name": "button_5"
+    },
+    {
+      "type": "button",
+      "value": "No header",
+      "_translations": {
+        "value": {}
+      },
+      "action_list": [
+        {
+          "trigger": "click",
+          "action_id": "go_to",
+          "args": [
+            "feat_app_layout_no_header"
+          ],
+          "_raw": "click | go_to: feat_app_layout_no_header",
+          "_cleaned": "click | go_to: feat_app_layout_no_header"
+        }
+      ],
+      "name": "button_6",
+      "_nested_name": "button_6"
+    },
+    {
+      "type": "button",
+      "value": "Custom footer",
+      "_translations": {
+        "value": {}
+      },
+      "action_list": [
+        {
+          "trigger": "click",
+          "action_id": "go_to",
+          "args": [
+            "feat_app_layout_custom_footer"
+          ],
+          "_raw": "click | go_to: feat_app_layout_custom_footer",
+          "_cleaned": "click | go_to: feat_app_layout_custom_footer"
+        }
+      ],
+      "name": "button_7",
+      "_nested_name": "button_7"
+    },
+    {
+      "type": "button",
+      "value": "No page padding",
+      "_translations": {
+        "value": {}
+      },
+      "action_list": [
+        {
+          "trigger": "click",
+          "action_id": "go_to",
+          "args": [
+            "feat_app_layout_padding"
+          ],
+          "_raw": "click | go_to: feat_app_layout_padding",
+          "_cleaned": "click | go_to: feat_app_layout_padding"
+        }
+      ],
+      "name": "button_8",
+      "_nested_name": "button_8"
+    },
     {
       "type": "button",
       "value": "Go home",
@@ -68,8 +148,8 @@
           "_cleaned": "click | go_to: home_screen"
         }
       ],
-      "name": "button_5",
-      "_nested_name": "button_5"
+      "name": "button_9",
+      "_nested_name": "button_9"
     }
   ],
   "_xlsxPath": "feature_sheets/feature_app_layout.xlsx"
diff --git a/app_data/sheets/template/feat_app_layout_no_header.json b/app_data/sheets/template/feat_app_layout_no_header.json
index b08f71d..5101587 100644
--- a/app_data/sheets/template/feat_app_layout_no_header.json
+++ b/app_data/sheets/template/feat_app_layout_no_header.json
@@ -4,13 +4,15 @@
   "status": "released",
   "parameter_list": {
     "app_config": {
-      "APP_HEADER_DEFAULTS": {}
+      "APP_HEADER_DEFAULTS": {
+        "show": false
+      }
     }
   },
   "rows": [
     {
       "type": "title",
-      "value": "Template-level app config overrides",
+      "value": "Template-level app config layout overrides",
       "_translations": {
         "value": {}
       },
@@ -18,13 +20,133 @@
       "_nested_name": "title_2"
     },
     {
-      "type": "text",
-      "value": "Do not show header",
+      "type": "title",
+      "value": "No header",
+      "_translations": {
+        "value": {}
+      },
+      "name": "title_3",
+      "_nested_name": "title_3"
+    },
+    {
+      "type": "button",
+      "value": "Compact header, no footer",
+      "_translations": {
+        "value": {}
+      },
+      "action_list": [
+        {
+          "trigger": "click",
+          "action_id": "go_to",
+          "args": [
+            "feat_app_layout_header_compact"
+          ],
+          "_raw": "click | go_to: feat_app_layout_header_compact",
+          "_cleaned": "click | go_to: feat_app_layout_header_compact"
+        }
+      ],
+      "name": "button_4",
+      "_nested_name": "button_4"
+    },
+    {
+      "type": "button",
+      "value": "Custom header, no back button",
+      "_translations": {
+        "value": {}
+      },
+      "action_list": [
+        {
+          "trigger": "click",
+          "action_id": "go_to",
+          "args": [
+            "feat_app_layout_custom_header"
+          ],
+          "_raw": "click | go_to: feat_app_layout_custom_header",
+          "_cleaned": "click | go_to: feat_app_layout_custom_header"
+        }
+      ],
+      "name": "button_5",
+      "_nested_name": "button_5"
+    },
+    {
+      "type": "button",
+      "value": "No header",
+      "_translations": {
+        "value": {}
+      },
+      "action_list": [
+        {
+          "trigger": "click",
+          "action_id": "go_to",
+          "args": [
+            "feat_app_layout_no_header"
+          ],
+          "_raw": "click | go_to: feat_app_layout_no_header",
+          "_cleaned": "click | go_to: feat_app_layout_no_header"
+        }
+      ],
+      "name": "button_6",
+      "_nested_name": "button_6"
+    },
+    {
+      "type": "button",
+      "value": "Custom footer",
+      "_translations": {
+        "value": {}
+      },
+      "action_list": [
+        {
+          "trigger": "click",
+          "action_id": "go_to",
+          "args": [
+            "feat_app_layout_custom_footer"
+          ],
+          "_raw": "click | go_to: feat_app_layout_custom_footer",
+          "_cleaned": "click | go_to: feat_app_layout_custom_footer"
+        }
+      ],
+      "name": "button_7",
+      "_nested_name": "button_7"
+    },
+    {
+      "type": "button",
+      "value": "No page padding",
+      "_translations": {
+        "value": {}
+      },
+      "action_list": [
+        {
+          "trigger": "click",
+          "action_id": "go_to",
+          "args": [
+            "feat_app_layout_padding"
+          ],
+          "_raw": "click | go_to: feat_app_layout_padding",
+          "_cleaned": "click | go_to: feat_app_layout_padding"
+        }
+      ],
+      "name": "button_8",
+      "_nested_name": "button_8"
+    },
+    {
+      "type": "button",
+      "value": "Go home",
       "_translations": {
         "value": {}
       },
-      "name": "text_3",
-      "_nested_name": "text_3"
+      "action_list": [
+        {
+          "trigger": "click",
+          "action_id": "go_to",
+          "args": [
+            "home_screen"
+          ],
+          "_raw": "click | go_to: home_screen",
+          "_cleaned": "click | go_to: home_screen"
+        }
+      ],
+      "name": "button_9",
+      "_nested_name": "button_9"
     }
   ],
   "_xlsxPath": "feature_sheets/feature_app_layout.xlsx"
diff --git a/app_data/sheets/template/feat_app_layout_padding.json b/app_data/sheets/template/feat_app_layout_padding.json
index 41e0ebf..be5ff62 100644
--- a/app_data/sheets/template/feat_app_layout_padding.json
+++ b/app_data/sheets/template/feat_app_layout_padding.json
@@ -12,7 +12,7 @@
   "rows": [
     {
       "type": "title",
-      "value": "No padding",
+      "value": "Template-level app config layout overrides",
       "_translations": {
         "value": {}
       },
@@ -20,13 +20,133 @@
       "_nested_name": "title_2"
     },
     {
-      "type": "text",
-      "value": "This template has set the padding around the main app content to 0.",
+      "type": "title",
+      "value": "Page padding: 0",
+      "_translations": {
+        "value": {}
+      },
+      "name": "title_3",
+      "_nested_name": "title_3"
+    },
+    {
+      "type": "button",
+      "value": "Compact header, no footer",
+      "_translations": {
+        "value": {}
+      },
+      "action_list": [
+        {
+          "trigger": "click",
+          "action_id": "go_to",
+          "args": [
+            "feat_app_layout_header_compact"
+          ],
+          "_raw": "click | go_to: feat_app_layout_header_compact",
+          "_cleaned": "click | go_to: feat_app_layout_header_compact"
+        }
+      ],
+      "name": "button_4",
+      "_nested_name": "button_4"
+    },
+    {
+      "type": "button",
+      "value": "Custom header, no back button",
+      "_translations": {
+        "value": {}
+      },
+      "action_list": [
+        {
+          "trigger": "click",
+          "action_id": "go_to",
+          "args": [
+            "feat_app_layout_custom_header"
+          ],
+          "_raw": "click | go_to: feat_app_layout_custom_header",
+          "_cleaned": "click | go_to: feat_app_layout_custom_header"
+        }
+      ],
+      "name": "button_5",
+      "_nested_name": "button_5"
+    },
+    {
+      "type": "button",
+      "value": "No header",
+      "_translations": {
+        "value": {}
+      },
+      "action_list": [
+        {
+          "trigger": "click",
+          "action_id": "go_to",
+          "args": [
+            "feat_app_layout_no_header"
+          ],
+          "_raw": "click | go_to: feat_app_layout_no_header",
+          "_cleaned": "click | go_to: feat_app_layout_no_header"
+        }
+      ],
+      "name": "button_6",
+      "_nested_name": "button_6"
+    },
+    {
+      "type": "button",
+      "value": "Custom footer",
+      "_translations": {
+        "value": {}
+      },
+      "action_list": [
+        {
+          "trigger": "click",
+          "action_id": "go_to",
+          "args": [
+            "feat_app_layout_custom_footer"
+          ],
+          "_raw": "click | go_to: feat_app_layout_custom_footer",
+          "_cleaned": "click | go_to: feat_app_layout_custom_footer"
+        }
+      ],
+      "name": "button_7",
+      "_nested_name": "button_7"
+    },
+    {
+      "type": "button",
+      "value": "No page padding",
+      "_translations": {
+        "value": {}
+      },
+      "action_list": [
+        {
+          "trigger": "click",
+          "action_id": "go_to",
+          "args": [
+            "feat_app_layout_padding"
+          ],
+          "_raw": "click | go_to: feat_app_layout_padding",
+          "_cleaned": "click | go_to: feat_app_layout_padding"
+        }
+      ],
+      "name": "button_8",
+      "_nested_name": "button_8"
+    },
+    {
+      "type": "button",
+      "value": "Go home",
       "_translations": {
         "value": {}
       },
-      "name": "text_3",
-      "_nested_name": "text_3"
+      "action_list": [
+        {
+          "trigger": "click",
+          "action_id": "go_to",
+          "args": [
+            "home_screen"
+          ],
+          "_raw": "click | go_to: home_screen",
+          "_cleaned": "click | go_to: home_screen"
+        }
+      ],
+      "name": "button_9",
+      "_nested_name": "button_9"
     }
   ],
   "_xlsxPath": "feature_sheets/feature_app_layout.xlsx"
diff --git a/config.ts b/config.ts
index 00ea91e..d1a24da 100644
--- a/config.ts
+++ b/config.ts
@@ -14,7 +14,7 @@ config.web.favicon_asset = "images/icons/favicon.svg";
 
 config.git = {
   content_repo: "https://github.com/IDEMSInternational/app-debug-content.git",
-  content_tag_latest: "1.3.9",
+  content_tag_latest: "1.3.10",
 };
 
 config.app_config.ASSET_PACKS = {
diff --git a/reports/summary.json b/reports/summary.json
index 8c8ad1e..31d8948 100644
--- a/reports/summary.json
+++ b/reports/summary.json
@@ -31,7 +31,7 @@
       },
       {
         "type": "button",
-        "count": 306
+        "count": 335
       },
       {
         "type": "calendar",
@@ -47,7 +47,7 @@
       },
       {
         "type": "combo_box",
-        "count": 48
+        "count": 47
       },
       {
         "type": "dashed_box",
@@ -55,7 +55,7 @@
       },
       {
         "type": "data_items",
-        "count": 42
+        "count": 43
       },
       {
         "type": "debug_toggle",
@@ -67,11 +67,11 @@
       },
       {
         "type": "display_grid",
-        "count": 3
+        "count": 4
       },
       {
         "type": "display_group",
-        "count": 193
+        "count": 190
       },
       {
         "type": "drawer",
@@ -91,7 +91,7 @@
       },
       {
         "type": "items",
-        "count": 50
+        "count": 49
       },
       {
         "type": "latex",
@@ -219,7 +219,7 @@
       },
       {
         "type": "subtitle",
-        "count": 62
+        "count": 60
       },
       {
         "type": "task_card",
@@ -235,7 +235,7 @@
       },
       {
         "type": "text",
-        "count": 952
+        "count": 944
       },
       {
         "type": "text_area",
@@ -243,7 +243,7 @@
       },
       {
         "type": "text_box",
-        "count": 52
+        "count": 50
       },
       {
         "type": "text_bubble",
@@ -259,7 +259,7 @@
       },
       {
         "type": "title",
-        "count": 453
+        "count": 461
       },
       {
         "type": "toggle_bar",
@@ -323,7 +323,7 @@
       },
       {
         "type": "emit: force_reprocess",
-        "count": 28
+        "count": 26
       },
       {
         "type": "emit: force_restart",
@@ -359,7 +359,7 @@
       },
       {
         "type": "go_to",
-        "count": 75
+        "count": 101
       },
       {
         "type": "go_to_url",
@@ -383,7 +383,7 @@
       },
       {
         "type": "pop_up",
-        "count": 39
+        "count": 40
       },
       {
         "type": "process_template",
@@ -427,7 +427,7 @@
       },
       {
         "type": "set_local",
-        "count": 34
+        "count": 35
       },
       {
         "type": "share",
@@ -528,7 +528,7 @@
   "assets_missing": {
     "data": [
       {
-        "path": "click | pop_up: my_template | variant: plh_completion, background_image: confetti.svg",
+        "path": "click | pop_up: example_text | variant: plh_completion, background_image: confetti.svg",
         "count": 2,
         "missing": true
       },
@@ -953,7 +953,7 @@
       {
         "type": "data_list",
         "subtype": "component_demo",
-        "total": 8
+        "total": 7
       },
       {
         "type": "data_list",
diff --git a/reports/summary.md b/reports/summary.md
index 2c4029b..69ad687 100644
--- a/reports/summary.md
+++ b/reports/summary.md
@@ -10,22 +10,22 @@
 | animated_section | 9 |
 | animated_slides | 1 |
 | audio | 13 |
-| button | 306 |
+| button | 335 |
 | calendar | 1 |
 | carousel | 9 |
 | colour_palette | 1 |
-| combo_box | 48 |
+| combo_box | 47 |
 | dashed_box | 19 |
-| data_items | 42 |
+| data_items | 43 |
 | debug_toggle | 1 |
 | demo_basic | 3 |
-| display_grid | 3 |
-| display_group | 193 |
+| display_grid | 4 |
+| display_group | 190 |
 | drawer | 1 |
 | form | 9 |
 | html | 4 |
 | image | 76 |
-| items | 50 |
+| items | 49 |
 | latex | 1 |
 | lottie_animation | 6 |
 | map | 2 |
@@ -57,17 +57,17 @@
 | simple_checkbox | 41 |
 | slider | 32 |
 | square_button | 8 |
-| subtitle | 62 |
+| subtitle | 60 |
 | task_card | 25 |
 | task_progress_bar | 6 |
 | template | 130 |
-| text | 952 |
+| text | 944 |
 | text_area | 13 |
-| text_box | 52 |
+| text_box | 50 |
 | text_bubble | 10 |
 | tile_component | 57 |
 | timer | 21 |
-| title | 453 |
+| title | 461 |
 | toggle_bar | 50 |
 | update_action_list | 2 |
 | video | 4 |
@@ -89,7 +89,7 @@
 | emit: @local.child_local_variable | 1 |
 | emit: completed | 34 |
 | emit: force_reload | 29 |
-| emit: force_reprocess | 28 |
+| emit: force_reprocess | 26 |
 | emit: force_restart | 2 |
 | emit: server_sync | 7 |
 | emit: set_language | 4 |
@@ -98,13 +98,13 @@
 | emit: translator_mode_toggle | 1 |
 | emit: uncompleted | 18 |
 | feedback | 13 |
-| go_to | 75 |
+| go_to | 101 |
 | go_to_url | 5 |
 | invalid_action | 1 |
 | nav | 5 |
 | nav_stack | 10 |
 | open_external | 2 |
-| pop_up | 39 |
+| pop_up | 40 |
 | process_template | 2 |
 | remove_item | 1 |
 | reset_app | 1 |
@@ -115,7 +115,7 @@
 | set_field | 112 |
 | set_item | 24 |
 | set_items | 2 |
-| set_local | 34 |
+| set_local | 35 |
 | share | 6 |
 | start_tour | 2 |
 | task | 2 |
@@ -162,7 +162,7 @@ Assets that have references within sheets but do not appear in app-data
 
 | path | count |
 | --- | --- |
-| click | pop_up: my_template | variant: plh_completion, background_image: confetti.svg | 2 |
+| click | pop_up: example_text | variant: plh_completion, background_image: confetti.svg | 2 |
 | confetti.svg | 1 |
 | debug_asset_pack_1/image_2.png | 1 |
 | https://www.w3schools.com/html/mov_bbb.mp4 | 1 |
@@ -261,7 +261,7 @@ Assets that are used within sheets and also can be found in the synced asset dat
 | data_list |  | 33 |
 | data_list | campaign_rows_debug | 6 |
 | data_list | campaign_schedule | 1 |
-| data_list | component_demo | 8 |
+| data_list | component_demo | 7 |
 | data_list | debug | 18 |
 | data_list | debug_lifecycle_actions | 1 |
 | data_list | example_generator | 3 |