diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 025f89af9b82c02b8d69b941a7b3870edc06f03c..cc3da5e0ded74d01f3eaefaa753df393e5e6f194 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -17,6 +17,4 @@ spring.messages.basename=messages/messages
 management.contextPath=/manage
 
 # Logging
-logging.level.org.springframework=INFO
-
-server.context-path=/petclinic
\ No newline at end of file
+logging.level.org.springframework=INFO
\ No newline at end of file
diff --git a/src/main/webapp/scripts/app/owner-details/owner-details.template.html b/src/main/webapp/scripts/app/owner-details/owner-details.template.html
index 78220f5db835302bc69f13ea1c6d85d7184a43a1..ceea83823851b4ce3067b028ff51d7815ebcc0fb 100644
--- a/src/main/webapp/scripts/app/owner-details/owner-details.template.html
+++ b/src/main/webapp/scripts/app/owner-details/owner-details.template.html
@@ -32,7 +32,8 @@
 <div ng-repeat="pet in $ctrl.owner.pets">
     <h3>{{pet.name}}</h3>
     <p>
-        {{pet.birthDate | date:'yyyy MMM dd'}} - {{pet.type.name}}
+        {{pet.birthDate | date:'yyyy MMM dd'}} - {{pet.type.name}} -
+        <a href="#!/owners/{{$ctrl.owner.id}}/pets/{{pet.id}}/visits">Add Visit</a>
     </p>
     <h4>Visits</h4>
     <p style="margin-left: 2em;" ng-repeat="visit in pet.visits">
diff --git a/src/main/webapp/scripts/app/owner-form/owner-form.component.js b/src/main/webapp/scripts/app/owner-form/owner-form.component.js
index 3baf9d5f9725c2f2bcefce00e0945d4032017d3a..987db5c3c601c388f65670cfcd5f45ebc0a4be01 100644
--- a/src/main/webapp/scripts/app/owner-form/owner-form.component.js
+++ b/src/main/webapp/scripts/app/owner-form/owner-form.component.js
@@ -5,7 +5,7 @@ angular.module('ownerForm', [
 ]);
 
 angular.module("ownerForm").component("ownerForm", {
-    templateUrl: "/petclinic/scripts/app/owner-form/owner-form.template.html",
+    templateUrl: "scripts/app/owner-form/owner-form.template.html",
     controller: ["$http", '$routeParams', '$location', function ($http, $routeParams, $location) {
         var self = this;
 
diff --git a/src/main/webapp/scripts/app/owner-list/owner-list.component.js b/src/main/webapp/scripts/app/owner-list/owner-list.component.js
index aeb61b9e42c1cc7680490d24abd7eb7486a5c10e..5fa6f03702e2b91e2ce2a30d7c357156ae7162cc 100644
--- a/src/main/webapp/scripts/app/owner-list/owner-list.component.js
+++ b/src/main/webapp/scripts/app/owner-list/owner-list.component.js
@@ -5,10 +5,10 @@ angular.module('ownerList', [
 ]);
 
 angular.module("ownerList").component("ownerList", {
-    templateUrl: "/petclinic/scripts/app/owner-list/owner-list.template.html",
+    templateUrl: "scripts/app/owner-list/owner-list.template.html",
     controller: ["$http", function ($http) {
         var self = this;
-        $http.get('/petclinic/owner/list').then(function(resp) {
+        $http.get('owner/list').then(function(resp) {
             self.owners = resp.data;
         });
     }]
diff --git a/src/main/webapp/scripts/app/pet-form/pet-form.component.js b/src/main/webapp/scripts/app/pet-form/pet-form.component.js
index 3de2b735a1ebd834c19ac3a50aedefd3fdc99dd3..31749fea6dbc72087c841584e7c7a81b242ccd47 100644
--- a/src/main/webapp/scripts/app/pet-form/pet-form.component.js
+++ b/src/main/webapp/scripts/app/pet-form/pet-form.component.js
@@ -5,7 +5,7 @@ angular.module('petForm', [
 ]);
 
 angular.module("petForm").component("petForm", {
-    templateUrl: "/petclinic/scripts/app/pet-form/pet-form.template.html",
+    templateUrl: "scripts/app/pet-form/pet-form.template.html",
     controller: ["$http", '$routeParams', '$location', function ($http, $routeParams, $location) {
         var self = this;
         var ownerId = $routeParams.ownerId || 0;
diff --git a/src/main/webapp/scripts/app/visits/visits.component.js b/src/main/webapp/scripts/app/visits/visits.component.js
index 706b4823cc04ed81d12422cfdb9da8e20d0f82b5..f8de1cb87383c2122e58a951488f5404d5463e6e 100644
--- a/src/main/webapp/scripts/app/visits/visits.component.js
+++ b/src/main/webapp/scripts/app/visits/visits.component.js
@@ -5,7 +5,7 @@ angular.module('visits', [
 ]);
 
 angular.module("visits").component("visits", {
-    templateUrl: "/petclinic/scripts/app/visits/visits.template.html",
+    templateUrl: "scripts/app/visits/visits.template.html",
     controller: ["$http", '$routeParams', '$location', '$filter', function ($http, $routeParams, $location, $filter) {
         var self = this;
         var petId = $routeParams.petId || 0;