diff --git a/src/core/css/tour.css b/src/core/css/tour.css
index d772c79e8e9684690796b8acbd35b2116adf6f9b..d398cd813b95a070821f52481347f4a23980547c 100644
--- a/src/core/css/tour.css
+++ b/src/core/css/tour.css
@@ -86,23 +86,6 @@
 .dropdown > .caosdb-f-tour-menu-dropdown {
     margin: 0px;
 }
-/*.caosdb-v-tour-overview > li {*/
-  /*[>float: left;<]*/
-  /*display: inline;*/
-/*}*/
-.caosdb-f-tour-overview-entry.caosdb-v-tour-overview-entry-pageset {
-}
-/*
-.caosdb-f-tour-overview-entry.caosdb-v-tour-overview-entry-page {
-  display: none;
-}
-*/
-li.list-group-item > ul.list-group {
-  margin-bottom: 0px;
-}
-li.list-group-item > .btn {
-  padding: 0px;
-}
 
 /* Taken from https://stackoverflow.com/a/32587571/232888, cc-by-sa 4.0 by
    ryachza */
diff --git a/src/core/css/webcaosdb.css b/src/core/css/webcaosdb.css
index 6ab5ed65e281a521193af909295f9fa7f2edd36c..cc7622d450a4648c1d748aaab83bb694c3d32839 100644
--- a/src/core/css/webcaosdb.css
+++ b/src/core/css/webcaosdb.css
@@ -51,7 +51,7 @@ footer {
   margin-right: 8px;
 }
 
-.caosdb-messages .caosdb-v-message-badge {
+.caosdb-v-message-badge {
   background-color: var(--bs-alert-bg);
   color: var(--bs-alert-color);
 }
diff --git a/src/core/js/ext_map.js b/src/core/js/ext_map.js
index 6dd9b963d4caa2887f4e680285e7b61a47e97b20..9d2e1d5d362fb4d24853fd99b81053b0198d8c27 100644
--- a/src/core/js/ext_map.js
+++ b/src/core/js/ext_map.js
@@ -1524,7 +1524,7 @@ var caosdb_map = new function () {
             const href = entity_on_page ? `#${id}` : connection.getBasePath() + `Entity/${id}`
             const link_title = entity_on_page ? "Jump to this entity." : "Browse to this entity.";
             const link = $(`<a title="${link_title}" href="${href}"/>`)
-                .addClass("pull-right")
+                .addClass("float-end")
                 .append(`<i class="bi bi-box-arrow-up-right"></i></a>`);
 
             const name_label = $('<div/>')
diff --git a/src/core/js/form_elements.js b/src/core/js/form_elements.js
index 20ff4ead80d897bd8b90497c7c0f03351c0d92ff..4b5bdf55e555a5755280b558770e4b2995731de7 100644
--- a/src/core/js/form_elements.js
+++ b/src/core/js/form_elements.js
@@ -830,7 +830,7 @@ var form_elements = new function () {
 
 
     this.add_help = function (field, config) {
-        var help_button = $('<a tabindex="0" role="button" data-bs-trigger="focus" data-bs-toggle="popover"><i class="caosdb-f-form-help pull-right bi-info-circle-fill"></i></a>')
+        var help_button = $('<a tabindex="0" role="button" data-bs-trigger="focus" data-bs-toggle="popover"><i class="caosdb-f-form-help float-end bi-info-circle-fill"></i></a>')
             .css({
                 "cursor": "pointer"
             });
diff --git a/src/core/js/webcaosdb.js b/src/core/js/webcaosdb.js
index 18387779cfe8a9ee2ac34a1b3e69fa3f1127689f..1d6d5c8326d3f7dc0f311404f825206c9303462f 100644
--- a/src/core/js/webcaosdb.js
+++ b/src/core/js/webcaosdb.js
@@ -1327,7 +1327,7 @@ var hintMessages = new function () {
         }
 
         // see the other TODO above: why is there a .caosdb-v-message-badge inside the caosdb-v-property-row without a div.caosdb-message
-        $(entity).find(".caosdb-v-property-row > .caosdb-v-message-badge").addClass("pull-right");
+        $(entity).find(".caosdb-v-property-row > .caosdb-v-message-badge").addClass("float-end");
     }
 }
 
diff --git a/src/core/xsl/entity.xsl b/src/core/xsl/entity.xsl
index ae195afc07920bce0aac84da0027911017840502..85c6f0b4944872ef270a8d64089af720514e1b06 100644
--- a/src/core/xsl/entity.xsl
+++ b/src/core/xsl/entity.xsl
@@ -559,7 +559,7 @@
       <li class="list-group-item caosdb-comments-heading d-flex">
         <i class="bi-chat-left-fill" style="margin-right: 1em;"/>
         <strong class="small">Comments</strong>
-        <button class="btn btn-sm pull-right caosdb-new-comment-button ms-auto">
+        <button class="btn btn-sm float-end caosdb-new-comment-button ms-auto">
           <strong>add new comment</strong>
         </button>
       </li>