diff --git a/app/pages/config.php b/app/pages/config.php
index 9e4c4ee..e4f61ea 100644
--- a/app/pages/config.php
+++ b/app/pages/config.php
@@ -107,7 +107,7 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') {
             include '../app/templates/config-list-interfaceconfigjs.php';
             break;
 
-    // if there is no $item, we work on the local config file
+    // if there is no $item, we work on the local config DB
         default:
             switch ($action) {
                 case 'add-agent':
@@ -125,12 +125,15 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') {
                     }
                     break;
                 case 'delete':
-                    include '../app/templates/config-delete-platform.php';
+                    if (isset($_GET['agent'])) {
+                        $agentDetails = $agentObject->getAgentDetails($platform_id, $agent);
+                        include '../app/templates/config-delete-agent.php';
+                    } else {
+                        include '../app/templates/config-delete-platform.php';
+                    }
                     break;
                 default:
                     if ($userObject->hasRight($user_id, 'view config file')) {
-//                        require '../app/classes/agent.php';
-//                        $agentObject = new Agent($dbWeb);
                         include '../app/templates/config-list.php';
                     } else {
                         include '../app/templates/unauthorized.php';
diff --git a/app/templates/config-add-agent.php b/app/templates/config-add-agent.php
index 69e0169..cd2a5d1 100644
--- a/app/templates/config-add-agent.php
+++ b/app/templates/config-add-agent.php
@@ -42,7 +42,7 @@
                             <input type="hidden" name="new" value="true" />
 
                             <br />
-                            <a class="btn btn-secondary" href="<?= $app_root ?>?platform=<?= htmlspecialchars($platform_id) ?>&page=agents" />Cancel</a>
+                            <a class="btn btn-secondary" href="<?= $app_root ?>?page=config" />Cancel</a>
                             <input type="submit" class="btn btn-primary" value="Save" />
                         </form>
                     </div>
diff --git a/app/templates/agent-delete.php b/app/templates/config-delete-agent.php
similarity index 95%
rename from app/templates/agent-delete.php
rename to app/templates/config-delete-agent.php
index 13aee9b..a9b44dd 100644
--- a/app/templates/agent-delete.php
+++ b/app/templates/config-delete-agent.php
@@ -24,7 +24,7 @@ foreach ($agentDetails[0] as $key => $value) {
                             <input type="hidden" name="delete" value="true" />
                             <p class="h5 text-danger">Are you sure you want to delete this agent?</p>
                             <br />
-                            <a class="btn btn-secondary" href="<?= $app_root ?>?platform=<?= htmlspecialchars($platform_id) ?>&page=agents" />Cancel</a>
+                            <a class="btn btn-secondary" href="<?= $app_root ?>?page=config" />Cancel</a>
                             <input type="submit" class="btn btn-danger" value="Delete" />
                         </form>
                     </div>
diff --git a/app/templates/config-edit-agent.php b/app/templates/config-edit-agent.php
index f9d5f06..73db2d7 100644
--- a/app/templates/config-edit-agent.php
+++ b/app/templates/config-edit-agent.php
@@ -12,7 +12,7 @@
                                     <span class="text-danger" style="margin-right: -12px;">*</span>
                                 </div>
                                 <div class="col-md-8">
-                                    <input class="form-control" type="text" name="type_id" value="<?= htmlspecialchars($agentDetails[0]['type_id'])?>" required autofocus />
+                                    <input class="form-control" type="text" name="type_id" value="<?= htmlspecialchars($agentDetails[0]['agent_type_id'])?>" required autofocus />
                                     <p class="text-start"><small>type of agent (meet, jvb, jibri, all)</small></p>
                                 </div>
                             </div>
@@ -42,7 +42,7 @@
 
                             <br />
                             <input type="hidden" name="agent" value="<?= htmlspecialchars($agentDetails[0]['id']) ?>" />
-                            <a class="btn btn-secondary" href="<?= $app_root ?>?platform=<?= htmlspecialchars($platform_id) ?>&page=agents" />Cancel</a>
+                            <a class="btn btn-secondary" href="<?= $app_root ?>?page=config" />Cancel</a>
                             <input type="submit" class="btn btn-primary" value="Save" />
                         </form>
                     </div>