diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html
index c7519180a59d689f7599af22e93182b5c5170fcc..fa6a745d52fc8babd76bbc084c18c240991d91bb 100644
--- a/src/main/webapp/index.html
+++ b/src/main/webapp/index.html
@@ -26,7 +26,11 @@
<body class="container">
<layout-nav></layout-nav>
-<div ng-view></div>
+<div class="container-fluid">
+ <div class="container xd-container">
+ <div ng-view></div>
+ </div>
+</div>
<layout-footer></layout-footer>
</body>
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 f1606cda0c435f5d675eafb62d1056dd64bcdd7e..5450aa0ea2fd5257580ef02d762e90d00bcf1fd2 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
@@ -19,36 +19,53 @@
</tr>
<tr>
<td>
- <a class="btn btn-info" href="#!/owners/{{$ctrl.owner.id}}/edit">Edit Owner</a>
+ <a class="btn btn-default" href="#!/owners/{{$ctrl.owner.id}}/edit">Edit Owner</a>
</td>
<td>
- <a href="#!/owners/{{$ctrl.owner.id}}/new-pet" class="btn btn-success">Add New Pet</a>
+ <a href="#!/owners/{{$ctrl.owner.id}}/new-pet" class="btn btn-default">Add New Pet</a>
</td>
</tr>
</table>
<h2>Pets and Visits</h2>
-<div ng-repeat="pet in $ctrl.owner.pets">
- <h3>
- <a href="#!/owners/{{$ctrl.owner.id}}/pets/{{pet.id}}">{{pet.name}}</a>
- </h3>
- <p>
- {{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>
-
- <div ng-repeat="visit in pet.visits" style="margin-top: 1em;">
- <h5>{{visit.date | date:'yyyy MMM dd'}}</h5>
- <p style="white-space: pre-line">{{visit.description}}</p>
- </div>
+<table class="table table-striped">
+ <tr ng-repeat="pet in $ctrl.owner.pets">
+ <td valign="top">
+ <dl class="dl-horizontal">
+ <dt>Name</dt>
+ <dd><a href="#!/owners/{{$ctrl.owner.id}}/pets/{{pet.id}}">{{pet.name}}</a></dd>
+ <dt>Birth Date</dt>
+ <dd>{{pet.birthDate | date:'yyyy MMM dd'}}</dd>
+ <dt>Type</dt>
+ <dd>{{pet.type.name}}</dd>
+ </dl>
+ </td>
+ <td valign="top">
+ <table class="table-condensed">
+ <thead>
+ <tr>
+ <th>Visit Date</th>
+ <th>Description</th>
+ </tr>
+ </thead>
+ <tr ng-repeat="visit in pet.visits">
+ <td>{{visit.date | date:'yyyy MMM dd'}}</td>
+ <td>{{visit.description}}</td>
+ </tr>
+ <tr>
+ <td>
+ <a href="#!/owners/{{$ctrl.owner.id}}/pets/{{pet.id}}">Edit Pet</a>
+ </td>
+ <td>
+ <a href="#!/owners/{{$ctrl.owner.id}}/pets/{{pet.id}}/visits">Add Visit</a>
+ </td>
+ </tr>
+ </table>
+ </td>
- <p ng-if="pet.visits.length == 0">
- No visit yet
- </p>
+ </tr>
+</table>
- <hr/>
-</div>
diff --git a/src/main/webapp/scripts/app/owner-form/owner-form.template.html b/src/main/webapp/scripts/app/owner-form/owner-form.template.html
index 988ca89537233d33cd236424a5656c33790945ec..0d49cfb92d3aba4e924ebd56319a0d0b1d1e1c7f 100644
--- a/src/main/webapp/scripts/app/owner-form/owner-form.template.html
+++ b/src/main/webapp/scripts/app/owner-form/owner-form.template.html
@@ -32,7 +32,7 @@
</div>
<div class="form-group">
- <button class="btn btn-primary" type="submit">Submit</button>
+ <button class="btn btn-default" type="submit">Submit</button>
</div>
</form>
diff --git a/src/main/webapp/scripts/app/pet-form/pet-form.template.html b/src/main/webapp/scripts/app/pet-form/pet-form.template.html
index a502b8ebe248a8ec49950ea6f14baa4772dc5b82..36884378c0f65edc149bd9a9821c3534f0cadc41 100644
--- a/src/main/webapp/scripts/app/pet-form/pet-form.template.html
+++ b/src/main/webapp/scripts/app/pet-form/pet-form.template.html
@@ -35,7 +35,7 @@
<div class="form-group">
<div class="col-sm-6 col-sm-offset-2">
- <button class="btn btn-primary" type="submit">
+ <button class="btn btn-default" type="submit">
Submit
</button>
</div>