diff --git a/objects/functions.php b/objects/functions.php
index e539f6aaf712..5f938f99a2a5 100644
--- a/objects/functions.php
+++ b/objects/functions.php
@@ -5415,9 +5415,12 @@ function getStatsNotifications($force_recreate = false, $listItIfIsAdminOrOwner
 
     TimeLogEnd($timeName, __LINE__);
     foreach ($json['applications'] as $key => $value) {
-        if (!Live::isApplicationListed(@$value['key'], $listItIfIsAdminOrOwner)) {
+        $isListed = Live::isApplicationListed(@$value['key'], $listItIfIsAdminOrOwner);
+        if (!$isListed) {
             $json['hidden_applications'][] = $value;
             unset($json['applications'][$key]);
+        }else{
+            $json['applications'][$key]['isListed'] = $isListed;
         }
     }
     TimeLogEnd($timeName, __LINE__);
diff --git a/plugin/Live/Live.php b/plugin/Live/Live.php
index 8f9e0423018b..dc046875d9ab 100644
--- a/plugin/Live/Live.php
+++ b/plugin/Live/Live.php
@@ -2562,21 +2562,21 @@ static function getTitleFromKey($key, $title = '')
     public static function isApplicationListed($key, $listItIfIsAdminOrOwner = true)
     {
         global $_isApplicationListed;
+        if (!isset($_isApplicationListed)) {
+            $_isApplicationListed = array();
+        }
         if (empty($key)) {
-            return __LINE__;
+            $_isApplicationListed[$key] = __LINE__;
         }
         if ($listItIfIsAdminOrOwner && User::isAdmin()) {
-            return __LINE__;
-        }
-        if (!isset($_isApplicationListed)) {
-            $_isApplicationListed = array();
+            $_isApplicationListed[$key] = __LINE__;
         }
         if (!isset($_isApplicationListed[$key])) {
             $row = LiveTransmition::keyExists($key);
             if (empty($row) || empty($row['users_id'])) {
                 $_isApplicationListed[$key] = __LINE__;
-            } else if (!empty($row['scheduled'])) {
-                $_isApplicationListed[$key] = __LINE__;
+            //} else if (!empty($row['scheduled'])) {
+            //    $_isApplicationListed[$key] = __LINE__;
             } else if (!empty($row['public'])) {
                 $_isApplicationListed[$key] = __LINE__;
             } else if ($listItIfIsAdminOrOwner && User::getId() == $row['users_id']) {
diff --git a/plugin/SocialMediaPublisher/SocialMediaPublisher.php b/plugin/SocialMediaPublisher/SocialMediaPublisher.php
index 78a9e726c521..bcdd25f1b1e2 100644
--- a/plugin/SocialMediaPublisher/SocialMediaPublisher.php
+++ b/plugin/SocialMediaPublisher/SocialMediaPublisher.php
@@ -50,8 +50,8 @@ class SocialMediaPublisher extends PluginAbstract
         self::SOCIAL_TYPE_LINKEDIN['name'] => self::SOCIAL_TYPE_LINKEDIN,
     );
 
-    const RESTREAMER_URL = 'https://restream.ypt.me/';
-    //const RESTREAMER_URL = 'http://localhost:81/Restreamer/';
+    //const RESTREAMER_URL = 'https://restream.ypt.me/';
+    const RESTREAMER_URL = 'http://localhost:81/Restreamer/';
 
     public function getTags()
     {
diff --git a/view/managerVideos_form.php b/view/managerVideos_form.php
index 56b903bebb7b..a16b95dd137d 100644
--- a/view/managerVideos_form.php
+++ b/view/managerVideos_form.php
@@ -265,7 +265,7 @@
                                             <label for="madeForKids" class="label-primary"></label>
                                         </div>
                                     </div>
-                                    <div class="col-md-5">
+                                    <div class="col-md-4">
                                         <label class="control-label" for="inputRrating">
                                             <?php echo __("R Rating"); ?>
                                         </label>
@@ -283,11 +283,26 @@
                                             ?>
                                         </select>
                                     </div>
-                                    <div class="col-md-5">
+                                    <div class="col-md-4">
                                         <?php
                                         include $global['systemRootPath'] . 'view/managerVideos_owner.php';
                                         ?>
                                     </div>
+                                    
+                                    <div class="col-md-2">
+                                        <?php
+                                        if (Permissions::canAdminVideos()) {
+                                        ?>
+                                            <div>
+                                                <label class="control-label" for="views_count"><?php echo __("Video Views"); ?></label>
+                                                <input type="number" step="1" id="views_count" class="form-control externalOptions">
+                                            </div>
+                                        <?php
+                                        } else {
+                                        ?><input type="hidden" id="views_count" value="-1"><?php
+                                                                                        }
+                                                                                            ?>
+                                    </div>
                                 </div>
 
                                 <hr>
@@ -332,20 +347,6 @@
                                             <input type="text" id="videoSkipIntroSecond" class="form-control externalOptions" placeholder="00:00:00" value="00:00:00" required>
                                         </div>
                                     </div>
-                                    <div class="col-md-6">
-                                        <?php
-                                        if (Permissions::canAdminVideos()) {
-                                        ?>
-                                            <div>
-                                                <label class="control-label" for="videoStartSecond"><?php echo __("Video Views"); ?></label>
-                                                <input type="number" step="1" id="views_count" class="form-control externalOptions">
-                                            </div>
-                                        <?php
-                                        } else {
-                                        ?><input type="hidden" id="views_count" value="-1"><?php
-                                                                                        }
-                                                                                            ?>
-                                    </div>
 
                                 </div>