diff --git a/src/Element/BootstrapDateTime.php b/src/Element/BootstrapDateTime.php
index 2ed0210..5976952 100644
--- a/src/Element/BootstrapDateTime.php
+++ b/src/Element/BootstrapDateTime.php
@@ -99,11 +99,11 @@ class BootstrapDateTime extends FormElement {
     // Append our attributes to element.
     $element['#attributes'] += $settings;
     $element['#attributes']['class'] = ['form-control'];
-
+    
     // Prefix and Suffix.
-    $element['#prefix'] = "<div class='container'>
+    $element['#prefix'] = "<div class='" . $element['#wrapper_class'] . "'>
     <div class='row'>
-        <div class='col-sm-6'>";
+        <div class='" . $element['#column_size_class'] . "'>";
     $element['#suffix'] = "</div></div></div>";
 
     // Attach library.
diff --git a/src/Plugin/Field/FieldWidget/BootstrapDateTimeWidget.php b/src/Plugin/Field/FieldWidget/BootstrapDateTimeWidget.php
index c626ee4..9f9ec2d 100644
--- a/src/Plugin/Field/FieldWidget/BootstrapDateTimeWidget.php
+++ b/src/Plugin/Field/FieldWidget/BootstrapDateTimeWidget.php
@@ -30,6 +30,8 @@ class BootstrapDateTimeWidget extends DateTimeWidgetBase implements ContainerFac
    */
   public static function defaultSettings() {
     return [
+      'wrapper_class' => 'container',
+      'column_size_class' => 'col-sm-6',
       'hour_format' => '24h',
       'allow_times' => '15',
       'disable_days' => [],
@@ -43,6 +45,40 @@ class BootstrapDateTimeWidget extends DateTimeWidgetBase implements ContainerFac
   public function settingsForm(array $form, FormStateInterface $form_state) {
 
     $elements = [];
+
+    $elements['wrapper_class'] = [
+      '#type' => 'select',
+      '#title' => $this->t('Wrapper Class'),
+      '#options' => [
+        'container' => $this->t('Container'),
+        'fluid-container' => $this->t('Fluid Container'),
+      ],
+      '#description' => $this->t('Select the wrapper class. Check https://getbootstrap.com/docs/4.3/layout/overview/'),
+      '#default_value' => $this->getSetting('wrapper_class'),
+    ];
+
+    $elements['column_size_class'] = [
+      '#type' => 'select',
+      '#title' => $this->t('Column Size'),
+      '#description' => $this->t('Select the column size based on bootstrap\'s grid system. Check https://getbootstrap.com/docs/4.0/layout/grid/'),
+      '#options' => [
+        'col-sm-1' => $this->t('1'),
+        'col-sm-2' => $this->t('2'),
+        'col-sm-3' => $this->t('3'),
+        'col-sm-4' => $this->t('4'),
+        'col-sm-5' => $this->t('5'),
+        'col-sm-6' => $this->t('6'),
+        'col-sm-7' => $this->t('7'),
+        'col-sm-8' => $this->t('8'),
+        'col-sm-9' => $this->t('9'),
+        'col-sm-10' => $this->t('10'),
+        'col-sm-11' => $this->t('11'),
+        'col-sm-12' => $this->t('12'),
+      ],
+      '#default_value' => $this->getSetting('column_size_class'),
+    ];
+
+
     $elements['hour_format'] = [
       '#type' => 'select',
       '#title' => $this->t('Hours Format'),
@@ -98,8 +134,10 @@ class BootstrapDateTimeWidget extends DateTimeWidgetBase implements ContainerFac
    * {@inheritdoc}
    */
   public function settingsSummary() {
-    $summary = [];
+    $summary = [];    
 
+    $summary[] = t('Wrapper Class: @wrapper_class', ['@wrapper_class' => $this->getSetting('wrapper_class')]);
+    $summary[] = t('Column Size: @column_size_class', ['@column_size_class' => $this->getSetting('column_size_class')]);
     $summary[] = t('Hours Format: @hour_format', ['@hour_format' => $this->getSetting('hour_format')]);
     $summary[] = t('Minutes Granularity: @allow_times', ['@allow_times' => $this->getSetting('allow_times')]);
 
@@ -248,6 +286,8 @@ class BootstrapDateTimeWidget extends DateTimeWidgetBase implements ContainerFac
       $element['value']['#default_value'] = $date->format($format);
     }
 
+    $element['value']['#wrapper_class'] = $this->getSetting('wrapper_class');
+    $element['value']['#column_size_class'] = $this->getSetting('column_size_class');
     $element['value']['#hour_format'] = $this->getSetting('hour_format');
     $element['value']['#allow_times'] = $this->getSetting('allow_times');
     $element['value']['#disable_days'] = $this->getSetting('disable_days');