diff --git a/dist/app/TouringPanel.d.ts b/dist/app/TouringPanel.d.ts
index e9eac48..7306349 100644
--- a/dist/app/TouringPanel.d.ts
+++ b/dist/app/TouringPanel.d.ts
@@ -1,11 +1,11 @@
 import 'd3.parsets/d3.parsets';
 import 'd3-grubert-boxplot/box';
 import { LocalDataProvider } from 'lineupjs';
-import { PanelTab } from 'tdp_core/dist/lineup/internal/panel/PanelTab';
-import { IPanelTabExtensionDesc } from 'tdp_core/dist/lineup/internal/LineUpPanelActions';
+import { PanelTab } from 'tdp_core';
+import { IPanelTabExtensionDesc } from 'tdp_core';
 import { RowComparison } from '../tasks/RowComparisonTask';
 import { ColumnComparison } from '../tasks/ColumnComparisonTask';
-export declare const tasks: (ColumnComparison | RowComparison)[];
+export declare const tasks: (RowComparison | ColumnComparison)[];
 export declare class TouringPanel {
     private readonly _desc;
     private readonly tab;
diff --git a/dist/app/TouringPanel.js b/dist/app/TouringPanel.js
index a65d653..073e493 100644
--- a/dist/app/TouringPanel.js
+++ b/dist/app/TouringPanel.js
@@ -2,7 +2,7 @@ import { RankingAdapter } from '../tasks/RankingAdapter';
 import * as d3 from 'd3';
 import 'd3.parsets/d3.parsets';
 import 'd3-grubert-boxplot/box';
-import { PanelTab } from 'tdp_core/dist/lineup/internal/panel/PanelTab';
+import { PanelTab } from 'tdp_core';
 import { RowComparison } from '../tasks/RowComparisonTask';
 import { ColumnComparison } from '../tasks/ColumnComparisonTask';
 export const tasks = [
@@ -19,8 +19,10 @@ const touringTemplate = `
 </div>
 <div class="input">
   <div class="type form-horizontal"> <!-- https://getbootstrap.com/docs/3.3/css/#forms-horizontal -->
-    <div class="form-group">
-      <label class="col-sm-4 control-label" style="padding-top: 0.5em;">What do you want to compare?</label> <!-- 1em top padding to center vertically-->
+    <div class="row">
+      <label class="col-sm-4 col-form-label" style="padding-top: 0.5em;">What do you want to compare?</label> <!-- 1em top padding to center vertically-->
+      <div class="btn-group col-sm-8 btn-wrapper" role="group" aria-label="Basic radio toggle button group">
+      </div>
     </div>
   </div>
 </div>
@@ -51,16 +53,24 @@ export class TouringPanel {
     insertTasks() {
         // For each Task, create a button
         // Link tasks with buttons
-        const taskSelectForm = d3.select(this.node).select('.input .type .form-group');
+        const taskSelectForm = d3.select(this.node).select('.input .type .row .btn-group');
         const taskButtons = taskSelectForm.selectAll('.btn-wrapper').data(tasks, (task) => task.id);
+        // TODO: Add in correct order and fix styling of selected button
         taskButtons.enter() // enter: add a button for each task
-            .append('div').attr('class', `btn-wrapper col-sm-${Math.max(Math.floor(8 / tasks.length), 1)}`)
-            .append('button').attr('class', 'task-btn btn btn-default btn-block')
-            .classed('active', (d, i) => i === 0) // Activate first task
-            .html((d) => `<img src="${d.icon}"/>${d.label}`);
+            .append('input').attr('class', `btn-check task-btn`).attr('type', 'radio').attr('id', (d, i) => `btnradio_${i}`).attr('name', 'btnradio').attr('checked', (d, i) => i === 0)
+            .classed('active', (d, i) => i === 0); // Activate first task
+        taskButtons.enter() // enter: add a button for each task
+            .append('label').attr('class', `btn btn-outline-secondary`).attr('for', (d, i) => `btnradio_${i}`)
+            .html((d) => `<img src="${d.icon}" style="height:70%" /> &nbsp;${d.label}`);
         // update: nothing to do
         taskButtons.exit().remove(); // exit: remove tasks no longer displayed
         taskButtons.order(); // order domelements as in the array
+        // order DOM elements to match Bootstrap button group markup
+        const inputs = this.node.querySelectorAll('.btn-wrapper > input.task-btn');
+        const labels = this.node.querySelectorAll('.btn-wrapper > label.btn');
+        inputs.forEach((input, i) => {
+            input.after(labels[i]);
+        });
     }
     addEventListeners() {
         this.tab.on(PanelTab.SHOW_PANEL, () => {
@@ -76,10 +86,11 @@ export class TouringPanel {
             this.currentTask.removeEventListeners();
         });
         // Click a different task
-        d3.select(this.node).selectAll('button.task-btn').on('click', (task) => {
-            const taskButtons = d3.select(this.node).selectAll('button.task-btn');
+        d3.select(this.node).selectAll('input.task-btn').on('click', (task) => {
+            const taskButtons = d3.select(this.node).selectAll('input.task-btn');
             if (this.currentTask && this.currentTask.id !== task.id) { // task changed
                 taskButtons.classed('active', (d) => d.id === task.id);
+                taskButtons.attr('checked', (d) => d.id === task.id);
                 this.currentTask.hide(); // hide old task
                 this.updateOutput(); // will show new task
             }
@@ -94,7 +105,7 @@ export class TouringPanel {
         }
     }
     updateTask() {
-        const activeButton = d3.select(this.node).select('button.task-btn.active');
+        const activeButton = d3.select(this.node).select('input.task-btn.active');
         if (activeButton.size() === 0) {
             console.warn('No comparison tasks registered and found.');
             return;
diff --git a/dist/app/TouringPanel.js.map b/dist/app/TouringPanel.js.map
index dab43a1..4925780 100644
--- a/dist/app/TouringPanel.js.map
+++ b/dist/app/TouringPanel.js.map
@@ -1 +1 @@
-{"version":3,"file":"TouringPanel.js","sourceRoot":"","sources":["../../src/app/TouringPanel.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"TouringPanel.js","sourceRoot":"","sources":["../../src/app/TouringPanel.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/dist/measure_visualization/BoxPlot.js b/dist/measure_visualization/BoxPlot.js
index c483f50..b8c5779 100644
--- a/dist/measure_visualization/BoxPlot.js
+++ b/dist/measure_visualization/BoxPlot.js
@@ -32,7 +32,7 @@ export class BoxPlot {
         if (setParameters.setBCategory && setParameters.setBCategory.label) {
             label = setParameters.setBCategory.label;
         }
-        setBBoxData.push('' + label);
+        setBBoxData.push('​' + label); // this label has a zero width space in between ''
         const setBValid = setParameters.setB.filter((item) => { return (item !== undefined) && (item !== null) && (!Number.isNaN(item)); });
         min = Math.min(min, Math.min(...setBValid));
         max = Math.max(max, Math.max(...setBValid));
@@ -147,6 +147,7 @@ export class BoxPlot {
             .attr('class', 'x axis')
             .attr('transform', 'translate(0,' + (height + margin.top + 10) + ')')
             .call(xAxis);
+        svgFigureGroup.selectAll('.x.axis .tick text').html((d) => d);
         // .append('text')             // text label for the x axis
         //   .attr('x', (width / 2) )
         //   .attr('y',  10 )
diff --git a/dist/measure_visualization/BoxPlot.js.map b/dist/measure_visualization/BoxPlot.js.map
index 9fe7639..c180dbc 100644
--- a/dist/measure_visualization/BoxPlot.js.map
+++ b/dist/measure_visualization/BoxPlot.js.map
@@ -1 +1 @@
-{"version":3,"file":"BoxPlot.js","sourceRoot":"","sources":["../../src/measure_visualization/BoxPlot.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"BoxPlot.js","sourceRoot":"","sources":["../../src/measure_visualization/BoxPlot.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/dist/measure_visualization/GroupedBarChart.js b/dist/measure_visualization/GroupedBarChart.js
index 2ee8cd0..339de85 100644
--- a/dist/measure_visualization/GroupedBarChart.js
+++ b/dist/measure_visualization/GroupedBarChart.js
@@ -152,7 +152,7 @@ export class GroupedBarChart {
                 .attr('y', function (d) { return yScale(d.amount); })
                 .append('title')
                 .classed('tooltip.measure', true)
-                .text(function (d) {
+                .html(function (d) {
                 const tooltipText = `Data Column: ${d.categoryLabel}\nCategory: ${d.def.label}\nAmount: ${d.amount}`;
                 return tooltipText;
             });
@@ -176,7 +176,7 @@ export class GroupedBarChart {
                 .attr('x', 19)
                 .attr('y', 7.5)
                 .attr('dy', '0.32em')
-                .text(function (d) { return d.label; });
+                .html(function (d) { return d.label; });
         }
     }
     getYAxis(yScale) {
diff --git a/dist/phovea.js b/dist/phovea.js
index 98df3a9..b3d4cc0 100644
--- a/dist/phovea.js
+++ b/dist/phovea.js
@@ -5,7 +5,7 @@ export default function (registry) {
     registry.push(EP_TDP_CORE_LINEUP_PANEL_TAB, 'statisticalAnalysisPanel', function () {
         return import('./app/TouringPanel').then((m) => m.TouringPanel);
     }, {
-        cssClass: 'fa-calculator',
+        faIcon: 'fas fa-calculator',
         title: 'Statistical Analysis',
         order: 10,
         width: '45em',
diff --git a/dist/phovea.js.map b/dist/phovea.js.map
index b216a37..22d188f 100644
--- a/dist/phovea.js.map
+++ b/dist/phovea.js.map
@@ -1 +1 @@
-{"version":3,"file":"phovea.js","sourceRoot":"","sources":["../src/phovea.ts"],"names":[],"mappings":"AAMA,OAAO,EAAC,4BAA4B,EAAC,MAAM,UAAU,CAAC;AAGtD,MAAM,CAAC,OAAO,WAAW,QAAmB;IAC1C,0GAA0G;IAC1G,yBAAyB;IAEzB,QAAQ,CAAC,IAAI,CAAC,4BAA4B,EAAE,0BAA0B,EAAE;QACtE,OAAO,MAAM,CAAC,oBAAoB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;IAClE,CAAC,EAA0B;QACzB,QAAQ,EAAE,eAAe;QACzB,KAAK,EAAE,sBAAsB;QAC7B,KAAK,EAAE,EAAE;QACT,KAAK,EAAE,MAAM;QACb,QAAQ,EAAE,IAAI;KACf,CAAC,CAAC;IACH,uBAAuB;AACzB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"phovea.js","sourceRoot":"","sources":["../src/phovea.ts"],"names":[],"mappings":"AAMA,OAAO,EAAC,4BAA4B,EAAC,MAAM,UAAU,CAAC;AAGtD,MAAM,CAAC,OAAO,WAAW,QAAmB;IAC1C,0GAA0G;IAC1G,yBAAyB;IAEzB,QAAQ,CAAC,IAAI,CAAC,4BAA4B,EAAE,0BAA0B,EAAE;QACtE,OAAO,MAAM,CAAC,oBAAoB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;IAClE,CAAC,EAA0B;QACzB,MAAM,EAAE,mBAAmB;QAC3B,KAAK,EAAE,sBAAsB;QAC7B,KAAK,EAAE,EAAE;QACT,KAAK,EAAE,MAAM;QACb,QAAQ,EAAE,IAAI;KACf,CAAC,CAAC;IACH,uBAAuB;AACzB,CAAC"}
\ No newline at end of file
diff --git a/dist/scss/base/_global.scss b/dist/scss/base/_global.scss
index fd739b3..020f677 100644
--- a/dist/scss/base/_global.scss
+++ b/dist/scss/base/_global.scss
@@ -20,7 +20,7 @@
 }
 
 .touring-highlight-hover-dark {
-  background-color: darken($highlight-color, 10%) !important;
+  background-color: shade-color($highlight-color, 10%) !important;
 }
 
 .touring-highlight-hover-border {
@@ -29,9 +29,9 @@
 
 .select2-dropdown {
   // dropdown is seperatly attached to DOM
-  $hover-background-color: darken(
-    $color: #ddd,
-    $amount: 20%
+  $hover-background-color: shade-color(
+    #ddd,
+    20%
   ) !default; // #ddd is default color for selected elements
   $hover-color: white !default;
 
diff --git a/dist/scss/components/_tourdino_panel.scss b/dist/scss/components/_tourdino_panel.scss
index 9cf2615..1359bcf 100644
--- a/dist/scss/components/_tourdino_panel.scss
+++ b/dist/scss/components/_tourdino_panel.scss
@@ -17,19 +17,25 @@ div.touring {
 
     // task switcher & task input
     overflow: hidden; // from the bootstrap stuff we get some overflow which introduces scrollbars --> hide it
-
-    .task-btn.active {
-      background-color: $active-color;
+  
+    .type {
+      .row {
+        .btn-group {
+          label {
+            height: 60%;
+          }
+        }
+      }
     }
   }
-
+  
   .removeMiniVis-btn {
     float: right !important;
     padding: 0px 7px !important;
     margin: 2px 1px !important;
   }
 
-  label.control-label {
+  label.col-form-label {
     padding: 0px;
     padding-left: 15px; // bootstrap default
   }
@@ -43,7 +49,7 @@ div.touring {
     $col-max-size: 15em !default;
 
     /*.select2-dropdown { // dropdown is seperatly attached to DOM
-      $hover-background-color: darken($color: #ddd, $amount: 20%); // #ddd is default color for selected elements
+      $hover-background-color: shade-color($color: #ddd, $amount: 20%); // #ddd is default color for selected elements
       $hover-color: white !default;
       .select2-results>.select2-results__options {
         max-height: 25vh; // 50% of browser window
@@ -120,20 +126,6 @@ div.touring {
         stroke:  $core_color_almost_black;
         shape-rendering: crispEdges;
       }
-
-      &.rowCmp {
-        .details {
-            overflow-x: auto;
-        }
-      }
-
-      &.colCmp {
-        .form-group {
-          > label {
-            padding-top: 0 !important;
-          }
-        }
-      }
     }
 
     a:hover,
@@ -171,7 +163,7 @@ div.touring {
       table-layout: fixed; // The table and column widths are set by the widths of table and col or by the width of the first row of cells. Cells in other rows do not affect column widths.
 
       tbody.bottom-margin {
-        border-bottom: 0.5em solid $table-border-color; // table's border spacing applies to all rows and tbody has no margin
+        border-bottom: 0.5em solid transparent; // table's border spacing applies to all rows and tbody has no margin
       }
 
       th {
@@ -258,7 +250,6 @@ div.touring {
       }
 
       td {
-        border: 1px solid $table-border-color;
         border-collapse: collapse;
         position: relative;
         background: white;
@@ -300,7 +291,7 @@ div.touring {
           &:hover,
           &:focus {
             // = td.action:hover
-            background-color: darken(
+            background-color: shade-color(
               $highlight-color,
               25%
             ) !important; // important because to overwrite the htmml inline color definition
diff --git a/dist/tasks/ATouringTask.js b/dist/tasks/ATouringTask.js
index 6e872e1..aba0d55 100644
--- a/dist/tasks/ATouringTask.js
+++ b/dist/tasks/ATouringTask.js
@@ -15,7 +15,7 @@ export class ATouringTask {
     }
     init(ranking, node) {
         this.ranking = ranking;
-        this.nodeObject = d3.select(node).append('div').attr('class', `task ${this.id}`);
+        this.nodeObject = d3.select(node).append('div').attr('class', `task ${this.id} py-3`);
         this.hide(); // hide initially
         this.initContent();
     }
@@ -40,12 +40,12 @@ export class ATouringTask {
         const updateTable = this.updateTable.bind(this);
         const uniqueID = UniqueIdManager.getInstance().uniqueId();
         this.nodeObject.select('.form-horizontal').append('div')
-            .attr('class', `form-group filter-missing`)
+            .attr('class', `row mb-3 filter-missing`)
             .html(`
-        <label class="col-sm-4 control-label" for="${uniqueID}">
+        <label class="col-sm-4 col-form-label" for="${uniqueID}">
           Do you want to exclude missing values in each comparison?
         </label>
-        <div class="col-sm-8">
+        <div class="col-sm-8 pt-1">
           <input type="checkbox" checked id="${uniqueID}">
         </div>
       `)
@@ -288,7 +288,7 @@ export class ATouringTask {
         // button for mini visualization removal
         const that = this;
         const detailRemoveButton = divDetailInfoContainer.append('button');
-        detailRemoveButton.attr('class', 'btn btn-default removeMiniVis-btn');
+        detailRemoveButton.attr('class', 'btn btn-light removeMiniVis-btn');
         detailRemoveButton.on('click', function () { that.removeCellDetails.bind(that)(miniVisualisation); });
         detailRemoveButton.html('x');
         const divDetailInfo = divDetailInfoContainer.append('div')
@@ -303,7 +303,7 @@ export class ATouringTask {
                 .classed('detail-label', true)
                 .text('Data Column: ')
                 .append('span')
-                .text(setParameters.setADesc.label);
+                .html(setParameters.setADesc.label);
             detailSetInfo.append('span')
                 .text(' / ');
         }
@@ -311,14 +311,14 @@ export class ATouringTask {
             .classed('detail-label', true)
             .text('Comparing ');
         detailSetInfo.append('span')
-            .text(setALabel + ' ')
+            .html(setALabel)
             .append('span')
             .text('[' + measureResult.setSizeA + ']');
         detailSetInfo.append('span')
             .classed('detail-label', true)
             .text(' vs. ');
         detailSetInfo.append('span')
-            .text(setBLabel + ' ')
+            .html(setBLabel)
             .append('span')
             .text('[' + measureResult.setSizeB + ']');
         // test value + p-value
diff --git a/dist/tasks/ATouringTask.js.map b/dist/tasks/ATouringTask.js.map
index adab82d..3c7cea7 100644
--- a/dist/tasks/ATouringTask.js.map
+++ b/dist/tasks/ATouringTask.js.map
@@ -1 +1 @@
-{"version":3,"file":"ATouringTask.js","sourceRoot":"","sources":["../../src/tasks/ATouringTask.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"ATouringTask.js","sourceRoot":"","sources":["../../src/tasks/ATouringTask.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/dist/templates/ColumnComparison.html b/dist/templates/ColumnComparison.html
index 6f95767..40fb533 100644
--- a/dist/templates/ColumnComparison.html
+++ b/dist/templates/ColumnComparison.html
@@ -1,21 +1,21 @@
 <div class="type form-horizontal input">
-  <div class="form-group" style="margin-bottom: 0"> <!-- less margin because the select's belong together-->
-      <label class="col-sm-4 control-label" style="padding-top: 0.6em">Which columns should be compared?</label>
+  <div class="row" style="margin-bottom: 0"> <!-- less margin because the select's belong together-->
+      <label class="col-sm-4 col-form-label" style="padding-top: 0.6em">Which columns should be compared?</label>
       <div class="col-sm-8">
         <select multiple class="attr form-control"  name="attr1[]">
-          <optgroup label="All"/>
+          <optgroup label="All"></optgroup>
         </select>
       </div>
     </div>
-    <div class="form-group" style="margin-bottom: 0; margin-top: -5px">
-      <div class="col-sm-8 col-sm-offset-4" style="text-align: center;">
+    <div class="row mb-3" style="margin-bottom: 4px; margin-top: -8px">
+      <div class="col-sm-8 offset-sm-4" style="text-align: center;">
           vs.
       </div>
     </div>
-    <div class="form-group">
-      <div class="col-sm-8 col-sm-offset-4">
+    <div class="row mb-3">
+      <div class="col-sm-8 offset-sm-4">
         <select multiple class="attr form-control" name="attr2[]">
-          <optgroup label="All"/>
+          <optgroup label="All"></optgroup>
         </select>
       </div>
     </div>
diff --git a/dist/templates/RowComparison.html b/dist/templates/RowComparison.html
index 51f2c50..c7a8350 100644
--- a/dist/templates/RowComparison.html
+++ b/dist/templates/RowComparison.html
@@ -1,27 +1,27 @@
 <div class="type form-horizontal input">
-  <div class="form-group" style="margin-bottom: 0"> <!-- less margin because the select's belong together-->
-    <label class="col-sm-4 control-label" style="padding-top: 0.6em">Which rows should be compared?</label> <!-- some padding to vertically center the label with the select2 -->
+  <div class="row mb-3"> <!-- less margin because the select's belong together-->
+    <label class="col-sm-4 col-form-label" style="padding-top: 0.6em">Which rows should be compared?</label> <!-- some padding to vertically center the label with the select2 -->
     <div class="col-sm-8">
       <select multiple class="rowGrp form-control"  name="row1[]">
       </select>
     </div>
   </div>
-  <div class="form-group" style="margin-bottom: 0; margin-top: -5px">
-    <div class="col-sm-8 col-sm-offset-4" style="text-align: center;">
+  <div class="row mb-3" style="margin-bottom: 5px; margin-top: -10px">
+    <div class="col-sm-8 offset-sm-4" style="text-align: center;">
         vs.
     </div>
   </div>
-  <div class="form-group">
-    <div class="col-sm-8 col-sm-offset-4">
+  <div class="row mb-3">
+    <div class="col-sm-8 offset-sm-4">
       <select multiple class="rowGrp form-control" name="row2[]">
       </select>
     </div>
   </div>
-  <div class="form-group">
-    <label class="col-sm-4 control-label">By which columns' data do you want to compare the rows?</label>
+  <div class="row mb-3">
+    <label class="col-sm-4 col-form-label">By which columns' data do you want to compare the rows?</label>
     <div class="col-sm-8">
       <select multiple class="attr form-control"  name="attr[]">
-        <optgroup label="All"/>
+        <optgroup label="All"></optgroup>
       </select>
     </div>
   </div>
diff --git a/package.json b/package.json
index 9bf9f7d..a28b29b 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "tourdino",
   "description": "Calculate and visualize similarity measures.",
   "homepage": "https://phovea.caleydo.org",
-  "version": "3.0.0",
+  "version": "4.0.0",
   "author": {
     "name": "The Caleydo Team",
     "email": "contact@caleydo.org",
@@ -76,7 +76,7 @@
     "worker-loader": "^2.0.0"
   },
   "dependencies": {
-    "tdp_core": "^11.0.0",
+    "tdp_core": "^12.1.0",
     "d3": "~3.5.17",
     "d3.parsets": "git+https://github.com/jasondavies/d3-parsets.git#v1.2.4",
     "d3-grubert-boxplot": "gist:366430a0ac8e6e55ce09b040b5b493a6",
diff --git a/src/app/TouringPanel.ts b/src/app/TouringPanel.ts
index 610c7b1..b1e4d3b 100644
--- a/src/app/TouringPanel.ts
+++ b/src/app/TouringPanel.ts
@@ -3,11 +3,11 @@ import * as d3 from 'd3';
 import 'd3.parsets/d3.parsets';
 import 'd3-grubert-boxplot/box';
 import {LocalDataProvider} from 'lineupjs';
-import {PanelTab} from 'tdp_core/dist/lineup/internal/panel/PanelTab';
-import {IPanelTabExtensionDesc} from 'tdp_core/dist/lineup/internal/LineUpPanelActions';
+import {PanelTab} from 'tdp_core';
+import {IPanelTabExtensionDesc} from 'tdp_core';
 import {RowComparison} from '../tasks/RowComparisonTask';
 import {ColumnComparison} from '../tasks/ColumnComparisonTask';
-import { ATouringTask } from '../tasks/ATouringTask';
+import {ATouringTask} from '../tasks/ATouringTask';
 
 export const tasks = [
   new RowComparison(),
@@ -25,8 +25,10 @@ const touringTemplate = `
 </div>
 <div class="input">
   <div class="type form-horizontal"> <!-- https://getbootstrap.com/docs/3.3/css/#forms-horizontal -->
-    <div class="form-group">
-      <label class="col-sm-4 control-label" style="padding-top: 0.5em;">What do you want to compare?</label> <!-- 1em top padding to center vertically-->
+    <div class="row">
+      <label class="col-sm-4 col-form-label" style="padding-top: 0.5em;">What do you want to compare?</label> <!-- 1em top padding to center vertically-->
+      <div class="btn-group col-sm-8 btn-wrapper" role="group" aria-label="Basic radio toggle button group">
+      </div>
     </div>
   </div>
 </div>
@@ -64,19 +66,29 @@ export class TouringPanel {
   private insertTasks() {
     // For each Task, create a button
     // Link tasks with buttons
-    const taskSelectForm = d3.select(this.node).select('.input .type .form-group');
+    const taskSelectForm = d3.select(this.node).select('.input .type .row .btn-group');
     const taskButtons = taskSelectForm.selectAll('.btn-wrapper').data(tasks, (task) => task.id);
 
+    // TODO: Add in correct order and fix styling of selected button
     taskButtons.enter() // enter: add a button for each task
-      .append('div').attr('class', `btn-wrapper col-sm-${Math.max(Math.floor(8 / tasks.length), 1)}`)
-      .append('button').attr('class', 'task-btn btn btn-default btn-block')
-      .classed('active', (d, i) => i === 0) // Activate first task
-      .html((d) => `<img src="${d.icon}"/>${d.label}`);
+      .append('input').attr('class', `btn-check task-btn`).attr('type', 'radio').attr('id', (d, i) => `btnradio_${i}`).attr('name', 'btnradio').attr('checked', (d, i) => i === 0)
+      .classed('active', (d, i) => i === 0); // Activate first task
 
+    taskButtons.enter() // enter: add a button for each task
+      .append('label').attr('class', `btn btn-outline-secondary`).attr('for', (d, i) => `btnradio_${i}`)
+      .html((d) => `<img src="${d.icon}" style="height:70%" /> &nbsp;${d.label}`);
 
     // update: nothing to do
     taskButtons.exit().remove();   // exit: remove tasks no longer displayed
     taskButtons.order();           // order domelements as in the array
+
+    // order DOM elements to match Bootstrap button group markup
+    const inputs = this.node.querySelectorAll('.btn-wrapper > input.task-btn');
+    const labels = this.node.querySelectorAll('.btn-wrapper > label.btn');
+
+    inputs.forEach((input, i) => {
+      input.after(labels[i]);
+    });
   }
 
   private addEventListeners() {
@@ -97,10 +109,11 @@ export class TouringPanel {
     });
 
     // Click a different task
-    d3.select(this.node).selectAll('button.task-btn').on('click', (task) => {
-      const taskButtons = d3.select(this.node).selectAll('button.task-btn');
+    d3.select(this.node).selectAll('input.task-btn').on('click', (task) => {
+      const taskButtons = d3.select(this.node).selectAll('input.task-btn');
       if (this.currentTask && this.currentTask.id !== task.id) { // task changed
         taskButtons.classed('active', (d) => d.id === task.id);
+        taskButtons.attr('checked', (d) => d.id === task.id);
         this.currentTask.hide(); // hide old task
         this.updateOutput(); // will show new task
       }
@@ -116,9 +129,9 @@ export class TouringPanel {
   }
 
   private updateTask() {
-    const activeButton = d3.select(this.node).select('button.task-btn.active');
+    const activeButton = d3.select(this.node).select('input.task-btn.active');
 
-    if(activeButton.size() === 0) {
+    if (activeButton.size() === 0) {
       console.warn('No comparison tasks registered and found.');
       return;
     }
diff --git a/src/measure_visualization/BoxPlot.ts b/src/measure_visualization/BoxPlot.ts
index ea9105a..f6b2e76 100644
--- a/src/measure_visualization/BoxPlot.ts
+++ b/src/measure_visualization/BoxPlot.ts
@@ -40,7 +40,7 @@ export class BoxPlot implements IMeasureVisualization {
     if(setParameters.setBCategory && setParameters.setBCategory.label) {
       label = setParameters.setBCategory.label;
     }
-    setBBoxData.push(''+label);
+    setBBoxData.push('​'+label); // this label has a zero width space in between ''
     const setBValid = setParameters.setB.filter((item) => { return (item !== undefined) && (item !== null) && (!Number.isNaN(item)); });
     min = Math.min(min,Math.min(...(<number[]> setBValid)));
     max = Math.max(max,Math.max(...(<number[]> setBValid)));
@@ -183,6 +183,8 @@ export class BoxPlot implements IMeasureVisualization {
       .attr('class', 'x axis')
       .attr('transform', 'translate(0,' + (height  + margin.top + 10) + ')')
       .call(xAxis);
+
+    svgFigureGroup.selectAll('.x.axis .tick text').html((d) => d);
       // .append('text')             // text label for the x axis
       //   .attr('x', (width / 2) )
       //   .attr('y',  10 )
diff --git a/src/measure_visualization/GroupedBarChart.ts b/src/measure_visualization/GroupedBarChart.ts
index 2e0f1db..a48424b 100644
--- a/src/measure_visualization/GroupedBarChart.ts
+++ b/src/measure_visualization/GroupedBarChart.ts
@@ -177,7 +177,7 @@ export class GroupedBarChart implements IMeasureVisualization {
                         .attr('y', function(d) { return yScale(d.amount); })
                         .append('title')
                           .classed('tooltip.measure',true)
-                          .text(function(d) {
+                          .html(function(d) {
                             const tooltipText = `Data Column: ${d.categoryLabel}\nCategory: ${d.def.label}\nAmount: ${d.amount}`;
                             return tooltipText;
                           });
@@ -202,7 +202,7 @@ export class GroupedBarChart implements IMeasureVisualization {
                 .attr('x', 19)
                 .attr('y', 7.5)
                 .attr('dy', '0.32em')
-                .text(function(d) { return d.label; });
+                .html(function(d) { return d.label; });
 
 
     }
diff --git a/src/phovea.ts b/src/phovea.ts
index ad2c139..2879af2 100644
--- a/src/phovea.ts
+++ b/src/phovea.ts
@@ -5,7 +5,7 @@
  **************************************************************************** */
 import {IRegistry} from 'phovea_core';
 import {EP_TDP_CORE_LINEUP_PANEL_TAB} from 'tdp_core';
-import {IPanelTabExtensionDesc} from 'tdp_core/dist/lineup/internal/LineUpPanelActions';
+import {IPanelTabExtensionDesc} from 'tdp_core';
 
 export default function (registry: IRegistry) {
   // registry.push('extension-type', 'extension-id', function() { return import('./extension_impl'); }, {});
@@ -14,7 +14,7 @@ export default function (registry: IRegistry) {
   registry.push(EP_TDP_CORE_LINEUP_PANEL_TAB, 'statisticalAnalysisPanel', function () {
     return import('./app/TouringPanel').then((m) => m.TouringPanel);
   }, <IPanelTabExtensionDesc>{
-    cssClass: 'fa-calculator',
+    faIcon: 'fas fa-calculator',
     title: 'Statistical Analysis',
     order: 10,
     width: '45em',
diff --git a/src/scss/base/_global.scss b/src/scss/base/_global.scss
index fd739b3..020f677 100644
--- a/src/scss/base/_global.scss
+++ b/src/scss/base/_global.scss
@@ -20,7 +20,7 @@
 }
 
 .touring-highlight-hover-dark {
-  background-color: darken($highlight-color, 10%) !important;
+  background-color: shade-color($highlight-color, 10%) !important;
 }
 
 .touring-highlight-hover-border {
@@ -29,9 +29,9 @@
 
 .select2-dropdown {
   // dropdown is seperatly attached to DOM
-  $hover-background-color: darken(
-    $color: #ddd,
-    $amount: 20%
+  $hover-background-color: shade-color(
+    #ddd,
+    20%
   ) !default; // #ddd is default color for selected elements
   $hover-color: white !default;
 
diff --git a/src/scss/components/_tourdino_panel.scss b/src/scss/components/_tourdino_panel.scss
index 9cf2615..1359bcf 100644
--- a/src/scss/components/_tourdino_panel.scss
+++ b/src/scss/components/_tourdino_panel.scss
@@ -17,19 +17,25 @@ div.touring {
 
     // task switcher & task input
     overflow: hidden; // from the bootstrap stuff we get some overflow which introduces scrollbars --> hide it
-
-    .task-btn.active {
-      background-color: $active-color;
+  
+    .type {
+      .row {
+        .btn-group {
+          label {
+            height: 60%;
+          }
+        }
+      }
     }
   }
-
+  
   .removeMiniVis-btn {
     float: right !important;
     padding: 0px 7px !important;
     margin: 2px 1px !important;
   }
 
-  label.control-label {
+  label.col-form-label {
     padding: 0px;
     padding-left: 15px; // bootstrap default
   }
@@ -43,7 +49,7 @@ div.touring {
     $col-max-size: 15em !default;
 
     /*.select2-dropdown { // dropdown is seperatly attached to DOM
-      $hover-background-color: darken($color: #ddd, $amount: 20%); // #ddd is default color for selected elements
+      $hover-background-color: shade-color($color: #ddd, $amount: 20%); // #ddd is default color for selected elements
       $hover-color: white !default;
       .select2-results>.select2-results__options {
         max-height: 25vh; // 50% of browser window
@@ -120,20 +126,6 @@ div.touring {
         stroke:  $core_color_almost_black;
         shape-rendering: crispEdges;
       }
-
-      &.rowCmp {
-        .details {
-            overflow-x: auto;
-        }
-      }
-
-      &.colCmp {
-        .form-group {
-          > label {
-            padding-top: 0 !important;
-          }
-        }
-      }
     }
 
     a:hover,
@@ -171,7 +163,7 @@ div.touring {
       table-layout: fixed; // The table and column widths are set by the widths of table and col or by the width of the first row of cells. Cells in other rows do not affect column widths.
 
       tbody.bottom-margin {
-        border-bottom: 0.5em solid $table-border-color; // table's border spacing applies to all rows and tbody has no margin
+        border-bottom: 0.5em solid transparent; // table's border spacing applies to all rows and tbody has no margin
       }
 
       th {
@@ -258,7 +250,6 @@ div.touring {
       }
 
       td {
-        border: 1px solid $table-border-color;
         border-collapse: collapse;
         position: relative;
         background: white;
@@ -300,7 +291,7 @@ div.touring {
           &:hover,
           &:focus {
             // = td.action:hover
-            background-color: darken(
+            background-color: shade-color(
               $highlight-color,
               25%
             ) !important; // important because to overwrite the htmml inline color definition
diff --git a/src/tasks/ATouringTask.ts b/src/tasks/ATouringTask.ts
index bd5a3e0..fc87684 100644
--- a/src/tasks/ATouringTask.ts
+++ b/src/tasks/ATouringTask.ts
@@ -59,7 +59,7 @@ export abstract class ATouringTask implements ITouringTask {
 
   public init(ranking: RankingAdapter, node: HTMLElement) {
     this.ranking = ranking;
-    this.nodeObject = d3.select(node).append('div').attr('class', `task ${this.id}`);
+    this.nodeObject = d3.select(node).append('div').attr('class', `task ${this.id} py-3`);
     this.hide(); // hide initially
     this.initContent();
   }
@@ -88,12 +88,12 @@ export abstract class ATouringTask implements ITouringTask {
     const updateTable = this.updateTable.bind(this);
     const uniqueID = UniqueIdManager.getInstance().uniqueId();
     this.nodeObject.select('.form-horizontal').append('div')
-      .attr('class', `form-group filter-missing`)
+      .attr('class', `row mb-3 filter-missing`)
       .html(`
-        <label class="col-sm-4 control-label" for="${uniqueID}">
+        <label class="col-sm-4 col-form-label" for="${uniqueID}">
           Do you want to exclude missing values in each comparison?
         </label>
-        <div class="col-sm-8">
+        <div class="col-sm-8 pt-1">
           <input type="checkbox" checked id="${uniqueID}">
         </div>
       `)
@@ -373,7 +373,7 @@ export abstract class ATouringTask implements ITouringTask {
     // button for mini visualization removal
     const that = this;
     const detailRemoveButton = divDetailInfoContainer.append('button');
-    detailRemoveButton.attr('class', 'btn btn-default removeMiniVis-btn');
+    detailRemoveButton.attr('class', 'btn btn-light removeMiniVis-btn');
     detailRemoveButton.on('click', function () { that.removeCellDetails.bind(that)(miniVisualisation); });
     detailRemoveButton.html('x');
 
@@ -390,7 +390,7 @@ export abstract class ATouringTask implements ITouringTask {
         .classed('detail-label', true)
         .text('Data Column: ')
         .append('span')
-        .text(setParameters.setADesc.label);
+        .html(setParameters.setADesc.label);
       detailSetInfo.append('span')
         .text(' / ');
     }
@@ -398,14 +398,14 @@ export abstract class ATouringTask implements ITouringTask {
       .classed('detail-label', true)
       .text('Comparing ');
     detailSetInfo.append('span')
-      .text(setALabel + ' ')
+      .html(setALabel)
       .append('span')
       .text('[' + measureResult.setSizeA + ']');
     detailSetInfo.append('span')
       .classed('detail-label', true)
       .text(' vs. ');
     detailSetInfo.append('span')
-      .text(setBLabel + ' ')
+      .html(setBLabel)
       .append('span')
       .text('[' + measureResult.setSizeB + ']');
 
diff --git a/src/templates/ColumnComparison.html b/src/templates/ColumnComparison.html
index 6f95767..40fb533 100644
--- a/src/templates/ColumnComparison.html
+++ b/src/templates/ColumnComparison.html
@@ -1,21 +1,21 @@
 <div class="type form-horizontal input">
-  <div class="form-group" style="margin-bottom: 0"> <!-- less margin because the select's belong together-->
-      <label class="col-sm-4 control-label" style="padding-top: 0.6em">Which columns should be compared?</label>
+  <div class="row" style="margin-bottom: 0"> <!-- less margin because the select's belong together-->
+      <label class="col-sm-4 col-form-label" style="padding-top: 0.6em">Which columns should be compared?</label>
       <div class="col-sm-8">
         <select multiple class="attr form-control"  name="attr1[]">
-          <optgroup label="All"/>
+          <optgroup label="All"></optgroup>
         </select>
       </div>
     </div>
-    <div class="form-group" style="margin-bottom: 0; margin-top: -5px">
-      <div class="col-sm-8 col-sm-offset-4" style="text-align: center;">
+    <div class="row mb-3" style="margin-bottom: 4px; margin-top: -8px">
+      <div class="col-sm-8 offset-sm-4" style="text-align: center;">
           vs.
       </div>
     </div>
-    <div class="form-group">
-      <div class="col-sm-8 col-sm-offset-4">
+    <div class="row mb-3">
+      <div class="col-sm-8 offset-sm-4">
         <select multiple class="attr form-control" name="attr2[]">
-          <optgroup label="All"/>
+          <optgroup label="All"></optgroup>
         </select>
       </div>
     </div>
diff --git a/src/templates/RowComparison.html b/src/templates/RowComparison.html
index 51f2c50..c7a8350 100644
--- a/src/templates/RowComparison.html
+++ b/src/templates/RowComparison.html
@@ -1,27 +1,27 @@
 <div class="type form-horizontal input">
-  <div class="form-group" style="margin-bottom: 0"> <!-- less margin because the select's belong together-->
-    <label class="col-sm-4 control-label" style="padding-top: 0.6em">Which rows should be compared?</label> <!-- some padding to vertically center the label with the select2 -->
+  <div class="row mb-3"> <!-- less margin because the select's belong together-->
+    <label class="col-sm-4 col-form-label" style="padding-top: 0.6em">Which rows should be compared?</label> <!-- some padding to vertically center the label with the select2 -->
     <div class="col-sm-8">
       <select multiple class="rowGrp form-control"  name="row1[]">
       </select>
     </div>
   </div>
-  <div class="form-group" style="margin-bottom: 0; margin-top: -5px">
-    <div class="col-sm-8 col-sm-offset-4" style="text-align: center;">
+  <div class="row mb-3" style="margin-bottom: 5px; margin-top: -10px">
+    <div class="col-sm-8 offset-sm-4" style="text-align: center;">
         vs.
     </div>
   </div>
-  <div class="form-group">
-    <div class="col-sm-8 col-sm-offset-4">
+  <div class="row mb-3">
+    <div class="col-sm-8 offset-sm-4">
       <select multiple class="rowGrp form-control" name="row2[]">
       </select>
     </div>
   </div>
-  <div class="form-group">
-    <label class="col-sm-4 control-label">By which columns' data do you want to compare the rows?</label>
+  <div class="row mb-3">
+    <label class="col-sm-4 col-form-label">By which columns' data do you want to compare the rows?</label>
     <div class="col-sm-8">
       <select multiple class="attr form-control"  name="attr[]">
-        <optgroup label="All"/>
+        <optgroup label="All"></optgroup>
       </select>
     </div>
   </div>