diff --git a/ckanext/odsh/assets/bootstrap-multiselect.js b/ckanext/odsh/assets/bootstrap-multiselect.js
index c4753719b909c7fec25256878df5f7d86e0daa67..9baff7fa84ef2e8911f63ef6bea55800985fe433 100644
--- a/ckanext/odsh/assets/bootstrap-multiselect.js
+++ b/ckanext/odsh/assets/bootstrap-multiselect.js
@@ -1725,7 +1725,7 @@
 
             if (this.options.dropRight)
             {
-                this.$ul.addClass('pull-right');
+                this.$ul.addClass('float-end');
             }
         },
 
diff --git a/ckanext/odsh/templates/organization/read_base.html b/ckanext/odsh/templates/organization/read_base.html
index 6277b79f8023d13753e6e112887557ca87c16119..32a5555be1b61f86741f0aa965abadda12858667 100644
--- a/ckanext/odsh/templates/organization/read_base.html
+++ b/ckanext/odsh/templates/organization/read_base.html
@@ -13,13 +13,13 @@
 
 {% block page_header %}
 <div class="odsh-dataset-heading">
-    <div class="pull-right">
-        {% if h.check_access('organization_update', {'id': group_dict.id}) %}
-        {% link_for _('Manage'), named_route=group_type+'.edit', id=group_dict.name, class_='btn btn-primary btn-add-dataset',
-        icon='wrench' %}
-        {% endif %}
-    </div>
-    <h2> {{ group_dict.title or group_dict.name }} </h2>
+  <div>
+    <h2>{{ group_dict.title or group_dict.name }}</h2>
+    {% if h.check_access('organization_update', {'id': group_dict.id}) %}
+      {% link_for _('Manage'), named_route=group_type+'.edit', id=group_dict.name, class_='btn btn-primary btn-add-dataset',
+      icon='wrench' %}
+    {% endif %}
+  </div>
 </div>
 {% if group_dict.description %}
 <div class="organizaion-full-description with-bottom-line">
diff --git a/ckanext/odsh/templates/package/search.html b/ckanext/odsh/templates/package/search.html
index 39b2b58d43b29543513eb2ae8b805180735321f6..03a2c78ff267a456af1616af756efbb5216ee846 100644
--- a/ckanext/odsh/templates/package/search.html
+++ b/ckanext/odsh/templates/package/search.html
@@ -105,7 +105,7 @@ method="get" data-module="select-switch">
                 {{_('wrong_end_date_for_search')}}
             </div>
           {%endif%}
-          <a class='pull-right action' href="javascript:{}" onclick="$('#dataset-search-box-form').submit();">{{_('submit date search') }}</a>
+          <a class="float-end action" href="javascript:{}" onclick="$('#dataset-search-box-form').submit();">{{_('submit date search') }}</a>
         </div>
       </div>
     </nav>