diff --git a/src/main/webapp/WEB-INF/jsp/header.jsp b/src/main/webapp/WEB-INF/jsp/header.jsp
index 7ca657876..22f503454 100644
--- a/src/main/webapp/WEB-INF/jsp/header.jsp
+++ b/src/main/webapp/WEB-INF/jsp/header.jsp
@@ -8,12 +8,12 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 	<title>PetClinic :: a Spring Framework demonstration</title>	
   
-	<spring:url value="/resources/css/petclinic.css" var="petclinicCss" />
-	<link href="${petclinicCss}" rel="stylesheet"/>
 
   	<spring:url value="/webjars/bootstrap/2.2.1/css/bootstrap.min.css" var="bootstrapCss" />
 	<link href="${bootstrapCss}" rel="stylesheet"/>
 	
+	<spring:url value="/resources/css/petclinic.css" var="petclinicCss" />
+	<link href="${petclinicCss}" rel="stylesheet"/>
 </head>
 
 
diff --git a/src/main/webapp/WEB-INF/jsp/owners/search.jsp b/src/main/webapp/WEB-INF/jsp/owners/search.jsp
index 954a88f63..2a88db5cd 100644
--- a/src/main/webapp/WEB-INF/jsp/owners/search.jsp
+++ b/src/main/webapp/WEB-INF/jsp/owners/search.jsp
@@ -8,7 +8,6 @@
 <jsp:include page="../header.jsp"/>
 
 <body>
-
 	<div class="container">
 		<spring:url value="/resources/images/banner-graphic.png" var="banner"/>
 		<img src="${banner}" />
@@ -16,9 +15,9 @@
 		<h2>Find Owners</h2>
 		
 		<spring:url value="/owners.html" var="formUrl"/>
-		<form:form modelAttribute="owner" action="${fn:escapeXml(formUrl)}" method="get" class="form-horizontal" style="width:600px;">
+		<form:form modelAttribute="owner" action="${fn:escapeXml(formUrl)}" method="get" class="form-horizontal" id="search-owner-form">
 					<fieldset>
-						<div class="controls">
+						<div class="control-group" id="lastName">
 							<label class="control-label">Last name </label>
 							<form:input path="lastName" size="30" maxlength="80"/>
 							<span class="help-inline"><form:errors path="*" /></span>
diff --git a/src/main/webapp/WEB-INF/jsp/pets/form.jsp b/src/main/webapp/WEB-INF/jsp/pets/form.jsp
index 2be8b4324..687b2901a 100644
--- a/src/main/webapp/WEB-INF/jsp/pets/form.jsp
+++ b/src/main/webapp/WEB-INF/jsp/pets/form.jsp
@@ -22,7 +22,7 @@
 		
 		<b>Owner:</b> ${pet.owner.firstName} ${pet.owner.lastName}
 		<br/>
-		<form:form modelAttribute="pet" method="${method}">
+		<form:form modelAttribute="pet" method="${method}" class="form-horizontal">
 			<fieldset>
 					<div class="control-group" id="name">
 						<label class="control-label">Name </label>
@@ -40,7 +40,7 @@
 					</div>
 					<div class="control-group" id="type">
 						<label class="control-label">Type </label>
-							<form:select path="type" items="${types}"/>
+						<form:select path="type" items="${types}"/>
 					</div>
 					<div class="form-actions">
 						<c:choose>
@@ -59,8 +59,8 @@
 			    <p class="submit"><input type="submit" value="Delete Pet"/></p>
 			  </form:form>
 			</c:if>    
+			<jsp:include page="../footer.jsp"/>
   	</div>
-	<jsp:include page="../footer.jsp"/>
 </body>
 
 </html>
diff --git a/src/main/webapp/resources/css/petclinic.css b/src/main/webapp/resources/css/petclinic.css
index ebf2eb15a..64852d959 100644
--- a/src/main/webapp/resources/css/petclinic.css
+++ b/src/main/webapp/resources/css/petclinic.css
@@ -1,5 +1,14 @@
 .container {
 	padding-top: 10px;
 	margin-left: 50px; 
+	width: 610px;
+}
+
+.form-horizontal {
+  	width: 100%;
+}
+
+input {
+	line-height: 35px;
 }
 
diff --git a/src/main/webapp/resources/html/tutorial.html b/src/main/webapp/resources/html/tutorial.html
index 9e6d970a9..f5c753495 100644
--- a/src/main/webapp/resources/html/tutorial.html
+++ b/src/main/webapp/resources/html/tutorial.html
@@ -3,7 +3,7 @@
 <head>
 	<title>The Spring PetClinic Application</title>
 	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-	<link rel="stylesheet" href="../styles/petclinic.css" type="text/css">
+	<link rel="stylesheet" href="../css/petclinic.css" type="text/css">
 </head>
 
 <body>
