diff --git a/photos/album.properties b/photos/album.properties
index ee71d95..b7d525a 100644
--- a/photos/album.properties
+++ b/photos/album.properties
@@ -1,4 +1,5 @@
 file.l1000729.jpg.caption=Test caption!
 file.IMG_0139.JPG.hidden=false
+file.fra_jakt.jpg.caption: Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
 dir.portraits.hidden=false
 sort=date desc
diff --git a/photos/geiranger/IMG_0577.JPG b/photos/geiranger/IMG_0577.JPG
new file mode 100755
index 0000000..f8dd751
Binary files /dev/null and b/photos/geiranger/IMG_0577.JPG differ
diff --git a/photos/portraits/album.properties b/photos/portraits/album.properties
index ded9676..428415f 100644
--- a/photos/portraits/album.properties
+++ b/photos/portraits/album.properties
@@ -1,4 +1,4 @@
 
 #cover=valdemar-dahl.jpg
 cover=anton-rudi.jpg
-caption=Old Portraits
+caption=Old Portraits. 1953-05-02, Kirsten Høystad, Anne Marie (søskenbarn av Erna), Erna, ukjent, ukjent, Sigrid Dokk, ukjent. De ukjente er barndomsvenninner av Erna fra Oslo.
diff --git a/webapp/WEB-INF/velocity/photo.vm b/webapp/WEB-INF/velocity/photo.vm
index fdc0e30..ee1fb5a 100644
--- a/webapp/WEB-INF/velocity/photo.vm
+++ b/webapp/WEB-INF/velocity/photo.vm
@@ -37,8 +37,12 @@
     }
     div.grid {
 	     float: left;
-         #set($divheight = $thmb + 50)
+         #set($divheight = $thmb + 60)
+         #set($divwidth = $thmb + 25)
          height: ${divheight}px;
+         max-height: ${divheight}px;
+         max-width: ${divwidth}px;
+         overflow: hidden;
     }
     img {
       padding: 5px;
@@ -63,7 +67,7 @@
 #set($enpath = $mapper.map(${entry.getPath()}))
   <div class="photo">
     <img src="${base}${thpath}?size=$thmb" border="0" width="$dim.width" height="$dim.height"/><br/>
-    <span class="caption">$!entry.caption</span>
+    <p class="caption">$!entry.caption</p>
   </div>
 #else
 
@@ -80,7 +84,7 @@
   <div class="grid">
     <span class="name">$en.name</span><br/>
     <a href="#navlink($en)"><img src="${base}${thpath}?size=${thmb}" border="0" width="${dim.width}" height="${dim.height}"/></a><br/>
-    <span class="caption">$!en.caption</span>
+    <p class="caption">$!en.caption</p>
   </div>
 #end
 #end