diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/flows/booking/enterBookingDetails.jsp b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/flows/booking/enterBookingDetails.jsp
index 7b15abb6..1521340b 100644
--- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/flows/booking/enterBookingDetails.jsp
+++ b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/flows/booking/enterBookingDetails.jsp
@@ -2,7 +2,7 @@
 <%@ taglib prefix="tiles" uri="http://tiles.apache.org/tags-tiles" %>
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
-<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
 <tiles:insertTemplate template="/WEB-INF/layouts/standard.jsp">
 <tiles:putAttribute name="content">
 
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/flows/booking/reviewBooking.jsp b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/flows/booking/reviewBooking.jsp
index e20be7f9..8fa4f4db 100755
--- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/flows/booking/reviewBooking.jsp
+++ b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/flows/booking/reviewBooking.jsp
@@ -2,7 +2,7 @@
 <%@ taglib prefix="tiles" uri="http://tiles.apache.org/tags-tiles" %>
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
-<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
 <tiles:insertTemplate template="/WEB-INF/layouts/standard.jsp">
 <tiles:putAttribute name="content">
 
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/flows/main/enterSearchCriteria.jsp b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/flows/main/enterSearchCriteria.jsp
index ac464920..aebdcbaf 100755
--- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/flows/main/enterSearchCriteria.jsp
+++ b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/flows/main/enterSearchCriteria.jsp
@@ -2,7 +2,7 @@
 <%@ taglib prefix="tiles" uri="http://tiles.apache.org/tags-tiles" %>
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
 <%@ taglib prefix="security" uri="http://www.springframework.org/security/tags" %>
-<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
 <tiles:insertTemplate template="/WEB-INF/layouts/standard.jsp">
 <tiles:putAttribute name="content">
 
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/flows/main/main.xml b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/flows/main/main.xml
index 0e5c9af6..707b8e40 100755
--- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/flows/main/main.xml
+++ b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/flows/main/main.xml
@@ -33,7 +33,7 @@
 	
 	<view-state id="reviewHotel">
 		<on-render>
-			<evaluate expression="bookingService.findHotel(hotelId)" result="requestScope.hotel" />
+			<evaluate expression="bookingService.findHotelById(hotelId)" result="requestScope.hotel" />
 		</on-render>
 		<transition on="book" to="bookHotel" />
 		<transition on="cancel" to="enterSearchCriteria" />
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/flows/main/reviewHotel.jsp b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/flows/main/reviewHotel.jsp
index 564f5f05..04fc6d62 100755
--- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/flows/main/reviewHotel.jsp
+++ b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/flows/main/reviewHotel.jsp
@@ -2,7 +2,7 @@
 <%@ taglib prefix="tiles" uri="http://tiles.apache.org/tags-tiles" %>
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
-<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
 <tiles:insertTemplate template="/WEB-INF/layouts/standard.jsp">
 <tiles:putAttribute name="content">
 
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/flows/main/reviewHotels.jsp b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/flows/main/reviewHotels.jsp
index 25dcac5b..f7c5d215 100644
--- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/flows/main/reviewHotels.jsp
+++ b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/flows/main/reviewHotels.jsp
@@ -1,7 +1,7 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="tiles" uri="http://tiles.apache.org/tags-tiles" %>
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
-<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
 <tiles:insertTemplate template="/WEB-INF/layouts/standard.jsp">
 <tiles:putAttribute name="content">
 
@@ -29,7 +29,7 @@
 				<td>${hotel.city}, ${hotel.state}, ${hotel.country}</td>
 				<td>${hotel.zip}</td>
 				<td>
-					<a href="${flowExecutionUrl}&_eventId=selectHotel&hotelId=${hotel.id}">View Hotel</a>
+					<a href="${flowExecutionUrl}&_eventId=select&hotelId=${hotel.id}">View Hotel</a>
 				</td>
 			</tr>
 			</c:forEach>
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/intro.jsp b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/intro.jsp
index a4aaeb5a..01bf1b74 100755
--- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/intro.jsp
+++ b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/intro.jsp
@@ -1,7 +1,6 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="tiles" uri="http://tiles.apache.org/tags-tiles" %>
 
-<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <tiles:insertTemplate template="/WEB-INF/layouts/standard.jsp">
 <tiles:putAttribute name="content">
 
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/layouts/standard.jsp b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/layouts/standard.jsp
index 04b8b9b9..f84ba105 100644
--- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/layouts/standard.jsp
+++ b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/layouts/standard.jsp
@@ -1,6 +1,7 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="tiles" uri="http://tiles.apache.org/tags-tiles" %>
 <%@ taglib prefix="security" uri="http://www.springframework.org/security/tags" %>
+
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
 <head>
@@ -33,16 +34,16 @@
 			</div>
 		</div>
 		<div id="branding" class="spring">
-			<a href="<c:url value="/" />"><img src="<c:url value="/images/header.jpg"/>"/></a>
+			<a href="<c:url value="/" />"><img src="<c:url value="/images/header.jpg"/>" alt="Spring Travel" /></a>
 		</div>
 	</div>
 	<div id="content" class="clearfix spring">
 		<div id="local" class="spring">
 			<a href="http://www.thespringexperience.com">
-				<img src="<c:url value="/images/diplomat.jpg"/>"/>
+				<img src="<c:url value="/images/diplomat.jpg"/>" alt="generic hotel" />
 			</a>
 			<a href="http://www.thespringexperience.com">
-				<img src="<c:url value="/images/tse.gif"/>"/>
+				<img src="<c:url value="/images/tse.gif"/>" alt="The Spring Experience" />
 			</a>
 			<p>
 			</p>
@@ -53,7 +54,7 @@
 	</div>
 	<div id="footer" class="clearfix spring">
 		<a href="http://www.springframework.org">
-			<img src="<c:url value="/images/powered-by-spring.png"/>"/>
+			<img src="<c:url value="/images/powered-by-spring.png"/>" alt="Powered by Spring" />
 		</a>
 	</div>
 </div>
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/login.jsp b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/login.jsp
index 893c0b89..65bf497a 100755
--- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/login.jsp
+++ b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/login.jsp
@@ -6,7 +6,6 @@
 <%@ page import="org.springframework.security.ui.webapp.AuthenticationProcessingFilter" %>
 <%@ page import="org.springframework.security.AuthenticationException" %>
 
-<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <tiles:insertTemplate template="/WEB-INF/layouts/standard.jsp">
 <tiles:putAttribute name="content">
 
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/logout-success.jsp b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/logout-success.jsp
index ed7ed422..f163556f 100755
--- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/logout-success.jsp
+++ b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/logout-success.jsp
@@ -1,7 +1,6 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="tiles" uri="http://tiles.apache.org/tags-tiles" %>
 
-<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <tiles:insertTemplate template="/WEB-INF/layouts/standard.jsp">
 <tiles:putAttribute name="content">
 
@@ -9,7 +8,7 @@
 <div class="section">
 	<h1>Logout</h1>
 	<p>You have successfully logged out.</p>
-	<p><a href="<c:url value="/spring/main" />" />Continue</a></p>
+	<p><a href="<c:url value="/spring/main" />">Continue</a></p>
 </div>