diff --git a/apps/example2-spring-boot/src/main/resources/templates/changePassword.html b/apps/example2-spring-boot/src/main/resources/templates/changePassword.html
index cd95680af..060298b74 100644
--- a/apps/example2-spring-boot/src/main/resources/templates/changePassword.html
+++ b/apps/example2-spring-boot/src/main/resources/templates/changePassword.html
@@ -1,12 +1,17 @@
 <!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
+<html xmlns:th="http://www.thymeleaf.org"
+      xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
+      layout:decorate="~{layout/base}">
 <head>
-    <title th:text="#{change.title}">Password Expired</title>
+    <title th:text="#{change.title}">Password Has Expired</title>
 </head>
 <body>
-    <h1 th:text="#{change.title}">Password Has Expired</h1>
-    <p th:text="#{change.message}">Your password has expired.</p>
-    <p th:text="${username}">username</p>
-    <a th:href="@{/editLogon}" th:text="#{change.try}">Try Again</a>
+    <div layout:fragment="menu">
+        <div th:replace="~{fragments/loggedoff-menu :: menu}"></div>
+    </div>
+    <div layout:fragment="content">
+        <p th:text="#{change.message}">Your password has expired. Please ask the system administrator to change it.</p>
+        <a th:href="@{/editLogon}" th:text="#{change.try}">Try Again</a>
+    </div>
 </body>
 </html>
diff --git a/apps/example2-spring-boot/src/main/resources/templates/fragments/footer.html b/apps/example2-spring-boot/src/main/resources/templates/fragments/footer.html
new file mode 100644
index 000000000..03a57f989
--- /dev/null
+++ b/apps/example2-spring-boot/src/main/resources/templates/fragments/footer.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<body>
+    <div th:fragment="footer">
+        <span th:text="#{footer.value}">Copyright (C) 1999-2004, The Apache Software Foundation</span>
+    </div>
+</body>
+</html>
diff --git a/apps/example2-spring-boot/src/main/resources/templates/fragments/header.html b/apps/example2-spring-boot/src/main/resources/templates/fragments/header.html
new file mode 100644
index 000000000..dfd463c48
--- /dev/null
+++ b/apps/example2-spring-boot/src/main/resources/templates/fragments/header.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<body>
+    <div th:fragment="header">
+        <span th:text="#{header.value}">Struts + Faces + Tiles</span>
+    </div>
+</body>
+</html>
diff --git a/apps/example2-spring-boot/src/main/resources/templates/fragments/loggedoff-menu.html b/apps/example2-spring-boot/src/main/resources/templates/fragments/loggedoff-menu.html
new file mode 100644
index 000000000..20b5f2820
--- /dev/null
+++ b/apps/example2-spring-boot/src/main/resources/templates/fragments/loggedoff-menu.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<body>
+    <div th:fragment="menu">
+        <a th:href="@{/editRegistration(action='Create')}" th:text="#{loggedoff.register}">Register</a>
+        <br />
+        <a th:href="@{/editLogon}" th:text="#{loggedoff.logon}">Log On</a>
+    </div>
+</body>
+</html>
diff --git a/apps/example2-spring-boot/src/main/resources/templates/fragments/loggedon-menu.html b/apps/example2-spring-boot/src/main/resources/templates/fragments/loggedon-menu.html
new file mode 100644
index 000000000..242c1cb58
--- /dev/null
+++ b/apps/example2-spring-boot/src/main/resources/templates/fragments/loggedon-menu.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<body>
+    <div th:fragment="menu">
+        <a th:href="@{/editRegistration(action='Edit')}" th:text="#{mainMenu.registration}">Edit Registration</a>
+        <br />
+        <a th:href="@{/logoff}" th:text="#{loggedon.logoff}">Log Off</a>
+    </div>
+</body>
+</html>
diff --git a/apps/example2-spring-boot/src/main/resources/templates/layout/base.html b/apps/example2-spring-boot/src/main/resources/templates/layout/base.html
new file mode 100644
index 000000000..7051a820d
--- /dev/null
+++ b/apps/example2-spring-boot/src/main/resources/templates/layout/base.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org"
+      xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout">
+<head>
+    <title layout:title-pattern="$CONTENT_TITLE - $LAYOUT_TITLE" th:text="#{layout.title}">Struts+Tiles+Faces Example Application</title>
+    <link th:href="@{/css/stylesheet.css}" rel="stylesheet" />
+</head>
+<body>
+    <table border="1" width="100%" cellspacing="5">
+        <tr>
+            <th colspan="2" align="center">
+                <div th:replace="~{fragments/header :: header}"></div>
+            </th>
+        </tr>
+        <tr>
+            <td width="140" valign="top">
+                <div layout:fragment="menu"></div>
+            </td>
+            <td align="left" valign="top">
+                <div layout:fragment="content"></div>
+            </td>
+        </tr>
+        <tr>
+            <td colspan="2" align="center">
+                <div th:replace="~{fragments/footer :: footer}"></div>
+            </td>
+        </tr>
+    </table>
+</body>
+</html>
diff --git a/apps/example2-spring-boot/src/main/resources/templates/logon.html b/apps/example2-spring-boot/src/main/resources/templates/logon.html
index a19ee29f9..b76fb3a5e 100644
--- a/apps/example2-spring-boot/src/main/resources/templates/logon.html
+++ b/apps/example2-spring-boot/src/main/resources/templates/logon.html
@@ -1,25 +1,52 @@
 <!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
+<html xmlns:th="http://www.thymeleaf.org"
+      xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
+      layout:decorate="~{layout/base}">
 <head>
     <title th:text="#{logon.title}">Logon</title>
 </head>
 <body>
-    <h1 th:text="#{logon.header}">Logon Form</h1>
-    <div th:if="${#fields.hasGlobalErrors()}" th:each="err : ${#fields.globalErrors()}">
-        <span th:text="${err}" class="error">Error</span>
+    <div layout:fragment="menu">
+        <div th:replace="~{fragments/loggedoff-menu :: menu}"></div>
+    </div>
+    <div layout:fragment="content">
+        <form th:action="@{/logon}" th:object="${logonForm}" method="post">
+            <table class="form-background">
+                <tr>
+                    <th colspan="2" class="form-header" th:text="#{logon.header}">Logon Form</th>
+                </tr>
+                <tr>
+                    <td class="form-prompt"><label for="username" th:text="#{prompt.username}">Username</label></td>
+                    <td class="form-field">
+                        <input type="text" th:field="*{username}" id="username" size="16" />
+                        <span th:if="${#fields.hasErrors('username')}" th:errors="*{username}" class="error"></span>
+                    </td>
+                </tr>
+                <tr>
+                    <td class="form-prompt"><label for="password" th:text="#{prompt.password}">Password</label></td>
+                    <td class="form-field">
+                        <input type="password" th:field="*{password}" id="password" size="16" />
+                        <span th:if="${#fields.hasErrors('password')}" th:errors="*{password}" class="error"></span>
+                    </td>
+                </tr>
+                <tr th:if="${#fields.hasGlobalErrors()}">
+                    <td colspan="2" class="form-field">
+                        <span th:each="err : ${#fields.globalErrors()}" th:text="${err}" class="error"></span>
+                    </td>
+                </tr>
+                <tr>
+                    <td class="form-field">
+                        <button type="submit" class="command-single">Log On</button>
+                    </td>
+                    <td class="form-field">
+                        <button type="reset" class="command-single">Reset</button>
+                    </td>
+                </tr>
+                <tr>
+                    <td colspan="2" class="form-footer" th:text="#{logon.footer}">Enter your username and password</td>
+                </tr>
+            </table>
+        </form>
     </div>
-    <form th:action="@{/logon}" th:object="${logonForm}" method="post">
-        <div>
-            <label th:text="#{prompt.username}">Username</label>
-            <input type="text" th:field="*{username}" />
-            <span th:if="${#fields.hasErrors('username')}" th:errors="*{username}" class="error">Username Error</span>
-        </div>
-        <div>
-            <label th:text="#{prompt.password}">Password</label>
-            <input type="password" th:field="*{password}" />
-            <span th:if="${#fields.hasErrors('password')}" th:errors="*{password}" class="error">Password Error</span>
-        </div>
-        <button type="submit" th:text="#{button.save}">Log On</button>
-    </form>
 </body>
 </html>
diff --git a/apps/example2-spring-boot/src/main/resources/templates/mainMenu.html b/apps/example2-spring-boot/src/main/resources/templates/mainMenu.html
index 2731360ed..15e425257 100644
--- a/apps/example2-spring-boot/src/main/resources/templates/mainMenu.html
+++ b/apps/example2-spring-boot/src/main/resources/templates/mainMenu.html
@@ -1,13 +1,23 @@
 <!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
+<html xmlns:th="http://www.thymeleaf.org"
+      xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
+      layout:decorate="~{layout/base}">
 <head>
     <title th:text="#{mainMenu.title}">Main Menu</title>
 </head>
 <body>
-    <h1 th:text="#{mainMenu.heading}">Main Menu Options</h1>
-    <ul>
-        <li><a th:href="@{/editRegistration?action=Edit}" th:text="#{mainMenu.registration}">Edit Registration</a></li>
-        <li><a th:href="@{/logoff}" th:text="#{mainMenu.logoff}">Log Off</a></li>
-    </ul>
+    <div layout:fragment="menu">
+        <div th:replace="~{fragments/loggedon-menu :: menu}"></div>
+    </div>
+    <div layout:fragment="content">
+        <h3>
+            <span th:text="#{mainMenu.heading}">Main Menu Options for </span>
+            <span th:text="${session.user.username}">username</span>
+        </h3>
+        <ul>
+            <li><a th:href="@{/editRegistration(action='Edit')}" th:text="#{mainMenu.registration}">Edit your user registration profile</a></li>
+            <li><a th:href="@{/logoff}" th:text="#{mainMenu.logoff}">Log off MailReader Demonstration Application</a></li>
+        </ul>
+    </div>
 </body>
 </html>
diff --git a/apps/example2-spring-boot/src/main/resources/templates/registration.html b/apps/example2-spring-boot/src/main/resources/templates/registration.html
index b64a05fc7..a73fb48ec 100644
--- a/apps/example2-spring-boot/src/main/resources/templates/registration.html
+++ b/apps/example2-spring-boot/src/main/resources/templates/registration.html
@@ -1,46 +1,121 @@
 <!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
+<html xmlns:th="http://www.thymeleaf.org"
+      xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
+      layout:decorate="~{layout/base}">
 <head>
-    <title>Registration</title>
+    <title th:if="${registrationForm.action == 'Create'}" th:text="#{registration.title.create}">Register</title>
+    <title th:if="${registrationForm.action == 'Edit'}" th:text="#{registration.title.edit}">Edit Registration</title>
 </head>
 <body>
-    <h1>Registration</h1>
-    <form th:action="@{/saveRegistration}" th:object="${registrationForm}" method="post">
-        <input type="hidden" th:field="*{action}" />
-        <div>
-            <label th:text="#{prompt.username}">Username</label>
-            <input type="text" th:field="*{username}" />
-            <span th:if="${#fields.hasErrors('username')}" th:errors="*{username}"></span>
+    <div layout:fragment="menu">
+        <th:block th:if="${session.user != null}">
+            <div th:replace="~{fragments/loggedon-menu :: menu}"></div>
+        </th:block>
+        <th:block th:if="${session.user == null}">
+            <div th:replace="~{fragments/loggedoff-menu :: menu}"></div>
+        </th:block>
+    </div>
+    <div layout:fragment="content">
+        <form th:action="@{/saveRegistration}" th:object="${registrationForm}" method="post">
+            <input type="hidden" th:field="*{action}" />
+            <table class="form-background">
+                <tr>
+                    <th colspan="2" class="form-header">
+                        <span th:if="${registrationForm.action == 'Create'}" th:text="#{registration.header.create}">Enter Registration Information</span>
+                        <span th:if="${registrationForm.action == 'Edit'}" th:text="#{registration.header.edit}">Edit Your Registration Information</span>
+                    </th>
+                </tr>
+                <tr>
+                    <td class="form-prompt"><label for="username" th:text="#{prompt.username}">Username</label></td>
+                    <td class="form-field">
+                        <span th:if="${registrationForm.action == 'Create'}">
+                            <input type="text" th:field="*{username}" id="username" size="16" />
+                        </span>
+                        <span th:if="${registrationForm.action == 'Edit'}">
+                            <span th:text="*{username}">username</span>
+                            <input type="hidden" th:field="*{username}" />
+                        </span>
+                        <span th:if="${#fields.hasErrors('username')}" th:errors="*{username}" class="error"></span>
+                    </td>
+                </tr>
+                <tr>
+                    <td class="form-prompt"><label for="password" th:text="#{prompt.password}">Password</label></td>
+                    <td class="form-field">
+                        <input type="text" th:field="*{password}" id="password" size="16" />
+                        <span th:if="${#fields.hasErrors('password')}" th:errors="*{password}" class="error"></span>
+                    </td>
+                </tr>
+                <tr>
+                    <td class="form-prompt"><label for="password2" th:text="#{prompt.password2}">(Repeat) Password</label></td>
+                    <td class="form-field">
+                        <input type="text" th:field="*{password2}" id="password2" size="16" />
+                        <span th:if="${#fields.hasErrors('password2')}" th:errors="*{password2}" class="error"></span>
+                    </td>
+                </tr>
+                <tr>
+                    <td class="form-prompt"><label for="fullName" th:text="#{prompt.fullName}">Full Name</label></td>
+                    <td class="form-field">
+                        <input type="text" th:field="*{fullName}" id="fullName" size="50" />
+                        <span th:if="${#fields.hasErrors('fullName')}" th:errors="*{fullName}" class="error"></span>
+                    </td>
+                </tr>
+                <tr>
+                    <td class="form-prompt"><label for="fromAddress" th:text="#{prompt.fromAddress}">From Address</label></td>
+                    <td class="form-field">
+                        <input type="text" th:field="*{fromAddress}" id="fromAddress" size="50" />
+                        <span th:if="${#fields.hasErrors('fromAddress')}" th:errors="*{fromAddress}" class="error"></span>
+                    </td>
+                </tr>
+                <tr>
+                    <td class="form-prompt"><label for="replyToAddress" th:text="#{prompt.replyToAddress}">Reply To Address</label></td>
+                    <td class="form-field">
+                        <input type="text" th:field="*{replyToAddress}" id="replyToAddress" size="50" />
+                        <span th:if="${#fields.hasErrors('replyToAddress')}" th:errors="*{replyToAddress}" class="error"></span>
+                    </td>
+                </tr>
+                <tr th:if="${#fields.hasGlobalErrors()}">
+                    <td colspan="2" class="form-field">
+                        <span th:each="err : ${#fields.globalErrors()}" th:text="${err}" class="error"></span>
+                    </td>
+                </tr>
+                <tr>
+                    <td class="form-field">
+                        <button type="submit" class="command-single" th:text="#{button.save}">Save</button>
+                    </td>
+                    <td class="form-field">
+                        <button type="reset" class="command-multiple" th:text="#{button.reset}">Reset</button>
+                        <a th:href="@{/mainMenu}" class="command-multiple" th:text="#{button.cancel}">Cancel</a>
+                    </td>
+                </tr>
+            </table>
+        </form>
+
+        <div th:if="${registrationForm.action == 'Edit' and session.user != null}">
+            <h3 th:text="#{heading.subscriptions}">Current Subscriptions</h3>
+            <table class="list-background">
+                <tr class="list-header">
+                    <th th:text="#{heading.host}">Host Name</th>
+                    <th th:text="#{heading.user}">User Name</th>
+                    <th th:text="#{heading.type}">Server Type</th>
+                    <th th:text="#{heading.autoConnect}">Auto</th>
+                    <th th:text="#{heading.action}">Action</th>
+                </tr>
+                <tr th:each="subscription, iterStat : ${session.user.subscriptions}"
+                    th:class="${iterStat.odd ? 'list-row-odd' : 'list-row-even'}">
+                    <td class="list-column-host" th:text="${subscription.host}">host</td>
+                    <td class="list-column-user" th:text="${subscription.username}">username</td>
+                    <td class="list-column-type" th:text="${subscription.type}">type</td>
+                    <td class="list-column-auto" th:text="${subscription.autoConnect}">false</td>
+                    <td class="list-column-action">
+                        <a th:href="@{/editSubscription(action='Delete',host=${subscription.host})}"
+                           class="command-multiple" th:text="#{registration.deleteSubscription}">Delete</a>
+                        <a th:href="@{/editSubscription(action='Edit',host=${subscription.host})}"
+                           class="command-multiple" th:text="#{registration.editSubscription}">Edit</a>
+                    </td>
+                </tr>
+            </table>
+            <a th:href="@{/editSubscription(action='Create')}" th:text="#{registration.addSubscription}">Add</a>
         </div>
-        <div>
-            <label th:text="#{prompt.fullName}">Full Name</label>
-            <input type="text" th:field="*{fullName}" />
-            <span th:if="${#fields.hasErrors('fullName')}" th:errors="*{fullName}"></span>
-        </div>
-        <div>
-            <label th:text="#{prompt.fromAddress}">From Address</label>
-            <input type="text" th:field="*{fromAddress}" />
-            <span th:if="${#fields.hasErrors('fromAddress')}" th:errors="*{fromAddress}"></span>
-        </div>
-        <div>
-            <label th:text="#{prompt.replyToAddress}">Reply To Address</label>
-            <input type="text" th:field="*{replyToAddress}" />
-            <span th:if="${#fields.hasErrors('replyToAddress')}" th:errors="*{replyToAddress}"></span>
-        </div>
-        <div>
-            <label th:text="#{prompt.password}">Password</label>
-            <input type="password" th:field="*{password}" />
-            <span th:if="${#fields.hasErrors('password')}" th:errors="*{password}"></span>
-        </div>
-        <div>
-            <label th:text="#{prompt.password2}">(Repeat) Password</label>
-            <input type="password" th:field="*{password2}" />
-            <span th:if="${#fields.hasErrors('password2')}" th:errors="*{password2}"></span>
-        </div>
-        <div>
-            <button type="submit" th:text="#{button.save}">Save</button>
-            <button type="reset" th:text="#{button.reset}">Reset</button>
-        </div>
-    </form>
+    </div>
 </body>
 </html>
diff --git a/apps/example2-spring-boot/src/main/resources/templates/subscription.html b/apps/example2-spring-boot/src/main/resources/templates/subscription.html
index 1b8bc8379..817518c3f 100644
--- a/apps/example2-spring-boot/src/main/resources/templates/subscription.html
+++ b/apps/example2-spring-boot/src/main/resources/templates/subscription.html
@@ -1,40 +1,90 @@
 <!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
+<html xmlns:th="http://www.thymeleaf.org"
+      xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
+      layout:decorate="~{layout/base}">
 <head>
-    <title>Subscription</title>
+    <title th:if="${subscriptionForm.action == 'Create'}" th:text="#{subscription.title.create}">Create Subscription</title>
+    <title th:if="${subscriptionForm.action == 'Delete'}" th:text="#{subscription.title.delete}">Delete Subscription</title>
+    <title th:if="${subscriptionForm.action == 'Edit'}" th:text="#{subscription.title.edit}">Edit Subscription</title>
 </head>
 <body>
-    <h1>Subscription</h1>
-    <form th:action="@{/saveSubscription}" th:object="${subscriptionForm}" method="post">
-        <input type="hidden" th:field="*{action}" />
-        <div>
-            <label>Host:</label>
-            <input type="text" th:field="*{host}" />
-            <span th:if="${#fields.hasErrors('host')}" th:errors="*{host}"></span>
-        </div>
-        <div>
-            <label>Username:</label>
-            <input type="text" th:field="*{username}" />
-            <span th:if="${#fields.hasErrors('username')}" th:errors="*{username}"></span>
-        </div>
-        <div>
-            <label>Password:</label>
-            <input type="password" th:field="*{password}" />
-        </div>
-        <div>
-            <label>Type:</label>
-            <select th:field="*{type}">
-                <option th:each="serverType : ${serverTypes}"
-                        th:value="${serverType.value}"
-                        th:text="${serverType.label}"></option>
-            </select>
-            <span th:if="${#fields.hasErrors('type')}" th:errors="*{type}"></span>
-        </div>
-        <div>
-            <label>Auto-Connect:</label>
-            <input type="checkbox" th:field="*{autoConnect}" />
-        </div>
-        <button type="submit">Save</button>
-    </form>
+    <div layout:fragment="menu">
+        <div th:replace="~{fragments/loggedon-menu :: menu}"></div>
+    </div>
+    <div layout:fragment="content">
+        <form th:action="@{/saveSubscription}" th:object="${subscriptionForm}" method="post">
+            <input type="hidden" th:field="*{action}" />
+            <table class="form-background">
+                <tr>
+                    <th colspan="2" class="form-header">
+                        <span th:if="${subscriptionForm.action == 'Create'}" th:text="#{subscription.title.create}">Create New Mail Subscription</span>
+                        <span th:if="${subscriptionForm.action == 'Delete'}" th:text="#{subscription.title.delete}">Delete Existing Mail Subscription</span>
+                        <span th:if="${subscriptionForm.action == 'Edit'}" th:text="#{subscription.title.edit}">Edit Existing Mail Subscription</span>
+                    </th>
+                </tr>
+                <tr>
+                    <td class="form-prompt"><label th:text="#{prompt.username}">Username</label></td>
+                    <td class="form-field" th:text="${session.user.username}">user</td>
+                </tr>
+                <tr>
+                    <td class="form-prompt"><label for="host" th:text="#{prompt.mailHostname}">Mail Server</label></td>
+                    <td class="form-field">
+                        <span th:if="${subscriptionForm.action == 'Create'}">
+                            <input type="text" th:field="*{host}" id="host" size="50" />
+                        </span>
+                        <span th:if="${subscriptionForm.action != 'Create'}">
+                            <span th:text="*{host}">hostname</span>
+                            <input type="hidden" th:field="*{host}" />
+                        </span>
+                        <span th:if="${#fields.hasErrors('host')}" th:errors="*{host}" class="error"></span>
+                    </td>
+                </tr>
+                <tr>
+                    <td class="form-prompt"><label for="username" th:text="#{prompt.mailUsername}">Mail Username</label></td>
+                    <td class="form-field">
+                        <input type="text" th:field="*{username}" id="username" size="50" />
+                        <span th:if="${#fields.hasErrors('username')}" th:errors="*{username}" class="error"></span>
+                    </td>
+                </tr>
+                <tr>
+                    <td class="form-prompt"><label for="password" th:text="#{prompt.mailPassword}">Mail Password</label></td>
+                    <td class="form-field">
+                        <input type="text" th:field="*{password}" id="password" size="50" />
+                    </td>
+                </tr>
+                <tr>
+                    <td class="form-prompt"><label for="type" th:text="#{prompt.mailServerType}">Server Type</label></td>
+                    <td class="form-field">
+                        <select th:field="*{type}" id="type">
+                            <option th:each="serverType : ${serverTypes}"
+                                    th:value="${serverType.value}"
+                                    th:text="${serverType.label}"></option>
+                        </select>
+                        <span th:if="${#fields.hasErrors('type')}" th:errors="*{type}" class="error"></span>
+                    </td>
+                </tr>
+                <tr>
+                    <td class="form-prompt"><label for="autoConnect" th:text="#{prompt.autoConnect}">Auto Connect</label></td>
+                    <td class="form-field">
+                        <input type="checkbox" th:field="*{autoConnect}" id="autoConnect" />
+                    </td>
+                </tr>
+                <tr>
+                    <td class="form-field">
+                        <span th:if="${subscriptionForm.action == 'Delete'}">
+                            <button type="submit" class="command-single" th:text="#{button.confirm}">Confirm</button>
+                        </span>
+                        <span th:if="${subscriptionForm.action != 'Delete'}">
+                            <button type="submit" class="command-single" th:text="#{button.save}">Save</button>
+                        </span>
+                    </td>
+                    <td class="form-field">
+                        <button type="reset" class="command-multiple" th:text="#{button.reset}">Reset</button>
+                        <a th:href="@{/editRegistration(action='Edit')}" class="command-multiple" th:text="#{button.cancel}">Cancel</a>
+                    </td>
+                </tr>
+            </table>
+        </form>
+    </div>
 </body>
 </html>
diff --git a/apps/example2-spring-boot/src/main/resources/templates/welcome.html b/apps/example2-spring-boot/src/main/resources/templates/welcome.html
index 16061ff6f..001a986b6 100644
--- a/apps/example2-spring-boot/src/main/resources/templates/welcome.html
+++ b/apps/example2-spring-boot/src/main/resources/templates/welcome.html
@@ -1,13 +1,20 @@
 <!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
+<html xmlns:th="http://www.thymeleaf.org"
+      xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
+      layout:decorate="~{layout/base}">
 <head>
-    <title th:text="#{index.title}">MailReader</title>
+    <title th:text="#{index.title}">MailReader Demonstration Application</title>
 </head>
 <body>
-    <h1 th:text="#{index.heading}">MailReader Demonstration Application Options</h1>
-    <ul>
-        <li><a th:href="@{/editLogon}" th:text="#{index.logon}">Log on</a></li>
-        <li><a th:href="@{/editRegistration?action=Create}" th:text="#{index.registration}">Register</a></li>
-    </ul>
+    <div layout:fragment="menu">
+        <div th:replace="~{fragments/loggedoff-menu :: menu}"></div>
+    </div>
+    <div layout:fragment="content">
+        <h3 th:text="#{index.heading}">MailReader Demonstration Application Options</h3>
+        <ul>
+            <li><a th:href="@{/editRegistration(action='Create')}" th:text="#{index.registration}">Register with the MailReader Demonstration Application</a></li>
+            <li><a th:href="@{/editLogon}" th:text="#{index.logon}">Log on to the MailReader Demonstration Application</a></li>
+        </ul>
+    </div>
 </body>
 </html>

Logon Form
Username	+ + +
Password	+ + +
+ +
+ +	+ +
Enter your username and password
+ Enter Registration Information + Edit Your Registration Information +
Username	+ + + + + username + + + +
Password	+ + +
(Repeat) Password	+ + +
Full Name	+ + +
From Address	+ + +
Reply To Address	+ + +
+ +
+ +	+ + Cancel +
+ Create New Mail Subscription + Delete Existing Mail Subscription + Edit Existing Mail Subscription +
Username	user
Mail Server	+ + + + + hostname + + + +
Mail Username	+ + +
Mail Password	+ +
Server Type	+ + +
Auto Connect	+ +
+ + + + + + +	+ + Cancel +