diff --git a/assets/functions.php b/assets/functions.php
index 4d6d724..5171235 100644
--- a/assets/functions.php
+++ b/assets/functions.php
@@ -163,13 +163,12 @@ function menu($selected,$selected_child){
         include dirname(__FILE__,2).'/settings/translations/translations_US.php';
     }  
   
-  $profile = $_SESSION['profile'];
+  $profile = explode(',',$_SESSION['profile']);
 
   //Define Menu
   $menu = '';
-
   foreach ($main_menu as $menu_item){
-      if (str_contains($profile,$item = $menu_item)){
+      if (in_array($item = $menu_item, $profile,)){
           //Main URL
           $menu .= '<a href="index.php?page='.$urls[$item]['url'].'"' . ($selected == $urls[$item]['selected'] ? ' class="selected"' : '') . '><i class="'.$urls[$item]['icon'].'"></i>'.ucfirst(${$urls[$item]['name']}).'</a>';
 
@@ -181,7 +180,7 @@ function menu($selected,$selected_child){
               $menu .= '<div class="sub" ' . ($selected == $urls[$item]['selected'] ? ' class="selected"' : '') . '>';
               foreach($sub_menu as $key){
               //CHECK IF USER IS ALLOWED
-                  if (str_contains($profile, $key)){  
+                  if (in_array($key,$profile)){  
                     $menu .= '<a href="index.php?page='.$urls[$key]['url'].'"' . ($selected == $urls[$key]['selected'] && $selected_child == 'view' ? ' class="selected"' : '') . '><span>&#9724;</span>'.ucfirst(${$urls[$key]['name']}).'</a>';
                   }
               }
diff --git a/equipment.php b/equipment.php
index 30935a8..e6896e1 100644
--- a/equipment.php
+++ b/equipment.php
@@ -64,7 +64,7 @@ if (!empty($products_software)){$products_software = decode_payload($products_so
 $status_text = 'status'.$responses->status.'_text';
 $warrantydate = warrantyStatus($responses->warranty_date);
 $service_date_due = serviceStatus($responses->service_date);
-$firmware_status = availableFirmware($responses->sw_version, $products_software);
+$firmware_status = availableFirmware($responses->sw_version, $responses->sw_version_latest);
 
 //Calculate Healthindex based on last test
 $total_score = assetHealthIndex($_SESSION['profile'],$_SESSION['permission'],$equipment_data,0);
diff --git a/settings/settingsmenu.php b/settings/settingsmenu.php
index b9d51a6..b00921b 100644
--- a/settings/settingsmenu.php
+++ b/settings/settingsmenu.php
@@ -13,6 +13,7 @@ $main_menu = array ('dashboard','sales','build','cartests','marketing','equipmen
 //Sub menus
 $equipments_sub = array('equipments','servicereports','histories','firmwaretool','equipments_mass_update');
 $sales_sub = array('accounts','contracts');
+$products_sub = array('products');
 $admin_sub = array('users','communications','partners');
 $reporting_sub = array('report_build','report_contracts_billing','report_healthindex','report_usage');
 $settings_sub = array('config','language','log','maintenance','profiles');
diff --git a/settings/settingsprofiles.php b/settings/settingsprofiles.php
index 42be17f..8e04819 100644
--- a/settings/settingsprofiles.php
+++ b/settings/settingsprofiles.php
@@ -1,22 +1,22 @@
 <?php
 /*Standard*/
-define('standard_profile','dashboard,profile,equipments,equipment,histories,history,firmwaretool,servicereports,servicereport,application');
+define('standard_profile','dashboard,profile,equipments,equipment,histories,history,firmwaretool,products_software,servicereports,servicereport,application');
 /*Superuser*/
-define('superuser_profile','dashboard,profile,assets,equipments,equipment,equipment_manage,equipment_manage_edit,equipments_mass_update,histories,history,history_manage,firmwaretool,products,products_versions,product,product_manage,servicereports,servicereport,admin,partners,partner,users,user,user_manage,marketing,application');
+define('superuser_profile','dashboard,profile,assets,equipments,equipment,equipment_manage,equipment_manage_edit,equipments_mass_update,histories,history,history_manage,firmwaretool,products,products_versions,products_software,product,product_manage,servicereports,servicereport,admin,partners,partner,users,user,user_manage,marketing,application');
 /*Admin*/
 define('admin_profile','dashboard,profile,buildtool,sales,accounts,account,contracts,contract,contract_manage,cartests,cartest,cartest_manage,assets,equipments,equipment,equipment_healthindex,equipment_data,equipment_manage,equipment_manage_edit,equipments_mass_update,histories,history,history_manage,firmwaretool,buildtool,products,products_versions,products_software,product,product_manage,servicereports,servicereport,admin,partners,partner,users,user,user_manage,communications,communication,communication_send,marketing,reporting,report_build,report_contracts_billing,report_healthindex,application');
 /*AdminPlus*/
 define('adminplus_profile','dashboard,profile,buildtool,sales,accounts,account,contracts,contract,contract_manage,cartests,cartest,cartest_manage,assets,equipments,equipment,equipment_healthindex,equipment_data,equipment_manage,equipment_manage_edit,equipments_mass_update,histories,history,history_manage,firmwaretool,buildtool,products,products_versions,products_software,product,product_manage,servicereports,servicereport,admin,partners,partner,users,user,user_manage,communications,communication,communication_send,marketing,reporting,report_build,report_contracts_billing,report_healthindex,report_usage,config,settings,logfile,changelog,language,application,maintenance,profiles,vin');
 /*Build*/
-define('build','buildtool,buildtool,application');
+define('build','buildtool,firmwaretool,buildtool,products_software,application');
 /*Distribution*/
-define('distribution','dashboard,profile,assets,equipments,equipment,equipment_manage,equipment_manage_edit,equipments_mass_update,histories,history,history_manage,firmwaretool,products,products_versions,product,product_manage,servicereports,servicereport,admin,partners,partner,users,user,user_manage,marketing,application');
+define('distribution','dashboard,profile,assets,equipments,equipment,equipment_manage,equipment_manage_edit,equipments_mass_update,histories,history,history_manage,firmwaretool,products,products_versions,products_software,product,product_manage,servicereports,servicereport,admin,partners,partner,users,user,user_manage,marketing,application');
 /*Firmware*/
-define('firmware','firmwaretool,application');
+define('firmware','firmwaretool,products_software,application');
 /*Garage*/
-define('garage','dashboard,profile,cartests,cartest,cartest_manage,application');
+define('garage','dashboard,profile,cartests,cartest,cartest_manage,products_versions,application');
 /*Interface*/
-define('interface','contracts,contract,equipments,equipment_manage,firmwaretool,products_versions,users,application');
+define('interface','contracts,contract,equipments,equipment_manage,firmwaretool,products_versions,products_software,users,application');
 /*Service*/
 define('service','dashboard,profile,assets,equipments,equipment,equipment_manage,histories,history,history_manage,firmwaretool,products_software,servicereports,servicereport,admin,partners,partner,marketing,application');
 /*Other*/