diff --git a/api/js/egw_action/egw_action.js b/api/js/egw_action/egw_action.js
index 2b745b814f..e523f2bcda 100644
--- a/api/js/egw_action/egw_action.js
+++ b/api/js/egw_action/egw_action.js
@@ -11,7 +11,6 @@
 /*egw:uses
 	egw_action_common;
 */
-import "../jsapi/egw.js";
 import {
 	EGW_AO_STATE_NORMAL,
 	EGW_AO_STATE_VISIBLE,
diff --git a/api/js/etemplate/et2_widget_video.ts b/api/js/etemplate/et2_widget_video.ts
index 300052ef2d..cde392eb4e 100644
--- a/api/js/etemplate/et2_widget_video.ts
+++ b/api/js/etemplate/et2_widget_video.ts
@@ -156,6 +156,7 @@ export class et2_video  extends et2_baseWidget implements et2_IDOMNode
         super(_parent, _attrs, ClassWithAttributes.extendAttributes(et2_video._attributes, _child || {}));
 
         this.set_src_type(this.options.src_type);
+        this.options.starttime = isNaN(this.options.starttime) ? 0 : this.options.starttime;
     }
 
     set_src_type(_type)
@@ -285,7 +286,7 @@ export class et2_video  extends et2_baseWidget implements et2_IDOMNode
         let value = _value>100?100:_value;
         if (value>= 0)
         {
-            if (this._isYoutube() && this.youtube)
+            if (this._isYoutube() && this.youtube && typeof this.youtube.setVolume === 'function')
             {
                 this.youtube.setVolume(value);
             }
@@ -569,7 +570,7 @@ export class et2_video  extends et2_baseWidget implements et2_IDOMNode
 
     public videoLoadnigIsFinished()
     {
-        if (this.options.starttime)
+        if (this.options.starttime >= 0)
         {
             this.seek_video(this.options.starttime);
 
diff --git a/api/js/jsapi/egw.js b/api/js/jsapi/egw.js
index 248bae94ac..534e246e17 100644
--- a/api/js/jsapi/egw.js
+++ b/api/js/jsapi/egw.js
@@ -78,7 +78,7 @@ window.app = {classes: {}};
 	window.egw_appName = egw_script.getAttribute('data-app');
 
 	// split includes in legacy js and modules
-	const legacy_js_regexp = /\/dhtmlx|jquery-ui-dist/;
+	const legacy_js_regexp = /\/dhtmlx|jquery-ui-dist|^etemplate\/|^phpbrain\//;
 
 	// check if egw object was injected by window open
 	if (typeof window.egw == 'undefined')
diff --git a/api/js/jsapi/egw_core.js b/api/js/jsapi/egw_core.js
index 3377c6b359..3151de51ab 100644
--- a/api/js/jsapi/egw_core.js
+++ b/api/js/jsapi/egw_core.js
@@ -10,7 +10,6 @@
  * @version $Id$
  */
 
- import "./egw.js";
 /**
  * This code setups the egw namespace and adds the "extend" function, which is
  * used by extension modules to inject their content into the egw object.
diff --git a/calendar/templates/mobile/app.css b/calendar/templates/mobile/app.css
index c2d1f18cb9..245e2dbfc1 100644
--- a/calendar/templates/mobile/app.css
+++ b/calendar/templates/mobile/app.css
@@ -419,13 +419,13 @@ Hide subsequent headers in week view with non-consolidated owners
   top: 2em;
 }
 #calendar-view_view.hideDayColHeader tr:first-of-type .calendar_calGridHeader .calendar_calDayColHeader_spacer {
-  height: calc(33.5em);
+  height: calc(1.5em + 32px);
 }
 #calendar-view_view.hideDayColHeader tr .calendar_calGridHeader > span.et2_label {
   white-space: nowrap;
   display: block;
   position: static;
-  width: calc(42%);
+  width: calc(100% - 58px);
   margin-left: 58px;
   color: white;
   background-color: #2D6393;
@@ -2940,7 +2940,7 @@ div#calendar-container div.calendar table tbody tr.rowhilite td {
     width: 50px;
   }
   #calendar-toolbar .nm-mob-header #calendar-toolbar_toolbar {
-    width: calc(0%);
+    width: calc(100% - 100px);
     display: inline-block;
     padding: 0px !important;
   }
diff --git a/calendar/templates/mobile/app.less b/calendar/templates/mobile/app.less
index 3b6a9d3c9c..e3a5b75fcb 100644
--- a/calendar/templates/mobile/app.less
+++ b/calendar/templates/mobile/app.less
@@ -110,7 +110,7 @@
 				width: 50px;
 			}
 			#calendar-toolbar_toolbar{
-				width: calc(100% - 100px);
+				width: ~"calc(100% - 100px)";
 				display: inline-block;
 				padding: 0px !important;
 				#toolbar-actionlist {
diff --git a/pixelegg/mobile/fw_mobile.css b/pixelegg/mobile/fw_mobile.css
index 1144d46187..b6ef3ab809 100644
--- a/pixelegg/mobile/fw_mobile.css
+++ b/pixelegg/mobile/fw_mobile.css
@@ -8383,14 +8383,14 @@ table.egwGridView_grid img.et2_appicon {
     margin-bottom: 5px;
   }
   body #egw_fw_basecontainer #egw_fw_toggler {
-    z-index: 2;
+    z-index: 999;
     height: 50px;
   }
   body #egw_fw_basecontainer #egw_fw_toggler span {
     top: 15px;
   }
   body #egw_fw_basecontainer.egw_fw_sidebar_toggleOn #egw_fw_toggler {
-    z-index: 2;
+    z-index: 999;
     height: 50px;
     background-color: transparent;
   }
diff --git a/pixelegg/mobile/fw_mobile.less b/pixelegg/mobile/fw_mobile.less
index ad94c9dcc1..865f9e9ba3 100644
--- a/pixelegg/mobile/fw_mobile.less
+++ b/pixelegg/mobile/fw_mobile.less
@@ -524,7 +524,7 @@
 				margin-bottom: 5px;
 			}
 			#egw_fw_toggler {
-				z-index: 2;
+				z-index: 999;
 				height: 50px;
 				span {
 					top: 15px;
@@ -533,7 +533,7 @@
 		}
 		#egw_fw_basecontainer.egw_fw_sidebar_toggleOn {
 			#egw_fw_toggler {
-				z-index: 2;
+				z-index: 999;
 				height: 50px;
 				background-color: transparent;
 				span {