diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/index.jsp b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/index.jsp
index 673e2c80..7733edcb 100644
--- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/index.jsp
+++ b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/index.jsp
@@ -9,21 +9,35 @@
     </span>
 	<h1>Search Hotels</h1>
 	<fieldset>
-		<form:input path="searchString"/>
-		<script type="text/javascript">
-			Spring.addDecoration(new Spring.ElementDecoration({
-				elementId : "searchString",
-				widgetType : "dijit.form.ValidationTextBox",
-				widgetAttrs : { promptMessage : "Search hotels by name, address, city, or zip." }}));
-		</script>
-		<label for="pageSize">Maximum results:</label>
-		<form:select path="pageSize">
-			<form:option label="5" value="5"/>
-			<form:option label="10" value="10"/>
-			<form:option label="20" value="20"/>
-		</form:select>
-		<form:hidden path="page"/>
-		<input type="submit" class="button" value="Find Hotels" />
+		<div class="field">
+			<div class="label">
+				<label for="searchString">Search String:</label>
+			</div>		
+			<div class="input">
+				<form:input id="searchString" path="searchString"/>
+				<script type="text/javascript">
+					Spring.addDecoration(new Spring.ElementDecoration({
+						elementId : "searchString",
+						widgetType : "dijit.form.ValidationTextBox",
+						widgetAttrs : { promptMessage : "Search hotels by name, address, city, or zip." }}));
+				</script>
+			</div>
+		</div>
+		<div class="field">
+			<div class="label">
+				<label for="pageSize">Maximum results:</label>
+			</div>
+			<div class="input">	
+				<form:select id="pageSize" path="pageSize">
+					<form:option label="5" value="5"/>
+					<form:option label="10" value="10"/>
+					<form:option label="20" value="20"/>
+				</form:select>
+			</div>
+		</div>
+		<div class="buttonGroup">
+			<input type="submit" value="Find Hotels" />
+		</div>		
     </fieldset>
 </div>
 </form:form>
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/logoutSuccess.jsp b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/logout-success.jsp
similarity index 100%
rename from spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/logoutSuccess.jsp
rename to spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/logout-success.jsp
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/booking.css b/spring-webflow-samples/booking-mvc/src/main/webapp/styles/booking.css
index 2a24ebfe..01c22a43 100644
--- a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/booking.css
+++ b/spring-webflow-samples/booking-mvc/src/main/webapp/styles/booking.css
@@ -127,19 +127,14 @@
 	
 	#content .searchGroup {
 		width: 35%;
-		text-align: right;
 	}
 	
 	#content .buttonGroup {
 		clear: both;
+		margin-top: 5px;
 		text-align: right;
 	}
 	
-	#content .buttonGroup input[type="submit"],
-	#content .buttonGroup input[type="button"] {
-		margin-right: 5px;
-	}
-	
 	#content .previous {
 		float: right;
 	}