diff --git a/lemur/static/app/angular/certificates/view/view.tpl.html b/lemur/static/app/angular/certificates/view/view.tpl.html
index 5c1e73ca..965e86c8 100644
--- a/lemur/static/app/angular/certificates/view/view.tpl.html
+++ b/lemur/static/app/angular/certificates/view/view.tpl.html
@@ -71,63 +71,52 @@
               <uib-tabset justified="true" class="col-md-8">
                 <uib-tab>
                   <uib-tab-heading>Basic Info</uib-tab-heading>
-                  <ul class="list-group">
-                    <li class="list-group-item">
-                      <strong>Creator</strong>
-                        <span class="pull-right">
-                          {{ certificate.user.email }}
-                        </span>
-                    </li>
-                    <li class="list-group-item">
-                      <strong>Not Before</strong>
-                        <span class="pull-right" uib-tooltip="{{ certificate.notBefore }}">
-                          {{ momentService.createMoment(certificate.notBefore) }}
-                        </span>
-                    </li>
-                    <li class="list-group-item">
-                      <strong>Not After</strong>
-                        <span class="pull-right" uib-tooltip="{{ certificate.notAfter }}">
-                          {{ momentService.createMoment(certificate.notAfter) }}
-                          </span>
-                    </li>
-                    <li class="list-group-item">
-                      <strong>San</strong>
-                      <span class="pull-right">
+                  <dl class="dl-horizontal list-group">
+                    <!-- Lemur metadata -->
+                    <div class="list-group-item">
+                      <dt>Creator</dt>
+                      <dd>{{ certificate.user.email }}</dd>
+                      <dt>Owner</dt>
+                      <dd>{{ certificate.owner }}</dd>
+                      <dt>Description</dt>
+                      <dd class="multiline">{{ certificate.description }}</dd>
+                    </div>
+                    <!-- Certificate fields -->
+                    <div class="list-group-item">
+                      <dt>Certificate Authority</dt>
+                      <dd>{{ certificate.authority ? certificate.authority.name : "Imported" }} <span class="text-muted">({{ certificate.issuer }})</span></dd>
+                      <dt>Serial</dt>
+                      <dd>
+                        <div>Hex: {{ certificate.serialHex }}</div>
+                        <div class="text-muted text-nowrap">Decimal: {{ certificate.serial }}</div>
+                      </dd>
+                      <dt>Valid From</dt>
+                      <dd><span class="text-muted">{{ certificate.notBefore }}</span> ({{ momentService.createMoment(certificate.notBefore) }})</dd>
+                      <dt>Valid To</dt>
+                      <dd><span class="text-muted">{{ certificate.notAfter }}</span> ({{ momentService.createMoment(certificate.notAfter) }})</dd>
+                      <dt>SAN</dt>
+                      <dd>
                         <i class="glyphicon glyphicon-ok" ng-if="certificate.san"></i>
                         <i class="glyphicon glyphicon-remove" ng-if="!certificate.san"></i>
-                      </span>
-                    </li>
-                    <li class="list-group-item">
-                      <strong>Bits</strong>
-                      <span class="pull-right">{{ certificate.bits }}</span>
-                    </li>
-                    <li class="list-group-item">
-                      <strong>Signing Algorithm</strong>
-                      <span class="pull-right">{{ certificate.signingAlgorithm }}</span>
-                    </li>
-                    <li class="list-group-item">
-                      <strong>Serial</strong>
-                      <span class="pull-right">{{ certificate.serial }}</span>
-                    </li>
-                    <li class="list-group-item">
-                      <strong>Serial (Hex)</strong>
-                      <span class="pull-right">{{ certificate.serialHex }}</span>
-                    </li>
-                    <li
-                      uib-tooltip="Lemur will attempt to check a certificates validity, this is used to track whether a certificate has been revoked"
-                      class="list-group-item">
-                      <strong>Validity</strong>
-                      <span class="pull-right">
+                      </dd>
+                    </div>
+                    <!-- Cryptography -->
+                    <div class="list-group-item">
+                      <dt>Key Length</dt>
+                      <dd>{{ certificate.bits }}</dd>
+                      <dt>Signing Algorithm</dt>
+                      <dd>{{ certificate.signingAlgorithm }}</dd>
+                    </div>
+                    <div uib-tooltip="Lemur will attempt to check a certificates validity, this is used to track whether a certificate has been revoked"
+                         class="list-group-item">
+                      <dt>Validity</dt>
+                      <dd>
                         <span ng-if="certificate.status == 'unknown'" class="label label-warning">Unknown</span>
                         <span ng-if="certificate.status == 'revoked'" class="label label-danger">Revoked</span>
                         <span ng-if="certificate.status == 'valid'" class="label label-success">Valid</span>
-                      </span>
-                    </li>
-                    <li class="list-group-item">
-                      <strong>Description</strong>
-                      <p>{{ certificate.description }}</p>
-                    </li>
-                  </ul>
+                      </dd>
+                    </div>
+                  </dl>
                 </uib-tab>
                 <uib-tab>
                   <uib-tab-heading>Endpoints</uib-tab-heading>
diff --git a/lemur/static/app/styles/lemur.css b/lemur/static/app/styles/lemur.css
index 85ba72a0..4aff7bdc 100644
--- a/lemur/static/app/styles/lemur.css
+++ b/lemur/static/app/styles/lemur.css
@@ -185,3 +185,6 @@ a {
   text-align:center;
 }
 
+.multiline {
+  white-space: pre-line;
+}