diff --git a/frontend-js/src/main/js/Export.js b/frontend-js/src/main/js/Export.js
index fa7484677ee79c57857590a742b91cf751e81a46..fd8dd9261c316b1709123354c0142eded1389dda 100644
--- a/frontend-js/src/main/js/Export.js
+++ b/frontend-js/src/main/js/Export.js
@@ -55,7 +55,8 @@ Export.prototype._createGui = function () {
     element: headerDiv,
     customMap: null,
     project: self.getProject(),
-    configuration: self.getConfiguration()
+    configuration: self.getConfiguration(),
+    serverConnector: self.getServerConnector()
   });
   self.getElement().appendChild(headerDiv);
 
diff --git a/frontend-js/src/main/js/gui/Header.js b/frontend-js/src/main/js/gui/Header.js
index 6da0b37c0822f7cb2847f772abd2abc308341ecd..2ea97b9f4bda4d1b9428218195b58c4593d9dfc1 100644
--- a/frontend-js/src/main/js/gui/Header.js
+++ b/frontend-js/src/main/js/gui/Header.js
@@ -17,7 +17,7 @@ var xss = require('xss');
  * @param {Object} params
  * @param {HTMLElement} params.element
  * @param {CustomMap} params.customMap
- * @param {boolean} params.optionsMenu
+ * @param {boolean} [params.optionsMenu=false]
  * @param {Configuration} params.configuration
  * @param {Project} [params.project]
  * @param {ServerConnector} [params.serverConnector]
@@ -71,7 +71,7 @@ Header.prototype._createHeaderGui = function (guiParams) {
     content: '<i class="fa fa-lock" style="font-size:17px"></i>&nbsp;',
     xss: false
   });
-  link.href = ServerConnector.getServerBaseUrl() + "admin.xhtml?id=" + projectId;
+  link.href = self.getServerConnector().getServerBaseUrl() + "admin.xhtml?id=" + projectId;
   self.getElement().appendChild(link);
 
   if (guiParams.optionsMenu) {
@@ -111,7 +111,7 @@ Header.prototype._createHeaderGui = function (guiParams) {
     content: '<i class="fa fa-home" style="font-size:17px"></i> ' + projectName,
     xss: false
   });
-  homeLink.href = ServerConnector.getServerBaseUrl() + "?id=" + projectId;
+  homeLink.href = self.getServerConnector().getServerBaseUrl() + "?id=" + projectId;
   self.getElement().appendChild(homeLink);
 };
 
@@ -161,8 +161,8 @@ Header.prototype.init = function () {
         $(div).hide();
       }
     };
-    ServerConnector.addListener("onDataLoadStart", self._onDataLoadStart);
-    ServerConnector.addListener("onDataLoadStop", self._onDataLoadStop);
+    self.getServerConnector().addListener("onDataLoadStart", self._onDataLoadStart);
+    self.getServerConnector().addListener("onDataLoadStop", self._onDataLoadStop);
     resolve();
   });
 };
@@ -173,8 +173,8 @@ Header.prototype.init = function () {
 Header.prototype.destroy = function () {
   var self = this;
   if (self._onDataLoadStart) {
-    ServerConnector.removeListener("onDataLoadStart", self._onDataLoadStart);
-    ServerConnector.removeListener("onDataLoadStop", self._onDataLoadStop);
+    self.getServerConnector().removeListener("onDataLoadStart", self._onDataLoadStart);
+    self.getServerConnector().removeListener("onDataLoadStop", self._onDataLoadStop);
   }
   if (self._optionsMenu !== undefined) {
     document.body.removeChild(self._optionsMenu.getElement());
diff --git a/frontend-js/src/main/js/gui/leftPanel/LeftPanel.js b/frontend-js/src/main/js/gui/leftPanel/LeftPanel.js
index 77cde470d08e121e9e8ffebcb1f98ccd9e442c49..2f1266695f14b3a9a7f32dd625394eb43d8bc345 100644
--- a/frontend-js/src/main/js/gui/leftPanel/LeftPanel.js
+++ b/frontend-js/src/main/js/gui/leftPanel/LeftPanel.js
@@ -18,6 +18,7 @@ var SearchPanel = require('./SearchPanel');
 var SubmapPanel = require('./SubmapPanel');
 
 var Functions = require('../../Functions');
+// noinspection JSUnusedLocalSymbols
 var logger = require('../../logger');
 
 /**