diff --git a/app/views/census_evaluation/base/index.html.haml b/app/views/census_evaluation/base/index.html.haml
index 06b52ef..5227ab3 100644
--- a/app/views/census_evaluation/base/index.html.haml
+++ b/app/views/census_evaluation/base/index.html.haml
@@ -9,12 +9,12 @@
 
 = render 'infos'
 
-#main.row-fluid
+#main.row
   -if @total
     -if @sub_groups
-      %article.span6
+      %article.col-6
         = render 'totals'
-    %article.span6
+    %article.col-6
       = render 'details'
 
   -else
diff --git a/app/views/member_counts/_table_header.html.haml b/app/views/member_counts/_table_header.html.haml
index 32dda24..96dbd32 100644
--- a/app/views/member_counts/_table_header.html.haml
+++ b/app/views/member_counts/_table_header.html.haml
@@ -8,7 +8,7 @@
 - classes ||= nil
 - id ||= nil
 
-%table.table.table-striped{style: 'width: auto;', class: classes, id: id}
+%table.table.table-striped.w-auto{class: classes, id: id}
   %thead
     %tr
       - before_columns.each do |c|
diff --git a/app/views/member_counts/edit.html.haml b/app/views/member_counts/edit.html.haml
index 0789acd..c6f0ebe 100644
--- a/app/views/member_counts/edit.html.haml
+++ b/app/views/member_counts/edit.html.haml
@@ -16,9 +16,9 @@
       = fields_for 'member_count[]', count, builder: StandardFormBuilder do |f|
         %tr
           %td
-            %span{style: 'padding-right: 5px;'}= format_member_count_born_in(count)
-          %td= f.input_field :person_f, class: 'span1'
-          %td= f.input_field :person_m, class: 'span1'
+            %span.pe-2= format_member_count_born_in(count)
+          %td= f.input_field :person_f
+          %td= f.input_field :person_m
 
   #member_counts_fields_blueprint{style: 'display: none', data: { blueprint: member_counts_fields_blueprint } }
   = link_to 'Eintrag hinzufügen', 'javascript:void(0);', class: 'add_nested_fields', data: { association: 'member_counts', 'blueprint-id' => 'member_counts_fields_blueprint' }
diff --git a/app/views/people/_fields_cevi.html.haml b/app/views/people/_fields_cevi.html.haml
index 9f1b677..0b5d6f2 100644
--- a/app/views/people/_fields_cevi.html.haml
+++ b/app/views/people/_fields_cevi.html.haml
@@ -13,21 +13,21 @@
   = f.labeled_collection_select :salutation, possible_person_salutations,
                                 :id,
                                 :to_s,
-                                { include_blank: true },
-                                class: 'span6'
+                                { include_blank: "" },
+                                class: 'form-select form-select-sm'
 
   = f.labeled_input_field :correspondence_language,
                           placeholder: t('.correspondence_language.placeholder'),
                           data: { provide: :typeahead, source: existing_person_correspondence_languages }
 
   = f.labeled(:canton) do
-    .span6.shown{style: 'margin-left: 0px'}
+    .shown.ms-0
       = f.collection_select :canton,
                             possible_person_cantons,
                             :id,
                             :to_s,
-                            { include_blank: true },
-                            class: 'chosen-select',
+                            { include_blank: "" },
+                            class: 'form-select form-select-sm',
                             data: { placeholder: ' ',
                                     chosen_no_results: t('global.chosen_no_results') }
 
@@ -35,18 +35,18 @@
                                 possible_person_confessions,
                                 :id,
                                 :to_s,
-                                { include_blank: true },
-                                class: 'span6'
+                                { include_blank: "" },
+                                class: 'form-select form-select-sm'
 
   = f.labeled_input_field :old_data if can?(:update_old_data, entry)
 
   = f.labeled(:ortsgruppe_id) do
-    .span6.shown{style: 'margin-left: 0px'}
+    .shown.ms-0
       = f.collection_select :ortsgruppe_id,
                             Group::Ortsgruppe.without_deleted.order(:name),
                             :id,
                             :to_s,
-                            { include_blank: true },
-                            class: 'chosen-select',
+                            { include_blank: "" },
+                            class: 'form-select form-select-sm',
                             data: { placeholder: ' ',
                                     chosen_no_results: t('global.chosen_no_results') }