diff --git a/examples/3hellolayout/controllers/main.cfc b/examples/3hellolayout/controllers/main.cfc
deleted file mode 100644
index 24b9914c..00000000
--- a/examples/3hellolayout/controllers/main.cfc
+++ /dev/null
@@ -1,5 +0,0 @@
-component {
-    function default( struct rc ) {
-        param name="rc.name" default="anonymous";
-    }
-}
diff --git a/examples/3hellolayout/views/main/default.cfm b/examples/3hellolayout/views/main/default.cfm
index f9031d49..f1b28a0a 100644
--- a/examples/3hellolayout/views/main/default.cfm
+++ b/examples/3hellolayout/views/main/default.cfm
@@ -1 +1,4 @@
-<cfoutput>Hello #rc.name#!</cfoutput>
+<cfoutput>
+  <p>Hello FW1!</p>
+  <p><a href="#buildURL('main.other')#">Go away</a>!</p>
+</cfoutput>
diff --git a/examples/4hellocontroller/layouts/default.cfm b/examples/4hellocontroller/layouts/default.cfm
new file mode 100644
index 00000000..a3515ab9
--- /dev/null
+++ b/examples/4hellocontroller/layouts/default.cfm
@@ -0,0 +1,5 @@
+<cfoutput>
+  <div style="border: solid green 2px; padding: 20px;">
+    #body#
+  </div>
+</cfoutput>
diff --git a/examples/4hellocontroller/layouts/main.cfm b/examples/4hellocontroller/layouts/main.cfm
new file mode 100644
index 00000000..fb060454
--- /dev/null
+++ b/examples/4hellocontroller/layouts/main.cfm
@@ -0,0 +1 @@
+<cfoutput><div style="border: solid blue 1px;">#body#</div></cfoutput>
diff --git a/examples/4hellocontroller/layouts/main/default.cfm b/examples/4hellocontroller/layouts/main/default.cfm
new file mode 100644
index 00000000..f709c210
--- /dev/null
+++ b/examples/4hellocontroller/layouts/main/default.cfm
@@ -0,0 +1,2 @@
+<h1>Welcome to FW/1!</h1>
+<cfoutput>#body#</cfoutput>
diff --git a/examples/4hellocontroller/views/main/default.cfm b/examples/4hellocontroller/views/main/default.cfm
index f9031d49..0a8704d9 100644
--- a/examples/4hellocontroller/views/main/default.cfm
+++ b/examples/4hellocontroller/views/main/default.cfm
@@ -1 +1,4 @@
-<cfoutput>Hello #rc.name#!</cfoutput>
+<cfoutput>
+  <p>Hello #rc.name#!</p>
+  <p><a href="#buildURL('main.other&name=#rc.name#')#">Go away</a>!</p>
+</cfoutput>
diff --git a/examples/4hellocontroller/views/main/other.cfm b/examples/4hellocontroller/views/main/other.cfm
index d6f48eca..99010b3e 100644
--- a/examples/4hellocontroller/views/main/other.cfm
+++ b/examples/4hellocontroller/views/main/other.cfm
@@ -1,4 +1,4 @@
 <cfoutput>
-  <p>Goodbye FW/1!</p>
-  <p><a href="#buildURL('main')#">Come back</a>!</p>
+  <p>Goodbye #rc.name#!</p>
+  <p><a href="#buildURL( action = 'main', queryString = 'name=#rc.name#' )#">Come back</a>!</p>
 </cfoutput>
diff --git a/examples/5helloservice/views/main/default.cfm b/examples/5helloservice/views/main/default.cfm
index f9031d49..0a8704d9 100644
--- a/examples/5helloservice/views/main/default.cfm
+++ b/examples/5helloservice/views/main/default.cfm
@@ -1 +1,4 @@
-<cfoutput>Hello #rc.name#!</cfoutput>
+<cfoutput>
+  <p>Hello #rc.name#!</p>
+  <p><a href="#buildURL('main.other&name=#rc.name#')#">Go away</a>!</p>
+</cfoutput>
diff --git a/examples/5helloservice/views/main/other.cfm b/examples/5helloservice/views/main/other.cfm
index d6f48eca..99010b3e 100644
--- a/examples/5helloservice/views/main/other.cfm
+++ b/examples/5helloservice/views/main/other.cfm
@@ -1,4 +1,4 @@
 <cfoutput>
-  <p>Goodbye FW/1!</p>
-  <p><a href="#buildURL('main')#">Come back</a>!</p>
+  <p>Goodbye #rc.name#!</p>
+  <p><a href="#buildURL( action = 'main', queryString = 'name=#rc.name#' )#">Come back</a>!</p>
 </cfoutput>