diff --git a/Gemfile b/Gemfile
index 35c39e14..e21cca7e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,8 +6,6 @@ gem 'rails', '3.2.17'
 # Bundle edge Rails instead:
 # gem 'rails', :git => 'git://github.com/rails/rails.git'
 
-gem 'phantomjs'
-
 gem 'devise'
 gem 'redis'
 gem 'pg'
@@ -19,9 +17,6 @@ gem 'rails3-jquery-autocomplete'
 gem 'best_in_place' #in-place editing
 gem 'kaminari' # pagination
 gem 'uservoice-ruby'
-gem 'sidekiq' # worker processes
-gem 'sinatra', require: false
-gem 'slim'
 
 gem 'paperclip'
 gem 'aws-sdk'
diff --git a/app/assets/javascripts/src/Metamaps.js b/app/assets/javascripts/src/Metamaps.js
index 8b217563..a2c88d04 100644
--- a/app/assets/javascripts/src/Metamaps.js
+++ b/app/assets/javascripts/src/Metamaps.js
@@ -1289,7 +1289,7 @@ Metamaps.SynapseCard = {
         });
     },
     add_drop_down: function (edge, synapse) {
-        var list, i, synapses, l;
+        var list, i, synapses, l, desc;
 
         synapses = edge.getData("synapses");
         l = synapses.length;
@@ -1311,7 +1311,9 @@ Metamaps.SynapseCard = {
             list = '<ul id="switchSynapseList">';
             for (i = 0; i < l; i++) {
                 if (synapses[i] !== synapse) { // don't add the current one to the list
-                    list += '<li data-synapse-index="' + i + '">' + synapses[i].get('desc') + '</li>';
+                    desc = synapses[i].get('desc');
+                    desc = desc === "" || desc === null ? "(no description)" : desc;
+                    list += '<li data-synapse-index="' + i + '">' + desc + '</li>';
                 }
             }
             list += '</ul>'
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index cc37c590..c3cecf5d 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -1902,6 +1902,9 @@ and it won't be important on password protected instances */
     color: #424242;
     text-align: left;
 }
+.lightboxContent li {
+    list-style: none;
+}
 .openLightbox {
     cursor: pointer;
 }
diff --git a/app/assets/stylesheets/base.css b/app/assets/stylesheets/base.css
index 3cce20a2..3f7fec10 100644
--- a/app/assets/stylesheets/base.css
+++ b/app/assets/stylesheets/base.css
@@ -732,14 +732,14 @@ font-family: 'din-regular', helvetica, sans-serif;
   border-bottom: 1px solid #BBBBBB;
 }
 #switchSynapseList li {
-  padding: 8px;
+  padding: 8px 8px 8px 68px;
   cursor: pointer;
   font-family: 'din-regular';
   font-size: 14px;
   line-height: 16px;
 }
 #switchSynapseList li:hover {
-  background: #E0E0E0;
+  background: #DAB539;
 }
 
 #edgeUser {
diff --git a/app/assets/stylesheets/clean.css b/app/assets/stylesheets/clean.css
index 6f8d2399..a19a8bfc 100644
--- a/app/assets/stylesheets/clean.css
+++ b/app/assets/stylesheets/clean.css
@@ -704,7 +704,7 @@
 .mapPage .infoAndHelp, .topicPage .infoAndHelp{
     right: 70px;
 }
-.mapPage .openCheatsheet .tooltipsAbove, .topicPage .openCheatsheat .tooltipsAbove {
+.mapPage .openCheatsheet .tooltipsAbove, .topicPage .openCheatsheet .tooltipsAbove {
     left: 29px;
 }
 
diff --git a/app/controllers/main_controller.rb b/app/controllers/main_controller.rb
index f9c7240f..873c3835 100644
--- a/app/controllers/main_controller.rb
+++ b/app/controllers/main_controller.rb
@@ -196,7 +196,7 @@ class MainController < ApplicationController
     if term && !term.empty?
       @synapses = Synapse.select('DISTINCT "desc"').
         where('LOWER("desc") like ?', '%' + term.downcase + '%').limit(5).order('"desc"')
-      
+
       render json: autocomplete_synapse_generic_json(@synapses)
       
     elsif topic1id && !topic1id.empty?
diff --git a/public/404.html b/public/404.html
index 0cc86728..643a5ded 100644
--- a/public/404.html
+++ b/public/404.html
@@ -26,14 +26,14 @@
     }
 
     body { 
-    background: #d8d9da url(shattered_@2X.png);
+    background: #d8d9da url(/assets/shattered_@2X.png);
     font-family: 'din-regular', helvetica, sans-serif;
     color: #424242;
     text-align: justify;
     font-size: 18px;
     line-height: 18px;
   }
-  .title a {
+  .dialog a {
     color:#c04f4f;
   }
     .title{
@@ -85,7 +85,7 @@
       box-shadow: 0px 1px 1.5px rgba(0,0,0,0.12), 0 1px 1px rgba(0,0,0,0.24);
       margin: 0 auto;
       text-decoration: none;
-      color: #FFFFFF;
+      color: #FFFFFF !important;
       cursor: pointer;
     }