diff --git a/Resources/public/css/all.css b/Resources/public/css/all.css
index d93a097..5814d71 100644
--- a/Resources/public/css/all.css
+++ b/Resources/public/css/all.css
@@ -15,7 +15,7 @@ ul.diff-summary input[type=checkbox] {
 ul.diff-summary a div.diff-file-label {
   display: inline-block;
   text-indent: 5px;
-  font-family: monospace;
+  font-family: "Lucida Console", Monaco, monospace;
 }
 
 ul.diff-summary a div.diff-file-label.creation:before {
@@ -76,7 +76,7 @@ ul.diff-summary a:hover > div {
 }
 
 .file-wrapper table.file-lines td {
-  font-family: monospace;
+  font-family: "Lucida Console", Monaco, monospace;
 }
 
 .file-wrapper table.file-lines td.line-number {
@@ -140,6 +140,10 @@ span.git-author {
     padding: 1px 5px;
 }
 
+span.git-author img {
+  margin-right: 5px;
+}
+
 .git-log-wrapper {
     position: relative;
     overflow: hidden;
diff --git a/Resources/views/default_theme.html.twig b/Resources/views/default_theme.html.twig
index 5c7f37f..47276c6 100644
--- a/Resources/views/default_theme.html.twig
+++ b/Resources/views/default_theme.html.twig
@@ -393,12 +393,20 @@
 {% spaceless %}
     <div class="file-wrapper">
         <table class="file-lines">
+            {% set lines = '' %}
+            {% set code  = '' %}
             {%- for number, content in blob.content|split("\n") -%}
-                <tr>
-                    <td class="line-number">{{ number }}</td>
-                    <td class="source"><pre>{{ content }}</pre></td>
-                </tr>
+                {% set ln = number + 1 %}
+                {% set lines = lines ~ ('<a id="L' ~ ln ~ '" href="#L' ~ ln ~ '">' ~ ln ~ "</a>") %}
+                {% set code  = code  ~ content|e %}
+                {% set lines = lines ~ '<br />' %}
+                {% set code  = code  ~ '<br />' %}
             {%- endfor -%}
+
+            <tr>
+                <td class="line-number">{{ lines|raw }}</td>
+                <td class="source"><pre>{{ code|raw }}</pre></td>
+            </tr>
         </table>
     </div>
 {% endspaceless %}