diff --git a/WebContent/page_gallery.jsp b/WebContent/page_gallery.jsp
index 06a8d27..bbbc0a5 100755
--- a/WebContent/page_gallery.jsp
+++ b/WebContent/page_gallery.jsp
@@ -25,7 +25,9 @@
                 <div class="grid folder-grid">
                     <c:forEach items="${subFolders}" var="subFolder">
                         <div class="grid-item folder-thumb col-md-2 col-sm-3 col-xs-4">
-                            <img class="img-responsive" src="${subFolder.getName()}" alt="${subFolder.getName()}" />
+                            <a href="?folder=${subFolder.id}">
+                                <img class="img-responsive" src="" alt="${subFolder.name}" />
+                            </a>
                         </div>
                     </c:forEach>
                 </div>
@@ -36,7 +38,7 @@
                 <div class="grid image-grid">
                     <c:forEach items="${media}" var="item">
                         <div class="grid-item photo-thumb col-md-3 col-sm-6 col-xs-12">
-                            <img class="img-responsive" src="${item.getUrl()}"/>
+                            <img class="img-responsive" src="${ContentServlet.getMediaUrl(item, Media.Size.SMALL)}"/>
                         </div>
                     </c:forEach>
                 </div>
diff --git a/src/zall/page/ContentServlet.java b/src/zall/page/ContentServlet.java
index 70bd174..44acd63 100755
--- a/src/zall/page/ContentServlet.java
+++ b/src/zall/page/ContentServlet.java
@@ -13,13 +13,13 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.fileupload.util.Streams;
 
+import zall.Zallery;
 import zall.ZalleryServlet;
 import zall.bean.Image;
 import zall.bean.Media;
 import zall.bean.Video;
 import zall.manager.ResourceManager;
 import zutil.db.DBConnection;
-import zutil.io.file.FileUtil;
 
 import static zall.page.ContentServlet.URI_IMAGE;
 import static zall.page.ContentServlet.URI_VIDEO;
@@ -76,4 +76,19 @@ public class ContentServlet extends ZalleryServlet {
             response.setStatus(404);
         }
     }
+
+    /**
+     * @return a URL for a specific media file where its data can be retrieved.
+     */
+    public static String getMediaUrl(Media media, Media.Size size) {
+        return getMediaUrl(media, size, false);
+    }
+    /**
+     * @return a URL for a specific media file where its data can be retrieved.
+     */
+    public static String getMediaUrl(Media media, Media.Size size, boolean download) {
+        return Zallery.WEBSITE_URL + "/" + media.getType().toString().toLowerCase() +
+                "?id=" + media.getId() + "&size=" + size.toString().toLowerCase() +
+                (download ? "&download" : "");
+    }
 }