diff --git a/src/main/resources/messages/messages.properties b/src/main/resources/messages/messages.properties
index f88ee55e9..87ee012b1 100644
--- a/src/main/resources/messages/messages.properties
+++ b/src/main/resources/messages/messages.properties
@@ -12,6 +12,7 @@ findOwners=Find owners
 veterinarians=Veterinarians
 error=Error
 new=New
+errorTitle=trigger a RuntimeException to see how it is handled
 
 somethingHappened=Something happened...
 
diff --git a/src/main/resources/messages/messages_zh_CN.properties b/src/main/resources/messages/messages_zh_CN.properties
index 3ccd48f6f..4f5cf632c 100644
--- a/src/main/resources/messages/messages_zh_CN.properties
+++ b/src/main/resources/messages/messages_zh_CN.properties
@@ -12,6 +12,7 @@ findOwners=\u67e5\u627e\u4e3b\u4eba
 veterinarians=\u5ba0\u7269\u533b\u751f
 error=\u9519\u8bef\u6d88\u606f
 new=\u65b0\u5efa
+errorTitle=\u89e6\u53d1\u4e00\u4e2a RuntimeException\u5f02\u5e38\uff0c\u89c2\u5bdf\u5176\u5904\u7406\u903b\u8f91
 
 somethingHappened=\u51fa\u4e86\u4e9b\u72b6\u51b5...
 
diff --git a/src/main/webapp/WEB-INF/jsp/fragments/bodyHeader.jsp b/src/main/webapp/WEB-INF/jsp/fragments/bodyHeader.jsp
index 0a2e93940..fcce9319f 100644
--- a/src/main/webapp/WEB-INF/jsp/fragments/bodyHeader.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fragments/bodyHeader.jsp
@@ -9,13 +9,13 @@
         <ul class="nav">
             <li style="width: 120px;"><a href="<spring:url value="/" htmlEscape="true" />"><i class="icon-home"></i>
                 <fmt:message key="home"/></a></li>
-            <li style="width: 150px;"><a href="<spring:url value="/owners/find.html" htmlEscape="true" />"><i
+            <li style="width: 150px;"><a href="<spring:url value='/owners/find.html' htmlEscape='true' />"><i
                     class="icon-search"></i> <fmt:message key="findOwners"/></a></li>
-            <li style="width: 160px;"><a href="<spring:url value="/vets.html" htmlEscape="true" />"><i
-                    class="icon-th-list"></i><fmt:message key="veterinarians"/> </a></li>
-            <li style="width: 110px;"><a href="<spring:url value="/oups.html" htmlEscape="true" />"
-                                        title="trigger a RuntimeException to see how it is handled"><i
-                    class="icon-warning-sign"></i><fmt:message key="error"/> </a></li>
+            <li style="width: 160px;"><a href="<spring:url value='/vets.html' htmlEscape='true' />"><i
+                    class="icon-th-list"></i> <fmt:message key="veterinarians"/> </a></li>
+            <li style="width: 110px;"><a href="<spring:url value='/oups.html' htmlEscape='true' />"
+                                        title="<fmt:message key='errorTitle'/>"><i
+                    class="icon-warning-sign"></i> <fmt:message key="error"/> </a></li>
         </ul>
     </div>
 </div>
diff --git a/src/main/webapp/WEB-INF/jsp/owners/ownersList.jsp b/src/main/webapp/WEB-INF/jsp/owners/ownersList.jsp
index 55a9b2afd..809d8e90a 100644
--- a/src/main/webapp/WEB-INF/jsp/owners/ownersList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/owners/ownersList.jsp
@@ -29,7 +29,7 @@
             </spring:url>
             <a href="${fn:escapeXml(ownerUrl)}"><c:out value="${owner.firstName} ${owner.lastName}"/></a>
         </datatables:column>
-        <datatables:column title="Name" display="pdf">
+        <datatables:column title="${Name}" display="pdf">
             <c:out value="${owner.firstName} ${owner.lastName}"/>
         </datatables:column>
         <datatables:column title="${Address}" property="address" cssStyle="width: 200px;"/>
diff --git a/src/main/webapp/WEB-INF/jsp/pets/createOrUpdatePetForm.jsp b/src/main/webapp/WEB-INF/jsp/pets/createOrUpdatePetForm.jsp
index 810ceb623..da7a3eb89 100644
--- a/src/main/webapp/WEB-INF/jsp/pets/createOrUpdatePetForm.jsp
+++ b/src/main/webapp/WEB-INF/jsp/pets/createOrUpdatePetForm.jsp
@@ -34,7 +34,8 @@
     </h2>
     
     <spring:message code="petName" var="Name" />
-    <spring:message code="description" var="description" />
+    <spring:message code="birthDate" var="BirthDate" />
+    <spring:message code="type" var="Type" />
 
     <form:form modelAttribute="pet" method="${method}"
                class="form-horizontal">
@@ -44,9 +45,9 @@
             <c:out value="${pet.owner.firstName} ${pet.owner.lastName}"/>
         </div>
         <petclinic:inputField label="${Name}" name="name"/>
-        <petclinic:inputField label="Birth Date" name="birthDate"/>
+        <petclinic:inputField label="${BirthDate}" name="birthDate"/>
         <div class="control-group">
-            <petclinic:selectField name="type" label="Type " names="${types}" size="5"/>
+            <petclinic:selectField name="type" label="${Type} " names="${types}" size="5"/>
         </div>
         <div class="form-actions">
             <c:choose>