diff --git a/render/templates/entry/Image.tmpl b/render/templates/entry/Image.tmpl
index 05f38f5..1c2dd48 100644
--- a/render/templates/entry/Image.tmpl
+++ b/render/templates/entry/Image.tmpl
@@ -1,4 +1,6 @@
-<img src="/media/{{.MetaData.ImageId}}">
+<a href="/media/{{.MetaData.ImageId}}" class="u-photo">
+    <img src="/media/{{.MetaData.ImageId}}" alt="{{.MetaData.Title}}" />
+</a>
 
 {{.MetaData.Content}}
 
diff --git a/render/templates/views/entry.tmpl b/render/templates/views/entry.tmpl
index 5fd2a3e..794918a 100644
--- a/render/templates/views/entry.tmpl
+++ b/render/templates/views/entry.tmpl
@@ -25,7 +25,9 @@
         </small> 
     </hgroup>
 
-    {{.Entry.Content}}
+    <div class="e-content">
+        {{.Entry.Content}}
+    </div>
 
 </div>