diff --git a/WebContent/page_gallery.jsp b/WebContent/page_gallery.jsp
index 4b28d1f..861e4ba 100755
--- a/WebContent/page_gallery.jsp
+++ b/WebContent/page_gallery.jsp
@@ -1,3 +1,5 @@
+<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+
 <jsp:include page="header.jsp"/>
 
 <jsp:include page="navbar.jsp"/>
@@ -7,45 +9,22 @@
     <div class="gallery col-center col-md-11">
         <div class="row">
             <div class="grid folder-grid">
-                <div class="grid-item folder-thumb col-md-2 col-sm-3 col-xs-4">
-                    <img class="img-responsive" src="img/folder2.jpg"/>
-                </div>
-                <div class="grid-item folder-thumb col-md-2 col-sm-3 col-xs-4">
-                    <img class="img-responsive" src="img/folder2.jpg"/>
-                </div>
-                <div class="grid-item folder-thumb col-md-2 col-sm-3 col-xs-4">
-                    <img class="img-responsive" src="img/folder2.jpg"/>
-                </div>
+                <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.getThumbnailUrl()}" alt="${subfolder.getName()}" />
+                    </div>
+                </c:forEach>
             </div>
 
             <hr>
         </div>
         <div class="row">
             <div class="grid image-grid">
-                <div class="grid-item photo-thumb col-md-3 col-sm-6 col-xs-12">
-                    <img class="img-responsive" src="http://lorempixel.com/400/200"/>
-                </div>
-                <div class="grid-item photo-thumb col-md-3 col-sm-6 col-xs-12">
-                    <img class="img-responsive" src="http://lorempixel.com/400/400"/>
-                </div>
-                <div class="grid-item photo-thumb col-md-3 col-sm-6 col-xs-12">
-                    <img class="img-responsive" src="http://lorempixel.com/400/200"/>
-                </div>
-                <div class="grid-item photo-thumb col-md-3 col-sm-6 col-xs-12">
-                    <img class="img-responsive" src="http://lorempixel.com/400/200"/>
-                </div>
-                <div class="grid-item photo-thumb col-md-3 col-sm-6 col-xs-12">
-                    <img class="img-responsive" src="http://lorempixel.com/400/800"/>
-                </div>
-                <div class="grid-item photo-thumb col-md-3 col-sm-6 col-xs-12">
-                    <img class="img-responsive" src="http://lorempixel.com/400/200"/>
-                </div>
-                <div class="grid-item photo-thumb col-md-3 col-sm-6 col-xs-12">
-                    <img class="img-responsive" src="http://lorempixel.com/400/300"/>
-                </div>
-                <div class="grid-item photo-thumb col-md-3 col-sm-6 col-xs-12">
-                    <img class="img-responsive" src="http://lorempixel.com/400/400"/>
-                </div>
+                <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()}"/>
+                    </div>
+                </c:forEach>
             </div>
         </div>
     </div> <!-- /gallery -->
diff --git a/src/zall/page/GalleryServlet.java b/src/zall/page/GalleryServlet.java
index a525502..2fa9db0 100755
--- a/src/zall/page/GalleryServlet.java
+++ b/src/zall/page/GalleryServlet.java
@@ -29,7 +29,7 @@ public class GalleryServlet extends ZalleryServlet {
         User user = AuthenticationManager.getUserSession(request.getSession());
         Folder folder;
         
-        if (request.getParameter("folder") != null && !request.getParameter("folder").equalsIgnoreCase("null"))
+        if (request.getParameter("folder") != null)
             folder = Folder.load(db, Long.parseLong(request.getParameter("folder")));
         else {
             folder = Folder.loadRoot(db, user);