diff --git a/src/data/templates/gramps-base.html b/src/data/templates/gramps-base.html
index 4dbeb3d38..17eec129d 100644
--- a/src/data/templates/gramps-base.html
+++ b/src/data/templates/gramps-base.html
@@ -17,11 +17,40 @@
     <script type="text/javascript" src="/styles/javascript/jquery-1.3.2.min.js"></script>
     <script type="text/javascript" src="/styles/javascript/jquery-ui-1.7.2.custom.min.js"></script>
     {% endblock %}
+
+   <style>
+     table td {
+        vertical-align: middle;
+     }
+     .content {
+        padding: 0px 0px 10px;
+     }
+     #subtitle {
+        font-weight: bold;
+        font-style: italic;
+        border-top: 1px solid;
+     }
+     td.ColumnAttribute {
+        text-align: right;
+     }
+   {% ifequal action "edit" %}
+   {% else %}
+     #rowspace {
+        height: 3px;
+     }
+     #data {
+        border: 1px solid;
+        background-color: white;
+     }
+   {% endifequal %}
+    </style
+
 </head>
 <body onload="if (document.getElementById('get_focus')) {document.getElementById('get_focus').focus();}">
    <div id="header" style="padding-top: 1em; background-position:0px -32px;">
      <h1 id="SiteTitle" style="margin-left: 0em;">{% block heading %}Gramps-Connect{% endblock %}</h1>
    </div>
+
    <div class="wrapper" role="navigation" id="nav">
     {% block navigation %}
     <div class="container">
diff --git a/src/data/templates/view_family_detail.html b/src/data/templates/view_family_detail.html
index 92bdad8fa..d5fc2a736 100644
--- a/src/data/templates/view_family_detail.html
+++ b/src/data/templates/view_family_detail.html
@@ -14,7 +14,7 @@
 
 {% include "detail_breadcrumb.html" %}
 
-<h3>{{family.father|make_name:user}} and {{family.mother|make_name:user}}</h3>
+<h2>{{family.father|make_name:user}} and {{family.mother|make_name:user}}</h2>
 
 <div id="summaryarea">
 <table class="infolist" style="width:90%;"> {% comment %} 4 cols {% endcomment %}
diff --git a/src/data/templates/view_person_detail.html b/src/data/templates/view_person_detail.html
index 25574428f..727bf21cf 100644
--- a/src/data/templates/view_person_detail.html
+++ b/src/data/templates/view_person_detail.html
@@ -32,40 +32,45 @@
 {% endif %}
 <form method="post">{% csrf_token %}
 <tr>
- <td colspan="4">{{nameform|render_name:user}}</td>
- <td class="ColumnAttribute" align="right">{{nameform.name_type.label}}:</td>
+ <td colspan="4" id="subtitle">{{nameform|render_name:user}}</td>
+ <td class="ColumnAttribute">{{nameform.name_type.label}}:</td>
  <td class="ColumnValue" id="data">{% render nameform.name_type user action %}</td>
 </tr>
+<tr><td id="rowspace"></td></tr>
 <tr>
- <td class="ColumnAttribute" align="right">{{nameform.title.label}}:</td>
+ <td class="ColumnAttribute">{{nameform.title.label}}:</td>
  <td class="ColumnValue" id="data">{% render nameform.title user action False "" "get_focus" %}</td>
- <td class="ColumnAttribute" align="right">{{nameform.nick.label}}:</td>
+ <td class="ColumnAttribute">{{nameform.nick.label}}:</td>
  <td class="ColumnValue" id="data">{% render nameform.nick user action %}</td>
- <td class="ColumnAttribute" align="right">{{nameform.call.label}}:</td>
+ <td class="ColumnAttribute">{{nameform.call.label}}:</td>
  <td class="ColumnValue" id="data">{% render nameform.call user action %}</td>
 </tr>
+<tr><td id="rowspace"></td></tr>
 <tr>
- <td class="ColumnAttribute" align="right">{{nameform.first_name.label}}:</td>
+ <td class="ColumnAttribute">{{nameform.first_name.label}}:</td>
  <td class="ColumnValue" id="data" colspan="4">{% render nameform.first_name user action %}</td>
  <td class="ColumnValue" id="data">{% render nameform.suffix user action %}</td>
 </tr>
+<tr><td id="rowspace"></td></tr>
 <tr>
- <td class="ColumnAttribute" align="right">{{surnameform.surname.label}}:</td>
+ <td class="ColumnAttribute">{{surnameform.surname.label}}:</td>
  <td class="ColumnValue" id="data">{% render surnameform.prefix user action %}</td>
  <td class="ColumnValue" id="data" colspan="2">{% render surnameform.surname user action %}</td>
- <td class="ColumnAttribute" align="right">{{surnameform.name_origin_type.label}}:</td>
+ <td class="ColumnAttribute">{{surnameform.name_origin_type.label}}:</td>
  <td class="ColumnValue" id="data" colspan="2">{% render surnameform.name_origin_type user action %}</td>
 </tr>
+<tr><td id="rowspace"></td></tr>
 <tr>
- <td class="ColumnAttribute" align="right">{{personform.gender_type.label}}:</td>
+ <td class="ColumnAttribute">{{personform.gender_type.label}}:</td>
  <td class="ColumnValue" id="data">{% render personform.gender_type user action %}</td>
- <td class="ColumnAttribute" align="right">{{personform.gramps_id.label}}:</td>
+ <td class="ColumnAttribute">{{personform.gramps_id.label}}:</td>
  <td class="ColumnValue" id="data">{% render personform.gramps_id user action %}</td>
- <td class="ColumnAttribute" align="right">{{personform.tags.label}}:</td>
- <td class="ColumnValue" id="data" rowspan="2">{% render personform.tags user action %}</td>
+ <td class="ColumnAttribute">{{personform.tags.label}}:</td>
+ <td class="ColumnValue" id="data" rowspan="3">{% render personform.tags user action %}</td>
 </tr>
+<tr><td id="rowspace"></td></tr>
 <tr>
- <td class="ColumnAttribute" align="right">{{personform.private.label}}:</td>
+ <td class="ColumnAttribute">{{personform.private.label}}:</td>
  <td class="ColumnValue" id="data">{% render personform.private user action %}</td>
 </tr>
 </tbody>
