diff --git a/docs/img/CUSTOM_PROPERTIES/Device_Custom_Properties_vid.gif b/docs/img/CUSTOM_PROPERTIES/Device_Custom_Properties_vid.gif
index c2ba369d..b21eeafa 100755
Binary files a/docs/img/CUSTOM_PROPERTIES/Device_Custom_Properties_vid.gif and b/docs/img/CUSTOM_PROPERTIES/Device_Custom_Properties_vid.gif differ
diff --git a/front/devices.php b/front/devices.php
index 7e59b8b1..70a98b3e 100755
--- a/front/devices.php
+++ b/front/devices.php
@@ -307,6 +307,8 @@ function processDeviceTotals(devicesData) {
 //------------------------------------------------------------------------------
 //  Render the info boxes/tiles on top
 function renderInfoboxes(customData) {
+  if(customData.length > 0)
+  {
     $.ajax({
       url: 'php/components/tile_cards.php', // PHP script URL
       type: 'POST', // Use POST method to send data
@@ -320,6 +322,7 @@ function renderInfoboxes(customData) {
       }
     });
   }
+}
 
 // -----------------------------------------------------------------------------
 // Map column index to column name for GraphQL query
@@ -833,7 +836,7 @@ function multiEditDevices()
   }
 
   // redirect to the Maintenance section
-  window.location.href = window.location.origin + '/maintenance.php#tab_multiEdit?macs=' + macs.slice(0, -1);
+  window.location.href = './maintenance.php#tab_multiEdit?macs=' + macs.slice(0, -1);
 }
 
 
diff --git a/front/js/common.js b/front/js/common.js
index 786e8f38..f0314f02 100755
--- a/front/js/common.js
+++ b/front/js/common.js
@@ -751,7 +751,7 @@ function navigateToDeviceWithIp (ip) {
       {
         mac = obj.devMac;
 
-        window.open(window.location.origin +'/deviceDetails.php?mac=' + mac , "_blank");
+        window.open('./deviceDetails.php?mac=' + mac , "_blank");
       }
     });