diff --git a/ISEN-Repair Inventory Manager/AddMachine.vb b/ISEN-Repair Inventory Manager/AddMachine.vb
index 02868c2..7bdf9b0 100644
--- a/ISEN-Repair Inventory Manager/AddMachine.vb	
+++ b/ISEN-Repair Inventory Manager/AddMachine.vb	
@@ -27,17 +27,16 @@ Public Class AddMachine
         If NewNameBox.Text = "" Then MsgBox("Vous ne pouvez pas laisser un nom vide !", 48, "Erreur de saisie") : Exit Sub
         If NewDetailsBox.Text = "" Then NewDetailsBox.Text = "N/A"
         If NewGivenByBox.Text = "" Then NewGivenByBox.Text = "N/A"
-        Dim addComputer_seq As String = "
-            INSERT INTO computers_desc VALUES ('" & NewIDBox.Text & "','" & NewNameBox.Text & "'," & NewEtatBox.SelectedIndex & "," & CheckToNumeric(NewSerieCheckBox) & ",'" & NewDetailsBox.Text & "',0,'N/A','" & NewGivenByBox.Text & "');
-            INSERT INTO computers_progress VALUES ('" & NewIDBox.Text & "',0,0,0,0,0,1,1,1);
-        "
 
         Try
             Main.StatusLabel.Text = "Tentative d'ajout de l'ordinateur à la base de données..."
             Using con As New SQLiteConnection("URI=file:db.sqlite")
                 con.Open()
-                Dim cmd As New SQLiteCommand(addComputer_seq, con)
-                If cmd.ExecuteNonQuery() <> 2 Then MsgBox("Erreur inconnue au niveau de la base de données !", 16, "Defaillance générale !") : End
+                Dim cmd As New SQLiteCommand(con)
+                cmd.CommandText = "INSERT INTO computers_desc VALUES ('" & NewIDBox.Text & "','" & NewNameBox.Text & "'," & NewEtatBox.SelectedIndex & "," & CheckToNumeric(NewSerieCheckBox) & ",'" & NewDetailsBox.Text & "',0,'N/A','" & NewGivenByBox.Text & "');"
+                If cmd.ExecuteNonQuery() <> 1 Then MsgBox("Erreur inconnue au niveau de la base de données !", 16, "Defaillance générale !") : End
+                cmd.CommandText = "INSERT INTO computers_progress VALUES ('" & NewIDBox.Text & "',0,0,0,0,0,1,1,1);"
+                If cmd.ExecuteNonQuery() <> 1 Then MsgBox("Erreur inconnue au niveau de la base de données !", 16, "Defaillance générale !") : End
                 con.Close()
             End Using
             Main.StatusLabel.Text = "Ordinateur ajouté avec succés dans la base de données."
diff --git a/ISEN-Repair Inventory Manager/Main.Designer.vb b/ISEN-Repair Inventory Manager/Main.Designer.vb
index 232bf96..06bcedc 100644
--- a/ISEN-Repair Inventory Manager/Main.Designer.vb	
+++ b/ISEN-Repair Inventory Manager/Main.Designer.vb	
@@ -119,7 +119,6 @@ Partial Class Main
         Me.InvList.Name = "InvList"
         Me.InvList.ScrollAlwaysVisible = True
         Me.InvList.Size = New System.Drawing.Size(324, 316)
-        Me.InvList.Sorted = True
         Me.InvList.TabIndex = 2
         '
         'SendOutButton
diff --git a/ISEN-Repair Inventory Manager/Main.vb b/ISEN-Repair Inventory Manager/Main.vb
index 498e9ae..2fd3e61 100644
--- a/ISEN-Repair Inventory Manager/Main.vb	
+++ b/ISEN-Repair Inventory Manager/Main.vb	
@@ -2,6 +2,7 @@
 
 Public Class Main
     Dim manualID_selected As Boolean = False
+    Dim idList As New ArrayList
 
     Private Sub Form1_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         CheckIfFirstRun()
@@ -63,6 +64,7 @@ Public Class Main
     End Sub
 
     Public Sub ListAllInv()
+        idList.Clear()
         Dim dtr As SQLiteDataReader
 
         InvList.Items.Clear()
@@ -73,10 +75,11 @@ Public Class Main
             Using con As New SQLiteConnection("URI=file:db.sqlite")
                 con.Open()
                 Using cmd As New SQLiteCommand(con)
-                    cmd.CommandText = "SELECT name FROM computers_desc;"
+                    cmd.CommandText = "SELECT id,name FROM computers_desc;"
                     dtr = cmd.ExecuteReader()
                     While dtr.Read()
-                        InvList.Items.Add(dtr.GetString(0))
+                        idList.Add(dtr.GetString(0))
+                        InvList.Items.Add(dtr.GetString(1))
                     End While
                 End Using
                 con.Close()
@@ -98,7 +101,7 @@ Public Class Main
             Using con As New SQLiteConnection("URI=file:db.sqlite")
                 con.Open()
                 Using cmd As New SQLiteCommand(con)
-                    cmd.CommandText = "SELECT * FROM computers_desc WHERE _rowid_=" & InvList.SelectedIndex + 1 & ";"
+                    cmd.CommandText = "SELECT * FROM computers_desc WHERE id=" & idList(InvList.SelectedIndex) & ";"
                     dtr = cmd.ExecuteReader()
                     While dtr.Read()
                         IDBox.Text = dtr.GetString(0)
@@ -258,17 +261,16 @@ Public Class Main
 
     Private Sub TrashButton_Click(sender As Object, e As EventArgs) Handles TrashButton.Click
         If MsgBox("ATTENTION ! Voulez vous vraiment supprimer cette ordinateur de la base de données ?", 292, "Trash") = 7 Then Exit Sub
-        Dim trash_seq As String = "
-            DELETE FROM computers_desc WHERE id='" & IDBox.Text & "';
-            DELETE FROM computers_progress WHERE id='" & IDBox.Text & "';
-        "
 
         Try
             StatusLabel.Text = "Supression d'un ordinateur de la base de données..."
             Using con As New SQLiteConnection("URI=file:db.sqlite")
                 con.Open()
-                Dim cmd As New SQLiteCommand(trash_seq, con)
-                If cmd.ExecuteNonQuery() <> 2 Then MsgBox("Erreur inconnue au niveau de la base de données !", 16, "Defaillance générale !") : End
+                Dim cmd As New SQLiteCommand(con)
+                cmd.CommandText = "DELETE FROM computers_desc WHERE id='" & IDBox.Text & "';"
+                If cmd.ExecuteNonQuery() <> 1 Then MsgBox("Erreur inconnue au niveau de la base de données !", 16, "Defaillance générale !") : End
+                cmd.CommandText = "DELETE FROM computers_progress WHERE id='" & IDBox.Text & "';"
+                If cmd.ExecuteNonQuery() <> 1 Then MsgBox("Erreur inconnue au niveau de la base de données !", 16, "Defaillance générale !") : End
                 con.Close()
             End Using
             StatusLabel.Text = "Ordinateur supprimé avec succès !"