diff --git a/resources/css/calendar.css b/resources/css/calendar.css
index f1eb3c87..6afafe08 100644
--- a/resources/css/calendar.css
+++ b/resources/css/calendar.css
@@ -664,6 +664,10 @@ tbody,
     margin-bottom: 0;
 }
 
+#calendar-entry-form .bootstrap-timepicker-widget {
+    min-width: 140px;
+}
+
 #calendar-entry-form .ProseMirror-menubar-wrapper {
     z-index: 8;
 }
diff --git a/resources/css/calendar.min.css b/resources/css/calendar.min.css
index 827ccf85..4a995a24 100644
--- a/resources/css/calendar.min.css
+++ b/resources/css/calendar.min.css
@@ -2,4 +2,4 @@
  * FullCalendar v2.0.2 Stylesheet
  * Docs & License: http://arshaw.com/fullcalendar/
  * (c) 2013 Adam Shaw
- */.fc{direction:ltr;text-align:left}.fc table{border-collapse:collapse;border-spacing:0}.fc table,html .fc{font-size:1em}.fc td,.fc th{padding:0;vertical-align:top}.fc-header td{white-space:nowrap}.fc-header-left{width:25%;text-align:left}.fc-header-center{text-align:center}.fc-header-right{width:25%;text-align:right}.fc-header-title{display:inline-block;vertical-align:top;color:red!important}.fc-header-toolbar h2{margin-top:0;white-space:nowrap;font-size:20px;font-weight:600;color:#555}.fc .fc-header-space{padding-left:10px}.fc-header .fc-button{margin-bottom:1em;vertical-align:top}.fc-header .fc-button{margin-right:-1px}.fc-header .fc-corner-right,.fc-header .ui-corner-right{margin-right:0}.fc-header .fc-state-hover,.fc-header .ui-state-hover{z-index:2}.fc-header .fc-state-down{z-index:3}.fc-header .fc-state-active,.fc-header .ui-state-active{z-index:4}.fc-day-header{border:1px solid #eee!important}.fc-content{position:relative;z-index:1;clear:both;zoom:1}.fc-content .fa{margin:0 2px}.fc-view{position:relative;width:100%;overflow:hidden}.fc-widget-content,.fc-widget-header{border:1px solid #eee}td.fc-today{background:var(--background-color-highlight)}.fc-state-highlight,.fc-unthemed td.fc-today{background:#f6fdfc!important}.fc-cell-overlay{background:#bce8f1;opacity:.3}.fc-button{position:relative;display:inline-block;padding:0 .6em;overflow:hidden;height:1.9em;line-height:1.9em;white-space:nowrap;cursor:pointer}.fc-state-default{border:1px solid;background-image:none!important}.fc-state-default.fc-corner-left{border-top-left-radius:4px;border-bottom-left-radius:4px}.fc-state-default.fc-corner-right{border-top-right-radius:4px;border-bottom-right-radius:4px}.fc-disabled-cursor:hover{cursor:not-allowed}.fc-button .fc-icon{margin:0 .1em;font-family:"Courier New",Courier,monospace;vertical-align:baseline}.fc-icon-left-single-arrow:after{content:"\02039";font-weight:700}.fc-icon-right-single-arrow:after{content:"\0203A";font-weight:700}.fc-icon-left-double-arrow:after{content:"\000AB"}.fc-icon-right-double-arrow:after{content:"\000BB"}.fc-button .ui-icon{position:relative;top:50%;float:left;margin-top:-8px}.fc-state-default{background-color:#ededed;color:#777;border-color:#ededed}.fc-state-hover{background-color:#ededed;color:#777}.fc-state-active,.fc-state-down{background-color:#d7d7d7;border-color:#d7d7d7;color:#777}.fc-state-disabled{cursor:default;background-image:none;opacity:.65;box-shadow:none}.fc-event-container>*{z-index:8}.fc-event-container>.ui-draggable-dragging,.fc-event-container>.ui-resizable-resizing{z-index:9}.fc-event{background-color:#6fdbe8;color:#fff;font-size:.85em;cursor:default}a.fc-event{text-decoration:none}.fc-event-draggable,a.fc-event{cursor:pointer}.fc-rtl .fc-event{text-align:right}.fc-day-grid-event{border:none}.fc-content{width:100%;height:100%;overflow:hidden;padding:2px;border:none}.fc-event-time,.fc-event-title{padding:0 1px;font-size:13px}.fc .ui-resizable-handle{display:block;position:absolute;z-index:99999;overflow:hidden;font-size:300%;line-height:50%}.fc-event-hori{border-width:1px 0;margin-bottom:1px}.fc-ltr .fc-event-hori.fc-event-start,.fc-rtl .fc-event-hori.fc-event-end{border-left-width:1px;border-top-left-radius:3px;border-bottom-left-radius:3px}.fc-ltr .fc-event-hori.fc-event-end,.fc-rtl .fc-event-hori.fc-event-start{border-right-width:1px;border-top-right-radius:3px;border-bottom-right-radius:3px}.fc-event-hori .ui-resizable-e{top:0!important;right:-3px!important;width:7px!important;height:100%!important;cursor:e-resize}.fc-event-hori .ui-resizable-w{top:0!important;left:-3px!important;width:7px!important;height:100%!important;cursor:w-resize}table.fc-border-separate{border-collapse:separate}.fc-border-separate td,.fc-border-separate th{border-width:1px 0 0 1px}.fc-border-separate td.fc-last,.fc-border-separate th.fc-last{border-right-width:1px}.fc-border-separate tr.fc-last td,.fc-border-separate tr.fc-last th{border-bottom-width:1px}.fc-border-separate tbody tr.fc-first td,.fc-border-separate tbody tr.fc-first th{border-top-width:0}.fc-grid th{text-align:center}.fc .fc-week-number{width:22px;text-align:center}.fc .fc-week-number div{padding:0 2px}.fc-grid .fc-day-number{float:right;padding:0 2px}.fc-grid .fc-other-month .fc-day-number{opacity:.3}.fc-grid .fc-day-content{clear:both;padding:2px 2px 1px}.fc-grid .fc-event-time{font-weight:700}.fc-rtl .fc-grid .fc-day-number{float:left}.fc-rtl .fc-grid .fc-event-time{float:right}.fc-agenda table{border-collapse:separate}.fc-agenda-days th{text-align:center}.fc-agenda .fc-agenda-axis{width:50px;padding:0 4px;vertical-align:middle;text-align:right;font-weight:400}.fc-agenda-slots .fc-agenda-axis{white-space:nowrap}.fc-agenda .fc-week-number{font-weight:700}.fc-agenda .fc-day-content{padding:2px 2px 1px}.fc-agenda-days .fc-agenda-axis{border-right-width:1px}.fc-agenda-days .fc-col0{border-left-width:0}.fc-agenda-allday th{border-width:0 1px}.fc-agenda-allday .fc-day-content{min-height:34px}.fc-agenda-divider-inner{height:2px;overflow:hidden}.fc-widget-header .fc-agenda-divider-inner{background:#eee}.fc-agenda-slots th{border-width:1px 1px 0}.fc-agenda-slots td{border-width:1px 0 0;background:0 0}.fc-agenda-slots td div{height:20px}.fc-agenda-slots tr.fc-slot0 td,.fc-agenda-slots tr.fc-slot0 th{border-top-width:0}.fc-agenda-slots tr.fc-minor td,.fc-agenda-slots tr.fc-minor th{border-top-style:dotted}.fc-event-vert{border-width:0 1px}.fc-event-vert.fc-event-start{border-top-width:1px;border-top-left-radius:3px;border-top-right-radius:3px}.fc-event-vert.fc-event-end{border-bottom-width:1px;border-bottom-left-radius:3px;border-bottom-right-radius:3px}.fc-event-vert .fc-event-time{white-space:nowrap;font-size:13px;font-weight:700}.fc-event-vert .fc-event-inner{position:relative;z-index:2}.fc-event-vert .fc-event-bg{position:absolute;z-index:1;top:0;left:0;width:100%;height:100%;background:#fff;opacity:.25}.fc-event-vert .ui-resizable-s{bottom:0!important;width:100%!important;height:8px!important;overflow:hidden!important;line-height:8px!important;font-size:11px!important;font-family:monospace;text-align:center;cursor:s-resize}.fc-content,.fc-divider,.fc-list-heading td,.fc-list-view,.fc-popover,.fc-row,tbody,td,th,thead{border-color:#eee}.fc-list-view{width:auto!important}.fc-event-dot{margin-right:2px}.fc-list-item{cursor:pointer}.fc-list-heading{background-color:#eee}.fc-view-container .table>tbody>tr>td,.fc-view-container .table>tbody>tr>th,.fc-view-container .table>tfoot>tr>td,.fc-view-container .table>tfoot>tr>th,.fc-view-container .table>thead>tr>td,.fc-view-container .table>thead>tr>th{padding:10px}.calendar-options .calendar-filters,.calendar-options .calendar-selectors,.calendar-options .calendar-types{float:left;margin-right:10px}.timeField .form-group{margin-bottom:0}.timeField .help-block{margin:0}#calendar-entry-form{padding-top:0}#calendar-entry-form .tab-menu{margin-bottom:0}#calendar-entry-form .ProseMirror-menubar-wrapper{z-index:8}#calendar-entry-form .ProseMirror{min-height:150px!important}.calendar-entry-participants.modal-body{padding:0 0 20px 0}.calendar-entry-participants button.btn-participants-action{margin:10px 0 0 12px}.calendar-entry-participants .pagination{margin:10px 0 0}.calendar-entry-participants .media-list{margin:0 11px}.calendar-entry-participants .media-body{width:1%;word-break:initial}.calendar-entry-participants .media-body:first-child{width:auto}.calendar-entry-participants .media-body:first-child .media-object{float:left;margin-right:5px}.calendar-entry-participants .media-body:not(:first-child){padding-left:5px}.calendar-entry-participants select.form-control{width:auto;height:40px;padding-right:24px}.calendar-entry-new-participants-form button.btn,.calendar-entry-participants .media-list button.btn{height:32px;margin-top:3px}.calendar-entry-participants-count{padding:18px;margin:0}.calendar-entry-new-participants-form{padding:18px 18px 4px}.calendar-entry-new-participants-form .form-group.field-calendarentryparticipationform-newparticipantstatus{padding:0;margin:0}.calendar-entry-new-participants-form .form-group .checkbox label{padding-left:0}.calendar-entry-new-participants-form .form-group.field-calendarentryparticipationform-newforcestatus{display:inline-block}.calendar-entry-participants-filters{padding:10px 18px 0}.calendar-entry-participants-filter-title{font-size:80%}.calendar-entry-participants-filters .btn.btn-info{margin:10px 8px 0 0;padding:3px 14px}.calendar-entry-participants-filters .btn.btn-info.active{background:#0397a8!important;color:#fff!important}.calendar-entry-participants-filters .btn.btn-info:not(.active){border:1px solid #435f6f;color:#435f6f!important;background:#fff}.calendar-entry-participants-filters .btn.btn-info:not(.active):hover{background:#0397a8!important;border:1px solid #0397a8;color:#fff!important}.calendar-entry-participants .pagination-container{margin-top:25px}.calendar-entry-participants .pagination>li>a{color:#000}.calendar-entry-participants .pagination>.active>a{color:#fff}.calendar-option-buttons{float:right}#calendar-overview-loader{position:absolute;right:10px;top:60px}.calendar-wall-entry .calendar-wall-entry-section{margin-bottom:10px}.calendar-wall-entry .event-info-section{margin-bottom:10px}.calendar-wall-entry .event-info-section-content{padding-left:25px}.calendar-wall-entry .event-participation-buttons{margin:32px 0 15px}.calendar-wall-entry .event-participation-buttons button{margin-right:8px}.calendar-wall-entry .event-participation-buttons button .fa{font-size:130%;position:relative;top:1px;margin-right:3px}.calendar-wall-entry [data-action-click]{cursor:pointer}.calendar-wall-entry .event-info-section-content h1{margin:0 0 5px;font-weight:600;font-size:14px}@media (max-width:767px){.calendar-option-buttons{float:none;text-align:right}#calendar-overview-loader{position:inherit;float:left}}
\ No newline at end of file
+ */.fc{direction:ltr;text-align:left}.fc table{border-collapse:collapse;border-spacing:0}.fc table,html .fc{font-size:1em}.fc td,.fc th{padding:0;vertical-align:top}.fc-header td{white-space:nowrap}.fc-header-left{width:25%;text-align:left}.fc-header-center{text-align:center}.fc-header-right{width:25%;text-align:right}.fc-header-title{display:inline-block;vertical-align:top;color:red!important}.fc-header-toolbar h2{margin-top:0;white-space:nowrap;font-size:20px;font-weight:600;color:#555}.fc .fc-header-space{padding-left:10px}.fc-header .fc-button{margin-bottom:1em;vertical-align:top}.fc-header .fc-button{margin-right:-1px}.fc-header .fc-corner-right,.fc-header .ui-corner-right{margin-right:0}.fc-header .fc-state-hover,.fc-header .ui-state-hover{z-index:2}.fc-header .fc-state-down{z-index:3}.fc-header .fc-state-active,.fc-header .ui-state-active{z-index:4}.fc-day-header{border:1px solid #eee!important}.fc-content{position:relative;z-index:1;clear:both;zoom:1}.fc-content .fa{margin:0 2px}.fc-view{position:relative;width:100%;overflow:hidden}.fc-widget-content,.fc-widget-header{border:1px solid #eee}td.fc-today{background:var(--background-color-highlight)}.fc-state-highlight,.fc-unthemed td.fc-today{background:#f6fdfc!important}.fc-cell-overlay{background:#bce8f1;opacity:.3}.fc-button{position:relative;display:inline-block;padding:0 .6em;overflow:hidden;height:1.9em;line-height:1.9em;white-space:nowrap;cursor:pointer}.fc-state-default{border:1px solid;background-image:none!important}.fc-state-default.fc-corner-left{border-top-left-radius:4px;border-bottom-left-radius:4px}.fc-state-default.fc-corner-right{border-top-right-radius:4px;border-bottom-right-radius:4px}.fc-disabled-cursor:hover{cursor:not-allowed}.fc-button .fc-icon{margin:0 .1em;font-family:"Courier New",Courier,monospace;vertical-align:baseline}.fc-icon-left-single-arrow:after{content:"\02039";font-weight:700}.fc-icon-right-single-arrow:after{content:"\0203A";font-weight:700}.fc-icon-left-double-arrow:after{content:"\000AB"}.fc-icon-right-double-arrow:after{content:"\000BB"}.fc-button .ui-icon{position:relative;top:50%;float:left;margin-top:-8px}.fc-state-default{background-color:#ededed;color:#777;border-color:#ededed}.fc-state-hover{background-color:#ededed;color:#777}.fc-state-active,.fc-state-down{background-color:#d7d7d7;border-color:#d7d7d7;color:#777}.fc-state-disabled{cursor:default;background-image:none;opacity:.65;box-shadow:none}.fc-event-container>*{z-index:8}.fc-event-container>.ui-draggable-dragging,.fc-event-container>.ui-resizable-resizing{z-index:9}.fc-event{background-color:#6fdbe8;color:#fff;font-size:.85em;cursor:default}a.fc-event{text-decoration:none}.fc-event-draggable,a.fc-event{cursor:pointer}.fc-rtl .fc-event{text-align:right}.fc-day-grid-event{border:none}.fc-content{width:100%;height:100%;overflow:hidden;padding:2px;border:none}.fc-event-time,.fc-event-title{padding:0 1px;font-size:13px}.fc .ui-resizable-handle{display:block;position:absolute;z-index:99999;overflow:hidden;font-size:300%;line-height:50%}.fc-event-hori{border-width:1px 0;margin-bottom:1px}.fc-ltr .fc-event-hori.fc-event-start,.fc-rtl .fc-event-hori.fc-event-end{border-left-width:1px;border-top-left-radius:3px;border-bottom-left-radius:3px}.fc-ltr .fc-event-hori.fc-event-end,.fc-rtl .fc-event-hori.fc-event-start{border-right-width:1px;border-top-right-radius:3px;border-bottom-right-radius:3px}.fc-event-hori .ui-resizable-e{top:0!important;right:-3px!important;width:7px!important;height:100%!important;cursor:e-resize}.fc-event-hori .ui-resizable-w{top:0!important;left:-3px!important;width:7px!important;height:100%!important;cursor:w-resize}table.fc-border-separate{border-collapse:separate}.fc-border-separate td,.fc-border-separate th{border-width:1px 0 0 1px}.fc-border-separate td.fc-last,.fc-border-separate th.fc-last{border-right-width:1px}.fc-border-separate tr.fc-last td,.fc-border-separate tr.fc-last th{border-bottom-width:1px}.fc-border-separate tbody tr.fc-first td,.fc-border-separate tbody tr.fc-first th{border-top-width:0}.fc-grid th{text-align:center}.fc .fc-week-number{width:22px;text-align:center}.fc .fc-week-number div{padding:0 2px}.fc-grid .fc-day-number{float:right;padding:0 2px}.fc-grid .fc-other-month .fc-day-number{opacity:.3}.fc-grid .fc-day-content{clear:both;padding:2px 2px 1px}.fc-grid .fc-event-time{font-weight:700}.fc-rtl .fc-grid .fc-day-number{float:left}.fc-rtl .fc-grid .fc-event-time{float:right}.fc-agenda table{border-collapse:separate}.fc-agenda-days th{text-align:center}.fc-agenda .fc-agenda-axis{width:50px;padding:0 4px;vertical-align:middle;text-align:right;font-weight:400}.fc-agenda-slots .fc-agenda-axis{white-space:nowrap}.fc-agenda .fc-week-number{font-weight:700}.fc-agenda .fc-day-content{padding:2px 2px 1px}.fc-agenda-days .fc-agenda-axis{border-right-width:1px}.fc-agenda-days .fc-col0{border-left-width:0}.fc-agenda-allday th{border-width:0 1px}.fc-agenda-allday .fc-day-content{min-height:34px}.fc-agenda-divider-inner{height:2px;overflow:hidden}.fc-widget-header .fc-agenda-divider-inner{background:#eee}.fc-agenda-slots th{border-width:1px 1px 0}.fc-agenda-slots td{border-width:1px 0 0;background:0 0}.fc-agenda-slots td div{height:20px}.fc-agenda-slots tr.fc-slot0 td,.fc-agenda-slots tr.fc-slot0 th{border-top-width:0}.fc-agenda-slots tr.fc-minor td,.fc-agenda-slots tr.fc-minor th{border-top-style:dotted}.fc-event-vert{border-width:0 1px}.fc-event-vert.fc-event-start{border-top-width:1px;border-top-left-radius:3px;border-top-right-radius:3px}.fc-event-vert.fc-event-end{border-bottom-width:1px;border-bottom-left-radius:3px;border-bottom-right-radius:3px}.fc-event-vert .fc-event-time{white-space:nowrap;font-size:13px;font-weight:700}.fc-event-vert .fc-event-inner{position:relative;z-index:2}.fc-event-vert .fc-event-bg{position:absolute;z-index:1;top:0;left:0;width:100%;height:100%;background:#fff;opacity:.25}.fc-event-vert .ui-resizable-s{bottom:0!important;width:100%!important;height:8px!important;overflow:hidden!important;line-height:8px!important;font-size:11px!important;font-family:monospace;text-align:center;cursor:s-resize}.fc-content,.fc-divider,.fc-list-heading td,.fc-list-view,.fc-popover,.fc-row,tbody,td,th,thead{border-color:#eee}.fc-list-view{width:auto!important}.fc-event-dot{margin-right:2px}.fc-list-item{cursor:pointer}.fc-list-heading{background-color:#eee}.fc-view-container .table>tbody>tr>td,.fc-view-container .table>tbody>tr>th,.fc-view-container .table>tfoot>tr>td,.fc-view-container .table>tfoot>tr>th,.fc-view-container .table>thead>tr>td,.fc-view-container .table>thead>tr>th{padding:10px}.calendar-options .calendar-filters,.calendar-options .calendar-selectors,.calendar-options .calendar-types{float:left;margin-right:10px}.timeField .form-group{margin-bottom:0}.timeField .help-block{margin:0}#calendar-entry-form{padding-top:0}#calendar-entry-form .tab-menu{margin-bottom:0}#calendar-entry-form .bootstrap-timepicker-widget{min-width:140px}#calendar-entry-form .ProseMirror-menubar-wrapper{z-index:8}#calendar-entry-form .ProseMirror{min-height:150px!important}.calendar-entry-participants.modal-body{padding:0 0 20px 0}.calendar-entry-participants button.btn-participants-action{margin:10px 0 0 12px}.calendar-entry-participants .pagination{margin:10px 0 0}.calendar-entry-participants .media-list{margin:0 11px}.calendar-entry-participants .media-body{width:1%;word-break:initial}.calendar-entry-participants .media-body:first-child{width:auto}.calendar-entry-participants .media-body:first-child .media-object{float:left;margin-right:5px}.calendar-entry-participants .media-body:not(:first-child){padding-left:5px}.calendar-entry-participants select.form-control{width:auto;height:40px;padding-right:24px}.calendar-entry-new-participants-form button.btn,.calendar-entry-participants .media-list button.btn{height:32px;margin-top:3px}.calendar-entry-participants-count{padding:18px;margin:0}.calendar-entry-new-participants-form{padding:18px 18px 4px}.calendar-entry-new-participants-form .form-group.field-calendarentryparticipationform-newparticipantstatus{padding:0;margin:0}.calendar-entry-new-participants-form .form-group .checkbox label{padding-left:0}.calendar-entry-new-participants-form .form-group.field-calendarentryparticipationform-newforcestatus{display:inline-block}.calendar-entry-participants-filters{padding:10px 18px 0}.calendar-entry-participants-filter-title{font-size:80%}.calendar-entry-participants-filters .btn.btn-info{margin:10px 8px 0 0;padding:3px 14px}.calendar-entry-participants-filters .btn.btn-info.active{background:#0397a8!important;color:#fff!important}.calendar-entry-participants-filters .btn.btn-info:not(.active){border:1px solid #435f6f;color:#435f6f!important;background:#fff}.calendar-entry-participants-filters .btn.btn-info:not(.active):hover{background:#0397a8!important;border:1px solid #0397a8;color:#fff!important}.calendar-entry-participants .pagination-container{margin-top:25px}.calendar-entry-participants .pagination>li>a{color:#000}.calendar-entry-participants .pagination>.active>a{color:#fff}.calendar-option-buttons{float:right}#calendar-overview-loader{position:absolute;right:10px;top:60px}.calendar-wall-entry .calendar-wall-entry-section{margin-bottom:10px}.calendar-wall-entry .event-info-section{margin-bottom:10px}.calendar-wall-entry .event-info-section-content{padding-left:25px}.calendar-wall-entry .event-participation-buttons{margin:32px 0 15px}.calendar-wall-entry .event-participation-buttons button{margin-right:8px}.calendar-wall-entry .event-participation-buttons button .fa{font-size:130%;position:relative;top:1px;margin-right:3px}.calendar-wall-entry [data-action-click]{cursor:pointer}.calendar-wall-entry .event-info-section-content h1{margin:0 0 5px;font-weight:600;font-size:14px}@media (max-width:767px){.calendar-option-buttons{float:none;text-align:right}#calendar-overview-loader{position:inherit;float:left}}
\ No newline at end of file
diff --git a/views/entry/edit-basic.php b/views/entry/edit-basic.php
index b50f1d00..e5e257b4 100644
--- a/views/entry/edit-basic.php
+++ b/views/entry/edit-basic.php
@@ -40,28 +40,35 @@
     <?php Yii::$app->formatter->timeZone = $calendarEntryForm->timeZone ?>
 
     <div class="row">
-        <div class="col-md-6">
+        <div class="col-xs-6">
             <?= $form->field($calendarEntryForm, 'start_date')->widget(DatePicker::class, ['dateFormat' => Yii::$app->formatter->dateInputFormat, 'clientOptions' => [], 'options' => ['class' => 'form-control']]) ?>
         </div>
-        <div class="col-md-6 timeField" <?= !$calendarEntryForm->showTimeFields() ? 'style="opacity:0.2"' : '' ?>>
+        <div class="col-xs-6 timeField" <?= !$calendarEntryForm->showTimeFields() ? 'style="opacity:0.2"' : '' ?>>
             <?= $form->field($calendarEntryForm, 'start_time')->widget(TimePicker::class, ['disabled' => $calendarEntryForm->entry->all_day]); ?>
         </div>
     </div>
 
     <div class="row">
-        <div class="col-md-6">
+        <div class="col-xs-6">
             <?= $form->field($calendarEntryForm, 'end_date')->widget(DatePicker::class, ['dateFormat' => Yii::$app->formatter->dateInputFormat, 'clientOptions' => [], 'options' => ['class' => 'form-control']]) ?>
         </div>
-        <div class="col-md-6 timeField" <?= !$calendarEntryForm->showTimeFields() ? 'style="opacity:0.2"' : '' ?>>
+        <div class="col-xs-6 timeField" <?= !$calendarEntryForm->showTimeFields() ? 'style="opacity:0.2"' : '' ?>>
             <?= $form->field($calendarEntryForm, 'end_time')->widget(TimePicker::class, ['disabled' => $calendarEntryForm->entry->all_day]); ?>
         </div>
     </div>
 
     <div class="row">
-        <div class="col-md-6">
-            <?= $form->field($calendarEntryForm->entry, 'location')->textInput() ?>
+        <div class="col-xs-6"  style="padding: 0">
+            <div class="col-sm-6">
+                <?= $form->field($calendarEntryForm->entry, 'all_day')->checkbox(['data-action-change' => 'toggleDateTime']) ?>
+            </div>
+            <?php if (Module::isRecurrenceActive()) : ?>
+            <div class="col-sm-6">
+                <?= $form->field($calendarEntryForm, 'recurring')->checkbox(['data-action-change' => 'toggleRecurring']) ?>
+            </div>
+            <?php endif; ?>
         </div>
-        <div class="col-md-6 timeZoneField"<?= $calendarEntryForm->entry->all_day ? ' hidden' : '' ?>>
+        <div class="col-xs-6 timeZoneField"<?= $calendarEntryForm->entry->all_day ? ' hidden' : '' ?>>
             <?= TimeZoneDropdownAddition::widget(['model' => $calendarEntryForm])?>
         </div>
     </div>
@@ -69,24 +76,22 @@
     <?php Yii::$app->i18n->autosetLocale(); ?>
 
     <div class="row">
-        <div class="col-sm-4">
-            <?= $form->field($calendarEntryForm->entry, 'all_day')->checkbox(['data-action-change' => 'toggleDateTime']) ?>
-        </div>
-        <?php if (Module::isRecurrenceActive()) : ?>
-        <div class="col-sm-4">
-            <?= $form->field($calendarEntryForm, 'recurring')->checkbox(['data-action-change' => 'toggleRecurring']) ?>
+        <div class="col-sm-6">
+            <?= $form->field($calendarEntryForm->entry, 'location')->textInput() ?>
         </div>
-        <?php endif; ?>
+    </div>
+    
+    <div class="row">
         <?php if ($calendarEntryForm->recurring || $calendarEntryForm->isFutureEvent()) : ?>
-        <div class="col-sm-4">
+        <div class="col-sm-3">
             <?= $form->field($calendarEntryForm, 'reminder')->checkbox(['data-action-change' => 'toggleReminder']) ?>
         </div>
         <?php endif; ?>
-        <div class="col-sm-4">
+        <div class="col-sm-3">
             <?= $form->field($calendarEntryForm, 'hidden')->widget(ContentHiddenCheckbox::class) ?>
         </div>
         <?php if ($calendarEntryForm->canCreatePublicEntry()) :?>
-        <div class="col-sm-8">
+        <div class="col-sm-6">
             <?= $form->field($calendarEntryForm, 'is_public')->widget(ContentVisibilitySelect::class, ['contentOwner' => 'entry']) ?>
         </div>
         <?php endif; ?>