diff --git a/pom.xml b/pom.xml
index 9a7078301a664fdd2e7fd5878eabc632b1c8c632..82da93b2f18a26412a121efb8d9bba6a267a4c0f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -156,6 +156,12 @@
 		    <version>2.2.1</version>
 		</dependency>
 		
+		<dependency>
+		    <groupId>org.webjars</groupId>
+		    <artifactId>jquery-ui</artifactId>
+		    <version>1.9.1</version>
+		</dependency>
+		
 		<!-- Rome RSS -->
 		<dependency>
 			<groupId>rome</groupId>
diff --git a/src/main/resources/spring/applicationContext-dao.xml b/src/main/resources/spring/applicationContext-dao.xml
index d6aa8dc72be542cf1d2c9deb52a9d865beeb0acd..af6eb5e8668bc9b93734c4e97eab82c8808b0563 100644
--- a/src/main/resources/spring/applicationContext-dao.xml
+++ b/src/main/resources/spring/applicationContext-dao.xml
@@ -15,7 +15,7 @@
 	<!-- ========================= RESOURCE DEFINITIONS ========================= -->
 
 	<!-- import the dataSource definition -->
-	<import resource="applicationContext-dataSource.xml"/>
+	<import resource="applicationContext-dataSource.xml"/> 
 
 
 	<!-- Configurer that replaces ${...} placeholders with values from a properties file -->
@@ -116,7 +116,7 @@
 			PersistenceExceptions will be auto-translated due to @Repository.
 		-->
 		<context:component-scan base-package="org.springframework.samples.petclinic.repository.jpa"/>
-	
+
 	</beans>
 	
 	<beans profile="spring-data-jpa">
diff --git a/src/main/webapp/WEB-INF/jsp/fragments/headTag.jsp b/src/main/webapp/WEB-INF/jsp/fragments/headTag.jsp
index 22f50345430d4489f4e5c6eb280ec7f4ef7f0e25..bfcd938380c240a30c81915e734247b9b10993c6 100644
--- a/src/main/webapp/WEB-INF/jsp/fragments/headTag.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fragments/headTag.jsp
@@ -14,6 +14,15 @@
 	
 	<spring:url value="/resources/css/petclinic.css" var="petclinicCss" />
 	<link href="${petclinicCss}" rel="stylesheet"/>
+	
+	<spring:url value="/webjars/jquery/1.8.2/jquery.js" var="jQuery" />
+	<script src="${jQuery}"></script>
+	
+	<spring:url value="/webjars/jquery-ui/1.9.1/js/jquery-ui-1.9.1.custom.js" var="jQueryUi" />
+	<script src="${jQueryUi}"></script>
+	
+	<spring:url value="/webjars/jquery-ui/1.9.1/css/smoothness/jquery-ui-1.9.1.custom.css" var="jQueryUiCss" />
+	<link href="${jQueryUiCss}" rel="stylesheet"></link>
 </head>
 
 
diff --git a/src/main/webapp/WEB-INF/jsp/pets/createOrUpdatePetForm.jsp b/src/main/webapp/WEB-INF/jsp/pets/createOrUpdatePetForm.jsp
index 1dfe06cd0988f7497f0b5c25ac3a2734a55c0ae0..3ee7caeca6dd7f0638c6ac0648774655d21fbda3 100644
--- a/src/main/webapp/WEB-INF/jsp/pets/createOrUpdatePetForm.jsp
+++ b/src/main/webapp/WEB-INF/jsp/pets/createOrUpdatePetForm.jsp
@@ -5,55 +5,38 @@
 
 <html lang="en">
 
-<jsp:include page="../fragments/headTag.jsp"/>
 
 <body>
+	<head>
+			<spring:url value="/webjars/jquery/1.8.2/jquery.js" var="jQuery" />
+			<script src="${jQuery}"></script>
+			
+			<spring:url value="/webjars/jquery-ui/1.9.1/js/jquery-ui-1.9.1.custom.js" var="jQueryUi" />
+			<script src="${jQueryUi}"></script>
+			
+			<spring:url value="/webjars/jquery-ui/1.9.1/css/smoothness/jquery-ui-1.9.1.custom.css" var="jQueryUiCss" />
+			<link href="${jQueryUiCss}" rel="stylesheet"></link>
+				
+	
+	</head>
   	<div class="container">
-		<jsp:include page="../fragments/bodyHeader.jsp"/>		
-		<c:choose>
-			<c:when test="${pet['new']}"><c:set var="method" value="post"/></c:when>
-			<c:otherwise><c:set var="method" value="put"/></c:otherwise>
-		</c:choose>
-		
-		<h2><c:if test="${pet['new']}">New </c:if>Pet</h2>
-		
-		<b>Owner:</b> ${pet.owner.firstName} ${pet.owner.lastName}
-		<br/>
-		<form:form modelAttribute="pet" method="${method}" class="form-horizontal">
-			<fieldset>
-					<div class="control-group" id="name">
-						<label class="control-label">Name </label>
-						<div class="controls">
-							<form:input path="name" />
-							<span class="help-inline"><form:errors path="name" /></span>
-						</div>
-					</div>
+			
+<script>
+	        $(function() {
+	            $( "#birthDate" ).datepicker();
+	        });
+	    </script>
+		<form:form modelAttribute="pet" class="form-horizontal">
+			<fieldset>			
 					<div class="control-group" id="birthDate">
-						<label class="control-label">Birth Date (yyyy-MM-dd)</label>
+						<label class="control-label">Birth Date</label>
 						<div class="controls">
-							<form:input path="birthDate" />
-							<span class="help-inline"><form:errors path="birthDate" /></span>
+							<form:input path="birthDate"  />
 						</div>
 					</div>
-					<div class="control-group" id="type">
-						<label class="control-label">Type </label>
-						<form:select path="type" items="${types}"/>
-					</div>
-					<div class="form-actions">
-						<c:choose>
-				          <c:when test="${owner['new']}">
-				            <button type="submit">Add Pet</button>
-				          </c:when>
-				          <c:otherwise>
-				            <button type="submit">Update Pet</button>
-				          </c:otherwise>
-				        </c:choose>
-					</div>
+					
 				</fieldset>	
 			</form:form>	
-			<c:if test="${!pet['new']}">
-			</c:if>    
-			<jsp:include page="../fragments/footer.jsp"/>
   	</div>
 </body>