diff --git a/package.json b/package.json
index bb7d7ec3db..074b9ab138 100644
--- a/package.json
+++ b/package.json
@@ -81,9 +81,9 @@
   },
   "homepage": "https://github.com/formio/formio.js#readme",
   "dependencies": {
-    "@formio/bootstrap": "^3.0.0-rc.15",
+    "@formio/bootstrap": "^3.0.0-rc.17",
     "@formio/choices.js": "^10.2.0",
-    "@formio/core": "^1.3.0-rc.23",
+    "@formio/core": "^2.0.0-rc.1",
     "@formio/text-mask-addons": "^3.8.0-formio.2",
     "@formio/vanilla-text-mask": "^5.1.1-formio.1",
     "abortcontroller-polyfill": "^1.7.5",
diff --git a/test/renders/component-bootstrap-columns-multiple.html b/test/renders/component-bootstrap-columns-multiple.html
index 37857bd664..41d74a3f1d 100644
--- a/test/renders/component-bootstrap-columns-multiple.html
+++ b/test/renders/component-bootstrap-columns-multiple.html
@@ -1,17 +1,9 @@
 <div id="columns" class="row formio-component formio-component-columns formio-component-columns formio-component-multiple  formio-component-label-hidden" ref="component">
-  <div class="
-    col-md-6
-    col-md-offset-0
-    col-md-push-0
-    col-md-pull-0
-  " ref="column-columns">
+  <div class="col-md-6
+    offset-md-0" ref="column-columns">
   </div>
-  <div class="
-    col-md-6
-    col-md-offset-0
-    col-md-push-0
-    col-md-pull-0
-  " ref="column-columns">
+  <div class="col-md-6
+    offset-md-0" ref="column-columns">
   </div>
   <div ref="messageContainer" class="formio-errors invalid-feedback"></div>
 </div>
\ No newline at end of file
diff --git a/test/renders/component-bootstrap-columns-readOnly.html b/test/renders/component-bootstrap-columns-readOnly.html
index ffc36051c6..04b93cc135 100644
--- a/test/renders/component-bootstrap-columns-readOnly.html
+++ b/test/renders/component-bootstrap-columns-readOnly.html
@@ -1,17 +1,9 @@
 <div id="columns" class="row formio-component formio-component-columns formio-component-columns  formio-component-label-hidden" ref="component">
-  <div class="
-    col-md-6
-    col-md-offset-0
-    col-md-push-0
-    col-md-pull-0
-  " ref="column-columns">
+  <div class="col-md-6
+    offset-md-0" ref="column-columns">
   </div>
-  <div class="
-    col-md-6
-    col-md-offset-0
-    col-md-push-0
-    col-md-pull-0
-  " ref="column-columns">
+  <div class="col-md-6
+    offset-md-0" ref="column-columns">
   </div>
   <div ref="messageContainer" class="formio-errors invalid-feedback"></div>
 </div>
\ No newline at end of file
diff --git a/test/renders/component-bootstrap-columns-required.html b/test/renders/component-bootstrap-columns-required.html
index dc26778e24..1250234f3c 100644
--- a/test/renders/component-bootstrap-columns-required.html
+++ b/test/renders/component-bootstrap-columns-required.html
@@ -1,18 +1,10 @@
 <div id="columns" class="row formio-component formio-component-columns formio-component-columns  formio-component-label-hidden" ref="component">
   <label class=" control-label--hidden"></label>
-  <div class="
-    col-md-6
-    col-md-offset-0
-    col-md-push-0
-    col-md-pull-0
-  " ref="column-columns">
+  <div class="col-md-6
+    offset-md-0" ref="column-columns">
   </div>
-  <div class="
-    col-md-6
-    col-md-offset-0
-    col-md-push-0
-    col-md-pull-0
-  " ref="column-columns">
+  <div class="col-md-6
+    offset-md-0" ref="column-columns">
   </div>
   <div ref="messageContainer" class="formio-errors invalid-feedback"></div>
 </div>
\ No newline at end of file
diff --git a/test/renders/component-bootstrap-columns.html b/test/renders/component-bootstrap-columns.html
index ffc36051c6..04b93cc135 100644
--- a/test/renders/component-bootstrap-columns.html
+++ b/test/renders/component-bootstrap-columns.html
@@ -1,17 +1,9 @@
 <div id="columns" class="row formio-component formio-component-columns formio-component-columns  formio-component-label-hidden" ref="component">
-  <div class="
-    col-md-6
-    col-md-offset-0
-    col-md-push-0
-    col-md-pull-0
-  " ref="column-columns">
+  <div class="col-md-6
+    offset-md-0" ref="column-columns">
   </div>
-  <div class="
-    col-md-6
-    col-md-offset-0
-    col-md-push-0
-    col-md-pull-0
-  " ref="column-columns">
+  <div class="col-md-6
+    offset-md-0" ref="column-columns">
   </div>
   <div ref="messageContainer" class="formio-errors invalid-feedback"></div>
 </div>
\ No newline at end of file
diff --git a/test/renders/component-bootstrap-datagrid-readOnly.html b/test/renders/component-bootstrap-datagrid-readOnly.html
index 6a7f7653dc..c441df38be 100644
--- a/test/renders/component-bootstrap-datagrid-readOnly.html
+++ b/test/renders/component-bootstrap-datagrid-readOnly.html
@@ -3,7 +3,7 @@
     Data Grid
   </label>
   <table class="table datagrid-table table-bordered
-    ">
+    " style="table-layout: fixed;">
     <tbody ref="datagrid-dataGrid-tbody" data-key="datagrid-dataGrid">
       <tr ref="datagrid-dataGrid-row">
       </tr>
diff --git a/test/renders/component-bootstrap-datamap-readOnly.html b/test/renders/component-bootstrap-datamap-readOnly.html
index 41a3a923d6..86d1e396b1 100644
--- a/test/renders/component-bootstrap-datamap-readOnly.html
+++ b/test/renders/component-bootstrap-datamap-readOnly.html
@@ -3,7 +3,7 @@
     Data Map
   </label>
   <table class="table datagrid-table table-bordered
-    ">
+    " style="table-layout: fixed;">
     <thead>
       <tr>
         <th class="">
diff --git a/test/renders/form-bootstrap-columnsForm.html b/test/renders/form-bootstrap-columnsForm.html
index 3b6d0adb1e..36a55c167f 100644
--- a/test/renders/form-bootstrap-columnsForm.html
+++ b/test/renders/form-bootstrap-columnsForm.html
@@ -1,19 +1,11 @@
 <div id="" class="formio-component formio-component-form  formio-component-label-hidden" ref="component">
   <div class="formio-form" ref="webform" novalidate>
     <div id="columns" class="row formio-component formio-component-columns formio-component-columns  formio-component-label-hidden" ref="component">
-      <div class="
-    col-md-6
-    col-md-offset-0
-    col-md-push-0
-    col-md-pull-0
-  " ref="column-columns">
+      <div class="col-md-6
+    offset-md-0" ref="column-columns">
       </div>
-      <div class="
-    col-md-6
-    col-md-offset-0
-    col-md-push-0
-    col-md-pull-0
-  " ref="column-columns">
+      <div class="col-md-6
+    offset-md-0" ref="column-columns">
       </div>
       <div ref="messageContainer" class="formio-errors invalid-feedback"></div>
     </div>
diff --git a/test/renders/form-bootstrap-defaults.html b/test/renders/form-bootstrap-defaults.html
index 8428cd395e..201abbe9e8 100644
--- a/test/renders/form-bootstrap-defaults.html
+++ b/test/renders/form-bootstrap-defaults.html
@@ -271,12 +271,8 @@
       <div ref="messageContainer" class="formio-errors invalid-feedback"></div>
     </div>
     <div id="columns" class="row formio-component formio-component-columns formio-component-columns  formio-component-label-hidden" ref="component">
-      <div class="
-    col-md-6
-    col-md-offset-0
-    col-md-push-0
-    col-md-pull-0
-  " ref="column-columns">
+      <div class="col-md-6
+    offset-md-0" ref="column-columns">
         <div id="textField" class="mb-2 formio-form-group has-feedback formio-component formio-component-textfield formio-component-textField " ref="component">
           <label ref="label" class="col-form-label " for="textField-textField" id="l-textField-textField">
             Text Field
@@ -287,12 +283,8 @@
           <div ref="messageContainer" class="formio-errors invalid-feedback"></div>
         </div>
       </div>
-      <div class="
-    col-md-6
-    col-md-offset-0
-    col-md-push-0
-    col-md-pull-0
-  " ref="column-columns">
+      <div class="col-md-6
+    offset-md-0" ref="column-columns">
       </div>
       <div ref="messageContainer" class="formio-errors invalid-feedback"></div>
     </div>
diff --git a/test/renders/form-bootstrap-formWithCollapsedPanel.html b/test/renders/form-bootstrap-formWithCollapsedPanel.html
index adc22bb934..39fbc5878e 100644
--- a/test/renders/form-bootstrap-formWithCollapsedPanel.html
+++ b/test/renders/form-bootstrap-formWithCollapsedPanel.html
@@ -4,7 +4,7 @@
       <div class="mb-2 card border">
         <div class="card-header bg-default" tabindex="0" role="button" aria-expanded="false" aria-controls="panel-panel" ref="header">
           <span class="mb-0 card-title ">
-        <i class="formio-collapse-icon fa fa-plus-square-o bi bi-plus-square-o text-muted" data-title="Collapse Panel"></i>
+        <i class="formio-collapse-icon fa fa-plus-square-o bi bi-plus-square text-muted" data-title="Collapse Panel"></i>
       Panel
     </span>
         </div>
diff --git a/test/renders/form-bootstrap-formWithDateTimeComponents.html b/test/renders/form-bootstrap-formWithDateTimeComponents.html
index d9740cf607..adf192482b 100644
--- a/test/renders/form-bootstrap-formWithDateTimeComponents.html
+++ b/test/renders/form-bootstrap-formWithDateTimeComponents.html
@@ -4,7 +4,7 @@
       <div class="mb-2 card border">
         <div class="card-header bg-default" tabindex="0" role="button" aria-expanded="true" aria-controls="panel-panel" ref="header">
           <span class="mb-0 card-title ">
-        <i class="formio-collapse-icon fa fa-minus-square-o bi bi-minus-square-o text-muted" data-title="Collapse Panel"></i>
+        <i class="formio-collapse-icon fa fa-minus-square-o bi bi-dash-square text-muted" data-title="Collapse Panel"></i>
       Panel
     </span>
         </div>
diff --git a/test/renders/form-bootstrap-initiallyCollapsedPanel.html b/test/renders/form-bootstrap-initiallyCollapsedPanel.html
index adc22bb934..39fbc5878e 100644
--- a/test/renders/form-bootstrap-initiallyCollapsedPanel.html
+++ b/test/renders/form-bootstrap-initiallyCollapsedPanel.html
@@ -4,7 +4,7 @@
       <div class="mb-2 card border">
         <div class="card-header bg-default" tabindex="0" role="button" aria-expanded="false" aria-controls="panel-panel" ref="header">
           <span class="mb-0 card-title ">
-        <i class="formio-collapse-icon fa fa-plus-square-o bi bi-plus-square-o text-muted" data-title="Collapse Panel"></i>
+        <i class="formio-collapse-icon fa fa-plus-square-o bi bi-plus-square text-muted" data-title="Collapse Panel"></i>
       Panel
     </span>
         </div>
diff --git a/test/renders/form-bootstrap-layout.html b/test/renders/form-bootstrap-layout.html
index efbca30fbb..b5ea605fc2 100644
--- a/test/renders/form-bootstrap-layout.html
+++ b/test/renders/form-bootstrap-layout.html
@@ -1,12 +1,8 @@
 <div id="" class="formio-component formio-component-form  formio-component-label-hidden" ref="component">
   <div class="formio-form" ref="webform" novalidate>
     <div id="columns" class="row formio-component formio-component-columns formio-component-columns  formio-component-label-hidden" ref="component">
-      <div class="
-    col-md-6
-    col-md-offset-0
-    col-md-push-0
-    col-md-pull-0
-  " ref="column-columns">
+      <div class="col-md-6
+    offset-md-0" ref="column-columns">
         <div id="columnsText" class="mb-2 formio-form-group has-feedback formio-component formio-component-textfield formio-component-columnsText " ref="component">
           <label ref="label" class="col-form-label " for="columnsText-columnsText" id="l-columnsText-columnsText">
             Text
@@ -17,22 +13,14 @@
           <div ref="messageContainer" class="formio-errors invalid-feedback"></div>
         </div>
       </div>
-      <div class="
-    col-md-6
-    col-md-offset-0
-    col-md-push-0
-    col-md-pull-0
-  " ref="column-columns">
+      <div class="col-md-6
+    offset-md-0" ref="column-columns">
       </div>
       <div ref="messageContainer" class="formio-errors invalid-feedback"></div>
     </div>
     <div id="columns2" class="row formio-component formio-component-columns formio-component-columns2  formio-component-label-hidden" ref="component">
-      <div class="
-    col-md-5
-    col-md-offset-0
-    col-md-push-0
-    col-md-pull-0
-  " ref="column-columns2">
+      <div class="col-md-5
+    offset-md-0" ref="column-columns2">
         <div id="columns2Text" class="mb-2 formio-form-group has-feedback formio-component formio-component-textfield formio-component-columns2Text " ref="component">
           <label ref="label" class="col-form-label " for="columns2Text-columns2Text" id="l-columns2Text-columns2Text">
             Text
@@ -43,19 +31,11 @@
           <div ref="messageContainer" class="formio-errors invalid-feedback"></div>
         </div>
       </div>
-      <div class="
-    col-md-5
-    col-md-offset-0
-    col-md-push-0
-    col-md-pull-0
-  " ref="column-columns2">
+      <div class="col-md-5
+    offset-md-0" ref="column-columns2">
       </div>
-      <div class="
-    col-md-2
-    col-md-offset-0
-    col-md-push-0
-    col-md-pull-0
-  " ref="column-columns2">
+      <div class="col-md-2
+    offset-md-0" ref="column-columns2">
       </div>
       <div ref="messageContainer" class="formio-errors invalid-feedback"></div>
     </div>
@@ -106,7 +86,7 @@
       <div class="mb-2 card border">
         <div class="card-header bg-default" tabindex="0" role="button" aria-expanded="false" aria-controls="panel2-panel2" ref="header">
           <span class="mb-0 card-title ">
-        <i class="formio-collapse-icon fa fa-plus-square-o bi bi-plus-square-o text-muted" data-title="Collapse Panel"></i>
+        <i class="formio-collapse-icon fa fa-plus-square-o bi bi-plus-square text-muted" data-title="Collapse Panel"></i>
     </span>
         </div>
       </div>
@@ -116,7 +96,7 @@
       <div class="mb-2 card border">
         <div class="card-header bg-default" tabindex="0" role="button" aria-expanded="true" aria-controls="panel3-panel3" ref="header">
           <span class="mb-0 card-title ">
-        <i class="formio-collapse-icon fa fa-minus-square-o bi bi-minus-square-o text-muted" data-title="Collapse Panel"></i>
+        <i class="formio-collapse-icon fa fa-minus-square-o bi bi-dash-square text-muted" data-title="Collapse Panel"></i>
     </span>
         </div>
         <div class="card-body" ref="nested-panel3" id="panel3-panel3">
diff --git a/test/renders/form-bootstrap-multipleTextareaInsideConditionalComponent.html b/test/renders/form-bootstrap-multipleTextareaInsideConditionalComponent.html
index 3d297afc22..fbb6a6b414 100644
--- a/test/renders/form-bootstrap-multipleTextareaInsideConditionalComponent.html
+++ b/test/renders/form-bootstrap-multipleTextareaInsideConditionalComponent.html
@@ -1,12 +1,8 @@
 <div id="" class="formio-component formio-component-form  formio-component-label-hidden" ref="component">
   <div class="formio-form" ref="webform" novalidate>
     <div id="columns3" class="row formio-component formio-component-columns formio-component-columns3  formio-component-label-hidden" ref="component">
-      <div class="
-    col-md-6
-    col-md-offset-0
-    col-md-push-0
-    col-md-pull-0
-  " ref="column-columns3">
+      <div class="col-md-6
+    offset-md-0" ref="column-columns3">
         <div id="issues" class="" ref="component">
           <div class="card card-body bg-light mb-3">
             <div ref="nested-issues">
@@ -32,12 +28,8 @@
           <div ref="messageContainer" class="formio-errors invalid-feedback"></div>
         </div>
       </div>
-      <div class="
-    col-md-6
-    col-md-offset-0
-    col-md-push-0
-    col-md-pull-0
-  " ref="column-columns3">
+      <div class="col-md-6
+    offset-md-0" ref="column-columns3">
       </div>
       <div ref="messageContainer" class="formio-errors invalid-feedback"></div>
     </div>
diff --git a/test/renders/form-bootstrap-readOnly-calculateValueWithManualOverride.html b/test/renders/form-bootstrap-readOnly-calculateValueWithManualOverride.html
index 5892e52ae0..d924be2828 100644
--- a/test/renders/form-bootstrap-readOnly-calculateValueWithManualOverride.html
+++ b/test/renders/form-bootstrap-readOnly-calculateValueWithManualOverride.html
@@ -31,7 +31,7 @@
               grid
             </label>
             <table class="table datagrid-table table-bordered
-    ">
+    " style="table-layout: fixed;">
               <thead>
                 <tr>
                   <th class="">
diff --git a/test/renders/form-bootstrap-readOnly-columnsForm.html b/test/renders/form-bootstrap-readOnly-columnsForm.html
index 6456ddef39..e51c7902d1 100644
--- a/test/renders/form-bootstrap-readOnly-columnsForm.html
+++ b/test/renders/form-bootstrap-readOnly-columnsForm.html
@@ -1,19 +1,11 @@
 <div id="" class="formio-component formio-component-form  formio-component-label-hidden" ref="component">
   <div class="formio-form formio-read-only" ref="webform" novalidate>
     <div id="columns" class="row formio-component formio-component-columns formio-component-columns  formio-component-label-hidden" ref="component">
-      <div class="
-    col-md-6
-    col-md-offset-0
-    col-md-push-0
-    col-md-pull-0
-  " ref="column-columns">
+      <div class="col-md-6
+    offset-md-0" ref="column-columns">
       </div>
-      <div class="
-    col-md-6
-    col-md-offset-0
-    col-md-push-0
-    col-md-pull-0
-  " ref="column-columns">
+      <div class="col-md-6
+    offset-md-0" ref="column-columns">
       </div>
       <div ref="messageContainer" class="formio-errors invalid-feedback"></div>
     </div>
diff --git a/test/renders/form-bootstrap-readOnly-data.html b/test/renders/form-bootstrap-readOnly-data.html
index a70ce608f3..5b952d9b10 100644
--- a/test/renders/form-bootstrap-readOnly-data.html
+++ b/test/renders/form-bootstrap-readOnly-data.html
@@ -25,7 +25,7 @@
         Data Grid
       </label>
       <table class="table datagrid-table table-bordered
-    ">
+    " style="table-layout: fixed;">
         <thead>
           <tr>
             <th class="">
@@ -171,7 +171,7 @@
         Data Grid
       </label>
       <table class="table datagrid-table table-bordered
-    ">
+    " style="table-layout: fixed;">
         <tbody ref="datagrid-dataGrid2-tbody" data-key="datagrid-dataGrid2">
           <tr ref="datagrid-dataGrid2-row">
             <td ref="datagrid-dataGrid2">
@@ -207,7 +207,7 @@
         Conditional Data Grid
       </label>
       <table class="table datagrid-table table-bordered
-    ">
+    " style="table-layout: fixed;">
         <thead>
           <tr>
             <th class="">
diff --git a/test/renders/form-bootstrap-readOnly-defaults.html b/test/renders/form-bootstrap-readOnly-defaults.html
index e1a2696d7c..01b58b5764 100644
--- a/test/renders/form-bootstrap-readOnly-defaults.html
+++ b/test/renders/form-bootstrap-readOnly-defaults.html
@@ -275,12 +275,8 @@
       <div ref="messageContainer" class="formio-errors invalid-feedback"></div>
     </div>
     <div id="columns" class="row formio-component formio-component-columns formio-component-columns  formio-component-label-hidden" ref="component">
-      <div class="
-    col-md-6
-    col-md-offset-0
-    col-md-push-0
-    col-md-pull-0
-  " ref="column-columns">
+      <div class="col-md-6
+    offset-md-0" ref="column-columns">
         <div id="textField" class="mb-2 formio-form-group has-feedback formio-component formio-component-textfield formio-component-textField " ref="component">
           <label ref="label" class="col-form-label " for="textField-textField" id="l-textField-textField">
             Text Field
@@ -291,12 +287,8 @@
           <div ref="messageContainer" class="formio-errors invalid-feedback"></div>
         </div>
       </div>
-      <div class="
-    col-md-6
-    col-md-offset-0
-    col-md-push-0
-    col-md-pull-0
-  " ref="column-columns">
+      <div class="col-md-6
+    offset-md-0" ref="column-columns">
       </div>
       <div ref="messageContainer" class="formio-errors invalid-feedback"></div>
     </div>
@@ -413,7 +405,7 @@
         Data Grid
       </label>
       <table class="table datagrid-table table-bordered
-    ">
+    " style="table-layout: fixed;">
         <thead>
           <tr>
             <th class="">
diff --git a/test/renders/form-bootstrap-readOnly-formWithCollapsedPanel.html b/test/renders/form-bootstrap-readOnly-formWithCollapsedPanel.html
index 630affe70f..eb286bceba 100644
--- a/test/renders/form-bootstrap-readOnly-formWithCollapsedPanel.html
+++ b/test/renders/form-bootstrap-readOnly-formWithCollapsedPanel.html
@@ -4,7 +4,7 @@
       <div class="mb-2 card border">
         <div class="card-header bg-default" tabindex="0" role="button" aria-expanded="false" aria-controls="panel-panel" ref="header">
           <span class="mb-0 card-title ">
-        <i class="formio-collapse-icon fa fa-plus-square-o bi bi-plus-square-o text-muted" data-title="Collapse Panel"></i>
+        <i class="formio-collapse-icon fa fa-plus-square-o bi bi-plus-square text-muted" data-title="Collapse Panel"></i>
       Panel
     </span>
         </div>
diff --git a/test/renders/form-bootstrap-readOnly-formWithCustomFormatDate.html b/test/renders/form-bootstrap-readOnly-formWithCustomFormatDate.html
index 3299bcfe08..3f125cb977 100644
--- a/test/renders/form-bootstrap-readOnly-formWithCustomFormatDate.html
+++ b/test/renders/form-bootstrap-readOnly-formWithCustomFormatDate.html
@@ -5,7 +5,7 @@
         Data Grid
       </label>
       <table class="table datagrid-table table-bordered
-    ">
+    " style="table-layout: fixed;">
         <thead>
           <tr>
             <th class="">
diff --git a/test/renders/form-bootstrap-readOnly-formWithDateTimeComponents.html b/test/renders/form-bootstrap-readOnly-formWithDateTimeComponents.html
index 35f6c5fbec..c396a1c286 100644
--- a/test/renders/form-bootstrap-readOnly-formWithDateTimeComponents.html
+++ b/test/renders/form-bootstrap-readOnly-formWithDateTimeComponents.html
@@ -4,7 +4,7 @@
       <div class="mb-2 card border">
         <div class="card-header bg-default" tabindex="0" role="button" aria-expanded="true" aria-controls="panel-panel" ref="header">
           <span class="mb-0 card-title ">
-        <i class="formio-collapse-icon fa fa-minus-square-o bi bi-minus-square-o text-muted" data-title="Collapse Panel"></i>
+        <i class="formio-collapse-icon fa fa-minus-square-o bi bi-dash-square text-muted" data-title="Collapse Panel"></i>
       Panel
     </span>
         </div>
diff --git a/test/renders/form-bootstrap-readOnly-initiallyCollapsedPanel.html b/test/renders/form-bootstrap-readOnly-initiallyCollapsedPanel.html
index 630affe70f..eb286bceba 100644
--- a/test/renders/form-bootstrap-readOnly-initiallyCollapsedPanel.html
+++ b/test/renders/form-bootstrap-readOnly-initiallyCollapsedPanel.html
@@ -4,7 +4,7 @@
       <div class="mb-2 card border">
         <div class="card-header bg-default" tabindex="0" role="button" aria-expanded="false" aria-controls="panel-panel" ref="header">
           <span class="mb-0 card-title ">
-        <i class="formio-collapse-icon fa fa-plus-square-o bi bi-plus-square-o text-muted" data-title="Collapse Panel"></i>
+        <i class="formio-collapse-icon fa fa-plus-square-o bi bi-plus-square text-muted" data-title="Collapse Panel"></i>
       Panel
     </span>
         </div>
diff --git a/test/renders/form-bootstrap-readOnly-layout.html b/test/renders/form-bootstrap-readOnly-layout.html
index 25ff20f8de..b95b05780c 100644
--- a/test/renders/form-bootstrap-readOnly-layout.html
+++ b/test/renders/form-bootstrap-readOnly-layout.html
@@ -1,12 +1,8 @@
 <div id="" class="formio-component formio-component-form  formio-component-label-hidden" ref="component">
   <div class="formio-form formio-read-only" ref="webform" novalidate>
     <div id="columns" class="row formio-component formio-component-columns formio-component-columns  formio-component-label-hidden" ref="component">
-      <div class="
-    col-md-6
-    col-md-offset-0
-    col-md-push-0
-    col-md-pull-0
-  " ref="column-columns">
+      <div class="col-md-6
+    offset-md-0" ref="column-columns">
         <div id="columnsText" class="mb-2 formio-form-group has-feedback formio-component formio-component-textfield formio-component-columnsText " ref="component">
           <label ref="label" class="col-form-label " for="columnsText-columnsText" id="l-columnsText-columnsText">
             Text
@@ -17,22 +13,14 @@
           <div ref="messageContainer" class="formio-errors invalid-feedback"></div>
         </div>
       </div>
-      <div class="
-    col-md-6
-    col-md-offset-0
-    col-md-push-0
-    col-md-pull-0
-  " ref="column-columns">
+      <div class="col-md-6
+    offset-md-0" ref="column-columns">
       </div>
       <div ref="messageContainer" class="formio-errors invalid-feedback"></div>
     </div>
     <div id="columns2" class="row formio-component formio-component-columns formio-component-columns2  formio-component-label-hidden" ref="component">
-      <div class="
-    col-md-5
-    col-md-offset-0
-    col-md-push-0
-    col-md-pull-0
-  " ref="column-columns2">
+      <div class="col-md-5
+    offset-md-0" ref="column-columns2">
         <div id="columns2Text" class="mb-2 formio-form-group has-feedback formio-component formio-component-textfield formio-component-columns2Text " ref="component">
           <label ref="label" class="col-form-label " for="columns2Text-columns2Text" id="l-columns2Text-columns2Text">
             Text
@@ -43,19 +31,11 @@
           <div ref="messageContainer" class="formio-errors invalid-feedback"></div>
         </div>
       </div>
-      <div class="
-    col-md-5
-    col-md-offset-0
-    col-md-push-0
-    col-md-pull-0
-  " ref="column-columns2">
+      <div class="col-md-5
+    offset-md-0" ref="column-columns2">
       </div>
-      <div class="
-    col-md-2
-    col-md-offset-0
-    col-md-push-0
-    col-md-pull-0
-  " ref="column-columns2">
+      <div class="col-md-2
+    offset-md-0" ref="column-columns2">
       </div>
       <div ref="messageContainer" class="formio-errors invalid-feedback"></div>
     </div>
@@ -106,7 +86,7 @@
       <div class="mb-2 card border">
         <div class="card-header bg-default" tabindex="0" role="button" aria-expanded="false" aria-controls="panel2-panel2" ref="header">
           <span class="mb-0 card-title ">
-        <i class="formio-collapse-icon fa fa-plus-square-o bi bi-plus-square-o text-muted" data-title="Collapse Panel"></i>
+        <i class="formio-collapse-icon fa fa-plus-square-o bi bi-plus-square text-muted" data-title="Collapse Panel"></i>
     </span>
         </div>
       </div>
@@ -116,7 +96,7 @@
       <div class="mb-2 card border">
         <div class="card-header bg-default" tabindex="0" role="button" aria-expanded="true" aria-controls="panel3-panel3" ref="header">
           <span class="mb-0 card-title ">
-        <i class="formio-collapse-icon fa fa-minus-square-o bi bi-minus-square-o text-muted" data-title="Collapse Panel"></i>
+        <i class="formio-collapse-icon fa fa-minus-square-o bi bi-dash-square text-muted" data-title="Collapse Panel"></i>
     </span>
         </div>
         <div class="card-body" ref="nested-panel3" id="panel3-panel3">
diff --git a/test/renders/form-bootstrap-readOnly-multipleTextareaInsideConditionalComponent.html b/test/renders/form-bootstrap-readOnly-multipleTextareaInsideConditionalComponent.html
index 1545ad1883..b93924f510 100644
--- a/test/renders/form-bootstrap-readOnly-multipleTextareaInsideConditionalComponent.html
+++ b/test/renders/form-bootstrap-readOnly-multipleTextareaInsideConditionalComponent.html
@@ -1,12 +1,8 @@
 <div id="" class="formio-component formio-component-form  formio-component-label-hidden" ref="component">
   <div class="formio-form formio-read-only" ref="webform" novalidate>
     <div id="columns3" class="row formio-component formio-component-columns formio-component-columns3  formio-component-label-hidden" ref="component">
-      <div class="
-    col-md-6
-    col-md-offset-0
-    col-md-push-0
-    col-md-pull-0
-  " ref="column-columns3">
+      <div class="col-md-6
+    offset-md-0" ref="column-columns3">
         <div id="issues" class="" ref="component">
           <div class="card card-body bg-light mb-3">
             <div ref="nested-issues">
@@ -32,12 +28,8 @@
           <div ref="messageContainer" class="formio-errors invalid-feedback"></div>
         </div>
       </div>
-      <div class="
-    col-md-6
-    col-md-offset-0
-    col-md-push-0
-    col-md-pull-0
-  " ref="column-columns3">
+      <div class="col-md-6
+    offset-md-0" ref="column-columns3">
       </div>
       <div ref="messageContainer" class="formio-errors invalid-feedback"></div>
     </div>
diff --git a/test/renders/form-bootstrap-readOnly-settingErrors.html b/test/renders/form-bootstrap-readOnly-settingErrors.html
index 5fa8f8d49f..953f005243 100644
--- a/test/renders/form-bootstrap-readOnly-settingErrors.html
+++ b/test/renders/form-bootstrap-readOnly-settingErrors.html
@@ -40,12 +40,8 @@
                   <div ref="messageContainer" class="formio-errors invalid-feedback"></div>
                 </div>
                 <div id="columns" class="row formio-component formio-component-columns formio-component-columns  formio-component-label-hidden" ref="component">
-                  <div class="
-    col-md-6
-    col-md-offset-0
-    col-md-push-0
-    col-md-pull-0
-  " ref="column-columns">
+                  <div class="col-md-6
+    offset-md-0" ref="column-columns">
                     <div id="selectColumn" class="mb-2 formio-form-group has-feedback formio-component formio-component-select formio-component-selectColumn  required" ref="component">
                       <label ref="label" class="col-form-label  field-required" for="selectColumn-selectColumn" id="l-selectColumn-selectColumn">
                         Select - Column
@@ -55,12 +51,8 @@
                       <div ref="messageContainer" class="formio-errors invalid-feedback"></div>
                     </div>
                   </div>
-                  <div class="
-    col-md-6
-    col-md-offset-0
-    col-md-push-0
-    col-md-pull-0
-  " ref="column-columns">
+                  <div class="col-md-6
+    offset-md-0" ref="column-columns">
                     <div id="checkboxColumn" class="mb-2 formio-form-group has-feedback formio-component formio-component-checkbox formio-component-checkboxColumn  required" ref="component">
                       <div class="form-check checkbox">
                         <input ref="input" name="data[checkboxColumn]" type="checkbox" class="form-check-input" lang="en" disabled="disabled" value="0" aria-required="true">
diff --git a/test/renders/form-bootstrap-settingErrors.html b/test/renders/form-bootstrap-settingErrors.html
index e86179af86..39d901b354 100644
--- a/test/renders/form-bootstrap-settingErrors.html
+++ b/test/renders/form-bootstrap-settingErrors.html
@@ -40,12 +40,8 @@
                   <div ref="messageContainer" class="formio-errors invalid-feedback"></div>
                 </div>
                 <div id="columns" class="row formio-component formio-component-columns formio-component-columns  formio-component-label-hidden" ref="component">
-                  <div class="
-    col-md-6
-    col-md-offset-0
-    col-md-push-0
-    col-md-pull-0
-  " ref="column-columns">
+                  <div class="col-md-6
+    offset-md-0" ref="column-columns">
                     <div id="selectColumn" class="mb-2 formio-form-group has-feedback formio-component formio-component-select formio-component-selectColumn  required" ref="component">
                       <label ref="label" class="col-form-label  field-required" for="selectColumn-selectColumn" id="l-selectColumn-selectColumn">
                         Select - Column
@@ -55,12 +51,8 @@
                       <div ref="messageContainer" class="formio-errors invalid-feedback"></div>
                     </div>
                   </div>
-                  <div class="
-    col-md-6
-    col-md-offset-0
-    col-md-push-0
-    col-md-pull-0
-  " ref="column-columns">
+                  <div class="col-md-6
+    offset-md-0" ref="column-columns">
                     <div id="checkboxColumn" class="mb-2 formio-form-group has-feedback formio-component formio-component-checkbox formio-component-checkboxColumn  required" ref="component">
                       <div class="form-check checkbox">
                         <input ref="input" name="data[checkboxColumn]" type="checkbox" class="form-check-input" lang="en" value="0" aria-required="true">
diff --git a/yarn.lock b/yarn.lock
index e37f5b0e95..53c89b13be 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -250,10 +250,10 @@
   resolved "https://registry.npmjs.org/@eslint/js/-/js-8.53.0.tgz#bea56f2ed2b5baea164348ff4d5a879f6f81f20d"
   integrity sha512-Kn7K8dx/5U6+cT1yEhpX1w4PCSg0M+XyRILPgvwcEBjerFWCwQj5sbr3/VmxqV0JGHCBCzyd6LxypEuehypY1w==
 
-"@formio/bootstrap@^3.0.0-rc.15":
-  version "3.0.0-rc.15"
-  resolved "https://registry.npmjs.org/@formio/bootstrap/-/bootstrap-3.0.0-rc.15.tgz#5593108f4caddbcec4c71eec66d44acb2c568279"
-  integrity sha512-3BaI7E/GTvNXfT9wmD/BEmX5ZLYVQjFWvis1uB1bOKO1LF8Oavy6QrzK/lWSIo1QADp6OyAopY1G5UwZo9aSbg==
+"@formio/bootstrap@^3.0.0-rc.17":
+  version "3.0.0-rc.17"
+  resolved "https://registry.npmjs.org/@formio/bootstrap/-/bootstrap-3.0.0-rc.17.tgz#4e93382484502a78788056ef37494f7470ceeec9"
+  integrity sha512-PIMptnW08IVL1xWh7q1ujX00GqUM2ZR5bbW5C0kRrOBT0KDC1eoOZ4MkmA8/UyVzrX+6UsapdrvIl2dom7sjBg==
 
 "@formio/choices.js@^10.2.0":
   version "10.2.0"
@@ -264,25 +264,20 @@
     fuse.js "^6.6.2"
     redux "^4.2.0"
 
-"@formio/core@^1.3.0-rc.23":
-  version "1.3.0-rc.23"
-  resolved "https://registry.npmjs.org/@formio/core/-/core-1.3.0-rc.23.tgz#b8d4d3276cb0fe000b7e51a0f7507b75b8732e51"
-  integrity sha512-ceoPYEQ6sDpRUO8sCoWJeuxPu2eviPoHKS4tznCYOt7MtpFj8icZfF1AhcNjoUQjbqkFK9cXPhdZQw/2FFX/8A==
+"@formio/core@^2.0.0-rc.1":
+  version "2.0.0-rc.1"
+  resolved "https://registry.npmjs.org/@formio/core/-/core-2.0.0-rc.1.tgz#0f4105e7638fcc0e033f8ffaf4f47e31b59a3550"
+  integrity sha512-rgS1T+4uer7PDX3JZe1nyljAdrvwwb+JtjWRzrqhBDKHToW1E8Tdx5zkBxDpqrB5Y1x1AnxKKBICgpz6wD6zNw==
   dependencies:
-    "@formio/lodash" "0.1.0"
-    "@types/json-logic-js" "^2.0.1"
+    "@types/json-logic-js" "^2.0.5"
     browser-cookies "^1.2.0"
-    core-js "^3.21.1"
-    dayjs "^1.10.8"
-    dompurify "^3.0.1"
+    core-js "^3.33.2"
+    dayjs "^1.11.10"
+    dompurify "^3.0.6"
     eventemitter3 "^5.0.0"
     fetch-ponyfill "^7.1.0"
     json-logic-js "^2.0.2"
-
-"@formio/lodash@0.1.0":
-  version "0.1.0"
-  resolved "https://registry.npmjs.org/@formio/lodash/-/lodash-0.1.0.tgz#6f837423d33e45a022211eb98bfc683dd8bee9a8"
-  integrity sha512-xwDR6UyoOVZaYHNRmSAQXzx57I6svqi7wY2n8PAbGCWFnSvIKIWjlZ8Jktb63VJY1b5lfNF8xyq2ZFcsAMjYVg==
+    lodash "^4.17.21"
 
 "@formio/text-mask-addons@^3.8.0-formio.2":
   version "3.8.0-formio.2"
@@ -505,10 +500,10 @@
   resolved "https://registry.npmjs.org/@types/expect/-/expect-1.20.4.tgz#8288e51737bf7e3ab5d7c77bfa695883745264e5"
   integrity sha512-Q5Vn3yjTDyCMV50TB6VRIbQNxSE4OmZR86VSbGaNpfUolm0iePBB4KdEEHmxoY5sT2+2DIvXW0rvMDP2nHZ4Mg==
 
-"@types/json-logic-js@^2.0.1":
-  version "2.0.4"
-  resolved "https://registry.npmjs.org/@types/json-logic-js/-/json-logic-js-2.0.4.tgz#87c95bfd17b1f485ffd6ee3a547df62239015336"
-  integrity sha512-qW0D40szYr8HNz4597+BqSB6zn9I6F+VHBe5Z6vDBrbZREWPWWvULYUVzRzHXLw88u4LgXqPVgEZ9emsee9csA==
+"@types/json-logic-js@^2.0.5":
+  version "2.0.5"
+  resolved "https://registry.npmjs.org/@types/json-logic-js/-/json-logic-js-2.0.5.tgz#8c2c8a42dc8cc21e2977f64dc7b944cf6479f782"
+  integrity sha512-hu/FTi0zwCjQEFfbPur275cNoZj6NsuOBhhYNzqoSdfmMhuxFr58OZ957lyIOWc9+kO+2tFlBthRjcxuytD4HA==
 
 "@types/json-schema@*", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
   version "7.0.14"
@@ -2044,7 +2039,7 @@ core-js@^2.0.0, core-js@^2.4.0:
   resolved "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
   integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
 
-core-js@^3.0.0, core-js@^3.21.1, core-js@^3.30.2, core-js@^3.32.1:
+core-js@^3.0.0, core-js@^3.30.2, core-js@^3.32.1, core-js@^3.33.2:
   version "3.33.2"
   resolved "https://registry.npmjs.org/core-js/-/core-js-3.33.2.tgz#312bbf6996a3a517c04c99b9909cdd27138d1ceb"
   integrity sha512-XeBzWI6QL3nJQiHmdzbAOiMYqjrb7hwU7A39Qhvd/POSa/t9E1AeZyEZx3fNvp/vtM8zXwhoL0FsiS0hD0pruQ==
@@ -2199,7 +2194,7 @@ date-format@^4.0.14:
   resolved "https://registry.npmjs.org/date-format/-/date-format-4.0.14.tgz#7a8e584434fb169a521c8b7aa481f355810d9400"
   integrity sha512-39BOQLs9ZjKh0/patS9nrT8wc3ioX3/eA/zgbKNopnF2wCqJEoxywwwElATYvRsXdnOxA/OQeQoFZ3rFjVajhg==
 
-dayjs@^1.10.8:
+dayjs@^1.11.10:
   version "1.11.10"
   resolved "https://registry.npmjs.org/dayjs/-/dayjs-1.11.10.tgz#68acea85317a6e164457d6d6947564029a6a16a0"
   integrity sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ==
@@ -2525,7 +2520,7 @@ domhandler@^2.3.0:
   dependencies:
     domelementtype "1"
 
-dompurify@^3.0.1, dompurify@^3.0.5:
+dompurify@^3.0.5, dompurify@^3.0.6:
   version "3.0.6"
   resolved "https://registry.npmjs.org/dompurify/-/dompurify-3.0.6.tgz#925ebd576d54a9531b5d76f0a5bef32548351dae"
   integrity sha512-ilkD8YEnnGh1zJ240uJsW7AzE+2qpbOUYjacomn3AvJ6J4JhKGSZ2nh4wUIXPZrEPppaCLx5jFe8T89Rk8tQ7w==