diff --git a/frontend-js/src/main/js/ServerConnector.js b/frontend-js/src/main/js/ServerConnector.js
index 60d0ed4ea7d2908ea392fd8a1473735bcb83dd76..c01ccad5710d1ecaec25bec91788d6568ff630c7 100644
--- a/frontend-js/src/main/js/ServerConnector.js
+++ b/frontend-js/src/main/js/ServerConnector.js
@@ -86,7 +86,7 @@ ServerConnector.readFile = function(url, description) {
     return self.callListeners("onDataLoadStop", description);
   }).then(function() {
     return content;
-  })
+  });
 };
 
 ServerConnector._readFile = function(url) {
diff --git a/frontend-js/src/main/js/gui/OverviewDialog.js b/frontend-js/src/main/js/gui/OverviewDialog.js
index cf4349f304dfb2dd9da56f7ae7c95403fdfe05da..7bbc2f656a5fe77ba6058b9b276e73b84e3031ef 100644
--- a/frontend-js/src/main/js/gui/OverviewDialog.js
+++ b/frontend-js/src/main/js/gui/OverviewDialog.js
@@ -118,7 +118,7 @@ OverviewDialog.prototype.showOverview = function(overviewImageId) {
         logger.debug("link coordinates [" + link.idObject + "]: " + link.latLng);
         
         map.openSubmap(link.modelLinkId);
-        var submap = this.getSubmapById(id);
+        var submap = this.getSubmapById(link.modelLinkId);
         submap.setCenter(link.latLng);
         submap.setZoom(link.zoomLevel + submap.getMinZoom());
         
diff --git a/frontend-js/src/main/js/gui/leftPanel/Footer.js b/frontend-js/src/main/js/gui/leftPanel/Footer.js
index 4137dc2bf6beadc65adcfe16ae1436168f7e84ed..a673ff93ad312c61b6be76d528c7e8cc7f9f5ea3 100644
--- a/frontend-js/src/main/js/gui/leftPanel/Footer.js
+++ b/frontend-js/src/main/js/gui/leftPanel/Footer.js
@@ -101,7 +101,7 @@ Footer.prototype.init = function() {
       self.addLoadMessage(e.arg);
       div.style.display = "block";
       div.title = e.arg;
-    }
+    };
 
     self._onDataLoadStop = function(e) {
       self.removeLoadMessage(e.arg);
@@ -110,7 +110,7 @@ Footer.prototype.init = function() {
       } else {
         div.style.display = "none";
       }
-    }
+    };
     ServerConnector.addListener("onDataLoadStart", self._onDataLoadStart);
     ServerConnector.addListener("onDataLoadStop", self._onDataLoadStop);
     resolve();
diff --git a/frontend-js/src/main/js/gui/leftPanel/PublicationListDialog.js b/frontend-js/src/main/js/gui/leftPanel/PublicationListDialog.js
index 5db98c3a8154f47a614a32940e2e3a8a3945189b..61bec33a150c3866140d26426862fe5b1928cfcf 100644
--- a/frontend-js/src/main/js/gui/leftPanel/PublicationListDialog.js
+++ b/frontend-js/src/main/js/gui/leftPanel/PublicationListDialog.js
@@ -111,7 +111,7 @@ PublicationListDialog.prototype.show = function() {
   $(self.getElement()).dialog("open");
 
   if (!$.fn.DataTable.isDataTable(self.tableElement)) {
-    return new Promise(function(resolve, reject) {
+    return new Promise(function(resolve) {
       $(self.tableElement).dataTable({
         serverSide : true,
         ordering : false,
diff --git a/frontend-js/src/main/js/map/AbstractCustomMap.js b/frontend-js/src/main/js/map/AbstractCustomMap.js
index 1053d1218924c6fa886e868af4b2884bacc37e70..b5daee848b2f3de149c979e6eb0c2fae058c72f4 100644
--- a/frontend-js/src/main/js/map/AbstractCustomMap.js
+++ b/frontend-js/src/main/js/map/AbstractCustomMap.js
@@ -670,12 +670,7 @@ AbstractCustomMap.prototype.getAliasVisibleLayoutsData = function(aliasId) {
     var result = [];
     for (var i = 0; i < visibleDataOverlays.length; i++) {
       var layout = visibleDataOverlays[i];
-      if (layout !== null && layout !== undefined) {
-        result.push(layout.getFullAliasById(aliasId));
-      } else {
-        logger.warn("No layout data found for layout: " + layouts[i]);
-        result.push(null);
-      }
+      result.push(layout.getFullAliasById(aliasId));
     }
     return Promise.all(result);
   });
@@ -1007,7 +1002,7 @@ AbstractCustomMap.prototype.fitBounds = function( markers) {
       map.fitBounds(bounds);
     }
   }
-}
+};
 
 
 module.exports = AbstractCustomMap;
diff --git a/frontend-js/src/main/js/map/CustomMap.js b/frontend-js/src/main/js/map/CustomMap.js
index 0cff29f7824b2a628662e5256e90aeb30b63279b..c3b9f9037c3711e58969133e87d16f372d3e4169 100644
--- a/frontend-js/src/main/js/map/CustomMap.js
+++ b/frontend-js/src/main/js/map/CustomMap.js
@@ -729,8 +729,6 @@ CustomMap.prototype.renderOverlayCollection = function(overlayCollection, fitBou
       function(identifiedElements) {
         elements = identifiedElements;
 
-        var bounds;
-
         return Promise.each(elements, function(element) {
           var model = self.getSubmapById(element.modelId);
           if (element.getType() === "ALIAS") {
diff --git a/frontend-js/src/main/js/map/overlay/UserDbOverlay.js b/frontend-js/src/main/js/map/overlay/UserDbOverlay.js
index 623113007c09a011f76412dd60403a0ede819988..a69d6a30d71d6ef3cc44bd5ed8482f45f3527117 100644
--- a/frontend-js/src/main/js/map/overlay/UserDbOverlay.js
+++ b/frontend-js/src/main/js/map/overlay/UserDbOverlay.js
@@ -4,14 +4,7 @@
 
 var logger = require('../../logger');
 
-var Promise = require("bluebird");
-
 var AbstractDbOverlay = require('./AbstractDbOverlay');
-var Alias = require('../data/Alias');
-var IdentifiedElement = require('../data/IdentifiedElement');
-var Reaction = require('../data/Reaction');
-
-var ServerConnector = require('../../ServerConnector');
 
 function UserDbOverlay(params) {
   params.iconType = "marker";
diff --git a/frontend-js/src/main/js/map/window/AliasInfoWindow.js b/frontend-js/src/main/js/map/window/AliasInfoWindow.js
index f59286e9ca2b09eae4c7ab32a43eee13a4a33aec..80ae566f68c765c69931c64b8dd879827576f270 100644
--- a/frontend-js/src/main/js/map/window/AliasInfoWindow.js
+++ b/frontend-js/src/main/js/map/window/AliasInfoWindow.js
@@ -93,7 +93,7 @@ AliasInfoWindow.prototype.createChartDiv = function() {
       return functions.overlayToColor(data).then(function(color) {
         var value = parseFloat(data.value);
         var description = data.description;
-        if (description == null || description == undefined || description == "") {
+        if (description === null || description === undefined || description === "") {
           description = "";
           if (!isNaN(value)) {
             description = value.toFixed(2);
diff --git a/frontend-js/src/main/js/minerva.js b/frontend-js/src/main/js/minerva.js
index 6820f3aa44dcfd0b29cb4215417ad207f582e53c..737a56d867f4e58ef1a36060fcda94e389750373 100644
--- a/frontend-js/src/main/js/minerva.js
+++ b/frontend-js/src/main/js/minerva.js
@@ -4,7 +4,6 @@ var functions = require('./Functions');
 
 var IdentifiedElement = require('./map/data/IdentifiedElement');
 
-
 var AbstractDbOverlay = require('./map/overlay/AbstractDbOverlay');
 var DbOverlayCollection = require('./map/overlay/DbOverlayCollection');
 var ConfigurationType = require('./ConfigurationType');
@@ -177,7 +176,7 @@ function createResult(customMap) {
       dbOverlay.addListener(type, function(e) {
         return getFullElements(customMap, e.arg.identifiedElements).then(function(result) {
           return callback(result);
-        })
+        });
       });
     },
     getHiglightedElements : function(dbOverlayName) {
@@ -221,7 +220,7 @@ function initGlobals(params) {
 
 }
 
-function verifyBrowser(params) {
+function verifyBrowser() {
 
   var browser = functions.browser;
   if (browser.name === "IE") {
@@ -244,12 +243,12 @@ function getProject(params) {
   } else {
     return ServerConnector.getProject(params.getProjectId());
   }
-};
+}
 
 function modifyParamsForTouchInterface(params) {
   if (params.markerOptimization === undefined && params.bigLogo === undefined
       && params.customTouchInterface === undefined) {
-    var windowsTouchInterface = ((navigator.appVersion.indexOf("Win") != -1) && ('ontouchstart' in document.documentElement));
+    var windowsTouchInterface = ((navigator.appVersion.indexOf("Win") > -1) && ('ontouchstart' in document.documentElement));
     params.markerOptimization = !windowsTouchInterface;
     params.bigLogo = windowsTouchInterface;
     params.customTouchInterface = windowsTouchInterface;
diff --git a/frontend-js/src/test/js/Functions-test.js b/frontend-js/src/test/js/Functions-test.js
index cc2231ef6d89eed9d5d73da379b353f1aa56c8fa..9595bf326be87b4c7f0e38f96f486ccd0a68cf7f 100644
--- a/frontend-js/src/test/js/Functions-test.js
+++ b/frontend-js/src/test/js/Functions-test.js
@@ -1,7 +1,5 @@
 "use strict";
 
-var Promise = require("bluebird");
-
 var functions = require('../../main/js/Functions');
 var logger = require('./logger');
 
diff --git a/frontend-js/src/test/js/helper.js b/frontend-js/src/test/js/helper.js
index 196e33819b178ae49987793c1386113f3ae563bc..8ed46f8a5a907f0810725e98083e50b21f80489a 100644
--- a/frontend-js/src/test/js/helper.js
+++ b/frontend-js/src/test/js/helper.js
@@ -350,7 +350,7 @@ Helper.prototype.createCustomMap = function(project) {
  */
 Helper.prototype.setUrl = function(url) {
   var cookies = Cookies.get();
-  jsdom.changeURL(window, url)
+  jsdom.changeURL(window, url);
   for ( var cookie in cookies) {
     Cookies.set(cookie, cookies[cookie]);
   }
diff --git a/frontend-js/src/test/js/map/CustomMap-test.js b/frontend-js/src/test/js/map/CustomMap-test.js
index 02bea72b160a0fc934babb204b675aff56e99a62..643a667cb5f6181e6b02bbf09c72d6cb48c34c29 100644
--- a/frontend-js/src/test/js/map/CustomMap-test.js
+++ b/frontend-js/src/test/js/map/CustomMap-test.js
@@ -410,17 +410,18 @@ describe('CustomMap', function() {
       return map.hideMarkersForDbOverlay(oc);
     }).then(function() {
       var markerCount = 0;
-      for ( var id in oc.reactionMarkers) {
+      var id;
+      for (id in oc.reactionMarkers) {
         if (oc.reactionMarkers.hasOwnProperty(id)) {
           markerCount++;
         }
       }
-      for ( var id in oc.pointMarkers) {
+      for (id in oc.pointMarkers) {
         if (oc.pointMarkers.hasOwnProperty(id)) {
           markerCount++;
         }
       }
-      for ( var id in oc.aliasMarkers) {
+      for (id in oc.aliasMarkers) {
         if (oc.aliasMarkers.hasOwnProperty(id)) {
           markerCount++;
         }
diff --git a/frontend-js/src/test/js/map/window/AliasInfoWindow-test.js b/frontend-js/src/test/js/map/window/AliasInfoWindow-test.js
index fb6c104bec4263b79d8c939c7f9e0b75386593c6..9c1fa68c54ce4013aa74dad99aee31b5e2a3a358 100644
--- a/frontend-js/src/test/js/map/window/AliasInfoWindow-test.js
+++ b/frontend-js/src/test/js/map/window/AliasInfoWindow-test.js
@@ -9,7 +9,6 @@ var Helper = require('../../Helper');
 var Alias = require('../../../../main/js/map/data/Alias');
 var AliasInfoWindow = require('../../../../main/js/map/window/AliasInfoWindow');
 var IdentifiedElement = require('../../../../main/js/map/data/IdentifiedElement');
-var LayoutAlias = require('../../../../main/js/map/data/LayoutAlias');
 var LayoutData = require('../../../../main/js/map/data/LayoutData');
 
 var assert = require('assert');
diff --git a/frontend-js/src/test/js/minerva-test.js b/frontend-js/src/test/js/minerva-test.js
index 412e557a56744daa0694824fa233f1ad97cd9424..69b0fbeb03493c4dc5a5c31839e4a71d0d38bdf8 100644
--- a/frontend-js/src/test/js/minerva-test.js
+++ b/frontend-js/src/test/js/minerva-test.js
@@ -134,7 +134,7 @@ describe('minerva global', function() {
       ServerConnectorMock.getSessionData(project).setSelectedBackgroundOverlay(layout.getId());
 
       return minerva.create(options);
-    }).then(function(customMap) {
+    }).then(function() {
       assert.equal(ServerConnectorMock.getSessionData().getSelectedBackgroundOverlay(), layout.getId());
     });
   });
@@ -216,7 +216,6 @@ describe('minerva global', function() {
   });
 
   it('getProject', function() {
-    var callbackOk = false;
     return ServerConnectorMock.getProject().then(function(project) {
       var options = helper.createCustomMapOptions(project);
       return minerva.create(options);
@@ -235,9 +234,9 @@ describe('minerva global', function() {
       globalResult = result;
       assert.ok(result);
     }).then(function() {
-      globalResult.destroy()
+      globalResult.destroy();
     }, function(exception) {
-      globalResult.destroy()
+      globalResult.destroy();
       throw exception;
     });
   });
@@ -258,9 +257,9 @@ describe('minerva global', function() {
     }).then(function(result) {
       assert.ok(result);
     }).then(function() {
-      globalResult.destroy()
+      globalResult.destroy();
     }, function(exception) {
-      globalResult.destroy()
+      globalResult.destroy();
       throw exception;
     });
   });