diff --git a/app/templates/agent-list.php b/app/templates/agent-list.php
deleted file mode 100644
index be1950a..0000000
--- a/app/templates/agent-list.php
+++ /dev/null
@@ -1,42 +0,0 @@
-
-                <!-- widget "agents" -->
-                <div class="card text-center w-75 mx-lef">
-                    <p class="h4 card-header">Jilo Agents on platform <strong>"<?= htmlspecialchars($platformDetails[0]['name']) ?>"</strong></p>
-                    <div class="card-body">
-                        <p class="card-text">agents configuration &nbsp;<a class="btn btn-secondary" style="padding: 0px;" href="<?= $app_root ?>?platform=<?= htmlspecialchars($platform_id) ?>&page=agents&action=add">add</a></p>
-
-<?php foreach ($agentDetails as $agent_array) { ?>
-
-                        <div class="row mb-3" style="padding-left: 0px;">
-                            <div class="border bg-light" style="padding-left: 50px; padding-bottom: 20px; padding-top: 20px;">
-                                <div class="row mb-1" style="padding-left: 0px;">
-                                    <div class="col-md-4 text-end">
-                                        agent id <?= $agent_array['id'] ?>:
-                                    </div>
-                                    <div class="col-md-8 text-start">
-                                        <a class="btn btn-secondary" style="padding: 2px;" href="<?= $app_root ?>?platform=<?= htmlspecialchars($agent_array['platform_id']) ?>&page=agents&agent=<?= htmlspecialchars($agent_array['id']) ?>&action=edit">edit</a>
-                                        <a class="btn btn-danger" style="padding: 2px;" href="<?= $app_root ?>?platform=<?= htmlspecialchars($agent_array['platform_id'])?>&page=agents&agent=<?= htmlspecialchars($agent_array['id']) ?>&action=delete">delete</a>
-                                    </div>
-                                    <div style="padding-left: 100px; padding-bottom: 20px;">
-<?php foreach ($agent_array as $key => $value) {
-        if ($key === 'id') continue;
-?>
-                                        <div class="row mb-1" style="padding-left: 100px;">
-                                            <div class="col-md-4 text-end">
-                                                <?= $key ?>:
-                                            </div>
-                                            <div class="border col-md-8 text-start">
-                                                <?= $value ?>
-                                            </div>
-                                        </div>
-<?php } ?>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-<?php } ?>
-
-
-                    </div>
-                </div>
-                <!-- /widget "agents" -->
diff --git a/app/templates/config-delete-agent.php b/app/templates/config-delete-agent.php
index b452acc..5e4cea1 100644
--- a/app/templates/config-delete-agent.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 ?>?page=config" />Cancel</a>
+                            <a class="btn btn-secondary" href="<?= $app_root ?>?page=config#platform<?= htmlspecialchars($platform_id) ?>agent<?= htmlspecialchars($agentDetails[0]['id']) ?>" />Cancel</a>
                             <input type="submit" class="btn btn-danger" value="Delete" />
                         </form>
                     </div>
diff --git a/app/templates/config-delete-platform.php b/app/templates/config-delete-platform.php
index 3375f0c..d7aeb9d 100644
--- a/app/templates/config-delete-platform.php
+++ b/app/templates/config-delete-platform.php
@@ -24,7 +24,7 @@ foreach ($platformDetails[0] as $key => $value) {
                             <input type="hidden" name="delete" value="true" />
                             <p class="h5 text-danger">Are you sure you want to delete this platform?</p>
                             <br />
-                            <a class="btn btn-secondary" href="<?= $app_root ?>?page=config" />Cancel</a>
+                            <a class="btn btn-secondary" href="<?= $app_root ?>?page=config#platform<?= htmlspecialchars($platform_id) ?>" />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 73d60a6..6ba4b2e 100644
--- a/app/templates/config-edit-agent.php
+++ b/app/templates/config-edit-agent.php
@@ -42,7 +42,7 @@
 
                             <br />
                             <input type="hidden" name="agent" value="<?= htmlspecialchars($agentDetails[0]['id']) ?>" />
-                            <a class="btn btn-secondary" href="<?= $app_root ?>?page=config" />Cancel</a>
+                            <a class="btn btn-secondary" href="<?= $app_root ?>?page=config#platform<?= htmlspecialchars($platform_id) ?>agent<?= htmlspecialchars($agentDetails[0]['id']) ?>" />Cancel</a>
                             <input type="submit" class="btn btn-primary" value="Save" />
                         </form>
                     </div>
diff --git a/app/templates/config-edit-platform.php b/app/templates/config-edit-platform.php
index 9754327..1b9f83d 100644
--- a/app/templates/config-edit-platform.php
+++ b/app/templates/config-edit-platform.php
@@ -28,7 +28,7 @@ foreach ($platformDetails[0] as $key => $value) {
 <?php } ?>
                             <br />
                             <input type="hidden" name="platform" value="<?= htmlspecialchars($platform_id) ?>" />
-                            <a class="btn btn-secondary" href="<?= $app_root ?>?page=config" />Cancel</a>
+                            <a class="btn btn-secondary" href="<?= $app_root ?>?page=config#platform<?= htmlspecialchars($platform_id) ?>" />Cancel</a>
                             <input type="submit" class="btn btn-primary" value="Save" />
                         </form>
                     </div>
diff --git a/app/templates/config-list.php b/app/templates/config-list.php
index ba16acc..759d240 100644
--- a/app/templates/config-list.php
+++ b/app/templates/config-list.php
@@ -17,6 +17,7 @@ echo "\n";
     $agents = $agentObject->getAgentDetails($platform_array['id']);
 ?>
 
+                        <a name="platform<?= $platform_array['id'] ?>"></a>
                         <div class="row mb-3" style="padding-left: 0px;">
                             <div class="border bg-light" style="padding-left: 50px; padding-bottom: 0px; padding-top: 0px;">
                                 <a style="text-decoration: none;" data-toggle="collapse" href="#collapsePlatform<?= $platform_array['id'] ?>" role="button" aria-expanded="true" aria-controls="collapsePlatform<?= $platform_array['id'] ?>">
@@ -68,6 +69,7 @@ echo "\n";
 
 <?php foreach ($agents as $agent_array) { ?>
 
+                                        <a name="platform<?= $platform_array['id'] ?>agent<?= $agent_array['id'] ?>"></a>
                                         <div class="row mb-3" style="padding-left: 0px;">
                                             <div class="border rounded bg-light" style="padding-left: 50px; padding-bottom: 20px; padding-top: 20px;">
                                                 <div class="row mb-1" style="padding-left: 0px;">