diff --git a/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/layout.html b/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/layout.html
index 1263f6d9e3..83a1cd8312 100644
--- a/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/layout.html
+++ b/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/layout.html
@@ -1,32 +1,25 @@
 <!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/web/thymeleaf/layout">
-  <head>
-    <title>Layout</title>
-    <link rel="stylesheet"
-      th:href="@{/css/bootstrap.min.css}"
-      href="../../css/bootstrap.min.css"/>
-  </head>
-  <body>
-    <div class="container">
-      <div class="navbar">
-        <div class="navbar-inner">
-          <a class="brand"
-              href="https://github.com/ultraq/thymeleaf-layout-dialect">
-              Thymeleaf - Layout
-          </a>
-          <ul class="nav">
-            <li>
-              <a th:href="@{/}" href="messages.html">
-                Messages
-              </a>
-            </li>
-          </ul>
-        </div>
-      </div>
-      <h1 layout:fragment="header">Layout</h1>
-      <div layout:fragment="content">
-        Fake content
-      </div>
-    </div>
-  </body>
+<html xmlns:th="http://www.thymeleaf.org"
+	xmlns:layout="http://www.ultraq.net.nz/web/thymeleaf/layout">
+<head>
+<title>Layout</title>
+<link rel="stylesheet" th:href="@{/css/bootstrap.min.css}"
+	href="../../css/bootstrap.min.css" />
+</head>
+<body>
+	<div class="container">
+		<div class="navbar">
+			<div class="navbar-inner">
+				<a class="brand"
+					href="https://github.com/ultraq/thymeleaf-layout-dialect">
+					Thymeleaf - Layout </a>
+				<ul class="nav">
+					<li><a th:href="@{/}" href="messages.html"> Messages </a></li>
+				</ul>
+			</div>
+		</div>
+		<h1 layout:fragment="header">Layout</h1>
+		<div layout:fragment="content">Fake content</div>
+	</div>
+</body>
 </html>
diff --git a/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/messages/form.html b/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/messages/form.html
index 20ff318301..747f029161 100644
--- a/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/messages/form.html
+++ b/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/messages/form.html
@@ -1,47 +1,34 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org"
-  xmlns:layout="http://www.ultraq.net.nz/web/thymeleaf/layout"
-  layout:decorator="layout">
-  <head>
-    <title>Messages : Create</title>
-  </head>
-  <body>
-    <h1 layout:fragment="header">Messages : Create</h1>
-    <div layout:fragment="content"
-        class="container">
-      <form id="messageForm"
-          th:action="@{/(form)}"
-          th:object="${message}"
-          action="#"
-          method="post">
-        <div th:if="${#fields.hasErrors('*')}"
-            class="alert alert-error">
-          <p th:each="error : ${#fields.errors('*')}"
-              th:text="${error}">
-            Validation error
-          </p>
-        </div>
-        <div class="pull-right">
-          <a th:href="@{/}" href="messages.html">
-            Messages
-          </a>
-        </div>
-        <input type="hidden"
-               th:field="*{id}"
-               th:class="${#fields.hasErrors('id')} ? 'field-error'"
-        />
-        <label for="summary">Summary</label>
-        <input type="text"
-            th:field="*{summary}"
-            th:class="${#fields.hasErrors('summary')} ? 'field-error'"/>
-        <label for="text">Message</label>
-        <textarea
-            th:field="*{text}"
-            th:class="${#fields.hasErrors('text')} ? 'field-error'"></textarea>
-        <div class="form-actions">
-          <input type="submit" value="Save"/>
-        </div>
-      </form>
-    </div>
-  </body>
-</html>
\ No newline at end of file
+	xmlns:layout="http://www.ultraq.net.nz/web/thymeleaf/layout"
+	layout:decorator="layout">
+<head>
+<title>Messages : Create</title>
+</head>
+<body>
+	<h1 layout:fragment="header">Messages : Create</h1>
+	<div layout:fragment="content" class="container">
+		<form id="messageForm" th:action="@{/(form)}" th:object="${message}"
+			action="#" method="post">
+			<div th:if="${#fields.hasErrors('*')}" class="alert alert-error">
+				<p th:each="error : ${#fields.errors('*')}" th:text="${error}">
+					Validation error</p>
+			</div>
+			<div class="pull-right">
+				<a th:href="@{/}" href="messages.html"> Messages </a>
+			</div>
+			<input type="hidden" th:field="*{id}"
+				th:class="${#fields.hasErrors('id')} ? 'field-error'" /> <label
+				for="summary">Summary</label> <input type="text"
+				th:field="*{summary}"
+				th:class="${#fields.hasErrors('summary')} ? 'field-error'" /> <label
+				for="text">Message</label>
+			<textarea th:field="*{text}"
+				th:class="${#fields.hasErrors('text')} ? 'field-error'"></textarea>
+			<div class="form-actions">
+				<input type="submit" value="Save" />
+			</div>
+		</form>
+	</div>
+</body>
+</html>
diff --git a/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/messages/list.html b/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/messages/list.html
index 862b46dfb9..2082622b17 100644
--- a/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/messages/list.html
+++ b/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/messages/list.html
@@ -1,45 +1,37 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org"
-  xmlns:layout="http://www.ultraq.net.nz/web/thymeleaf/layout"
-  layout:decorator="layout">
-  <head>
-    <title>Messages : View all</title>
-  </head>
-  <body>
-    <h1 layout:fragment="header">Messages : View all</h1>
-    <div layout:fragment="content" class="container">
-      <div class="pull-right">
-        <a href="form.html" th:href="@{/(form)}">Create Message</a>
-       </div>
-      <table class="table table-bordered table-striped">
-        <thead>
-          <tr>
-            <td>ID</td>
-            <td>Created</td>
-            <td>Summary</td>
-          </tr>
-        </thead>
-        <tbody>
-          <tr th:if="${messages.empty}">
-            <td colspan="3">
-              No messages
-            </td>
-          </tr>
-          <tr th:each="message : ${messages}">
-            <td th:text="${message.id}">1</td>
-            <td th:text="${#calendars.format(message.created)}">
-              July 11, 2012 2:17:16 PM CDT
-            </td>
-            <td>
-              <a href="view.html"
-                  th:href="@{'/' + ${message.id}}"
-                  th:text="${message.summary}">
-                The summary
-              </a>
-            </td>
-          </tr>
-        </tbody>
-      </table>
-    </div>
-  </body>
-</html>
\ No newline at end of file
+	xmlns:layout="http://www.ultraq.net.nz/web/thymeleaf/layout"
+	layout:decorator="layout">
+<head>
+<title>Messages : View all</title>
+</head>
+<body>
+	<h1 layout:fragment="header">Messages : View all</h1>
+	<div layout:fragment="content" class="container">
+		<div class="pull-right">
+			<a href="form.html" th:href="@{/(form)}">Create Message</a>
+		</div>
+		<table class="table table-bordered table-striped">
+			<thead>
+				<tr>
+					<td>ID</td>
+					<td>Created</td>
+					<td>Summary</td>
+				</tr>
+			</thead>
+			<tbody>
+				<tr th:if="${messages.empty}">
+					<td colspan="3">No messages</td>
+				</tr>
+				<tr th:each="message : ${messages}">
+					<td th:text="${message.id}">1</td>
+					<td th:text="${#calendars.format(message.created)}">July 11,
+						2012 2:17:16 PM CDT</td>
+					<td><a href="view.html" th:href="@{'/' + ${message.id}}"
+						th:text="${message.summary}"> The summary </a></td>
+				</tr>
+			</tbody>
+		</table>
+	</div>
+</body>
+</html>
diff --git a/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/messages/view.html b/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/messages/view.html
index 37d2e3200e..16c2ab3ada 100644
--- a/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/messages/view.html
+++ b/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/messages/view.html
@@ -1,53 +1,35 @@
 <html xmlns:th="http://www.thymeleaf.org"
-  xmlns:layout="http://www.ultraq.net.nz/web/thymeleaf/layout"
-  layout:decorator="layout">
-  <head>
-    <title>Messages : View</title>
-  </head>
-  <body>
-    <h1 layout:fragment="header">Messages : Create</h1>
-    <div layout:fragment="content"
-        class="container">
-      <div class="alert alert-success"
-          th:if="${globalMessage}"
-          th:text="${globalMessage}">
-        Some Success message
-      </div>
-      <div class="pull-right">
-        <a th:href="@{/}" href="list.html">
-          Messages
-        </a>
-      </div>
-      <dl>
-        <dt>ID</dt>
-        <dd id="id" th:text="${message.id}">123</dd>
-        <dt>Date</dt>
-        <dd id="created"
-            th:text="${#calendars.format(message.created)}">
-          July 11, 2012 2:17:16 PM CDT
-        </dd>
-        <dt>Summary</dt>
-        <dd id="summary"
-            th:text="${message.summary}">
-          A short summary...
-        </dd>
-        <dt>Message</dt>
-        <dd id="text"
-            th:text="${message.text}">
-          A detailed message that is longer than the summary.
-        </dd>
-      </dl>
-      <div class="pull-left">
-        <a href="messages"
-           th:href="@{'/delete/' + ${message.id}}">
-          delete
-        </a>
-        |
-        <a href="form.html"
-           th:href="@{'/modify/' + ${message.id}}">
-          modify
-        </a>
-      </div>
-    </div>
-  </body>
-</html>
\ No newline at end of file
+	xmlns:layout="http://www.ultraq.net.nz/web/thymeleaf/layout"
+	layout:decorator="layout">
+<head>
+<title>Messages : View</title>
+</head>
+<body>
+	<h1 layout:fragment="header">Messages : Create</h1>
+	<div layout:fragment="content" class="container">
+		<div class="alert alert-success" th:if="${globalMessage}"
+			th:text="${globalMessage}">Some Success message</div>
+		<div class="pull-right">
+			<a th:href="@{/}" href="list.html"> Messages </a>
+		</div>
+		<dl>
+			<dt>ID</dt>
+			<dd id="id" th:text="${message.id}">123</dd>
+			<dt>Date</dt>
+			<dd id="created" th:text="${#calendars.format(message.created)}">
+				July 11, 2012 2:17:16 PM CDT</dd>
+			<dt>Summary</dt>
+			<dd id="summary" th:text="${message.summary}">A short summary...
+			</dd>
+			<dt>Message</dt>
+			<dd id="text" th:text="${message.text}">A detailed message that
+				is longer than the summary.</dd>
+		</dl>
+		<div class="pull-left">
+			<a href="messages" th:href="@{'/delete/' + ${message.id}}">
+				delete </a> | <a href="form.html"
+				th:href="@{'/modify/' + ${message.id}}"> modify </a>
+		</div>
+	</div>
+</body>
+</html>

ID	Created	Summary
- No messages -
1	- July 11, 2012 2:17:16 PM CDT -	- - The summary - -
ID	Created	Summary
No messages
1	July 11, + 2012 2:17:16 PM CDT	The summary