diff --git a/api/v0/post/application.php b/api/v0/post/application.php
index 5e8c299..95b4408 100644
--- a/api/v0/post/application.php
+++ b/api/v0/post/application.php
@@ -204,7 +204,7 @@ if (!empty($post_content['sn']) && !empty($post_content['testdetails'])) {
     }
     else {
     // Insert Equipment
-        $sql = "INSERT INTO history (equipmentid,type,description,createdby ) VALUES (?,?,?,?)";
+        $sql = "INSERT INTO equipment_history (equipmentid,type,description,createdby ) VALUES (?,?,?,?)";
         $stmt = $pdo->prepare($sql);
         $stmt->execute([$rowID,$historytype,$testdetails,$user]);
         $last_id = $pdo->lastInsertId();
@@ -322,7 +322,7 @@ if (!empty($post_content['sn']) && !empty($post_content['testdetails'])) {
         
         if($total_servicetool != 0){ 
         // Insert historyitem
-        $sql = "INSERT INTO history (equipmentid,type,description,createdby) VALUES (?,?,?,?)";
+        $sql = "INSERT INTO equipment_history (equipmentid,type,description,createdby) VALUES (?,?,?,?)";
         $stmt = $pdo->prepare($sql);
         $stmt->execute([$rowID_servicetool,$historytype,$testdetails,$user]);
         //Update status to InUse
diff --git a/api/v1/post/application.php b/api/v1/post/application.php
index 88b1fbb..79c121d 100644
--- a/api/v1/post/application.php
+++ b/api/v1/post/application.php
@@ -108,7 +108,7 @@ switch ($action) {
 
             if ($rowID){
                 //check if under warranty
-                $warranty = getrowID($dbname,'rowID','history','equipmentid="'.$rowID['rowID'].'" && (type="'.$type9.'" || type="'.$type10.'" || type="'.$type11.'" || type="'.$type12.'")');
+                $warranty = getrowID($dbname,'rowID','equipment_history','equipmentid="'.$rowID['rowID'].'" && (type="'.$type9.'" || type="'.$type10.'" || type="'.$type11.'" || type="'.$type12.'")');
                 if ($warranty){
                 // --------------------------------------------
                 // Already under contract
@@ -125,7 +125,7 @@ switch ($action) {
                 $firmware_account_send = 1;
                 //create history
                 // Prepare queries
-                $sql = 'INSERT INTO history (equipmentid, type, description, created, createdby) VALUES (?,?,?,?,?)';
+                $sql = 'INSERT INTO equipment_history (equipmentid, type, description, created, createdby) VALUES (?,?,?,?,?)';
                 $stmt = $pdo->prepare($sql);
                 $stmt->execute([$rowID['rowID'],$type9,$description,$timestamp,$post_content['email']]);
 
@@ -218,7 +218,7 @@ switch ($action) {
         $rowID = getrowID($dbname,'rowID','equipment','serialnumber="'.$post_content['sn'].'"');
         if ($rowID){
             //check if under warranty
-            $warranty = getrowID($dbname,'rowID','history','equipmentid="'.$rowID['rowID'].'" && (type="'.$type9.'" || type="'.$type10.'" || type="'.$type11.'" || type="'.$type12.'")');
+            $warranty = getrowID($dbname,'rowID','equipment_history','equipmentid="'.$rowID['rowID'].'" && (type="'.$type9.'" || type="'.$type10.'" || type="'.$type11.'" || type="'.$type12.'")');
             if ($warranty){
             // --------------------------------------------
             // Already under contract
@@ -232,7 +232,7 @@ switch ($action) {
             // --------------------------------------------
             $firmware_account_send = 1;
             //create history
-            $sql = 'INSERT INTO history (equipmentid, type, description, created, createdby) VALUES (?,?,?,?,?)';
+            $sql = 'INSERT INTO equipment_history (equipmentid, type, description, created, createdby) VALUES (?,?,?,?,?)';
             $stmt = $pdo->prepare($sql);
             $stmt->execute([$rowID['rowID'],$type9,$description,$timestamp,$post_content['email']]);
 
diff --git a/api/v1/post/history.php b/api/v1/post/history.php
index 5040d82..6ec61e1 100644
--- a/api/v1/post/history.php
+++ b/api/v1/post/history.php
@@ -73,7 +73,7 @@ if ($command == 'update' && !isset($post_content['delete']) && isAllowed('histor
     $stmt->execute($execute_input);
 } 
 elseif ($command == 'insert' && !isset($post_content['delete']) && isAllowed('history',$profile,$permission,'C') === 1){
-    $sql = 'INSERT INTO history ('.$clause_insert.') VALUES ('.$input_insert.')';
+    $sql = 'INSERT INTO equipment_history ('.$clause_insert.') VALUES ('.$input_insert.')';
     $stmt = $pdo->prepare($sql);
     $stmt->execute($execute_input);
 }
diff --git a/api/v2/post/history.php b/api/v2/post/history.php
index 8d31f46..80b8ce8 100644
--- a/api/v2/post/history.php
+++ b/api/v2/post/history.php
@@ -190,7 +190,7 @@ if (isset($post_content['sn']) && isset($post_content['payload'])){
         }
         else {
         // Insert Equipment
-            $sql = "INSERT INTO history (equipmentid,type,description,createdby ) VALUES (?,?,?,?)";
+            $sql = "INSERT INTO equipment_history (equipmentid,type,description,createdby ) VALUES (?,?,?,?)";
             $stmt = $pdo->prepare($sql);
             $stmt->execute([$rowID,$historytype,$testdetails,$user]);
             $last_id = $pdo->lastInsertId();
@@ -308,7 +308,7 @@ if (isset($post_content['sn']) && isset($post_content['payload'])){
             
             if($total_servicetool != 0){ 
                 // Insert historyitem
-                $sql = "INSERT INTO history (equipmentid,type,description,createdby) VALUES (?,?,?,?)";
+                $sql = "INSERT INTO equipment_history (equipmentid,type,description,createdby) VALUES (?,?,?,?)";
                 $stmt = $pdo->prepare($sql);
                 $stmt->execute([$rowID_servicetool,$historytype,$testdetails,$user]);
                 //Update status to InUse
@@ -405,7 +405,7 @@ else {
         $stmt->execute($execute_input);
     } 
     elseif ($command == 'insert' && !isset($post_content['delete']) && isAllowed('history',$profile,$permission,'C') === 1){
-        $sql = 'INSERT INTO history ('.$clause_insert.') VALUES ('.$input_insert.')';
+        $sql = 'INSERT INTO equipment_history ('.$clause_insert.') VALUES ('.$input_insert.')';
         $stmt = $pdo->prepare($sql);
         $stmt->execute($execute_input);
     }
diff --git a/assets/functions.php b/assets/functions.php
index c700483..2013bd8 100644
--- a/assets/functions.php
+++ b/assets/functions.php
@@ -170,7 +170,7 @@ function menu($selected,$selected_child){
   foreach ($main_menu as $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>';
+          $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']}?? 'not specified')).'</a>';
 
           //DEFINE SUBMENU
           $sub_menu = $item.'_sub' ?? '';
@@ -181,7 +181,7 @@ function menu($selected,$selected_child){
               foreach($sub_menu as $key){
               //CHECK IF USER IS ALLOWED
                   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>';
+                    $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']}?? 'not specified')).'</a>';
                   }
               }
               $menu .= '</div>';