diff --git a/app/classes/agent.php b/app/classes/agent.php
index c087039..ba6fdfd 100644
--- a/app/classes/agent.php
+++ b/app/classes/agent.php
@@ -33,14 +33,14 @@ class Agent {
     public function addAgent($platform_id, $newAgent) {
         try {
             $sql = 'INSERT INTO jilo_agents
-                    (platform_id, type_id, url, secret_key)
+                    (platform_id, agent_type_id, url, secret_key)
                     VALUES
-                    (:platform_id, :type_id, :url, :secret_key)';
+                    (:platform_id, :agent_type_id, :url, :secret_key)';
 
             $query = $this->db->prepare($sql);
             $query->execute([
                 ':platform_id'		=> $platform_id,
-                ':type_id'		=> $newAgent['type_id'],
+                ':agent_type_id'	=> $newAgent['type_id'],
                 ':url'			=> $newAgent['url'],
                 ':secret_key'		=> $newAgent['secret_key'],
             ]);
@@ -56,7 +56,7 @@ class Agent {
     public function editAgent($platform_id, $updatedAgent) {
         try {
             $sql = 'UPDATE jilo_agents SET
-                        type_id = :type_id,
+                        agent_type_id = :agent_type_id,
                         url = :url,
                         secret_key = :secret_key
                     WHERE
@@ -66,7 +66,7 @@ class Agent {
 
             $query = $this->db->prepare($sql);
             $query->execute([
-                ':type_id'		=> $updatedAgent['type_id'],
+                ':agent_type_id'	=> $updatedAgent['agent_type_id'],
                 ':url'			=> $updatedAgent['url'],
                 ':secret_key'		=> $updatedAgent['secret_key'],
                 ':agent_id'		=> $updatedAgent['id'],
diff --git a/app/pages/agents.php b/app/pages/agents.php
index 1649c15..f97a971 100644
--- a/app/pages/agents.php
+++ b/app/pages/agents.php
@@ -49,28 +49,28 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') {
 //
 //    }
 
-    header("Location: $app_root?platform=$platform_id&page=agents");
+    header("Location: $app_root?platform=$platform_id&page=config");
     exit();
 
 // no form submitted, show the templates
 } else {
 
-    switch ($action) {
-        case 'add':
-            include '../app/templates/agent-add.php';
-            break;
-        case 'edit':
-            $agentDetails = $agentObject->getAgentDetails($platform_id, $agent);
-            include '../app/templates/agent-edit.php';
-            break;
-        case 'delete':
-            $agentDetails = $agentObject->getAgentDetails($platform_id, $agent);
-            include '../app/templates/agent-delete.php';
-            break;
-        default:
-            $agentDetails = $agentObject->getAgentDetails($platform_id);
-            include '../app/templates/agent-list.php';
-    }
+//    switch ($action) {
+//        case 'add':
+//            include '../app/templates/agent-add.php';
+//            break;
+//        case 'edit':
+//            $agentDetails = $agentObject->getAgentDetails($platform_id, $agent);
+//            include '../app/templates/agent-edit.php';
+//            break;
+//        case 'delete':
+//            $agentDetails = $agentObject->getAgentDetails($platform_id, $agent);
+//            include '../app/templates/agent-delete.php';
+//            break;
+//        default:
+//            $agentDetails = $agentObject->getAgentDetails($platform_id);
+//            include '../app/templates/agent-list.php';
+//    }
 }
 
 ?>
diff --git a/app/pages/config.php b/app/pages/config.php
index e6c6dac..adf8004 100644
--- a/app/pages/config.php
+++ b/app/pages/config.php
@@ -41,7 +41,7 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') {
         $platformObject->addPlatform($newPlatform);
 
     // deleting an agent
-    } elseif (isset($_POST['delete']) && isset($_POST['item']) && $_POST['delete'] === 'true' && $_POST['item'] === 'agent') {
+    } elseif (isset($_POST['delete']) && isset($_POST['agent']) && $_POST['delete'] === 'true') {
         $result = $agentObject->deleteAgent($agent);
         if ($result === true) {
             $_SESSION['notice'] = "Agent id \"{$_REQUEST['agent']}\" deleted.";
diff --git a/app/templates/config-add-agent.php b/app/templates/config-add-agent.php
index cd2a5d1..2a910f7 100644
--- a/app/templates/config-add-agent.php
+++ b/app/templates/config-add-agent.php
@@ -4,7 +4,7 @@
                     <p class="h4 card-header">Add new Jilo Agent to Jitsi platform "<strong><?= htmlspecialchars($platformDetails[0]['name']) ?></strong>"</p>
                     <div class="card-body">
                         <!--p class="card-text">add new platform:</p-->
-                        <form method="POST" action="<?= $app_root ?>?platform=<?= htmlspecialchars($platform_id) ?>&page=agents">
+                        <form method="POST" action="<?= $app_root ?>?platform=<?= htmlspecialchars($platform_id) ?>&page=config">
 
                             <div class="row mb-3">
                                 <div class="col-md-4 text-end">
@@ -40,6 +40,7 @@
                             </div>
 
                             <input type="hidden" name="new" value="true" />
+                            <input type="hidden" name="item" value="agent" />
 
                             <br />
                             <a class="btn btn-secondary" href="<?= $app_root ?>?page=config" />Cancel</a>
diff --git a/app/templates/config-delete-agent.php b/app/templates/config-delete-agent.php
index a9b44dd..b452acc 100644
--- a/app/templates/config-delete-agent.php
+++ b/app/templates/config-delete-agent.php
@@ -4,7 +4,7 @@
                     <p class="h4 card-header">Jilo Agent configuration for Jitsi platform <strong>"<?= htmlspecialchars($platformDetails[0]['name']) ?>"</strong></p>
                     <div class="card-body">
                         <p class="card-text">delete an agent:</p>
-                        <form method="POST" action="<?= $app_root ?>?platform=<?= htmlspecialchars($platform_id) ?>&page=agents">
+                        <form method="POST" action="<?= $app_root ?>?platform=<?= htmlspecialchars($platform_id) ?>&page=config">
 <?php
 foreach ($agentDetails[0] as $key => $value) {
 //    if ($key === 'id') continue;
diff --git a/app/templates/config-edit-agent.php b/app/templates/config-edit-agent.php
index 73db2d7..73d60a6 100644
--- a/app/templates/config-edit-agent.php
+++ b/app/templates/config-edit-agent.php
@@ -4,7 +4,7 @@
                     <p class="h4 card-header">Jilo Agent configuration for Jitsi platform <strong>"<?= htmlspecialchars($platformDetails[0]['name']) ?>"</strong></p>
                     <div class="card-body">
                         <p class="card-text">edit the agent details:</p>
-                        <form method="POST" action="<?= $app_root ?>?platform=<?= htmlspecialchars($platform_id) ?>&page=agents">
+                        <form method="POST" action="<?= $app_root ?>?platform=<?= htmlspecialchars($platform_id) ?>&page=config">
 
                             <div class="row mb-3">
                                 <div class="col-md-4 text-end">