diff --git a/spring-webflow-samples/phonebook-portlet/src/main/webapp/WEB-INF/jsp/details.jsp b/spring-webflow-samples/phonebook-portlet/src/main/webapp/WEB-INF/jsp/details.jsp
index e62b8172..5aae29b9 100644
--- a/spring-webflow-samples/phonebook-portlet/src/main/webapp/WEB-INF/jsp/details.jsp
+++ b/spring-webflow-samples/phonebook-portlet/src/main/webapp/WEB-INF/jsp/details.jsp
@@ -1,18 +1,36 @@
-<%@ include file="includeTop.jsp" %>
-
+<%@ page contentType="text/html" %>
+<%@ page session="false" %>
 <%@ page import="org.springframework.webflow.samples.phonebook.Person" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="portlet" uri="http://java.sun.com/portlet" %>
+
+<portlet:defineObjects/>
+
+<html>
+<head>
+<title>Enter Search Criteria</title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="<%= renderResponse.encodeURL(renderRequest.getContextPath() + "style.css") %>" type="text/css">
+</head>
+<body>
+
+<div id="logo">
+	<img src="<%= renderResponse.encodeURL(renderRequest.getContextPath() + "/images/spring-logo.jpg") %>" height="73" alt="Logo" border="0"> 
+</div>
 
 <div id="content">
+	
 	<div id="insert">
 		<img src="<%= renderResponse.encodeURL(renderRequest.getContextPath() + "/images/webflow-logo.jpg") %>"/>
 	</div>
+	
 	<form action="<portlet:actionURL/>" method="post">
 	<table>
 		<tr>
 			<td class="portlet-section-subheader">Person Details</td>
 		</tr>
 		<tr>
-			<td colpan="2"><hr></td>
+			<td colspan="2"><hr></td>
 		</tr>
 		<tr>
 			<td><b>First Name</b></td>
diff --git a/spring-webflow-samples/phonebook-portlet/src/main/webapp/WEB-INF/jsp/error.jsp b/spring-webflow-samples/phonebook-portlet/src/main/webapp/WEB-INF/jsp/error.jsp
deleted file mode 100644
index 87754023..00000000
--- a/spring-webflow-samples/phonebook-portlet/src/main/webapp/WEB-INF/jsp/error.jsp
+++ /dev/null
@@ -1,18 +0,0 @@
-<%@ page session="false" %>
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-	<HEAD>
-	</HEAD>
-	<BODY>
-		<DIV align="left">Error</DIV>
-		<HR>
-		<DIV align="left">
-			<P>
-				An error has occured!
-			</P>
-		</DIV>
-		<HR>
-		<DIV align="right"></DIV>
-	</BODY>
-</HTML>
diff --git a/spring-webflow-samples/phonebook-portlet/src/main/webapp/WEB-INF/jsp/searchCriteria.jsp b/spring-webflow-samples/phonebook-portlet/src/main/webapp/WEB-INF/jsp/searchCriteria.jsp
index d7de8568..56338049 100644
--- a/spring-webflow-samples/phonebook-portlet/src/main/webapp/WEB-INF/jsp/searchCriteria.jsp
+++ b/spring-webflow-samples/phonebook-portlet/src/main/webapp/WEB-INF/jsp/searchCriteria.jsp
@@ -1,10 +1,29 @@
-<%@ include file="includeTop.jsp" %>
+<%@ page contentType="text/html" %>
+<%@ page session="false" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<%@ taglib prefix="portlet" uri="http://java.sun.com/portlet" %>
+
+<portlet:defineObjects/>
+
+<html>
+<head>
+<title>Enter Search Criteria</title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="<%= renderResponse.encodeURL(renderRequest.getContextPath() + "style.css") %>" type="text/css">
+</head>
+<body>
+
+<div id="logo">
+	<img src="<%= renderResponse.encodeURL(renderRequest.getContextPath() + "/images/spring-logo.jpg") %>" height="73" alt="Logo" border="0"> 
+</div>
 
 <div id="content">
 
 	<div id="insert">
 		<img src="<%= renderResponse.encodeURL(renderRequest.getContextPath() + "/images/webflow-logo.jpg") %>"/>
 	</div>
+	
 	<form action="<portlet:actionURL/>" method="post">
 	<table>
 		<tr>
@@ -17,32 +36,21 @@
 				<hr>
 			</td>
 		</tr>
-		<spring:hasBindErrors name="searchCriteria">
 		<tr>
 			<td colspan="2">
-				<div class="portlet-msg-error">Please provide valid search criteria!</div>
+				<form:errors cssClass="portlet-msg-error"/>
 			</td>
 		</tr>
-		</spring:hasBindErrors>
-		<spring:bind path="searchCriteria.firstName">
 		<tr>
 			<td>First Name</td>
 			<td>
-				<input type="text" name="<c:out value="${status.expression}"/>" value="<c:out value="${status.value}"/>">
+				<form:input path="firstName" />
 			</td>
 		</tr>
-		</spring:bind>		
-		<spring:bind path="searchCriteria.lastName">
-		<TR>
+		<tr>
 			<td>Last Name</td>
 			<td>
-				<input type="text" name="<c:out value="${status.expression}"/>" value="<c:out value="${status.value}"/>">
-			</td>
-		</TR>
-		</spring:bind>
-		<tr>
-			<td colspan="2">
-				<hr>
+				<form:input path="lastName" />
 			</td>
 		</tr>
 		<tr>
@@ -55,4 +63,8 @@
 	</form>
 </div>
 
-<%@ include file="includeBottom.jsp" %>
\ No newline at end of file
+<div id="copyright">
+	<p>&copy; Copyright 2004-2007, <a href="http://www.springframework.org">www.springframework.org</a>, under the terms of the Apache 2.0 software license.</p>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/spring-webflow-samples/phonebook-portlet/src/main/webapp/WEB-INF/jsp/searchResults.jsp b/spring-webflow-samples/phonebook-portlet/src/main/webapp/WEB-INF/jsp/searchResults.jsp
index 282a0a1f..886ee501 100644
--- a/spring-webflow-samples/phonebook-portlet/src/main/webapp/WEB-INF/jsp/searchResults.jsp
+++ b/spring-webflow-samples/phonebook-portlet/src/main/webapp/WEB-INF/jsp/searchResults.jsp
@@ -1,11 +1,31 @@
-<%@ include file="includeTop.jsp" %>
+<%@ page contentType="text/html" %>
+<%@ page session="false" %>
+<%@ page import="org.springframework.webflow.samples.phonebook.Person" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="portlet" uri="http://java.sun.com/portlet" %>
+
+<portlet:defineObjects/>
+
+<html>
+<head>
+<title>Enter Search Criteria</title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="<%= renderResponse.encodeURL(renderRequest.getContextPath() + "style.css") %>" type="text/css">
+</head>
+<body>
+
+<div id="logo">
+	<img src="<%= renderResponse.encodeURL(renderRequest.getContextPath() + "/images/spring-logo.jpg") %>" height="73" alt="Logo" border="0"> 
+</div>
 
 <%@ page import="org.springframework.webflow.samples.phonebook.Person" %>
 
 <div id="content">
+
 	<div id="insert">
 		<img src="<%= renderResponse.encodeURL(renderRequest.getContextPath() + "/images/webflow-logo.jpg") %>"/>
 	</div>
+	
 	<form action="<portlet:actionURL/>" method="post">
 	<table>
 		<tr>

- Please provide valid search criteria! +
First Name	- " value=""> +
Last Name	- " value=""> -
- +