diff --git a/static/style.css b/static/style.css
index 19c0891..23e2f75 100644
--- a/static/style.css
+++ b/static/style.css
@@ -180,6 +180,10 @@ a:hover {
   padding: 1rem 0 1rem 0;
 }
 
+.commit-hash, .commit-email {
+  font-family: var(--mono-font);
+}
+
 .commit-email:before {
   content: '<';
 }
@@ -238,21 +242,24 @@ a:hover {
   -webkit-user-select: none;
   -o-user-select: none;
   user-select: none;
+  display: flex;
+  float: left;
+  flex-direction: column;
+  margin-right: 1ch;
 }
 
 .file-wrapper {
-  display: flex;
-  flex-direction: row;
-  grid-template-columns: 1rem minmax(0, 1fr);
-  gap: 1rem;
-  padding: 0.5rem;
   background: var(--light-gray);
+  display: table;
+  padding: 0.5rem
+  width: 100%;
 }
 
 .file-content {
   background: var(--light-gray);
   overflow-y: hidden;
   overflow-x: auto;
+  display: block;
 }
 
 .diff-type {
diff --git a/templates/commit.html b/templates/commit.html
index 2f05b46..4a01b77 100644
--- a/templates/commit.html
+++ b/templates/commit.html
@@ -11,13 +11,13 @@
           {{- .commit.Message -}}
         </pre>
         <div class="commit-info">
-        {{ .commit.Author.Name }} <span class="commit-email">{{ .commit.Author.Email}}</span>
+        {{ .commit.Author.Name }} <a href="mailto:{{ .Author.Email }}" class="commit-email">{{ .commit.Author.Email}}</span>
         <div>{{ .commit.Author.When.Format "Mon, 02 Jan 2006 15:04:05 -0700" }}</div>
         </div>
 
         <div>
         <strong>commit</strong>
-        <p><a href="/{{ .name }}/commit/{{ .commit.This }}">
+        <p><a href="/{{ .name }}/commit/{{ .commit.This }}" class="commit-hash">
           {{ .commit.This }}
         </a>
         </p>
@@ -26,7 +26,7 @@
         {{ if .commit.Parent }}
         <div>
         <strong>parent</strong>
-        <p><a href="/{{ .name }}/commit/{{ .commit.Parent }}">
+        <p><a href="/{{ .name }}/commit/{{ .commit.Parent }}" class="commit-hash">
           {{ .commit.Parent }}
         </a></p>
         </div>
diff --git a/templates/file.html b/templates/file.html
index ab432d3..82a3384 100644
--- a/templates/file.html
+++ b/templates/file.html
@@ -8,18 +8,22 @@
     {{ template "nav" . }}
     <main>
       <p>{{ .path }}</p>
-      <div class="file-wrapper">
-        <div class="line-numbers">
-          {{- range .linecount }}
+      <table class="file-wrapper">
+        <tbody><tr>
+        <td class="line-numbers">
+          <pre>
+            {{- range .linecount }}
 <a id="L{{ . }}" href="#L{{ . }}">{{ . }}</a>
-          {{- end -}}
-        </div>
-        <div class="file-content">
-          <span></span>
+            {{- end -}}
+          </pre>
+        </td>
+        <td class="file-content">
           <pre>
             {{- .content -}}
           </pre>
-        </div>
+        </td>
+        </tbody></tr>
+      </table>
     </main>
   </body>
 </html>
diff --git a/templates/log.html b/templates/log.html
index 4e592b6..1ab6cbc 100644
--- a/templates/log.html
+++ b/templates/log.html
@@ -14,11 +14,11 @@
       <div class="log">
         {{ range .commits }}
         <div>
-          <div><a href="/{{ $repo }}/commit/{{ .Hash.String }}">{{ slice .Hash.String 0 8 }}</a></div>
+          <div><a href="/{{ $repo }}/commit/{{ .Hash.String }}" class="commit-hash">{{ slice .Hash.String 0 8 }}</a></div>
           <pre>{{ .Message }}</pre>
         </div>
         <div class="commit-info">
-          {{ .Author.Name }} <span class="commit-email">{{ .Author.Email }}</span>
+          {{ .Author.Name }} <a href="mailto:{{ .Author.Email }}" class="commit-email">{{ .Author.Email }}</a>
           <div>{{ .Author.When.Format "Mon, 02 Jan 2006 15:04:05 -0700" }}</div>
         </div>
         {{ end }}
diff --git a/templates/repo.html b/templates/repo.html
index 6307fd7..1c700b5 100644
--- a/templates/repo.html
+++ b/templates/repo.html
@@ -16,11 +16,11 @@
       <div class="log">
         {{ range .commits }}
         <div>
-          <div><a href="/{{ $repo }}/commit/{{ .Hash.String }}">{{ slice .Hash.String 0 8 }}</a></div>
+          <div><a href="/{{ $repo }}/commit/{{ .Hash.String }}" class="commit-hash">{{ slice .Hash.String 0 8 }}</a></div>
           <pre>{{ .Message }}</pre>
         </div>
         <div class="commit-info">
-          {{ .Author.Name }} <span class="commit-email">{{ .Author.Email }}</span>
+          {{ .Author.Name }} <a href="mailto:{{ .Author.Email }}" class="commit-email">{{ .Author.Email }}</a>
           <div>{{ .Author.When.Format "Mon, 02 Jan 2006 15:04:05 -0700" }}</div>
         </div>
         {{ end }}