diff --git a/plugin/Live/view/Live_schedule/panel.php b/plugin/Live/view/Live_schedule/panel.php
index 55656e3867..d30bc4e5a5 100644
--- a/plugin/Live/view/Live_schedule/panel.php
+++ b/plugin/Live/view/Live_schedule/panel.php
@@ -134,7 +134,7 @@ global $Schedulecount;
             <?php
             if (Live::canStreamWithWebRTC()) {
                 ?>
-            <button class="btn btn-default faa-parent animated-hover " onclick="avideoModalIframeLarge(webSiteRootURL + 'plugin/Live/webcamFullscreen.php?live_schedule_id=' + $(this).attr('schedule_id'));" data-toggle="tooltip" title=<?php printJSString($objScheduleLive->button_title); ?> >
+                <button class="btn btn-default faa-parent animated-hover " onclick="avideoModalIframeLarge(webSiteRootURL + 'plugin/Live/webcamFullscreen.php?live_schedule_id=' + $(this).attr('schedule_id'));" data-toggle="tooltip" title=<?php printJSString($objScheduleLive->button_title); ?> >
                     <i class="fas fa-circle faa-flash" style="color:red;"></i> <span class=""><?php echo __($objScheduleLive->button_title); ?></span>
                 </button>
                 <?php
@@ -170,7 +170,7 @@ global $Schedulecount;
                     }
                     modal.showPleaseWait();
                     var data = $("#Schedule_form").serialize();
-                    data += '&users_id_company='+$('#users_id_company').val();
+                    data += '&users_id_company=' + $('#users_id_company').val();
                     //console.log('saveSchedule', data);
                     $.ajax({
                         type: "POST",
@@ -245,7 +245,7 @@ global $Schedulecount;
                     $("#Schedule_status").val(schedule.status);
                     $("#scheduled_time").val(schedule.scheduled_time);
                     $("#scheduled_password").val(schedule.scheduled_password);
-                    $("#Schedule_live_servers_id").val(schedule.live_servers_id?schedule.live_servers_id:0);
+                    $("#Schedule_live_servers_id").val(schedule.live_servers_id ? schedule.live_servers_id : 0);
                     $("#users_id_company").val(schedule.users_id_company).trigger('change');
                     $("#Schedule_description").val(schedule.description);
                 }
@@ -279,8 +279,8 @@ global $Schedulecount;
 
                 function uploadPosterCroppie(live_schedule_id) {
                     var url = webSiteRootURL + "plugin/Live/view/Live_schedule/uploadPoster.php";
-                    url = addQueryStringParameter(url,'live_schedule_id',live_schedule_id);
-                    url = addQueryStringParameter(url,'live_servers_id',<?php printJSString($_REQUEST['live_servers_id'] ?? ''); ?>);
+                    url = addQueryStringParameter(url, 'live_schedule_id', live_schedule_id);
+                    url = addQueryStringParameter(url, 'live_servers_id',<?php printJSString($_REQUEST['live_servers_id'] ?? ''); ?>);
                     avideoModalIframe(url);
                 }
 
diff --git a/plugin/Live/webcamFullscreen.php b/plugin/Live/webcamFullscreen.php
index 0152c33864..ecd07ddc96 100644
--- a/plugin/Live/webcamFullscreen.php
+++ b/plugin/Live/webcamFullscreen.php
@@ -48,7 +48,10 @@ $controls = Live::getAllControlls($streamName);
         <link href="<?php echo getURL('node_modules/fontawesome-free/css/all.min.css'); ?>" rel="stylesheet" type="text/css"/>
         <link href="<?php echo getURL('plugin/Live/webRTC.css'); ?>" rel="stylesheet" type="text/css"/>
         <script src="<?php echo getURL('node_modules/jquery/dist/jquery.min.js'); ?>" type="text/javascript"></script>
+        <link href="<?php echo getURL('node_modules/jquery-ui-dist/jquery-ui.min.css'); ?>" rel="stylesheet" type="text/css"/>
+        <link href="<?php echo getURL('view/css/main.css'); ?>" rel="stylesheet" type="text/css"/>
         <?php
+        include $global['systemRootPath'] . 'view/include/moment.js.php';
         include $global['systemRootPath'] . 'view/include/bootstrap.js.php';
         ?>
         <style>
@@ -123,9 +126,10 @@ $controls = Live::getAllControlls($streamName);
             ?>
         </div>
         <script src="<?php echo getURL('view/js/script.js'); ?>" type="text/javascript"></script>
-        <script src="<?php echo getCDN(); ?>node_modules/js-cookie/dist/js.cookie.js" type="text/javascript"></script>
-        <script src="<?php echo getCDN(); ?>node_modules/jquery-toast-plugin/dist/jquery.toast.min.js" type="text/javascript"></script>
-        <script src="<?php echo getCDN(); ?>node_modules/sweetalert/dist/sweetalert.min.js" type="text/javascript"></script>
+        <script src="<?php echo getURL('node_modules/js-cookie/dist/js.cookie.js'); ?>" type="text/javascript"></script>
+        <script src="<?php echo getURL('node_modules/jquery-toast-plugin/dist/jquery.toast.min.js'); ?>" type="text/javascript"></script>
+        <script src="<?php echo getURL('node_modules/sweetalert/dist/sweetalert.min.js'); ?>" type="text/javascript"></script>
+        <script src="<?php echo getURL('node_modules/jquery-ui-dist/jquery-ui.min.js'); ?>" type="text/javascript"></script>
         <!-- getFooterCode start -->
         <?php
         echo AVideoPlugin::getFooterCode();
diff --git a/plugin/UserNotifications/script.js b/plugin/UserNotifications/script.js
index fbc088c987..8292f23017 100644
--- a/plugin/UserNotifications/script.js
+++ b/plugin/UserNotifications/script.js
@@ -11,7 +11,7 @@ function getTemplateFromArray(itemsArray) {
             replace = webSiteRootURL + replace;
         } else if (search == 'element_class' && !empty(itemsArray.id)) {
             replace += " UserNotificationsJS_" + itemsArray.id;
-        } else if (search == 'created') {
+        } else if (search == 'created' && typeof _serverSystemTimezone !== 'undefined') {
             m = moment.tz(itemsArray.created, _serverSystemTimezone).local();
             replace = m.fromNow();
         } else if (search == 'href' && !empty(replace) && !isValidURL(replace)) {
diff --git a/view/include/moment.js.php b/view/include/moment.js.php
new file mode 100644
index 0000000000..c42a810476
--- /dev/null
+++ b/view/include/moment.js.php
@@ -0,0 +1,11 @@
+<script src="<?php echo getURL('node_modules/moment/min/moment.min.js'); ?>"></script>
+<?php
+$lang = getLanguage();
+$momentFile = 'node_modules/moment/locale/' . $lang . '.js';
+if (file_exists($global['systemRootPath'] . $momentFile)) {
+    ?>
+    <script src="<?php echo getURL($momentFile); ?>"></script>
+    <?php
+}
+?>        
+<script src="<?php echo getURL('node_modules/moment-timezone/builds/moment-timezone-with-data.min.js'); ?>"></script>
\ No newline at end of file