diff --git a/api/tacticalrmm/automation/models.py b/api/tacticalrmm/automation/models.py
index b1e72cc2..c0874dcd 100644
--- a/api/tacticalrmm/automation/models.py
+++ b/api/tacticalrmm/automation/models.py
@@ -23,60 +23,27 @@ class Policy(BaseAuditModel):
         return self.name
 
     def related_agents(self):
-        return self.related_server_agents() | self.related_workstation_agents()
+        return self.get_related("server") | self.get_related("workstation")
 
-    def related_server_agents(self):
-        explicit_agents = self.agents.filter(monitoring_type="server")
-        explicit_clients = self.server_clients.all()
-        explicit_sites = self.server_sites.all()
+    def get_related(self, mon_type):
+        explicit_agents = self.agents.filter(monitoring_type=mon_type)
+        explicit_clients = getattr(self, f"{mon_type}_clients").all()
+        explicit_sites = getattr(self, f"{mon_type}_sites").all()
 
-        filtered_agents_pks = list()
+        filtered_agents_pks = Policy.objects.none()
 
         for site in explicit_sites:
             if site.client not in explicit_clients:
-                filtered_agents_pks.append(
-                    Agent.objects.filter(
-                        client=site.client.client,
-                        site=site.site,
-                        monitoring_type="server",
-                    ).values_list("pk", flat=True)
-                )
-
-        for client in explicit_clients:
-            filtered_agents_pks.append(
-                Agent.objects.filter(
-                    client=client.client, monitoring_type="server"
+                filtered_agents_pks |= Agent.objects.filter(
+                    client=site.client.client,
+                    site=site.site,
+                    monitoring_type=mon_type,
                 ).values_list("pk", flat=True)
-            )
 
-        return Agent.objects.filter(
-            models.Q(pk__in=filtered_agents_pks)
-            | models.Q(pk__in=explicit_agents.only("pk"))
-        )
-
-    def related_workstation_agents(self):
-        explicit_agents = self.agents.filter(monitoring_type="workstation")
-        explicit_clients = self.workstation_clients.all()
-        explicit_sites = self.workstation_sites.all()
-
-        filtered_agents_pks = list()
-
-        for site in explicit_sites:
-            if site.client not in explicit_clients:
-                filtered_agents_pks.append(
-                    Agent.objects.filter(
-                        client=site.client.client,
-                        site=site.site,
-                        monitoring_type="workstation",
-                    ).values_list("pk", flat=True)
-                )
-
-        for client in explicit_clients:
-            filtered_agents_pks.append(
-                Agent.objects.filter(
-                    client=client.client, monitoring_type="workstation"
-                ).values_list("pk", flat=True)
-            )
+        filtered_agents_pks |= Agent.objects.filter(
+            client__in=[client.client for client in explicit_clients],
+            monitoring_type=mon_type,
+        ).values_list("pk", flat=True)
 
         return Agent.objects.filter(
             models.Q(pk__in=filtered_agents_pks)
diff --git a/api/tacticalrmm/automation/tasks.py b/api/tacticalrmm/automation/tasks.py
index 0e0637c1..d517d161 100644
--- a/api/tacticalrmm/automation/tasks.py
+++ b/api/tacticalrmm/automation/tasks.py
@@ -7,20 +7,20 @@ from tacticalrmm.celery import app
 
 @app.task
 def generate_agent_checks_from_policies_task(
-    ### 
+    ###
     # copies the policy checks to all affected agents
-    # 
+    #
     # clear: clears all policy checks first
     # create_tasks: also create tasks after checks are generated
     ###
-    policypk, clear=False, create_tasks=False
+    policypk,
+    clear=False,
+    create_tasks=False,
 ):
 
     policy = Policy.objects.get(pk=policypk)
     for agent in policy.related_agents():
-        agent.generate_checks_from_policies(
-            clear=clear
-        )
+        agent.generate_checks_from_policies(clear=clear)
         if create_tasks:
             agent.generate_tasks_from_policies(
                 clear=clear,
@@ -63,10 +63,9 @@ def update_policy_check_fields_task(checkpk):
         threshold=check.threshold,
         name=check.name,
         fails_b4_alert=check.fails_b4_alert,
-        disk=check.disk,
         ip=check.ip,
-        script=check.script,
         script_args=check.script_args,
+        timeout=check.timeout,
         pass_if_start_pending=check.pass_if_start_pending,
         pass_if_svc_not_exist=check.pass_if_svc_not_exist,
         restart_if_stopped=check.restart_if_stopped,
@@ -84,9 +83,7 @@ def update_policy_check_fields_task(checkpk):
 
 
 @app.task
-def generate_agent_tasks_from_policies_task(
-    policypk, clear=False
-):
+def generate_agent_tasks_from_policies_task(policypk, clear=False):
 
     policy = Policy.objects.get(pk=policypk)
     for agent in policy.related_agents():
@@ -94,9 +91,7 @@ def generate_agent_tasks_from_policies_task(
 
 
 @app.task
-def generate_agent_tasks_by_location_task(
-    location, mon_type, clear=False
-):
+def generate_agent_tasks_by_location_task(location, mon_type, clear=False):
 
     for agent in Agent.objects.filter(**location).filter(monitoring_type=mon_type):
         agent.generate_tasks_from_policies(clear=clear)
@@ -125,10 +120,8 @@ def update_policy_task_fields_task(taskpk, enabled):
     from autotasks.tasks import enable_or_disable_win_task
 
     tasks = AutomatedTask.objects.filter(parent_task=taskpk)
-    
-    tasks.update(
-        enabled=enabled
-    )
+
+    tasks.update(enabled=enabled)
 
     for autotask in tasks:
         enable_or_disable_win_task(autotask.pk, enabled)
diff --git a/api/tacticalrmm/automation/tests.py b/api/tacticalrmm/automation/tests.py
index 7c03161d..bcff71b0 100644
--- a/api/tacticalrmm/automation/tests.py
+++ b/api/tacticalrmm/automation/tests.py
@@ -521,7 +521,9 @@ class TestPolicyViews(TacticalTestCase):
         task = baker.make("autotasks.AutomatedTask", policy=policy)
 
         # create policy managed tasks
-        policy_tasks = baker.make("autotasks.AutomatedTask", parent_task=task.id, _quantity=5)
+        policy_tasks = baker.make(
+            "autotasks.AutomatedTask", parent_task=task.id, _quantity=5
+        )
 
         url = f"/automation/policyautomatedtaskstatus/{task.id}/task/"
 
@@ -790,19 +792,19 @@ class TestPolicyTasks(TacticalTestCase):
                 self.assertEqual(check.ip, checks[1].ip)
             elif check.check_type == "cpuload":
                 self.assertEqual(check.parent_check, checks[2].id)
-                self.assertEqual(check.threshold, checks[2].threshold)  
+                self.assertEqual(check.threshold, checks[2].threshold)
             elif check.check_type == "memory":
                 self.assertEqual(check.parent_check, checks[3].id)
-                self.assertEqual(check.threshold, checks[3].threshold) 
+                self.assertEqual(check.threshold, checks[3].threshold)
             elif check.check_type == "winsvc":
-                self.assertEqual(check.parent_check, checks[4].id) 
+                self.assertEqual(check.parent_check, checks[4].id)
                 self.assertEqual(check.svc_name, checks[4].svc_name)
-                self.assertEqual(check.svc_display_name, checks[4].svc_display_name) 
+                self.assertEqual(check.svc_display_name, checks[4].svc_display_name)
                 self.assertEqual(check.svc_policy_mode, checks[4].svc_policy_mode)
             elif check.check_type == "script":
                 self.assertEqual(check.parent_check, checks[5].id)
-                self.assertEqual(check.script, checks[5].script)  
-            elif check.check_type == "eventlog": 
+                self.assertEqual(check.script, checks[5].script)
+            elif check.check_type == "eventlog":
                 self.assertEqual(check.parent_check, checks[6].id)
                 self.assertEqual(check.event_id, checks[6].event_id)
                 self.assertEqual(check.event_type, checks[6].event_type)
@@ -823,7 +825,12 @@ class TestPolicyTasks(TacticalTestCase):
 
         # make sure each agent check says overriden_by_policy
         self.assertEqual(Agent.objects.get(pk=agent.id).agentchecks.count(), 14)
-        self.assertEqual(Agent.objects.get(pk=agent.id).agentchecks.filter(overriden_by_policy=True).count(), 7)
+        self.assertEqual(
+            Agent.objects.get(pk=agent.id)
+            .agentchecks.filter(overriden_by_policy=True)
+            .count(),
+            7,
+        )
 
     def test_generating_agent_policy_checks_by_location(self):
         from .tasks import generate_agent_checks_by_location_task
@@ -831,23 +838,46 @@ class TestPolicyTasks(TacticalTestCase):
         # setup data
         policy = baker.make("automation.Policy", active=True)
         self.create_checks(policy=policy)
-        clients = baker.make("clients.Client", client=seq("Default"), _quantity=2, server_policy=policy, workstation_policy=policy)
-        baker.make("clients.Site", client=cycle(clients), site=seq("Default"), _quantity=4)
-        server_agent = baker.make_recipe("agents.server_agent", client="Default1", site="Default1")
-        workstation_agent = baker.make_recipe("agents.workstation_agent", client="Default1", site="Default3")
+        clients = baker.make(
+            "clients.Client",
+            client=seq("Default"),
+            _quantity=2,
+            server_policy=policy,
+            workstation_policy=policy,
+        )
+        baker.make(
+            "clients.Site", client=cycle(clients), site=seq("Default"), _quantity=4
+        )
+        server_agent = baker.make_recipe(
+            "agents.server_agent", client="Default1", site="Default1"
+        )
+        workstation_agent = baker.make_recipe(
+            "agents.workstation_agent", client="Default1", site="Default3"
+        )
         agent1 = baker.make_recipe("agents.agent", client="Default2", site="Default2")
         agent2 = baker.make_recipe("agents.agent", client="Default2", site="Default4")
 
-        generate_agent_checks_by_location_task({"client": "Default1", "site": "Default1"}, "server", clear=True, create_tasks=True)
+        generate_agent_checks_by_location_task(
+            {"client": "Default1", "site": "Default1"},
+            "server",
+            clear=True,
+            create_tasks=True,
+        )
 
         # server_agent should have policy checks and the other agents should not
         self.assertEqual(Agent.objects.get(pk=server_agent.id).agentchecks.count(), 7)
-        self.assertEqual(Agent.objects.get(pk=workstation_agent.id).agentchecks.count(), 0)
+        self.assertEqual(
+            Agent.objects.get(pk=workstation_agent.id).agentchecks.count(), 0
+        )
         self.assertEqual(Agent.objects.get(pk=agent1.id).agentchecks.count(), 0)
 
-        generate_agent_checks_by_location_task({"client": "Default1"}, "workstation", clear=True, create_tasks=True)
+        generate_agent_checks_by_location_task(
+            {"client": "Default1"}, "workstation", clear=True, create_tasks=True
+        )
         # workstation_agent should now have policy checks and the other agents should not
-        self.assertEqual(Agent.objects.get(pk=workstation_agent.id).agentchecks.count(), 7)
+        self.assertEqual(
+            Agent.objects.get(pk=workstation_agent.id).agentchecks.count(), 7
+        )
         self.assertEqual(Agent.objects.get(pk=server_agent.id).agentchecks.count(), 7)
         self.assertEqual(Agent.objects.get(pk=agent1.id).agentchecks.count(), 0)
         self.assertEqual(Agent.objects.get(pk=agent2.id).agentchecks.count(), 0)
@@ -860,9 +890,15 @@ class TestPolicyTasks(TacticalTestCase):
         policy = baker.make("automation.Policy", active=True)
         self.create_checks(policy=policy)
         clients = baker.make("clients.Client", client=seq("Default"), _quantity=2)
-        baker.make("clients.Site", client=cycle(clients), site=seq("Default"), _quantity=4)
-        server_agent = baker.make_recipe("agents.server_agent", client="Default1", site="Default1")
-        workstation_agent = baker.make_recipe("agents.workstation_agent", client="Default1", site="Default3")
+        baker.make(
+            "clients.Site", client=cycle(clients), site=seq("Default"), _quantity=4
+        )
+        server_agent = baker.make_recipe(
+            "agents.server_agent", client="Default1", site="Default1"
+        )
+        workstation_agent = baker.make_recipe(
+            "agents.workstation_agent", client="Default1", site="Default3"
+        )
         agent1 = baker.make_recipe("agents.agent", client="Default2", site="Default2")
         agent2 = baker.make_recipe("agents.agent", client="Default2", site="Default4")
         core = CoreSettings.objects.first()
@@ -873,7 +909,9 @@ class TestPolicyTasks(TacticalTestCase):
         generate_all_agent_checks_task("server", clear=True, create_tasks=True)
 
         # all servers should have 7 checks
-        self.assertEqual(Agent.objects.get(pk=workstation_agent.id).agentchecks.count(), 0)
+        self.assertEqual(
+            Agent.objects.get(pk=workstation_agent.id).agentchecks.count(), 0
+        )
         self.assertEqual(Agent.objects.get(pk=server_agent.id).agentchecks.count(), 7)
         self.assertEqual(Agent.objects.get(pk=agent1.id).agentchecks.count(), 7)
         self.assertEqual(Agent.objects.get(pk=agent2.id).agentchecks.count(), 0)
@@ -881,7 +919,9 @@ class TestPolicyTasks(TacticalTestCase):
         generate_all_agent_checks_task("workstation", clear=True, create_tasks=True)
 
         # all agents should have 7 checks now
-        self.assertEqual(Agent.objects.get(pk=workstation_agent.id).agentchecks.count(), 7)
+        self.assertEqual(
+            Agent.objects.get(pk=workstation_agent.id).agentchecks.count(), 7
+        )
         self.assertEqual(Agent.objects.get(pk=server_agent.id).agentchecks.count(), 7)
         self.assertEqual(Agent.objects.get(pk=agent1.id).agentchecks.count(), 7)
         self.assertEqual(Agent.objects.get(pk=agent2.id).agentchecks.count(), 7)
@@ -894,7 +934,9 @@ class TestPolicyTasks(TacticalTestCase):
         self.create_checks(policy=policy)
         client = baker.make("clients.Client", client="Default", server_policy=policy)
         baker.make("clients.Site", client=client, site="Default")
-        agent = baker.make_recipe("agents.server_agent", client="Default", site="Default")
+        agent = baker.make_recipe(
+            "agents.server_agent", client="Default", site="Default"
+        )
         agent.generate_checks_from_policies()
 
         # make sure agent has 7 checks
@@ -907,7 +949,11 @@ class TestPolicyTasks(TacticalTestCase):
 
         # make sure policy check doesn't exist on agent
         self.assertEqual(Agent.objects.get(pk=agent.id).agentchecks.count(), 6)
-        self.assertFalse(Agent.objects.get(pk=agent.id).agentchecks.filter(parent_check=policy_check_id).exists())
+        self.assertFalse(
+            Agent.objects.get(pk=agent.id)
+            .agentchecks.filter(parent_check=policy_check_id)
+            .exists()
+        )
 
     def update_policy_check_fields(self):
         from .tasks import update_policy_check_fields_task
@@ -917,36 +963,51 @@ class TestPolicyTasks(TacticalTestCase):
         self.create_checks(policy=policy)
         client = baker.make("clients.Client", client="Default", server_policy=policy)
         baker.make("clients.Site", client=client, site="Default")
-        agent = baker.make_recipe("agents.server_agent", client="Default", site="Default")
+        agent = baker.make_recipe(
+            "agents.server_agent", client="Default", site="Default"
+        )
         agent.generate_checks_from_policies()
 
         # make sure agent has 7 checks
         self.assertEqual(Agent.objects.get(pk=agent.id).agentchecks.count(), 7)
 
         # pick a policy check and update it with new values
-        ping_check = Policy.objects.get(pk=policy.id).policychecks.filter(check_type="ping").first()
+        ping_check = (
+            Policy.objects.get(pk=policy.id)
+            .policychecks.filter(check_type="ping")
+            .first()
+        )
         ping_check.ip = "12.12.12.12"
         ping_check.save()
 
         update_policy_check_fields_task(ping_check.id)
 
         # make sure policy check was updated on the agent
-        self.assertEquals(Agent.objects.get(pk=agent.id).agentchecks.filter(parent_check=ping_check.id).ip, "12.12.12.12")
+        self.assertEquals(
+            Agent.objects.get(pk=agent.id)
+            .agentchecks.filter(parent_check=ping_check.id)
+            .ip,
+            "12.12.12.12",
+        )
 
     def test_generate_agent_tasks(self):
         from .tasks import generate_agent_tasks_from_policies_task
 
         # create test data
         policy = baker.make("automation.Policy", active=True)
-        tasks = baker.make("autotasks.AutomatedTask", policy=policy, name=seq("Task"), _quantity=3)
+        tasks = baker.make(
+            "autotasks.AutomatedTask", policy=policy, name=seq("Task"), _quantity=3
+        )
         client = baker.make("clients.Client", client="Default")
         baker.make("clients.Site", client=client, site="Default")
-        agent = baker.make_recipe("agents.server_agent", client="Default", site="Default", policy=policy)
-        
+        agent = baker.make_recipe(
+            "agents.server_agent", client="Default", site="Default", policy=policy
+        )
+
         generate_agent_tasks_from_policies_task(policy.id, clear=True)
 
         agent_tasks = Agent.objects.get(pk=agent.id).autotasks.all()
-        
+
         # make sure there are 3 agent tasks
         self.assertEqual(len(agent_tasks), 3)
 
@@ -967,26 +1028,48 @@ class TestPolicyTasks(TacticalTestCase):
 
         # setup data
         policy = baker.make("automation.Policy", active=True)
-        tasks = baker.make("autotasks.AutomatedTask", policy=policy, name=seq("Task"), _quantity=3)
-        clients = baker.make("clients.Client", client=seq("Default"), _quantity=2, server_policy=policy, workstation_policy=policy)
-        baker.make("clients.Site", client=cycle(clients), site=seq("Default"), _quantity=4)
-        server_agent = baker.make_recipe("agents.server_agent", client="Default1", site="Default1")
-        workstation_agent = baker.make_recipe("agents.workstation_agent", client="Default1", site="Default3")
+        tasks = baker.make(
+            "autotasks.AutomatedTask", policy=policy, name=seq("Task"), _quantity=3
+        )
+        clients = baker.make(
+            "clients.Client",
+            client=seq("Default"),
+            _quantity=2,
+            server_policy=policy,
+            workstation_policy=policy,
+        )
+        baker.make(
+            "clients.Site", client=cycle(clients), site=seq("Default"), _quantity=4
+        )
+        server_agent = baker.make_recipe(
+            "agents.server_agent", client="Default1", site="Default1"
+        )
+        workstation_agent = baker.make_recipe(
+            "agents.workstation_agent", client="Default1", site="Default3"
+        )
         agent1 = baker.make_recipe("agents.agent", client="Default2", site="Default2")
         agent2 = baker.make_recipe("agents.agent", client="Default2", site="Default4")
 
-        generate_agent_tasks_by_location_task({"client": "Default1", "site": "Default1"}, "server", clear=True)
+        generate_agent_tasks_by_location_task(
+            {"client": "Default1", "site": "Default1"}, "server", clear=True
+        )
 
         # all servers in Default1 and site Default1 should have 3 tasks
-        self.assertEqual(Agent.objects.get(pk=workstation_agent.id).autotasks.count(), 0)
+        self.assertEqual(
+            Agent.objects.get(pk=workstation_agent.id).autotasks.count(), 0
+        )
         self.assertEqual(Agent.objects.get(pk=server_agent.id).autotasks.count(), 3)
         self.assertEqual(Agent.objects.get(pk=agent1.id).autotasks.count(), 0)
         self.assertEqual(Agent.objects.get(pk=agent2.id).autotasks.count(), 0)
 
-        generate_agent_tasks_by_location_task({"client": "Default1"}, "workstation", clear=True)
+        generate_agent_tasks_by_location_task(
+            {"client": "Default1"}, "workstation", clear=True
+        )
 
         # all workstations in Default1 should have 3 tasks
-        self.assertEqual(Agent.objects.get(pk=workstation_agent.id).autotasks.count(), 3)
+        self.assertEqual(
+            Agent.objects.get(pk=workstation_agent.id).autotasks.count(), 3
+        )
         self.assertEqual(Agent.objects.get(pk=server_agent.id).autotasks.count(), 3)
         self.assertEqual(Agent.objects.get(pk=agent1.id).autotasks.count(), 0)
         self.assertEqual(Agent.objects.get(pk=agent2.id).autotasks.count(), 0)
@@ -999,14 +1082,15 @@ class TestPolicyTasks(TacticalTestCase):
         tasks = baker.make("autotasks.AutomatedTask", policy=policy, _quantity=3)
         client = baker.make("clients.Client", client="Default", server_policy=policy)
         baker.make("clients.Site", client=client, site="Default")
-        agent = baker.make_recipe("agents.server_agent", client="Default", site="Default")
+        agent = baker.make_recipe(
+            "agents.server_agent", client="Default", site="Default"
+        )
         agent.generate_tasks_from_policies()
 
         delete_policy_autotask_task(tasks[0].id)
 
         delete_win_task_schedule.assert_called_with(agent.autotasks.first().id)
 
-
     @patch("autotasks.tasks.run_win_task.delay")
     def test_run_policy_task(self, run_win_task):
         from .tasks import run_win_policy_autotask_task
@@ -1026,10 +1110,14 @@ class TestPolicyTasks(TacticalTestCase):
 
         # setup data
         policy = baker.make("automation.Policy", active=True)
-        tasks = baker.make("autotasks.AutomatedTask", enabled=True, policy=policy, _quantity=3)
+        tasks = baker.make(
+            "autotasks.AutomatedTask", enabled=True, policy=policy, _quantity=3
+        )
         client = baker.make("clients.Client", client="Default", server_policy=policy)
         baker.make("clients.Site", client=client, site="Default")
-        agent = baker.make_recipe("agents.server_agent", client="Default", site="Default")
+        agent = baker.make_recipe(
+            "agents.server_agent", client="Default", site="Default"
+        )
         agent.generate_tasks_from_policies()
 
         tasks[0].enabled = False
diff --git a/api/tacticalrmm/automation/views.py b/api/tacticalrmm/automation/views.py
index 1e08adec..2d000801 100644
--- a/api/tacticalrmm/automation/views.py
+++ b/api/tacticalrmm/automation/views.py
@@ -186,7 +186,7 @@ class GetRelated(APIView):
         ).data
 
         response["agents"] = AgentHostnameSerializer(
-            policy.related_server_agents() | policy.related_workstation_agents(),
+            policy.related_agents(),
             many=True,
         ).data
 
diff --git a/api/tacticalrmm/tacticalrmm/settings.py b/api/tacticalrmm/tacticalrmm/settings.py
index f31f94e9..f6b69cd1 100644
--- a/api/tacticalrmm/tacticalrmm/settings.py
+++ b/api/tacticalrmm/tacticalrmm/settings.py
@@ -11,7 +11,7 @@ AUTH_USER_MODEL = "accounts.User"
 
 # bump this version everytime vue code is changed
 # to alert user they need to manually refresh their browser
-APP_VER = "0.0.81"
+APP_VER = "0.0.82"
 
 # https://github.com/wh1te909/salt
 LATEST_SALT_VER = "1.1.0"
diff --git a/web/src/components/automation/AutomationManager.vue b/web/src/components/automation/AutomationManager.vue
index 4e7a3531..d53d07b5 100644
--- a/web/src/components/automation/AutomationManager.vue
+++ b/web/src/components/automation/AutomationManager.vue
@@ -1,5 +1,5 @@
 <template>
-  <div style="width: 900px; max-width: 90vw;">
+  <div style="width: 900px; max-width: 90vw">
     <q-card>
       <q-bar>
         <q-btn ref="refresh" @click="refresh" class="q-mr-sm" dense flat push icon="refresh" />Automation Manager
@@ -10,17 +10,7 @@
       </q-bar>
       <div class="q-pa-md">
         <div class="q-gutter-sm">
-          <q-btn
-            ref="new"
-            label="New"
-            dense
-            flat
-            push
-            unelevated
-            no-caps
-            icon="add"
-            @click="showAddPolicyModal"
-          />
+          <q-btn ref="new" label="New" dense flat push unelevated no-caps icon="add" @click="showAddPolicyModal" />
           <q-btn
             ref="edit"
             label="Edit"
@@ -102,36 +92,21 @@
               <!-- context menu -->
               <q-menu context-menu>
                 <q-list dense style="min-width: 200px">
-                  <q-item
-                    clickable
-                    v-close-popup
-                    @click="showEditPolicyModal(props.row.id)"
-                    id="context-edit"
-                  >
+                  <q-item clickable v-close-popup @click="showEditPolicyModal(props.row.id)" id="context-edit">
                     <q-item-section side>
                       <q-icon name="edit" />
                     </q-item-section>
                     <q-item-section>Edit</q-item-section>
                   </q-item>
 
-                  <q-item
-                    clickable
-                    v-close-popup
-                    @click="showCopyPolicyModal(props.row)"
-                    id="context-copy"
-                  >
+                  <q-item clickable v-close-popup @click="showCopyPolicyModal(props.row)" id="context-copy">
                     <q-item-section side>
                       <q-icon name="content_copy" />
                     </q-item-section>
                     <q-item-section>Copy</q-item-section>
                   </q-item>
 
-                  <q-item
-                    clickable
-                    v-close-popup
-                    @click="deletePolicy(props.row.id)"
-                    id="context-delete"
-                  >
+                  <q-item clickable v-close-popup @click="deletePolicy(props.row.id)" id="context-delete">
                     <q-item-section side>
                       <q-icon name="delete" />
                     </q-item-section>
@@ -140,24 +115,14 @@
 
                   <q-separator></q-separator>
 
-                  <q-item
-                    clickable
-                    v-close-popup
-                    @click="showRelationsModal(props.row)"
-                    id="context-relation"
-                  >
+                  <q-item clickable v-close-popup @click="showRelationsModal(props.row)" id="context-relation">
                     <q-item-section side>
                       <q-icon name="account_tree" />
                     </q-item-section>
                     <q-item-section>Show Relations</q-item-section>
                   </q-item>
 
-                  <q-item
-                    clickable
-                    v-close-popup
-                    @click="showEditPatchPolicyModal(props.row)"
-                    id="context-winupdate"
-                  >
+                  <q-item clickable v-close-popup @click="showEditPatchPolicyModal(props.row)" id="context-winupdate">
                     <q-item-section side>
                       <q-icon name="system_update" />
                     </q-item-section>
@@ -173,47 +138,35 @@
               </q-menu>
               <!-- enabled checkbox -->
               <q-td>
-                <q-checkbox
-                  dense
-                  @input="toggleCheckbox(props.row, 'Active')"
-                  v-model="props.row.active"
-                />
+                <q-checkbox dense @input="toggleCheckbox(props.row, 'Active')" v-model="props.row.active" />
               </q-td>
               <!-- enforced checkbox -->
               <q-td>
-                <q-checkbox
-                  dense
-                  @input="toggleCheckbox(props.row, 'Enforced')"
-                  v-model="props.row.enforced"
-                />
+                <q-checkbox dense @input="toggleCheckbox(props.row, 'Enforced')" v-model="props.row.enforced" />
               </q-td>
               <q-td>
                 {{ props.row.name }}
-                <q-chip
-                  v-if="props.row.default_server_policy"
-                  color="primary"
-                  text-color="white"
-                  size="sm"
-                >Default Server</q-chip>
-                <q-chip
-                  v-if="props.row.default_workstation_policy"
-                  color="primary"
-                  text-color="white"
-                  size="sm"
-                >Default Workstation</q-chip>
+                <q-chip v-if="props.row.default_server_policy" color="primary" text-color="white" size="sm"
+                  >Default Server</q-chip
+                >
+                <q-chip v-if="props.row.default_workstation_policy" color="primary" text-color="white" size="sm"
+                  >Default Workstation</q-chip
+                >
               </q-td>
               <q-td>{{ props.row.desc }}</q-td>
               <q-td>
                 <span
-                  style="cursor:pointer;color:blue;text-decoration:underline"
+                  style="cursor: pointer; color: blue; text-decoration: underline"
                   @click="showRelationsModal(props.row)"
-                >{{ `Show Relations (${ props.row.agents_count }+)` }}</span>
+                  >{{ `Show Relations (${props.row.agents_count}+)` }}</span
+                >
               </q-td>
               <q-td>
                 <span
-                  style="cursor:pointer;color:blue;text-decoration:underline"
+                  style="cursor: pointer; color: blue; text-decoration: underline"
                   @click="showEditPatchPolicyModal(props.row)"
-                >{{ patchPolicyText(props.row) }}</span>
+                  >{{ patchPolicyText(props.row) }}</span
+                >
               </q-td>
               <q-td>
                 <q-icon name="content_copy" size="1.5em" @click="showCopyPolicyModal(props.row)">
@@ -247,7 +200,7 @@
 
     <!-- patch policy modal -->
     <q-dialog v-model="showPatchPolicyModal" @hide="closePatchPolicyModal">
-      <q-card style="width: 900px; max-width: 90vw;">
+      <q-card style="width: 900px; max-width: 90vw">
         <q-bar>
           {{ patchPolicyModalText() }}
           <q-space />
@@ -255,7 +208,7 @@
             <q-tooltip content-class="bg-white text-primary">Close</q-tooltip>
           </q-btn>
         </q-bar>
-        <q-scroll-area :thumb-style="thumbStyle" style="height: 500px;">
+        <q-scroll-area :thumb-style="thumbStyle" style="height: 70vh">
           <PatchPolicyForm :policy="policy" @close="closePatchPolicyModal" />
         </q-scroll-area>
       </q-card>
diff --git a/web/src/components/automation/modals/PolicyAdd.vue b/web/src/components/automation/modals/PolicyAdd.vue
index 75ab7afd..bd47ddde 100644
--- a/web/src/components/automation/modals/PolicyAdd.vue
+++ b/web/src/components/automation/modals/PolicyAdd.vue
@@ -73,7 +73,7 @@
         </q-select>
       </q-card-section>
       <q-card-section class="row items-center">
-        <q-btn label="Add Policies" color="primary" type="submit" />
+        <q-btn label="Edit Policies" color="primary" type="submit" />
       </q-card-section>
     </q-form>
   </q-card>
diff --git a/web/src/components/automation/modals/RelationsView.vue b/web/src/components/automation/modals/RelationsView.vue
index cb2a20bb..12066c0b 100644
--- a/web/src/components/automation/modals/RelationsView.vue
+++ b/web/src/components/automation/modals/RelationsView.vue
@@ -5,10 +5,7 @@
       <q-space />
       <q-btn icon="close" flat round dense v-close-popup />
     </q-card-section>
-    <q-card-section
-      class="row items-center"
-      v-if="related.default_server_policy || related.default_workstation_policy"
-    >
+    <q-card-section class="row items-center" v-if="related.default_server_policy || related.default_workstation_policy">
       <div v-if="related.default_server_policy" class="text-body">
         <q-icon name="error_outline" color="info" size="1.5em" />This policy is set as the Default Server Policy.
       </div>
@@ -34,74 +31,75 @@
       </q-tabs>
 
       <q-separator />
+      <q-scroll-area :thumb-style="thumbStyle" style="height: 50vh">
+        <q-tab-panels v-model="tab" :animated="false">
+          <q-tab-panel name="clients">
+            <q-list separator padding>
+              <q-item :key="item.id + 'servers'" v-for="item in related.server_clients">
+                <q-item-section>
+                  <q-item-label>{{ item.client }}</q-item-label>
+                </q-item-section>
+                <q-item-section side>
+                  <q-item-label>
+                    <i>Applied to Servers</i>
+                  </q-item-label>
+                </q-item-section>
+              </q-item>
+              <q-item :key="item.id + 'workstations'" v-for="item in related.workstation_clients">
+                <q-item-section>
+                  <q-item-label>{{ item.client }}</q-item-label>
+                </q-item-section>
+                <q-item-section side>
+                  <q-item-label>
+                    <i>Applied to Workstations</i>
+                  </q-item-label>
+                </q-item-section>
+              </q-item>
+            </q-list>
+          </q-tab-panel>
 
-      <q-tab-panels v-model="tab" :animated="false">
-        <q-tab-panel name="clients">
-          <q-list separator padding>
-            <q-item :key="item.id+'servers'" v-for="item in related.server_clients">
-              <q-item-section>
-                <q-item-label>{{ item.client }}</q-item-label>
-              </q-item-section>
-              <q-item-section side>
-                <q-item-label>
-                  <i>Applied to Servers</i>
-                </q-item-label>
-              </q-item-section>
-            </q-item>
-            <q-item :key="item.id+'workstations'" v-for="item in related.workstation_clients">
-              <q-item-section>
-                <q-item-label>{{ item.client }}</q-item-label>
-              </q-item-section>
-              <q-item-section side>
-                <q-item-label>
-                  <i>Applied to Workstations</i>
-                </q-item-label>
-              </q-item-section>
-            </q-item>
-          </q-list>
-        </q-tab-panel>
+          <q-tab-panel name="sites">
+            <q-list separator padding>
+              <q-item :key="item.id + 'servers'" v-for="item in related.server_sites">
+                <q-item-section>
+                  <q-item-label>{{ item.site }}</q-item-label>
+                  <q-item-label caption>{{ item.client_name }}</q-item-label>
+                </q-item-section>
+                <q-item-section side>
+                  <q-item-label>
+                    <i>Applied to Servers</i>
+                  </q-item-label>
+                </q-item-section>
+              </q-item>
+              <q-item :key="item.id + 'workstations'" v-for="item in related.workstation_sites">
+                <q-item-section>
+                  <q-item-label>{{ item.site }}</q-item-label>
+                  <q-item-label caption>{{ item.client_name }}</q-item-label>
+                </q-item-section>
+                <q-item-section side>
+                  <q-item-label>
+                    <i>Applied to Workstations</i>
+                  </q-item-label>
+                </q-item-section>
+              </q-item>
+            </q-list>
+          </q-tab-panel>
 
-        <q-tab-panel name="sites">
-          <q-list separator padding>
-            <q-item :key="item.id+'servers'" v-for="item in related.server_sites">
-              <q-item-section>
-                <q-item-label>{{ item.site }}</q-item-label>
-                <q-item-label caption>{{ item.client_name }}</q-item-label>
-              </q-item-section>
-              <q-item-section side>
-                <q-item-label>
-                  <i>Applied to Servers</i>
-                </q-item-label>
-              </q-item-section>
-            </q-item>
-            <q-item :key="item.id+'workstations'" v-for="item in related.workstation_sites">
-              <q-item-section>
-                <q-item-label>{{ item.site }}</q-item-label>
-                <q-item-label caption>{{ item.client_name }}</q-item-label>
-              </q-item-section>
-              <q-item-section side>
-                <q-item-label>
-                  <i>Applied to Workstations</i>
-                </q-item-label>
-              </q-item-section>
-            </q-item>
-          </q-list>
-        </q-tab-panel>
-
-        <q-tab-panel name="agents">
-          <q-list separator padding>
-            <q-item :key="item.pk" v-for="item in related.agents">
-              <q-item-section>
-                <q-item-label>{{ item.hostname }}</q-item-label>
-                <q-item-label caption>
-                  <b>{{ item.client }}</b>
-                  {{ item.site }}
-                </q-item-label>
-              </q-item-section>
-            </q-item>
-          </q-list>
-        </q-tab-panel>
-      </q-tab-panels>
+          <q-tab-panel name="agents">
+            <q-list separator padding>
+              <q-item :key="item.pk" v-for="item in related.agents">
+                <q-item-section>
+                  <q-item-label>{{ item.hostname }}</q-item-label>
+                  <q-item-label caption>
+                    <b>{{ item.client }}</b>
+                    {{ item.site }}
+                  </q-item-label>
+                </q-item-section>
+              </q-item>
+            </q-list>
+          </q-tab-panel>
+        </q-tab-panels>
+      </q-scroll-area>
     </q-card-section>
   </q-card>
 </template>
@@ -119,6 +117,13 @@ export default {
     return {
       tab: "clients",
       related: {},
+      thumbStyle: {
+        right: "2px",
+        borderRadius: "5px",
+        backgroundColor: "#027be3",
+        width: "5px",
+        opacity: 0.75,
+      },
     };
   },
   mounted() {