diff --git a/src/components/model.pcss b/src/components/model.pcss
index 70558b3c..283395c2 100644
--- a/src/components/model.pcss
+++ b/src/components/model.pcss
@@ -26,6 +26,8 @@
     height: 5em;
     justify-content: center;
     min-height: 5em;
+    text-align: center;
+    word-break: break-word;
 
     .nbr-of-rows {
       font-weight: 400;
@@ -182,6 +184,7 @@
 
     .column {
       box-sizing: border-box;
+      max-width: 48rem;
       padding: 3.5em;
     }
 
diff --git a/src/components/table-field.pcss b/src/components/table-field.pcss
index cb61a418..b1ef06c6 100644
--- a/src/components/table-field.pcss
+++ b/src/components/table-field.pcss
@@ -12,6 +12,12 @@
   padding: 1em;
   position: relative;
 
+  .name,
+  .bartext {
+    margin-right: 1em;
+    padding: 0 0.5em;
+  }
+
   &:hover {
     box-shadow: 0 0 2em -0.5em #999;
   }
@@ -36,7 +42,6 @@
     .name {
       background-color: #019b39;
       color: white;
-      padding: 0 0.5em;
     }
   }
 
diff --git a/test/e2e/__artifacts__/baseline/cleared-selections.png b/test/e2e/__artifacts__/baseline/cleared-selections.png
index ab66ca59..fa8cb5d2 100644
Binary files a/test/e2e/__artifacts__/baseline/cleared-selections.png and b/test/e2e/__artifacts__/baseline/cleared-selections.png differ
diff --git a/test/e2e/__artifacts__/baseline/created-hypercube.png b/test/e2e/__artifacts__/baseline/created-hypercube.png
index 7dc4460f..4d87331e 100644
Binary files a/test/e2e/__artifacts__/baseline/created-hypercube.png and b/test/e2e/__artifacts__/baseline/created-hypercube.png differ
diff --git a/test/e2e/__artifacts__/baseline/extra-information-box.png b/test/e2e/__artifacts__/baseline/extra-information-box.png
index 9404b5be..28e8cc91 100644
Binary files a/test/e2e/__artifacts__/baseline/extra-information-box.png and b/test/e2e/__artifacts__/baseline/extra-information-box.png differ
diff --git a/test/e2e/__artifacts__/baseline/loaded-app.png b/test/e2e/__artifacts__/baseline/loaded-app.png
index 05c0645e..ae8c8fb4 100644
Binary files a/test/e2e/__artifacts__/baseline/loaded-app.png and b/test/e2e/__artifacts__/baseline/loaded-app.png differ
diff --git a/test/e2e/__artifacts__/baseline/make-another-selection-in-selection-bar.png b/test/e2e/__artifacts__/baseline/make-another-selection-in-selection-bar.png
index 8076a49b..07247f47 100644
Binary files a/test/e2e/__artifacts__/baseline/make-another-selection-in-selection-bar.png and b/test/e2e/__artifacts__/baseline/make-another-selection-in-selection-bar.png differ
diff --git a/test/e2e/__artifacts__/baseline/open-hypercube-view.png b/test/e2e/__artifacts__/baseline/open-hypercube-view.png
index 9b683cfe..852d25c0 100644
Binary files a/test/e2e/__artifacts__/baseline/open-hypercube-view.png and b/test/e2e/__artifacts__/baseline/open-hypercube-view.png differ
diff --git a/test/e2e/__artifacts__/baseline/opened-menu.png b/test/e2e/__artifacts__/baseline/opened-menu.png
index 29fa2681..a399d510 100644
Binary files a/test/e2e/__artifacts__/baseline/opened-menu.png and b/test/e2e/__artifacts__/baseline/opened-menu.png differ
diff --git a/test/e2e/__artifacts__/baseline/selection.png b/test/e2e/__artifacts__/baseline/selection.png
index 9813a5b3..142d6d45 100644
Binary files a/test/e2e/__artifacts__/baseline/selection.png and b/test/e2e/__artifacts__/baseline/selection.png differ