diff --git a/.gitignore b/.gitignore
index 295acb3..507681c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,5 @@ mup.json
 .DS_Store
 */.DS_Store
 ssl/
+node_modules/
+*.swp
diff --git a/client/main.scss b/client/main.scss
index 0b62b3a..f9bd271 100644
--- a/client/main.scss
+++ b/client/main.scss
@@ -1,6 +1,7 @@
 @import '{}/node_modules/photoswipe/src/css/main.scss';
 @import '{}/node_modules/photoswipe/src/css/default-skin/default-skin.scss';
 
+@import '{}/imports/ui/stylesheets/global.scss';
 @import '{}/imports/ui/stylesheets/layout.scss';
 @import '{}/imports/ui/stylesheets/autocomplete.scss';
 
diff --git a/imports/ui/blaze-helpers.js b/imports/ui/blaze-helpers.js
index 1143c13..98ab229 100644
--- a/imports/ui/blaze-helpers.js
+++ b/imports/ui/blaze-helpers.js
@@ -3,3 +3,5 @@ import { Template } from 'meteor/templating';
 Template.registerHelper('$and', (a, b) => {
   return a && b;
 });
+
+Template.registerHelper('$not', a => !a);
diff --git a/imports/ui/components/loading_overlay.scss b/imports/ui/components/loading_overlay.scss
index e866016..b38e121 100644
--- a/imports/ui/components/loading_overlay.scss
+++ b/imports/ui/components/loading_overlay.scss
@@ -1,14 +1,3 @@
-.overlay {
-  position: fixed;
-  left: 0;
-  top: 0;
-  height: 100%;
-  width: 100%;
-  opacity: 0.7;
-  z-index: 500;
-  background-color: #000000;
-}
-
 .loader {
   color: #ffffff;
   font-size: 90px;
diff --git a/imports/ui/pages/results.html b/imports/ui/pages/results.html
index 5cf40a7..8d064a1 100644
--- a/imports/ui/pages/results.html
+++ b/imports/ui/pages/results.html
@@ -2,9 +2,9 @@
   <div id="results">
     {{#if moduleChosen "camera"}}
       <h3>{{experience.name}}</h3>
-      <h5>View only photos from:
-        <select id="pic-dropdown">
-          <option value="anywhere" selected>Anywhere</option>
+      <h5>Filter by: 
+        <select id="pic-dropdown" class="form-control">
+          <option value="anywhere" selected>Location</option>
           <option value="north-campus">NU North Campus</option>
           <option value="south-campus">NU South Campus</option>
           <option value="offcampus-evanston">Off-campus Evanston</option>
@@ -14,16 +14,20 @@ <h5>View only photos from:
           <option value="greater-st-louis">Greater St. Louis, MO Area</option>
         </select>
       </h5>
-      <br/>
       <div class="row">
         {{#each image in images}}
-          <div class="col-xs-6 col-sm-4 col-md-2 col">
+          <div class="image-grid col-xs-6 col-sm-4 col-md-2 col">
             <img src="{{image.url store="thumbs"}}" alt="" data-index="{{@index}}">
+            {{#if moduleChosen "text"}}
+              <div class="caption">
+                {{image.caption}}, from {{image.location}}
+              </div>
+            {{/if}}
           </div>
         {{/each}}
       </div>
     {{/if}}
-    {{#if moduleChosen "text"}}
+    {{#if $and (moduleChosen "text") ($not (moduleChosen "camera"))}}
       <h3>Here's what everyone wrote for {{experience.name}}</h3>
       <!--<h5>View only submissions from:-->
         <!--<select id="text-dropdown">-->
@@ -47,25 +51,17 @@ <h3>Here's what everyone wrote for {{experience.name}}</h3>
     {{/if}}
     {{#if moduleChosen "camera"}}
       <div id="gallery" class="pswp" tabindex="-1" role="dialog" aria-hidden="true">
-        <!-- Background of PhotoSwipe.
-             It's a separate element as animating opacity is faster than rgba(). -->
         <div class="pswp__bg"></div>
-        <!-- Slides wrapper with overflow:hidden. -->
         <div class="pswp__scroll-wrap">
 
-          <!-- Container that holds slides.
-              PhotoSwipe keeps only 3 of them in the DOM to save memory.
-              Don't modify these 3 pswp__item elements, data is added later on. -->
           <div class="pswp__container">
             <div class="pswp__item"></div>
             <div class="pswp__item"></div>
             <div class="pswp__item"></div>
           </div>
 
-          <!-- Default (PhotoSwipeUI_Default) interface on top of sliding area. Can be changed. -->
           <div class="pswp__ui pswp__ui--hidden">
             <div class="pswp__top-bar">
-              <!--  Controls are self-explanatory. Order can be changed. -->
               <div class="pswp__counter"></div>
               <button class="pswp__button pswp__button--close" title="Close (Esc)"></button>
               <button class="pswp__button pswp__button--share" title="Share"></button>
diff --git a/imports/ui/pages/results.js b/imports/ui/pages/results.js
index 6c0df16..20b862d 100644
--- a/imports/ui/pages/results.js
+++ b/imports/ui/pages/results.js
@@ -86,11 +86,12 @@ Template.results.events({
         return {
           src: image.url(),
           w: image.metadata.width,
-          h: image.metadata.height
+          h: image.metadata.height,
+          title: `${ image.caption } from ${ image.location }`
         };
       });
     const options = {
-      index: event.target.getAttribute('data-index')
+      index: parseInt(event.target.getAttribute('data-index'))
     };
     const gallery = new PhotoSwipe(galleryElement, PhotoSwipeUI_Default, items, options);
     gallery.init();
diff --git a/imports/ui/pages/results.scss b/imports/ui/pages/results.scss
index 6e0b343..9f35068 100644
--- a/imports/ui/pages/results.scss
+++ b/imports/ui/pages/results.scss
@@ -1,43 +1,36 @@
 
 #results {
+  select.form-control {
+    display: inline-block;
+    width: auto;
+  }
 
   img {
     width: 100%;
+    padding: 0px;
   }
 
   .col {
     padding: 0;
   }
 
-//    display: flex;
-//    flex-wrap: wrap;
-//    font-size: 0;
+  .pswp__caption__center {
+    text-align: center;
+  }
+
+  .image-grid {
+    position: relative;
 
-//    li {
-//      display: inline-block;
-//      font-size: 16px;
-//      margin-left: 4px;
-//      margin-right: 4px;
-//      margin-bottom: 8px;
-//    }
-    //li {
-    //  margin: 4px;
-    //  width: 400px;
-    //  height: 400px;
-    //  overflow: hidden;
-    //  position: relative;
-    //}
-    //img {
-    //  position: absolute;
-    //  margin: auto;
-    //  min-height: 100%;
-    //  max-width: 100%;
-    //
-    //  /* For the following settings we set 100%, but it can be higher if needed
-    //  See the answer's update */
-    //  left: -100%;
-    //  right: -100%;
-    //  top: -100%;
-    //  bottom: -100%;
-    //}
+    .caption {
+      position: absolute;
+      width: 100%;
+      text-align: center;
+      background-color: rgba(0, 0, 0, 0.6);
+      bottom: 0;
+      height: 48px;
+      color: rgba(255, 255, 255, 0.8);
+      text-overflow: ellipsis;
+      overflow: hidden;
+    }
+  }
 }
diff --git a/imports/ui/stylesheets/global.scss b/imports/ui/stylesheets/global.scss
new file mode 100644
index 0000000..923a9a2
--- /dev/null
+++ b/imports/ui/stylesheets/global.scss
@@ -0,0 +1,11 @@
+.overlay {
+  position: fixed;
+  left: 0;
+  top: 0;
+  height: 100%;
+  width: 100%;
+  opacity: 0.7;
+  z-index: 500;
+  background-color: #000000;
+}
+
diff --git a/package.json b/package.json
index 6270610..63549c2 100644
--- a/package.json
+++ b/package.json
@@ -9,8 +9,7 @@
     "photoswipe": "4.1.1"
   },
   "devDependencies": {},
-  "scripts": {
-  },
+  "scripts": {},
   "repository": {
     "type": "git",
     "url": "git+https://github.com/NUDelta/ce-platform.git"
diff --git a/public/default-skin.png b/public/default-skin.png
new file mode 100644
index 0000000..441c502
Binary files /dev/null and b/public/default-skin.png differ
diff --git a/public/default-skin.svg b/public/default-skin.svg
new file mode 100644
index 0000000..9d5f0c6
--- /dev/null
+++ b/public/default-skin.svg
@@ -0,0 +1 @@
+<svg width="264" height="88" viewBox="0 0 264 88" xmlns="http://www.w3.org/2000/svg"><title>default-skin 2</title><g fill="none" fill-rule="evenodd"><g><path d="M67.002 59.5v3.768c-6.307.84-9.184 5.75-10.002 9.732 2.22-2.83 5.564-5.098 10.002-5.098V71.5L73 65.585 67.002 59.5z" id="Shape" fill="#fff"/><g fill="#fff"><path d="M13 29v-5h2v3h3v2h-5zM13 15h5v2h-3v3h-2v-5zM31 15v5h-2v-3h-3v-2h5zM31 29h-5v-2h3v-3h2v5z" id="Shape"/></g><g fill="#fff"><path d="M62 24v5h-2v-3h-3v-2h5zM62 20h-5v-2h3v-3h2v5zM70 20v-5h2v3h3v2h-5zM70 24h5v2h-3v3h-2v-5z"/></g><path d="M20.586 66l-5.656-5.656 1.414-1.414L22 64.586l5.656-5.656 1.414 1.414L23.414 66l5.656 5.656-1.414 1.414L22 67.414l-5.656 5.656-1.414-1.414L20.586 66z" fill="#fff"/><path d="M111.785 65.03L110 63.5l3-3.5h-10v-2h10l-3-3.5 1.785-1.468L117 59l-5.215 6.03z" fill="#fff"/><path d="M152.215 65.03L154 63.5l-3-3.5h10v-2h-10l3-3.5-1.785-1.468L147 59l5.215 6.03z" fill="#fff"/><g><path id="Rectangle-11" fill="#fff" d="M160.957 28.543l-3.25-3.25-1.413 1.414 3.25 3.25z"/><path d="M152.5 27c3.038 0 5.5-2.462 5.5-5.5s-2.462-5.5-5.5-5.5-5.5 2.462-5.5 5.5 2.462 5.5 5.5 5.5z" id="Oval-1" stroke="#fff" stroke-width="1.5"/><path fill="#fff" d="M150 21h5v1h-5z"/></g><g><path d="M116.957 28.543l-1.414 1.414-3.25-3.25 1.414-1.414 3.25 3.25z" fill="#fff"/><path d="M108.5 27c3.038 0 5.5-2.462 5.5-5.5s-2.462-5.5-5.5-5.5-5.5 2.462-5.5 5.5 2.462 5.5 5.5 5.5z" stroke="#fff" stroke-width="1.5"/><path fill="#fff" d="M106 21h5v1h-5z"/><path fill="#fff" d="M109.043 19.008l-.085 5-1-.017.085-5z"/></g></g></g></svg>
\ No newline at end of file