diff --git a/themes/compact/src/compact-pdf.css b/themes/compact/src/compact-pdf.css
index 9fe2a2d..0e1740d 100644
--- a/themes/compact/src/compact-pdf.css
+++ b/themes/compact/src/compact-pdf.css
@@ -1,6 +1,5 @@
-
 html, body, main, section, header, ul, p, h1, h2, h3 {
-  font-family: 'Calibri', 'Helvetica Neue', Helvetica, 'Segoe UI', sans-serif;
+  font-family: Calibri, 'Helvetica Neue', Helvetica, 'Segoe UI', sans-serif;
   font-size: 12px;
   margin: 0; padding: 0;
   display: block;
@@ -27,6 +26,11 @@ h3 {
   font-size: 1em;
 }
 
+hr {
+  border: none;
+  border-top: 1px solid #B3B3B3;
+}
+
 main {
   padding: 15px;
   max-width: 700px;
@@ -60,16 +64,22 @@ thead {
 main > header {
   width: 100%;
   float: left;
-  margin-bottom: 1em;
+  margin-bottom: 0;
+  position: relative;
 }
 
 
 main > header > h1 {
   float: left;
   font-size: 1.5em;
+  text-transform: uppercase;
+  line-height: 1;
 }
 #contact {
   float: right;
+  position: absolute;
+  right: 0;
+  bottom: 0;
 }
 
 #contact > div {
diff --git a/themes/compact/src/compact-pdf.html b/themes/compact/src/compact-pdf.html
index 46ed3ae..ee8c031 100644
--- a/themes/compact/src/compact-pdf.html
+++ b/themes/compact/src/compact-pdf.html
@@ -10,18 +10,18 @@
   <body>
     <main>
       <header>
-        <h1>{{ r.name }}</h1>
+        <h1>{{{ r.name }}}</h1>
         <div id="contact">
-          {{#if r.contact.email}}<div class="email"><a href="mailto:{{ RAW.contact.email }}">{{ r.contact.email }}</a></div>{{/if}}
-          {{#if r.contact.phone}}<div class="phone">{{ r.contact.phone }}</div>{{/if}}
-          {{#if r.contact.website}}<div class="website"><a href="{{ RAW.contact.website }}">{{ r.contact.website }}</a></div>{{/if}}
+          {{#if r.contact.email}}<div class="email"><a href="mailto:{{{ RAW.contact.email }}}">{{ RAW.contact.email }}</a></div>{{/if}}
+          {{#if r.contact.phone}}<div class="phone">{{ RAW.contact.phone }}</div>{{/if}}
+          {{#if r.contact.website}}<div class="website"><a href="{{{ RAW.contact.website }}}">{{trimURL RAW.contact.website }}</a></div>{{/if}}
         </div>
       </header>
 
 
 {{#if r.info.brief}}
       <section id="summary">
-        {{ r.info.brief }}
+        {{{ r.info.brief }}}
       </section>
 {{/if}}
 
@@ -58,7 +58,7 @@
         <h2><span class="fa fa-building" style="vertical-align: top;"></span> Employment</h2><hr>
         </header>
 
-        {{#each r.employment.history }}
+        {{#each r.employment.history}}
           {{#compare @index 4 operator="<"}}
             <h3><em>{{ position }}</em>,
               {{#if url }}
@@ -67,11 +67,11 @@
               {{ employer }}
               {{/if}}
               <span class="tenure">{{formatDate safe.start 'YYYY-MM' }} &mdash; {{formatDate safe.end 'YYYY-MM' }}<span></h3>
-            <p style="clear: both;">{{ summary }}</p>
+            <p style="clear: both;">{{{ summary }}}</p>
             {{#if highlights}}
               <ul>
               {{#each highlights}}
-                <li>{{ this }}</li>
+                <li>{{{ this }}}</li>
               {{/each}}
               </ul>
             {{/if}}
@@ -84,7 +84,7 @@
             <ul>
             {{/compare}}
 
-            <li>{{ position }}, {{ employer }}</li>
+            <li>{{{ position }}}, {{{ employer }}}</li>
 
             {{#if @last}}
             </ul>
@@ -101,7 +101,7 @@
         <h2><span class="fa fa-mortar-board"></span> Education</h2><hr>
         </header>
         {{#each r.education.history}}
-          <h3>{{ institution }} <span class="tenure">{{formatDate safe.start 'YYYY' }} &mdash; {{formatDate safe.end 'YYYY' }}<span></h3>
+          <h3>{{{ institution }}} <span class="tenure">{{formatDate safe.start 'YYYY' }} &mdash; {{formatDate safe.end 'YYYY' }}<span></h3>
         {{/each}}
 
       </section>
@@ -120,11 +120,11 @@
             {{ organization }}
             {{/if}}
             <span class="tenure">{{formatDate safe.start 'YYYY' }} &mdash; {{formatDate safe.end 'YYYY' }}<span></h3>
-          <p style="clear: both;">{{ summary }}</p>
+          <p style="clear: both;">{{{ summary }}}</p>
           {{#if highlights}}
             <ul>
             {{#each highlights}}
-              <li>{{ this }}</li>
+              <li>{{{ this }}}</li>
             {{/each}}
             </ul>
           {{/if}}
@@ -139,9 +139,9 @@
         <h2><span class="fa fa-book"></span> Writing</h2><hr>
         </header>
         {{#each r.writing }}
-          <h3><em>{{#if url}}<a href="{{ url }}">{{ title }}</a>{{else}}{{ title }}{{/if}}</em>,
+          <h3><em>{{#if url}}<a href="{{{ url }}}">{{{ title }}}</a>{{else}}{{{ title }}}{{/if}}</em>,
             {{ publisher }} <span class="tenure">{{formatDate safe.date 'YYYY'}}</span></h3>
-        {{# if summary}}{{ summary }}{{/if}}
+        {{# if summary}}{{{ summary }}}{{/if}}
         {{/each}}
       </section>
 {{/if}}
