diff --git a/frontend-js/src/main/js/gui/admin/MapsAdminPanel.js b/frontend-js/src/main/js/gui/admin/MapsAdminPanel.js
index a2f7dbfd7333ad91e3e82e6201bdede48520efe1..ff518729310a890aef8113f7baaea44960b5fb57 100644
--- a/frontend-js/src/main/js/gui/admin/MapsAdminPanel.js
+++ b/frontend-js/src/main/js/gui/admin/MapsAdminPanel.js
@@ -4,6 +4,8 @@
 
 var AbstractAdminPanel = require('./AbstractAdminPanel');
 
+var logger = require('../../logger');
+
 var Functions = require('../../Functions');
 var GuiConnector = require('../../GuiConnector');
 var Promise = require("bluebird");
@@ -43,6 +45,7 @@ MapsAdminPanel.prototype._createMenuRow = function() {
   var self = this;
   var menuRow = Functions.createElement({
     type : "div",
+    className : "menu-row",
     style : "display:table-row; margin:10px",
   });
 
@@ -112,14 +115,8 @@ MapsAdminPanel.prototype.init = function() {
 
 MapsAdminPanel.prototype.projectToTableRow = function(project) {
   var self = this;
-  var disease = "N/A";
-  if (project.getDisease() != undefined && project.getDisease() != null) {
-    disease = self.getGuiUtils().createAnnotationLink(project.getDisease(), true).innerHTML;
-  }
-  var organism = "N/A";
-  if (project.getOrganism() != undefined && project.getOrganism() != null) {
-    organism = self.getGuiUtils().createAnnotationLink(project.getOrganism(), true).innerHTML;
-  }
+  var disease = self.getHtmlStringLink(project.getDisease());
+  var organism =  self.getHtmlStringLink(project.getOrganism());
 
   var row = [ project.getProjectId(), // 
   project.getName(), //
@@ -132,6 +129,19 @@ MapsAdminPanel.prototype.projectToTableRow = function(project) {
   return row;
 }
 
+MapsAdminPanel.prototype.getHtmlStringLink = function(annotation) {
+  var self = this;
+  if (annotation != undefined && annotation != null) {
+    var link = self.getGuiUtils().createAnnotationLink(annotation, true);
+    var tmp = document.createElement("div");
+    tmp.appendChild(link);
+    return tmp.innerHTML;
+  } else {
+    return "N/A";
+  }
+
+};
+
 MapsAdminPanel.prototype.setProjects = function(projects) {
   var self = this;
   var dataTable = $($("[name='projectsTable']", self.getElement())[0]).DataTable();