diff --git a/src/main/webapp/assets/render.js b/src/main/webapp/assets/render.js
index 222839f..11f2f10 100644
--- a/src/main/webapp/assets/render.js
+++ b/src/main/webapp/assets/render.js
@@ -91,13 +91,25 @@ $(function() {
                 href = "/photo/album" + encUri(entry.path) + "?size=" + picSize;
                 poster = "/photo/album" + encUri(entry.path);
             }
-            var gridDiv = $("<div class=\"grid\">\n"
-                       		+ "   <span class=\"name\">" + entry.name + "</span><br/>\n"
-                            + "   <div class=\"imgborder\"><a class=\"ss\" id=\"ent" + idx + "\" href=\"" + href + "\" title=\"" + entry.name + "\">"
-                            + "<img class=\"" + entry.type + "pic\" src=\"" + poster + "?size=" + thmb + "\" border=\"0\" width=\"" + dim.w + "\" height=\"" + dim.h + "\"/></a></div>\n"
-                       		+ "</div>\n");
+            var imgTag = $("<img/>");
+            imgTag.addClass(entry.type + "pic")
+            .attr("src", poster + "?size=" + thmb)
+            .attr("width", dim.w)
+            .attr("height", dim.h)
+            .attr("border", "0");
+            var anchor = $("<a/>");
+            anchor.addClass("ss")
+            .attr("id", "ent" + idx)
+            .attr("href", href)
+            .attr("title", entry.name)
+             anchor.append(imgTag);
 
-            var captionP = $("<p class=\"caption\"></p>\n");
+
+            var gridDiv = $("<div></div>").addClass("grid");
+
+            gridDiv.append($("<span></span>").addClass("name").text(entry.name), "<br>\n", $("<div class=\"imgborder\"></div>").append(anchor))
+
+            var captionP = $("<p></p>").addClass("caption");
             captionP.attr("id", entry.name);
             if (entry.caption) {
                 captionP.text(entry.caption);