diff --git a/js/apps/system/aardvark/frontend/js/templates/modalBase.ejs b/js/apps/system/aardvark/frontend/js/templates/modalBase.ejs
index 9b192858ef..17c3500bbd 100644
--- a/js/apps/system/aardvark/frontend/js/templates/modalBase.ejs
+++ b/js/apps/system/aardvark/frontend/js/templates/modalBase.ejs
@@ -3,7 +3,7 @@
        aria-labelledby="myModalLabel" aria-hidden="true">
     <div class="modal-header">
       <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-      <a class="arangoHeader"><%=title%>></a>
+      <a class="arangoHeader"><%=title%></a>
     </div>
 
     <div class="modal-body">
diff --git a/js/apps/system/aardvark/frontend/js/templates/modalTable.ejs b/js/apps/system/aardvark/frontend/js/templates/modalTable.ejs
index f9539fc906..6f15fefdb3 100644
--- a/js/apps/system/aardvark/frontend/js/templates/modalTable.ejs
+++ b/js/apps/system/aardvark/frontend/js/templates/modalTable.ejs
@@ -31,7 +31,7 @@
           if (row.checked) {
             checked = 'checked';
           }
-          if (row.checked) {
+          if (row.disabled) {
             disabled = 'disabled';
           }
     %>
diff --git a/js/apps/system/aardvark/frontend/js/views/modalView.js b/js/apps/system/aardvark/frontend/js/views/modalView.js
index a2cae6df7e..f54d62abba 100644
--- a/js/apps/system/aardvark/frontend/js/views/modalView.js
+++ b/js/apps/system/aardvark/frontend/js/views/modalView.js
@@ -76,11 +76,15 @@
         model = {};
       model.content = tableContent || [];
       $(".modal-body").html(template.render(model));
-      $("#modal-dialog").show();
+      $('.modalTooltips').tooltip({
+        placement: "left"
+      });
+
+      $("#modal-dialog").modal("show");
     },
 
     hide: function() {
-      $("#modal-dialog").hide();
+      $("#modal-dialog").modal("hide");
     }
   });
 }());
diff --git a/js/apps/system/aardvark/frontend/scss/_modals.scss b/js/apps/system/aardvark/frontend/scss/_modals.scss
index 6fc1395853..f1d53a711b 100644
--- a/js/apps/system/aardvark/frontend/scss/_modals.scss
+++ b/js/apps/system/aardvark/frontend/scss/_modals.scss
@@ -196,6 +196,5 @@ pre.gv-object-view {
 }
 
 .createModalDialog table {
-  display: none;
   width: 100%;
 }
\ No newline at end of file
diff --git a/js/apps/system/aardvark/frontend/scss/generated.css b/js/apps/system/aardvark/frontend/scss/generated.css
index ee85e7d28a..50a876cc5b 100644
--- a/js/apps/system/aardvark/frontend/scss/generated.css
+++ b/js/apps/system/aardvark/frontend/scss/generated.css
@@ -2595,7 +2595,6 @@ pre.gv-object-view {
       margin-right: -18px; }
 
 .createModalDialog table {
-  display: none;
   width: 100%; }
 
 .navlogo .stat_cpu {