From 1b5cf0af89cc79f19d1338ce11251fd60ca663a8 Mon Sep 17 00:00:00 2001
From: sadnub <josh@torchlake.com>
Date: Sat, 9 Oct 2021 22:52:56 -0400
Subject: [PATCH] agent per site/client  permissions initial, uri updates, comp
 api rework

---
 src/App.vue                                   |   13 +-
 src/api/accounts.js                           |   26 +-
 src/api/agents.js                             |  109 +-
 src/api/checks.js                             |   32 +
 src/api/clients.js                            |    4 +-
 src/api/core.js                               |    7 +-
 src/api/scripts.js                            |    6 +-
 src/api/services.js                           |   31 +
 src/api/software.js                           |   35 +
 src/api/tasks.js                              |   32 +
 src/api/winupdates.js                         |   22 +
 src/boot/axios.js                             |   21 +-
 src/components/AgentTable.vue                 |   86 +-
 src/components/AssetsTab.vue                  |  138 --
 src/components/AutomatedTasksTab.vue          |  423 ------
 src/components/ChecksTab.vue                  |  529 --------
 src/components/EventLog.vue                   |  134 --
 src/components/FileBar.vue                    |    4 +-
 src/components/NotesTab.vue                   |  220 ---
 src/components/PermissionsManager.vue         |  127 --
 src/components/ProcessManager.vue             |  220 ---
 src/components/Services.vue                   |  329 -----
 src/components/SoftwareTab.vue                |  133 --
 src/components/SubTableTabs.vue               |  146 +-
 src/components/WindowsUpdates.vue             |  205 ---
 src/components/WmiDetail.vue                  |   32 -
 .../accounts/PermissionsManager.vue           |  160 +++
 src/components/accounts/RolesForm.vue         |  330 +++++
 src/components/agents/AssetsTab.vue           |  123 ++
 src/components/agents/AutomatedTasksTab.vue   |  435 ++++++
 src/components/agents/ChecksTab.vue           |  495 +++++++
 src/components/agents/HistoryTab.vue          |   15 +-
 src/components/agents/NotesTab.vue            |  225 ++++
 src/components/agents/SoftwareTab.vue         |  167 +++
 src/components/{ => agents}/SummaryTab.vue    |  115 +-
 src/components/agents/WinUpdateTab.vue        |  276 ++++
 src/components/agents/WmiDetail.vue           |   36 +
 .../agents/remotebg/EventLogManager.vue       |  140 ++
 .../agents/remotebg/ProcessManager.vue        |  231 ++++
 .../agents/remotebg/ServicesManager.vue       |  373 ++++++
 .../automation/PolicyAutomatedTasksTab.vue    |    4 +-
 src/components/automation/PolicyChecksTab.vue |   18 +-
 .../automation/modals/PolicyAdd.vue           |    5 +-
 .../automation/modals/PolicyStatus.vue        |    4 +-
 src/components/checks/CpuLoadCheck.vue        |  110 ++
 src/components/checks/DiskSpaceCheck.vue      |  116 ++
 src/components/checks/EventLogCheck.vue       |  232 ++++
 src/components/checks/EventLogCheckOutput.vue |   87 ++
 src/components/checks/MemCheck.vue            |  110 ++
 src/components/checks/PingCheck.vue           |  143 ++
 src/components/checks/ScriptCheck.vue         |  186 +++
 .../{modals => }/checks/ScriptOutput.vue      |   29 +-
 src/components/checks/WinSvcCheck.vue         |  204 +++
 src/components/graphs/CheckGraph.vue          |    2 +-
 src/components/modals/admin/RolesForm.vue     |  266 ----
 .../modals/agents/AgentRecovery.vue           |    5 +-
 src/components/modals/agents/EditAgent.vue    |    6 +-
 src/components/modals/agents/InstallAgent.vue |    6 +-
 src/components/modals/agents/RebootLater.vue  |    6 +-
 src/components/modals/agents/SendCommand.vue  |    5 +-
 .../modals/alerts/AlertsOverview.vue          |    2 +-
 src/components/modals/checks/CpuLoadCheck.vue |  134 --
 .../modals/checks/DiskSpaceCheck.vue          |  165 ---
 .../modals/checks/EventLogCheck.vue           |  270 ----
 .../modals/checks/EventLogCheckOutput.vue     |   52 -
 src/components/modals/checks/MemCheck.vue     |  134 --
 src/components/modals/checks/PingCheck.vue    |  134 --
 src/components/modals/checks/ScriptCheck.vue  |  213 ---
 src/components/modals/checks/WinSvcCheck.vue  |  247 ----
 .../modals/software/InstallSoftware.vue       |  112 --
 src/components/scripts/TestScriptModal.vue    |    3 +-
 src/components/software/InstallSoftware.vue   |  136 ++
 .../{modals => }/tasks/AddAutomatedTask.vue   |    8 +-
 .../{modals => }/tasks/EditAutomatedTask.vue  |    0
 src/composables/checks.js                     | 1174 +++++++++++++++++
 src/composables/clients.js                    |   10 +-
 src/composables/scripts.js                    |    2 +-
 src/mixins/mixins.js                          |    2 +-
 src/router/routes.js                          |    4 +-
 src/store/index.js                            |  133 +-
 src/utils/format.js                           |   33 +-
 src/utils/validation.js                       |   37 +
 src/views/Dashboard.vue                       |   40 +-
 src/views/RemoteBackground.vue                |  103 +-
 src/views/TakeControl.vue                     |  198 ++-
 85 files changed, 6293 insertions(+), 4782 deletions(-)
 create mode 100644 src/api/checks.js
 create mode 100644 src/api/services.js
 create mode 100644 src/api/software.js
 create mode 100644 src/api/tasks.js
 create mode 100644 src/api/winupdates.js
 delete mode 100644 src/components/AssetsTab.vue
 delete mode 100644 src/components/AutomatedTasksTab.vue
 delete mode 100644 src/components/ChecksTab.vue
 delete mode 100644 src/components/EventLog.vue
 delete mode 100644 src/components/NotesTab.vue
 delete mode 100644 src/components/PermissionsManager.vue
 delete mode 100644 src/components/ProcessManager.vue
 delete mode 100644 src/components/Services.vue
 delete mode 100644 src/components/SoftwareTab.vue
 delete mode 100644 src/components/WindowsUpdates.vue
 delete mode 100644 src/components/WmiDetail.vue
 create mode 100644 src/components/accounts/PermissionsManager.vue
 create mode 100644 src/components/accounts/RolesForm.vue
 create mode 100644 src/components/agents/AssetsTab.vue
 create mode 100644 src/components/agents/AutomatedTasksTab.vue
 create mode 100644 src/components/agents/ChecksTab.vue
 create mode 100644 src/components/agents/NotesTab.vue
 create mode 100644 src/components/agents/SoftwareTab.vue
 rename src/components/{ => agents}/SummaryTab.vue (67%)
 create mode 100644 src/components/agents/WinUpdateTab.vue
 create mode 100644 src/components/agents/WmiDetail.vue
 create mode 100644 src/components/agents/remotebg/EventLogManager.vue
 create mode 100644 src/components/agents/remotebg/ProcessManager.vue
 create mode 100644 src/components/agents/remotebg/ServicesManager.vue
 create mode 100644 src/components/checks/CpuLoadCheck.vue
 create mode 100644 src/components/checks/DiskSpaceCheck.vue
 create mode 100644 src/components/checks/EventLogCheck.vue
 create mode 100644 src/components/checks/EventLogCheckOutput.vue
 create mode 100644 src/components/checks/MemCheck.vue
 create mode 100644 src/components/checks/PingCheck.vue
 create mode 100644 src/components/checks/ScriptCheck.vue
 rename src/components/{modals => }/checks/ScriptOutput.vue (72%)
 create mode 100644 src/components/checks/WinSvcCheck.vue
 delete mode 100644 src/components/modals/admin/RolesForm.vue
 delete mode 100644 src/components/modals/checks/CpuLoadCheck.vue
 delete mode 100644 src/components/modals/checks/DiskSpaceCheck.vue
 delete mode 100644 src/components/modals/checks/EventLogCheck.vue
 delete mode 100644 src/components/modals/checks/EventLogCheckOutput.vue
 delete mode 100644 src/components/modals/checks/MemCheck.vue
 delete mode 100644 src/components/modals/checks/PingCheck.vue
 delete mode 100644 src/components/modals/checks/ScriptCheck.vue
 delete mode 100644 src/components/modals/checks/WinSvcCheck.vue
 delete mode 100644 src/components/modals/software/InstallSoftware.vue
 create mode 100644 src/components/software/InstallSoftware.vue
 rename src/components/{modals => }/tasks/AddAutomatedTask.vue (96%)
 rename src/components/{modals => }/tasks/EditAutomatedTask.vue (100%)
 create mode 100644 src/composables/checks.js
 create mode 100644 src/utils/validation.js

diff --git a/src/App.vue b/src/App.vue
index 2087333..9cf7df4 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -9,6 +9,9 @@ export default {
 </script>
 
 <style lang="sass">
+body
+  overflow-y: hidden
+
 .tabs-tbl-sticky
 
   thead tr th
@@ -45,7 +48,6 @@ export default {
     top: 0
 
 .agents-tbl-sticky
-
   thead tr th
     position: sticky
     z-index: 1
@@ -64,6 +66,12 @@ export default {
   thead tr:first-child th
     background-color: #1d1d1d
 
+.bg-dark
+  background-color: --q-page-dark
+
+.bg-light
+  background-color: #ffffff
+
 .highlight
   background-color: #c9e6ff
 
@@ -78,4 +86,7 @@ export default {
 
 .agent-overdue
   background: red !important
+
+.min-width
+  min-width: 0px !important
 </style>
\ No newline at end of file
diff --git a/src/api/accounts.js b/src/api/accounts.js
index 1dc01fc..3ca976a 100644
--- a/src/api/accounts.js
+++ b/src/api/accounts.js
@@ -7,16 +7,38 @@ export async function fetchUsers(params = {}) {
   try {
     const { data } = await axios.get(`${baseUrl}/users/`, { params: params })
     return data
-  } catch (e) { }
+  } catch (e) { console.error(e) }
 }
 
+// role api function
+export async function fetchRoles(params = {}) {
+  try {
+    const { data } = await axios.get(`${baseUrl}/roles/`, { params: params })
+    return data
+  } catch (e) { console.error(e) }
+}
+
+export async function removeRole(id) {
+  const { data } = await axios.delete(`${baseUrl}/roles/${id}/`)
+  return data
+}
+
+export async function saveRole(payload) {
+  const { data } = await axios.post(`${baseUrl}/roles/`, payload)
+  return data
+}
+
+export async function editRole(id, payload) {
+  const { data } = await axios.put(`${baseUrl}/roles/${id}/`, payload)
+  return data
+}
 
 // api key api functions
 export async function fetchAPIKeys(params = {}) {
   try {
     const { data } = await axios.get(`${baseUrl}/apikeys/`, { params: params })
     return data
-  } catch (e) { }
+  } catch (e) { console.error(e) }
 }
 
 export async function saveAPIKey(payload) {
diff --git a/src/api/agents.js b/src/api/agents.js
index 4069ceb..b161b5f 100644
--- a/src/api/agents.js
+++ b/src/api/agents.js
@@ -2,30 +2,115 @@ import axios from "axios"
 
 const baseUrl = "/agents"
 
-export async function fetchAgents() {
+export async function fetchAgents(params = {}) {
   try {
-    const { data } = await axios.get(`${baseUrl}/listagentsnodetail/`)
+    const { data } = await axios.get(`${baseUrl}/`, { params: params })
     return data
-  } catch (e) { }
+  } catch (e) {
+    console.error(e)
+  }
 }
 
-export async function fetchAgentHistory(pk) {
+export async function fetchAgent(agent_id, params = {}) {
   try {
-    const { data } = await axios.get(`${baseUrl}/history/${pk}/`)
+    const { data } = await axios.get(`${baseUrl}/${agent_id}/`, { params: params })
     return data
-  } catch (e) { }
+  } catch (e) { console.error(e) }
 }
 
-export async function runScript(payload) {
+export async function fetchAgentHistory(agent_id, params = {}) {
   try {
-    const { data } = await axios.post(`${baseUrl}/runscript/`, payload)
+    const { data } = await axios.get(`${baseUrl}/${agent_id}/history/`, { params: params })
     return data
-  } catch (e) { }
+  } catch (e) { console.error(e) }
+}
+
+export async function fetchAgentChecks(agent_id, params = {}) {
+  try {
+    const { data } = await axios.get(`${baseUrl}/${agent_id}/checks/`, { params: params })
+    return data
+  } catch (e) { console.error(e) }
+}
+
+export async function fetchAgentTasks(agent_id, params = {}) {
+  try {
+    const { data } = await axios.get(`${baseUrl}/${agent_id}/tasks/`, { params: params })
+    return data
+  } catch (e) { console.error(e) }
+}
+
+
+export async function refreshAgentWMI(agent_id) {
+  const { data } = await axios.post(`${baseUrl}/${agent_id}/wmi/`)
+  return data
+}
+
+export async function runScript(agent_id, payload) {
+  const { data } = await axios.post(`${baseUrl}/${agent_id}/runscript/`, payload)
+  return data
 }
 
 export async function runBulkAction(payload) {
-
-  const { data } = await axios.post("/agents/bulk/", payload)
+  const { data } = await axios.post(`${baseUrl}/bulk/`, payload)
   return data
+}
 
-}
\ No newline at end of file
+export async function fetchAgentProcesses(agent_id, params = {}) {
+  try {
+    const { data } = await axios.get(`${baseUrl}/${agent_id}/processes/`, { params: params })
+    return data
+  } catch (e) {
+    console.error(e)
+  }
+}
+
+export async function killAgentProcess(agent_id, pid, params = {}) {
+  const { data } = await axios.delete(`${baseUrl}/${agent_id}/processes/${pid}/`, { params: params })
+  return data
+}
+
+export async function fetchAgentEventLog(agent_id, logType, days, params = {}) {
+  try {
+    const { data } = await axios.get(`${baseUrl}/${agent_id}/eventlog/${logType}/${days}/`, { params: params })
+    return data
+  } catch (e) {
+    console.error(e)
+  }
+}
+
+export async function fetchAgentMeshCentralURLs(agent_id, params = {}) {
+  try {
+    const { data } = await axios.get(`${baseUrl}/${agent_id}/meshcentral/`, { params: params })
+    return data
+  } catch (e) {
+    console.error(e)
+  }
+}
+
+export async function sendAgentRecoverMesh(agent_id, params = {}) {
+  const { data } = await axios.post(`${baseUrl}/${agent_id}/meshcentral/recover/`, { params: params })
+  return data
+}
+
+// agent notes
+export async function fetchAgentNotes(agent_id, params = {}) {
+  try {
+    const { data } = await axios.get(`${baseUrl}/${agent_id}/notes/`, { params: params })
+    return data
+  } catch (e) { console.error(e) }
+}
+
+export async function saveAgentNote(payload) {
+  const { data } = await axios.post(`${baseUrl}/notes/`, payload)
+  return data
+}
+
+export async function editAgentNote(pk, payload) {
+  const { data } = await axios.put(`${baseUrl}/notes/${pk}/`, payload)
+  return data
+}
+
+export async function removeAgentNote(pk) {
+  const { data } = await axios.delete(`${baseUrl}/notes/${pk}/`)
+  return data
+}
diff --git a/src/api/checks.js b/src/api/checks.js
new file mode 100644
index 0000000..ec5436a
--- /dev/null
+++ b/src/api/checks.js
@@ -0,0 +1,32 @@
+import axios from "axios"
+
+const baseUrl = "/checks"
+
+export async function fetchChecks(params = {}) {
+    try {
+        const { data } = await axios.get(`${baseUrl}/`, { params: params })
+        return data
+    } catch (e) {
+        console.error(e)
+    }
+}
+
+export async function saveCheck(payload) {
+    const { data } = await axios.post(`${baseUrl}/`, payload)
+    return data
+}
+
+export async function updateCheck(id, payload) {
+    const { data } = await axios.put(`${baseUrl}/${id}/`, payload)
+    return data
+}
+
+export async function removeCheck(id) {
+    const { data } = await axios.delete(`${baseUrl}/${id}/`)
+    return data
+}
+
+export async function resetCheck(id) {
+    const { data } = await axios.post(`${baseUrl}/${id}/reset/`)
+    return data
+}
\ No newline at end of file
diff --git a/src/api/clients.js b/src/api/clients.js
index a6a8ff2..04fc59c 100644
--- a/src/api/clients.js
+++ b/src/api/clients.js
@@ -6,12 +6,12 @@ export async function fetchClients() {
   try {
     const { data } = await axios.get(`${baseUrl}/clients/`)
     return data
-  } catch (e) { }
+  } catch (e) { console.error(e) }
 }
 
 export async function fetchSites() {
   try {
     const { data } = await axios.get(`${baseUrl}/sites/`)
     return data
-  } catch (e) { }
+  } catch (e) { console.error(e) }
 }
\ No newline at end of file
diff --git a/src/api/core.js b/src/api/core.js
index 8bb6a56..6e61e56 100644
--- a/src/api/core.js
+++ b/src/api/core.js
@@ -2,7 +2,7 @@ import axios from "axios"
 
 const baseUrl = "/core"
 
-export async function fetchCustomFields(params) {
+export async function fetchCustomFields(params = {}) {
   try {
     const { data } = await axios.get(`${baseUrl}/customfields/`, { params: params })
     return data
@@ -12,4 +12,9 @@ export async function fetchCustomFields(params) {
 export async function uploadMeshAgent(payload) {
   const { data } = await axios.put(`${baseUrl}/uploadmesh/`, payload)
   return data
+}
+
+export async function fetchDashboardInfo(params = {}) {
+  const { data } = await axios.get(`${baseUrl}/dashinfo/`, { params: params })
+  return data
 }
\ No newline at end of file
diff --git a/src/api/scripts.js b/src/api/scripts.js
index 192bdb6..62b5b70 100644
--- a/src/api/scripts.js
+++ b/src/api/scripts.js
@@ -10,9 +10,9 @@ export async function fetchScripts(params = {}) {
   } catch (e) { }
 }
 
-export async function testScript(payload) {
+export async function testScript(agent_id, payload) {
   try {
-    const { data } = await axios.post(`${baseUrl}/testscript/`, payload)
+    const { data } = await axios.post(`${baseUrl}/${agent_id}/test/`, payload)
     return data
   } catch (e) { }
 }
@@ -34,7 +34,7 @@ export async function removeScript(id) {
 
 export async function downloadScript(id, params = {}) {
   try {
-    const { data } = await axios.get(`${baseUrl}/download/${id}/`, { params: params })
+    const { data } = await axios.get(`${baseUrl}/${id}/download/`, { params: params })
     return data
   } catch (e) { }
 }
diff --git a/src/api/services.js b/src/api/services.js
new file mode 100644
index 0000000..ddd9a04
--- /dev/null
+++ b/src/api/services.js
@@ -0,0 +1,31 @@
+import axios from "axios"
+
+const baseUrl = "/services"
+
+export async function getAgentServices(agent_id, params = {}) {
+  try {
+    const { data } = await axios.get(`${baseUrl}/${agent_id}/`, { params: params })
+    return data
+  } catch (e) {
+    console.error(e)
+  }
+}
+
+export async function getAgentServiceDetails(agent_id, svcname, params = {}) {
+  try {
+    const { data } = await axios.get(`${baseUrl}/${agent_id}/${svcname}/`, { params: params })
+    return data
+  } catch (e) {
+    console.error(e)
+  }
+}
+
+export async function editAgentServiceStartType(agent_id, svcname, payload) {
+  const { data } = await axios.put(`${baseUrl}/${agent_id}/${svcname}/`, payload)
+  return data
+}
+
+export async function sendAgentServiceAction(agent_id, svcname, payload) {
+  const { data } = await axios.post(`${baseUrl}/${agent_id}/${svcname}/`, payload)
+  return data
+}
diff --git a/src/api/software.js b/src/api/software.js
new file mode 100644
index 0000000..22c525e
--- /dev/null
+++ b/src/api/software.js
@@ -0,0 +1,35 @@
+import axios from "axios"
+
+const baseUrl = "/software"
+
+export async function fetchChocosSoftware(params = {}) {
+    try {
+        const { data } = await axios.get(`${baseUrl}/chocos/`, { params: params })
+        return data
+    } catch (e) {
+        console.error(e)
+    }
+}
+
+export async function fetchAgentSoftware(agent_id, params = {}) {
+    try {
+        const { data } = await axios.get(`${baseUrl}/${agent_id}/`, { params: params })
+        return data.software
+    } catch (e) {
+        console.error(e)
+    }
+}
+
+export async function installAgentSoftware(agent_id, payload) {
+    const { data } = await axios.post(`${baseUrl}/${agent_id}/`, payload)
+    return data
+}
+
+export async function refreshAgentSoftware(agent_id) {
+    try {
+        const { data } = await axios.put(`${baseUrl}/${agent_id}/`)
+        return data
+    } catch (e) {
+        console.error(e)
+    }
+}
\ No newline at end of file
diff --git a/src/api/tasks.js b/src/api/tasks.js
new file mode 100644
index 0000000..5d7eb33
--- /dev/null
+++ b/src/api/tasks.js
@@ -0,0 +1,32 @@
+import axios from "axios"
+
+const baseUrl = "/tasks"
+
+export async function fetchTasks(params = {}) {
+    try {
+        const { data } = await axios.get(`${baseUrl}/`, { params: params })
+        return data
+    } catch (e) {
+        console.error(e)
+    }
+}
+
+export async function saveTasks(payload) {
+    const { data } = await axios.post(`${baseUrl}/`, payload)
+    return data
+}
+
+export async function updateTask(id, payload) {
+    const { data } = await axios.put(`${baseUrl}/${id}/`, payload)
+    return data
+}
+
+export async function removeTask(id) {
+    const { data } = await axios.delete(`${baseUrl}/${id}/`)
+    return data
+}
+
+export async function runTask(id) {
+    const { data } = await axios.post(`${baseUrl}/${id}/run/`)
+    return data
+}
\ No newline at end of file
diff --git a/src/api/winupdates.js b/src/api/winupdates.js
new file mode 100644
index 0000000..50e9734
--- /dev/null
+++ b/src/api/winupdates.js
@@ -0,0 +1,22 @@
+import axios from "axios"
+
+const baseUrl = "/winupdate"
+
+// win updates api functions
+export async function fetchAgentUpdates(agent_id, params = {}) {
+  try {
+    const { data } = await axios.get(`${baseUrl}/${agent_id}/`, { params: params })
+    return data
+  } catch (e) { console.error(e) }
+}
+
+export async function runAgentUpdateScan(agent_id) {
+  const { data } = await axios.post(`${baseUrl}/${agent_id}/scan/`)
+  return data
+
+}
+
+export async function editAgentUpdate(id, payload) {
+  const { data } = await axios.put(`${baseUrl}/${id}/`, payload)
+  return data
+}
diff --git a/src/boot/axios.js b/src/boot/axios.js
index 6cf263f..ee1e4c9 100644
--- a/src/boot/axios.js
+++ b/src/boot/axios.js
@@ -35,15 +35,12 @@ export default function ({ app, router, store }) {
     function (response) {
       return response;
     },
-    function (error) {
+    async function (error) {
       let text
 
       if (!error.response) {
         text = error.message
       }
-      else if (error.config.url === "/checkcreds/") {
-        text = "Bad credentials"
-      }
       // unauthorized
       else if (error.response.status === 401) {
         router.push({ path: "/expired" });
@@ -52,9 +49,14 @@ export default function ({ app, router, store }) {
       else if (error.response.status === 403) {
         text = error.response.data.detail;
       }
-      else if (error.response.status === 400) {
+      // catch all for other 400 error messages
+      else if (error.response.status >= 400 && error.response.status < 500) {
 
-        if (error.response.data.non_field_errors) {
+        if (error.config.responseType === "blob") {
+          text = (await error.response.data.text()).replace(/^"|"$/g, '')
+        }
+
+        else if (error.response.data.non_field_errors) {
           text = error.response.data.non_field_errors[0]
 
         } else {
@@ -65,13 +67,6 @@ export default function ({ app, router, store }) {
             text = key + ": " + value[0]
           }
         }
-
-      }
-      else if (error.response.status === 406) {
-        text = "Missing 64 bit meshagent.exe. Upload it from Settings > Global Settings > MeshCentral"
-      }
-      else if (error.response.status === 415) {
-        text = "Missing 32 bit meshagent-x86.exe. Upload it from Settings > Global Settings > MeshCentral"
       }
 
       if (text || error.response) {
diff --git a/src/components/AgentTable.vue b/src/components/AgentTable.vue
index 38febfe..c9d71aa 100644
--- a/src/components/AgentTable.vue
+++ b/src/components/AgentTable.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="q-pt-none q-pb-none q-pr-xs q-pl-xs">
+  <div class="q-pa-none">
     <q-table
       dense
       :table-class="{ 'table-bgcolor': !$q.dark.isActive, 'table-bgcolor-dark': $q.dark.isActive }"
@@ -78,11 +78,11 @@
       <!-- body slots -->
       <template v-slot:body="props">
         <q-tr
-          @contextmenu="agentRowSelected(props.row.id)"
+          @contextmenu="agentRowSelected(props.row.agent_id)"
           :props="props"
-          :class="rowSelectedClass(props.row.id)"
-          @click="agentRowSelected(props.row.id)"
-          @dblclick="rowDoubleClicked(props.row.id)"
+          :class="rowSelectedClass(props.row.agent_id)"
+          @click="agentRowSelected(props.row.agent_id)"
+          @dblclick="rowDoubleClicked(props.row.agent_id)"
         >
           <!-- context menu -->
           <q-menu context-menu>
@@ -102,7 +102,7 @@
                 <q-item-section>Pending Agent Actions</q-item-section>
               </q-item>
               <!-- take control -->
-              <q-item clickable v-ripple v-close-popup @click.stop.prevent="takeControl(props.row.id)">
+              <q-item clickable v-ripple v-close-popup @click.stop.prevent="takeControl(props.row.agent_id)">
                 <q-item-section side>
                   <q-icon size="xs" name="fas fa-desktop" />
                 </q-item-section>
@@ -172,7 +172,7 @@
                 </q-menu>
               </q-item>
 
-              <q-item clickable v-close-popup @click.stop.prevent="remoteBG(props.row.id)">
+              <q-item clickable v-close-popup @click.stop.prevent="remoteBG(props.row.agent_id)">
                 <q-item-section side>
                   <q-icon size="xs" name="fas fa-cogs" />
                 </q-item-section>
@@ -401,18 +401,16 @@
       <RebootLater @close="showRebootLaterModal = false" @edit="agentEdited" />
     </q-dialog>
     <!-- pending actions modal -->
-    <div class="q-pa-md q-gutter-sm">
-      <q-dialog v-model="showPendingActions" @hide="closePendingActionsModal">
-        <PendingActions :agentpk="pendingActionAgentPk" @close="closePendingActionsModal" @edit="agentEdited" />
-      </q-dialog>
-    </div>
+    <q-dialog v-model="showPendingActions" @hide="closePendingActionsModal">
+      <PendingActions :agentpk="pendingActionAgentPk" @close="closePendingActionsModal" @edit="agentEdited" />
+    </q-dialog>
     <!-- send command modal -->
     <q-dialog v-model="showSendCommand" persistent @keydown.esc="showSendCommand = false">
-      <SendCommand @close="showSendCommand = false" :pk="selectedAgentPk" />
+      <SendCommand @close="showSendCommand = false" :pk="selectedAgentId" />
     </q-dialog>
     <!-- agent recovery modal -->
     <q-dialog v-model="showAgentRecovery">
-      <AgentRecovery @close="showAgentRecovery = false" :pk="selectedAgentPk" />
+      <AgentRecovery @close="showAgentRecovery = false" :pk="selectedAgentId" />
     </q-dialog>
   </div>
 </template>
@@ -511,8 +509,8 @@ export default {
         });
       });
     },
-    rowDoubleClicked(pk) {
-      this.$store.commit("setActiveRow", pk);
+    rowDoubleClicked(agent_id) {
+      this.$store.commit("setActiveRow", agent);
       this.$q.loading.show();
       // give time for store to change active row
       setTimeout(() => {
@@ -522,13 +520,13 @@ export default {
             this.showEditAgentModal = true;
             break;
           case "takecontrol":
-            this.takeControl(pk);
+            this.takeControl(agent.agent_id);
             break;
           case "remotebg":
-            this.remoteBG(pk);
+            this.remoteBG(agent.agent_id);
             break;
           case "urlaction":
-            this.runURLAction(pk, this.agentUrlAction);
+            this.runURLAction(agent.pk, this.agentUrlAction);
             break;
         }
       }, 500);
@@ -554,18 +552,18 @@ export default {
         })
         .catch(e => {});
     },
-    runPatchStatusScan(pk, hostname) {
+    runPatchStatusScan(agent_id, hostname) {
       this.$axios
-        .get(`/winupdate/${pk}/runupdatescan/`)
+        .get(`/winupdate/${agent_id}/scan/`)
         .then(r => {
           this.notifySuccess(`Scan will be run shortly on ${hostname}`);
         })
         .catch(e => {});
     },
-    installPatches(pk) {
+    installPatches(agent_id) {
       this.$q.loading.show();
       this.$axios
-        .get(`/winupdate/${pk}/installnow/`)
+        .get(`/winupdate/${agent_id}/install/`)
         .then(r => {
           this.$q.loading.hide();
           this.notifySuccess(r.data);
@@ -585,12 +583,12 @@ export default {
       this.showPendingActions = false;
       this.pendingActionAgentPk = null;
     },
-    takeControl(pk) {
-      const url = this.$router.resolve(`/takecontrol/${pk}`).href;
+    takeControl(agent_id) {
+      const url = this.$router.resolve(`/takecontrol/${agent_id}`).href;
       window.open(url, "", "scrollbars=no,location=no,status=no,toolbar=no,menubar=no,width=1600,height=900");
     },
-    remoteBG(pk) {
-      const url = this.$router.resolve(`/remotebackground/${pk}`).href;
+    remoteBG(agent_id) {
+      const url = this.$router.resolve(`/remotebackground/${agent_id}`).href;
       window.open(url, "", "scrollbars=no,location=no,status=no,toolbar=no,menubar=no,width=1280,height=826");
     },
     runChecks(pk) {
@@ -605,7 +603,7 @@ export default {
           this.$q.loading.hide();
         });
     },
-    removeAgent(pk, name) {
+    removeAgent(agent_id, name) {
       this.$q
         .dialog({
           title: `Please type <code style="color:red">${name}</code> to confirm deletion.`,
@@ -620,9 +618,8 @@ export default {
           html: true,
         })
         .onOk(val => {
-          const data = { pk: pk };
           this.$axios
-            .delete("/agents/uninstall/", { data: data })
+            .delete(`/agents/${agent_id}/`)
             .then(r => {
               this.notifySuccess(r.data);
               setTimeout(() => {
@@ -632,10 +629,10 @@ export default {
             .catch(e => {});
         });
     },
-    pingAgent(pk) {
+    pingAgent(agent_id) {
       this.$q.loading.show();
       this.$axios
-        .get(`/agents/${pk}/ping/`)
+        .get(`/agents/${agent_id}/ping/`)
         .then(r => {
           this.$q.loading.hide();
           if (r.data.status === "offline") {
@@ -663,7 +660,7 @@ export default {
           this.$q.loading.hide();
         });
     },
-    rebootNow(pk, hostname) {
+    rebootNow(agent_id, hostname) {
       this.$q
         .dialog({
           title: "Are you sure?",
@@ -674,7 +671,7 @@ export default {
         .onOk(() => {
           this.$q.loading.show();
           this.$axios
-            .post("/agents/reboot/", { pk: pk })
+            .post(`/agents/${agent_id}/reboot/`)
             .then(r => {
               this.$q.loading.hide();
               this.notifySuccess(`${hostname} will now be restarted`);
@@ -684,16 +681,10 @@ export default {
             });
         });
     },
-    agentRowSelected(pk) {
-      this.$store.commit("setActiveRow", pk);
-      this.$store.dispatch("loadSummary", pk);
-      this.$store.dispatch("loadChecks", pk);
-      this.$store.dispatch("loadAutomatedTasks", pk);
-      this.$store.dispatch("loadWinUpdates", pk);
-      this.$store.dispatch("loadInstalledSoftware", pk);
-      this.$store.dispatch("loadNotes", pk);
+    agentRowSelected(agent_id) {
+      this.$store.commit("setActiveRow", agent_id);
     },
-    overdueAlert(category, pk, alert_action) {
+    overdueAlert(category, agent_id, alert_action) {
       let db_field = "";
       if (category === "email") db_field = "overdue_email_alert";
       else if (category === "text") db_field = "overdue_text_alert";
@@ -701,12 +692,11 @@ export default {
 
       const action = !alert_action ? "enabled" : "disabled";
       const data = {
-        pk: pk,
         [db_field]: !alert_action,
       };
       const alertColor = !alert_action ? "positive" : "warning";
       this.$axios
-        .post("/agents/overdueaction/", data)
+        .put(`/agents/${agent_id}/`, data)
         .then(r => {
           this.$q.notify({
             color: alertColor,
@@ -754,8 +744,8 @@ export default {
     menuMaintenanceText(mode) {
       return mode ? "Disable Maintenance Mode" : "Enable Maintenance Mode";
     },
-    rowSelectedClass(id) {
-      if (id === this.selectedRow) {
+    rowSelectedClass(agent_id) {
+      if (agent_id === this.selectedRow) {
         return this.$q.dark.isActive ? "highlight-dark" : "highlight";
       } else {
         return "";
@@ -796,7 +786,7 @@ export default {
     },
   },
   computed: {
-    ...mapGetters(["selectedAgentPk", "agentTableHeight", "showCommunityScripts"]),
+    ...mapGetters(["selectedAgentId", "agentTableHeight", "showCommunityScripts"]),
     agentDblClickAction() {
       return this.$store.state.agentDblClickAction;
     },
diff --git a/src/components/AssetsTab.vue b/src/components/AssetsTab.vue
deleted file mode 100644
index c8242f5..0000000
--- a/src/components/AssetsTab.vue
+++ /dev/null
@@ -1,138 +0,0 @@
-<template>
-  <div v-if="!selectedAgentPk">No agent selected</div>
-  <div v-else class="q-pa-none">
-    <div class="q-gutter-y-md">
-      <q-card>
-        <q-tabs
-          v-model="tab"
-          dense
-          class="text-grey"
-          active-color="primary"
-          indicator-color="primary"
-          align="justify"
-          narrow-indicator
-          no-caps
-        >
-          <q-tab name="os" label="Operating System" />
-          <q-tab name="cpu" label="CPU" />
-          <q-tab name="mem" label="Memory" />
-          <q-tab name="usb" label="USB" />
-          <q-tab name="bios" label="Bios" />
-          <q-tab name="disk" label="Disks" />
-          <q-tab name="comp_sys" label="Computer System" />
-          <q-tab name="base_board" label="Motherboard" />
-          <q-tab name="comp_sys_prod" label="Computer System Product" />
-          <q-tab name="network_config" label="Network Config" />
-          <q-tab name="graphics" label="Graphics" />
-          <q-tab name="desktop_monitor" label="Monitors" />
-          <q-tab name="network_adapter" label="Network Adapters" />
-        </q-tabs>
-
-        <q-separator />
-
-        <q-tab-panels v-model="tab">
-          <q-tab-panel name="os">
-            <WmiDetail :info="os" />
-          </q-tab-panel>
-          <q-tab-panel name="cpu">
-            <WmiDetail :info="cpu" />
-          </q-tab-panel>
-          <q-tab-panel name="mem">
-            <WmiDetail :info="mem" />
-          </q-tab-panel>
-          <q-tab-panel name="usb">
-            <WmiDetail :info="usb" />
-          </q-tab-panel>
-          <q-tab-panel name="bios">
-            <WmiDetail :info="bios" />
-          </q-tab-panel>
-          <q-tab-panel name="disk">
-            <WmiDetail :info="disk" />
-          </q-tab-panel>
-          <q-tab-panel name="comp_sys">
-            <WmiDetail :info="comp_sys" />
-          </q-tab-panel>
-          <q-tab-panel name="base_board">
-            <WmiDetail :info="base_board" />
-          </q-tab-panel>
-          <q-tab-panel name="comp_sys_prod">
-            <WmiDetail :info="comp_sys_prod" />
-          </q-tab-panel>
-          <q-tab-panel name="network_config">
-            <WmiDetail :info="network_config" />
-          </q-tab-panel>
-          <q-tab-panel name="desktop_monitor">
-            <WmiDetail :info="desktop_monitor" />
-          </q-tab-panel>
-          <q-tab-panel name="graphics">
-            <WmiDetail :info="graphics" />
-          </q-tab-panel>
-          <q-tab-panel name="network_adapter">
-            <WmiDetail :info="network_adapter" />
-          </q-tab-panel>
-        </q-tab-panels>
-      </q-card>
-    </div>
-  </div>
-</template>
-
-<script>
-import { mapGetters } from "vuex";
-import WmiDetail from "@/components/WmiDetail";
-
-export default {
-  name: "AssetsTab",
-  components: { WmiDetail },
-  data() {
-    return {
-      tab: "os",
-    };
-  },
-  computed: {
-    ...mapGetters(["selectedAgentPk"]),
-    assets() {
-      return this.$store.state.agentSummary.wmi_detail;
-    },
-    os() {
-      return this.assets.os;
-    },
-    cpu() {
-      return this.assets.cpu;
-    },
-    mem() {
-      return this.assets.mem;
-    },
-    usb() {
-      return this.assets.usb;
-    },
-    bios() {
-      return this.assets.bios;
-    },
-    disk() {
-      return this.assets.disk;
-    },
-    comp_sys() {
-      return this.assets.comp_sys;
-    },
-    base_board() {
-      return this.assets.base_board;
-    },
-    comp_sys_prod() {
-      return this.assets.comp_sys_prod;
-    },
-    network_config() {
-      return this.assets.network_config;
-    },
-    desktop_monitor() {
-      return this.assets.desktop_monitor;
-    },
-    network_adapter() {
-      return this.assets.network_adapter;
-    },
-    graphics() {
-      return this.assets.graphics;
-    },
-  },
-};
-</script>
-
diff --git a/src/components/AutomatedTasksTab.vue b/src/components/AutomatedTasksTab.vue
deleted file mode 100644
index 85ea5e0..0000000
--- a/src/components/AutomatedTasksTab.vue
+++ /dev/null
@@ -1,423 +0,0 @@
-<template>
-  <div v-if="!this.selectedAgentPk">No agent selected</div>
-  <div v-else-if="Object.keys(automatedTasks).length === 0">No Tasks</div>
-  <div class="row" v-else>
-    <div class="col-12">
-      <q-btn
-        size="sm"
-        color="grey-5"
-        icon="fas fa-plus"
-        label="Add Task"
-        text-color="black"
-        @click="showAddAutomatedTask = true"
-      />
-      <q-btn dense flat push @click="refreshTasks(automatedTasks.pk)" icon="refresh" />
-      <template v-if="tasks === undefined || tasks.length === 0">
-        <p>No Tasks</p>
-      </template>
-      <template v-else>
-        <q-table
-          dense
-          :table-class="{ 'table-bgcolor': !$q.dark.isActive, 'table-bgcolor-dark': $q.dark.isActive }"
-          class="tabs-tbl-sticky"
-          :style="{ 'max-height': tabsTableHeight }"
-          :rows="tasks"
-          :columns="columns"
-          :row-key="row => row.id"
-          binary-state-sort
-          v-model:pagination="pagination"
-          hide-bottom
-        >
-          <!-- header slots -->
-          <template v-slot:header-cell-enabled="props">
-            <q-th auto-width :props="props">
-              <small>Enabled</small>
-            </q-th>
-          </template>
-
-          <template v-slot:header-cell-smsalert="props">
-            <q-th auto-width :props="props">
-              <q-icon name="phone_android" size="1.5em">
-                <q-tooltip>SMS Alert</q-tooltip>
-              </q-icon>
-            </q-th>
-          </template>
-          <template v-slot:header-cell-emailalert="props">
-            <q-th auto-width :props="props">
-              <q-icon name="email" size="1.5em">
-                <q-tooltip>Email Alert</q-tooltip>
-              </q-icon>
-            </q-th>
-          </template>
-          <template v-slot:header-cell-dashboardalert="props">
-            <q-th auto-width :props="props">
-              <q-icon name="notifications" size="1.5em">
-                <q-tooltip>Dashboard Alert</q-tooltip>
-              </q-icon>
-            </q-th>
-          </template>
-          <template v-slot:header-cell-policystatus="props">
-            <q-th auto-width :props="props"></q-th>
-          </template>
-
-          <template v-slot:header-cell-collector="props">
-            <q-th auto-width :props="props">
-              <q-icon name="mdi-database-arrow-up" size="1.5em">
-                <q-tooltip>Collector Task</q-tooltip>
-              </q-icon>
-            </q-th>
-          </template>
-
-          <template v-slot:header-cell-status="props">
-            <q-th auto-width :props="props"></q-th>
-          </template>
-          <!-- body slots -->
-          <template v-slot:body="props">
-            <q-tr @contextmenu="editTaskPk = props.row.id">
-              <!-- context menu -->
-              <q-menu context-menu>
-                <q-list dense style="min-width: 200px">
-                  <q-item clickable v-close-popup @click="runTask(props.row.id, props.row.enabled)">
-                    <q-item-section side>
-                      <q-icon name="play_arrow" />
-                    </q-item-section>
-                    <q-item-section>Run task now</q-item-section>
-                  </q-item>
-                  <q-item clickable v-close-popup @click="showEditTask(props.row)" v-if="!props.row.managed_by_policy">
-                    <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="deleteTask(props.row.name, props.row.id)"
-                    v-if="!props.row.managed_by_policy"
-                  >
-                    <q-item-section side>
-                      <q-icon name="delete" />
-                    </q-item-section>
-                    <q-item-section>Delete</q-item-section>
-                  </q-item>
-                  <q-separator></q-separator>
-                  <q-item clickable v-close-popup>
-                    <q-item-section>Close</q-item-section>
-                  </q-item>
-                </q-list>
-              </q-menu>
-              <!-- tds -->
-              <q-td>
-                <q-checkbox
-                  dense
-                  @update:model-value="
-                    taskEnableorDisable(props.row.id, props.row.enabled, props.row.managed_by_policy)
-                  "
-                  v-model="props.row.enabled"
-                  :disable="props.row.managed_by_policy"
-                />
-              </q-td>
-              <!-- text alert -->
-              <q-td>
-                <q-checkbox
-                  v-if="props.row.alert_template && props.row.alert_template.always_text !== null"
-                  :value="props.row.alert_template.always_text"
-                  disable
-                  dense
-                >
-                  <q-tooltip> Setting is overidden by alert template: {{ props.row.alert_template.name }} </q-tooltip>
-                </q-checkbox>
-
-                <q-checkbox
-                  v-else
-                  dense
-                  @update:model-value="
-                    taskAlert(props.row.id, 'Text', props.row.text_alert, props.row.managed_by_policy)
-                  "
-                  v-model="props.row.text_alert"
-                  :disable="props.row.managed_by_policy"
-                />
-              </q-td>
-              <!-- email alert -->
-              <q-td>
-                <q-checkbox
-                  v-if="props.row.alert_template && props.row.alert_template.always_email !== null"
-                  :value="props.row.alert_template.always_email"
-                  disable
-                  dense
-                >
-                  <q-tooltip> Setting is overidden by alert template: {{ props.row.alert_template.name }} </q-tooltip>
-                </q-checkbox>
-
-                <q-checkbox
-                  v-else
-                  dense
-                  @update:model-value="
-                    taskAlert(props.row.id, 'Email', props.row.email_alert, props.row.managed_by_policy)
-                  "
-                  v-model="props.row.email_alert"
-                  :disable="props.row.managed_by_policy"
-                />
-              </q-td>
-              <!-- dashboard alert -->
-              <q-td>
-                <q-checkbox
-                  v-if="props.row.alert_template && props.row.alert_template.always_alert !== null"
-                  :value="props.row.alert_template.always_alert"
-                  disable
-                  dense
-                >
-                  <q-tooltip> Setting is overidden by alert template: {{ props.row.alert_template.name }} </q-tooltip>
-                </q-checkbox>
-
-                <q-checkbox
-                  v-else
-                  dense
-                  @update:model-value="
-                    taskAlert(props.row.id, 'Dashboard', props.row.dashboard_alert, props.row.managed_by_policy)
-                  "
-                  v-model="props.row.dashboard_alert"
-                  :disable="props.row.managed_by_policy"
-                />
-              </q-td>
-              <!-- policy check icon -->
-              <q-td>
-                <q-icon v-if="props.row.managed_by_policy" style="font-size: 1.3rem" name="policy">
-                  <q-tooltip>This task is managed by a policy</q-tooltip>
-                </q-icon>
-              </q-td>
-
-              <!-- is collector task -->
-              <q-td>
-                <q-icon v-if="!!props.row.custom_field" style="font-size: 1.3rem" name="check">
-                  <q-tooltip>The task updates a custom field on the agent</q-tooltip>
-                </q-icon>
-              </q-td>
-              <!-- status icon -->
-              <q-td v-if="props.row.status === 'passing'">
-                <q-icon style="font-size: 1.3rem" color="positive" name="check_circle">
-                  <q-tooltip>Passing</q-tooltip>
-                </q-icon>
-              </q-td>
-              <q-td v-else-if="props.row.status === 'failing'">
-                <q-icon v-if="props.row.alert_severity === 'info'" style="font-size: 1.3rem" color="info" name="info">
-                  <q-tooltip>Informational</q-tooltip>
-                </q-icon>
-                <q-icon
-                  v-else-if="props.row.alert_severity === 'warning'"
-                  style="font-size: 1.3rem"
-                  color="warning"
-                  name="warning"
-                >
-                  <q-tooltip>Warning</q-tooltip>
-                </q-icon>
-                <q-icon v-else style="font-size: 1.3rem" color="negative" name="error">
-                  <q-tooltip>Error</q-tooltip>
-                </q-icon>
-              </q-td>
-              <q-td v-else></q-td>
-              <!-- name -->
-              <q-td>{{ props.row.name }}</q-td>
-              <!-- sync status -->
-              <q-td v-if="props.row.sync_status === 'notsynced'">Will sync on next agent checkin</q-td>
-              <q-td v-else-if="props.row.sync_status === 'synced'">Synced with agent</q-td>
-              <q-td v-else-if="props.row.sync_status === 'pendingdeletion'">Pending deletion on agent</q-td>
-              <q-td v-else-if="props.row.sync_status === 'initial'">Waiting for task creation on agent</q-td>
-              <q-td v-else></q-td>
-              <q-td v-if="props.row.retcode !== null || props.row.stdout || props.row.stderr">
-                <span
-                  style="cursor: pointer; text-decoration: underline"
-                  class="text-primary"
-                  @click="showScriptOutput(props.row)"
-                  >output</span
-                >
-              </q-td>
-              <q-td v-else>Awaiting output</q-td>
-              <q-td v-if="props.row.last_run">{{ props.row.last_run }}</q-td>
-              <q-td v-else>Has not run yet</q-td>
-              <q-td>{{ props.row.schedule }}</q-td>
-              <q-td v-if="props.row.assigned_check">{{ props.row.assigned_check.readable_desc }}</q-td>
-              <q-td v-else></q-td>
-            </q-tr>
-          </template>
-        </q-table>
-      </template>
-    </div>
-    <!-- modals -->
-    <q-dialog v-model="showAddAutomatedTask" position="top">
-      <AddAutomatedTask @close="showAddAutomatedTask = false" />
-    </q-dialog>
-  </div>
-</template>
-
-<script>
-import { mapState, mapGetters } from "vuex";
-import mixins from "@/mixins/mixins";
-import AddAutomatedTask from "@/components/modals/tasks/AddAutomatedTask";
-import EditAutomatedTask from "@/components/modals/tasks/EditAutomatedTask";
-import ScriptOutput from "@/components/modals/checks/ScriptOutput";
-
-export default {
-  name: "AutomatedTasksTab",
-  components: { AddAutomatedTask },
-  mixins: [mixins],
-  data() {
-    return {
-      showAddAutomatedTask: false,
-      showEditAutomatedTask: false,
-      editTaskPk: null,
-      scriptInfo: {},
-      columns: [
-        { name: "enabled", align: "left", field: "enabled" },
-        { name: "smsalert", field: "text_alert", align: "left" },
-        { name: "emailalert", field: "email_alert", align: "left" },
-        { name: "dashboardalert", field: "dashboard_alert", align: "left" },
-        { name: "policystatus", align: "left" },
-        { name: "collector", label: "Collector", field: "custom_field", align: "left", sortable: true },
-        { name: "status", align: "left" },
-        { name: "name", label: "Name", field: "name", align: "left", sortable: true },
-        { name: "sync_status", label: "Sync Status", field: "sync_status", align: "left", sortable: true },
-        {
-          name: "moreinfo",
-          label: "More Info",
-          field: "more_info",
-          align: "left",
-          sortable: true,
-        },
-        {
-          name: "datetime",
-          label: "Last Run Time",
-          field: "last_run",
-          align: "left",
-          sortable: true,
-        },
-        {
-          name: "schedule",
-          label: "Schedule",
-          field: "schedule",
-          align: "left",
-          sortable: true,
-        },
-        {
-          name: "assignedcheck",
-          label: "Assigned Check",
-          field: "assigned_check",
-          align: "left",
-          sortable: true,
-        },
-      ],
-      pagination: {
-        rowsPerPage: 9999,
-        sortBy: "name",
-        descending: false,
-      },
-    };
-  },
-  methods: {
-    taskEnableorDisable(pk, action, managed_by_policy) {
-      if (managed_by_policy) {
-        return;
-      }
-      const data = { enableordisable: action };
-      this.$axios
-        .patch(`/tasks/${pk}/automatedtasks/`, data)
-        .then(r => {
-          this.$store.dispatch("loadAutomatedTasks", this.automatedTasks.pk);
-          this.notifySuccess(r.data);
-        })
-        .catch(e => {});
-    },
-    taskAlert(pk, alert_type, action, managed_by_policy) {
-      if (managed_by_policy) {
-        return;
-      }
-      this.$q.loading.show();
-
-      const data = {
-        id: pk,
-      };
-
-      if (alert_type === "Email") {
-        data.email_alert = !action;
-      } else if (alert_type === "Text") {
-        data.text_alert = !action;
-      } else {
-        data.dashboard_alert = !action;
-      }
-
-      const act = !action ? "enabled" : "disabled";
-      this.$axios
-        .put(`/tasks/${pk}/automatedtasks/`, data)
-        .then(r => {
-          this.$q.loading.hide();
-          this.notifySuccess(`${alert_type} alerts ${act}`);
-        })
-        .catch(e => {
-          this.$q.loading.hide();
-        });
-    },
-    refreshTasks(id) {
-      this.$store.dispatch("loadAutomatedTasks", id);
-    },
-    showScriptOutput(script) {
-      this.$q.dialog({
-        component: ScriptOutput,
-        componentProps: {
-          scriptInfo: script,
-        },
-      });
-    },
-    showEditTask(task) {
-      this.$q
-        .dialog({
-          component: EditAutomatedTask,
-          componentProps: {
-            task: task,
-          },
-        })
-        .onOk(() => {
-          this.refreshTasks(this.automatedTasks.pk);
-        });
-    },
-    runTask(pk, enabled) {
-      if (!enabled) {
-        this.notifyError("Task cannot be run when it's disabled. Enable it first.");
-        return;
-      }
-      this.$axios
-        .get(`/tasks/runwintask/${pk}/`)
-        .then(r => this.notifySuccess(r.data))
-        .catch(e => {});
-    },
-    deleteTask(name, pk) {
-      this.$q
-        .dialog({
-          title: "Are you sure?",
-          message: `Delete ${name} task`,
-          cancel: true,
-          persistent: true,
-        })
-        .onOk(() => {
-          this.$axios
-            .delete(`/tasks/${pk}/automatedtasks/`)
-            .then(r => {
-              this.$store.dispatch("loadAutomatedTasks", this.automatedTasks.pk);
-              this.$store.dispatch("loadChecks", this.automatedTasks.pk);
-              this.notifySuccess(r.data);
-            })
-            .catch(e => {});
-        });
-    },
-  },
-  computed: {
-    ...mapGetters(["selectedAgentPk", "tabsTableHeight"]),
-    ...mapState({
-      automatedTasks: state => state.automatedTasks,
-    }),
-    tasks() {
-      return this.automatedTasks.autotasks.filter(task => task.sync_status !== "pendingdeletion");
-    },
-  },
-};
-</script>
-
diff --git a/src/components/ChecksTab.vue b/src/components/ChecksTab.vue
deleted file mode 100644
index 1f669f3..0000000
--- a/src/components/ChecksTab.vue
+++ /dev/null
@@ -1,529 +0,0 @@
-<template>
-  <div v-if="checks === null">No agent selected</div>
-  <div class="row" v-else>
-    <div class="col-12">
-      <q-btn size="sm" color="grey-5" icon="fas fa-plus" label="Add Check" text-color="black">
-        <q-menu>
-          <q-list dense style="min-width: 200px">
-            <q-item clickable v-close-popup @click="showCheck('add', 'diskspace')">
-              <q-item-section side>
-                <q-icon size="xs" name="far fa-hdd" />
-              </q-item-section>
-              <q-item-section>Disk Space Check</q-item-section>
-            </q-item>
-            <q-item clickable v-close-popup @click="showCheck('add', 'ping')">
-              <q-item-section side>
-                <q-icon size="xs" name="fas fa-network-wired" />
-              </q-item-section>
-              <q-item-section>Ping Check</q-item-section>
-            </q-item>
-            <q-item clickable v-close-popup @click="showCheck('add', 'cpuload')">
-              <q-item-section side>
-                <q-icon size="xs" name="fas fa-microchip" />
-              </q-item-section>
-              <q-item-section>CPU Load Check</q-item-section>
-            </q-item>
-            <q-item clickable v-close-popup @click="showCheck('add', 'memory')">
-              <q-item-section side>
-                <q-icon size="xs" name="fas fa-memory" />
-              </q-item-section>
-              <q-item-section>Memory Check</q-item-section>
-            </q-item>
-            <q-item clickable v-close-popup @click="showCheck('add', 'winsvc')">
-              <q-item-section side>
-                <q-icon size="xs" name="fas fa-cogs" />
-              </q-item-section>
-              <q-item-section>Windows Service Check</q-item-section>
-            </q-item>
-            <q-item clickable v-close-popup @click="showCheck('add', 'script')">
-              <q-item-section side>
-                <q-icon size="xs" name="fas fa-terminal" />
-              </q-item-section>
-              <q-item-section>Script Check</q-item-section>
-            </q-item>
-            <q-item clickable v-close-popup @click="showCheck('add', 'eventlog')">
-              <q-item-section side>
-                <q-icon size="xs" name="fas fa-clipboard-list" />
-              </q-item-section>
-              <q-item-section>Event Log Check</q-item-section>
-            </q-item>
-          </q-list>
-        </q-menu>
-      </q-btn>
-      <q-btn dense flat push @click="onRefresh(selectedAgentPk)" icon="refresh" />
-      <template v-if="checks === undefined || checks.length === 0">
-        <p>No Checks</p>
-      </template>
-      <template v-else>
-        <q-table
-          dense
-          :table-class="{ 'table-bgcolor': !$q.dark.isActive, 'table-bgcolor-dark': $q.dark.isActive }"
-          class="tabs-tbl-sticky"
-          :style="{ 'max-height': tabsTableHeight }"
-          :rows="checks"
-          :columns="columns"
-          :row-key="row => row.id + row.check_type"
-          binary-state-sort
-          v-model:pagination="pagination"
-          hide-bottom
-        >
-          <!-- header slots -->
-          <template v-slot:header-cell-smsalert="props">
-            <q-th auto-width :props="props">
-              <q-icon name="phone_android" size="1.5em">
-                <q-tooltip>SMS Alert</q-tooltip>
-              </q-icon>
-            </q-th>
-          </template>
-          <template v-slot:header-cell-emailalert="props">
-            <q-th auto-width :props="props">
-              <q-icon name="email" size="1.5em">
-                <q-tooltip>Email Alert</q-tooltip>
-              </q-icon>
-            </q-th>
-          </template>
-          <template v-slot:header-cell-dashboardalert="props">
-            <q-th auto-width :props="props">
-              <q-icon name="notifications" size="1.5em">
-                <q-tooltip>Dashboard Alert</q-tooltip>
-              </q-icon>
-            </q-th>
-          </template>
-          <template v-slot:header-cell-statusicon="props">
-            <q-th auto-width :props="props"></q-th>
-          </template>
-          <template v-slot:header-cell-policystatus="props">
-            <q-th auto-width :props="props"></q-th>
-          </template>
-          <!-- body slots -->
-          <template v-slot:body="props">
-            <q-tr @contextmenu="checkpk = props.row.id">
-              <!-- context menu -->
-              <q-menu context-menu>
-                <q-list dense style="min-width: 200px">
-                  <q-item
-                    clickable
-                    v-close-popup
-                    @click="showCheck('edit', props.row.check_type)"
-                    v-if="!props.row.managed_by_policy"
-                  >
-                    <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="deleteCheck(props.row.id, props.row.readable_desc)"
-                    v-if="!props.row.managed_by_policy"
-                  >
-                    <q-item-section side>
-                      <q-icon name="delete" />
-                    </q-item-section>
-                    <q-item-section>Delete</q-item-section>
-                  </q-item>
-                  <q-separator></q-separator>
-                  <q-item clickable v-close-popup @click="resetCheck(props.row.id)">
-                    <q-item-section side>
-                      <q-icon name="info" />
-                    </q-item-section>
-                    <q-item-section>Reset Check Status</q-item-section>
-                  </q-item>
-                  <q-separator></q-separator>
-                  <q-item clickable v-close-popup>
-                    <q-item-section>Close</q-item-section>
-                  </q-item>
-                </q-list>
-              </q-menu>
-              <!-- tds -->
-              <!-- text alert -->
-              <q-td>
-                <q-checkbox
-                  v-if="props.row.alert_template && props.row.alert_template.always_text !== null"
-                  :value="props.row.alert_template.always_text"
-                  disable
-                  dense
-                >
-                  <q-tooltip> Setting is overidden by alert template: {{ props.row.alert_template.name }} </q-tooltip>
-                </q-checkbox>
-
-                <q-checkbox
-                  v-else
-                  dense
-                  @update:model-value="
-                    checkAlert(props.row.id, 'Text', props.row.text_alert, props.row.managed_by_policy)
-                  "
-                  v-model="props.row.text_alert"
-                  :disable="props.row.managed_by_policy"
-                />
-              </q-td>
-              <!-- email alert -->
-              <q-td>
-                <q-checkbox
-                  v-if="props.row.alert_template && props.row.alert_template.always_email !== null"
-                  :value="props.row.alert_template.always_email"
-                  disable
-                  dense
-                >
-                  <q-tooltip> Setting is overidden by alert template: {{ props.row.alert_template.name }} </q-tooltip>
-                </q-checkbox>
-
-                <q-checkbox
-                  v-else
-                  dense
-                  @update:model-value="
-                    checkAlert(props.row.id, 'Email', props.row.email_alert, props.row.managed_by_policy)
-                  "
-                  v-model="props.row.email_alert"
-                  :disable="props.row.managed_by_policy"
-                />
-              </q-td>
-              <!-- dashboard alert -->
-              <q-td>
-                <q-checkbox
-                  v-if="props.row.alert_template && props.row.alert_template.always_alert !== null"
-                  :value="props.row.alert_template.always_alert"
-                  disable
-                  dense
-                >
-                  <q-tooltip> Setting is overidden by alert template: {{ props.row.alert_template.name }} </q-tooltip>
-                </q-checkbox>
-
-                <q-checkbox
-                  v-else
-                  dense
-                  @update:model-value="
-                    checkAlert(props.row.id, 'Dashboard', props.row.dashboard_alert, props.row.managed_by_policy)
-                  "
-                  v-model="props.row.dashboard_alert"
-                  :disable="props.row.managed_by_policy"
-                />
-              </q-td>
-              <!-- policy check icon -->
-              <q-td v-if="props.row.managed_by_policy">
-                <q-icon style="font-size: 1.3rem" name="policy">
-                  <q-tooltip>This check is managed by a policy</q-tooltip>
-                </q-icon>
-              </q-td>
-              <q-td v-else-if="props.row.overriden_by_policy">
-                <q-icon style="font-size: 1.3rem" name="remove_circle_outline">
-                  <q-tooltip>This check is overriden by a policy</q-tooltip>
-                </q-icon>
-              </q-td>
-              <q-td v-else></q-td>
-              <!-- status icon -->
-              <q-td v-if="props.row.status === 'passing'">
-                <q-icon style="font-size: 1.3rem" color="positive" name="check_circle">
-                  <q-tooltip>Passing</q-tooltip>
-                </q-icon>
-              </q-td>
-              <q-td v-else-if="props.row.status === 'failing'">
-                <q-icon v-if="props.row.alert_severity === 'info'" style="font-size: 1.3rem" color="info" name="info">
-                  <q-tooltip>Informational</q-tooltip>
-                </q-icon>
-                <q-icon
-                  v-else-if="props.row.alert_severity === 'warning'"
-                  style="font-size: 1.3rem"
-                  color="warning"
-                  name="warning"
-                >
-                  <q-tooltip>Warning</q-tooltip>
-                </q-icon>
-                <q-icon v-else style="font-size: 1.3rem" color="negative" name="error">
-                  <q-tooltip>Error</q-tooltip>
-                </q-icon>
-              </q-td>
-              <q-td v-else></q-td>
-              <!-- check description -->
-              <q-td>{{ props.row.readable_desc }}</q-td>
-              <!-- more info -->
-              <q-td>
-                <span
-                  style="cursor: pointer; text-decoration: underline"
-                  class="text-primary"
-                  @click="showCheckGraphModal(props.row)"
-                  >Show Run History</span
-                >
-                &nbsp;&nbsp;&nbsp;
-                <span
-                  v-if="props.row.check_type === 'ping'"
-                  style="cursor: pointer; text-decoration: underline"
-                  class="text-primary"
-                  @click="pingInfo(props.row.readable_desc, props.row.more_info)"
-                  >Last Output</span
-                >
-                <span
-                  v-else-if="props.row.check_type === 'script'"
-                  style="cursor: pointer; text-decoration: underline"
-                  class="text-primary"
-                  @click="showScriptOutput(props.row)"
-                  >Last Output</span
-                >
-                <span
-                  v-else-if="props.row.check_type === 'eventlog'"
-                  style="cursor: pointer; text-decoration: underline"
-                  class="text-primary"
-                  @click="eventLogMoreInfo(props.row)"
-                  >Last Output</span
-                >
-                <span v-else-if="props.row.check_type === 'diskspace' || props.row.check_type === 'winsvc'">{{
-                  props.row.more_info
-                }}</span>
-              </q-td>
-              <q-td>{{ props.row.last_run || "Never" }}</q-td>
-              <q-td v-if="props.row.assigned_task !== null && props.row.assigned_task.length > 1"
-                >{{ props.row.assigned_task.length }} Tasks</q-td
-              >
-              <q-td v-else-if="props.row.assigned_task">{{ props.row.assigned_task.name }}</q-td>
-              <q-td v-else></q-td>
-            </q-tr>
-          </template>
-        </q-table>
-      </template>
-    </div>
-    <!-- modals -->
-    <q-dialog v-model="showDiskSpaceCheck">
-      <DiskSpaceCheck @close="showDiskSpaceCheck = false" :agentpk="selectedAgentPk" :mode="mode" :checkpk="checkpk" />
-    </q-dialog>
-    <q-dialog v-model="showMemCheck">
-      <MemCheck @close="showMemCheck = false" :agentpk="selectedAgentPk" :mode="mode" :checkpk="checkpk" />
-    </q-dialog>
-    <q-dialog v-model="showCpuLoadCheck">
-      <CpuLoadCheck @close="showCpuLoadCheck = false" :agentpk="selectedAgentPk" :mode="mode" :checkpk="checkpk" />
-    </q-dialog>
-    <q-dialog v-model="showPingCheck">
-      <PingCheck @close="showPingCheck = false" :agentpk="selectedAgentPk" :mode="mode" :checkpk="checkpk" />
-    </q-dialog>
-    <q-dialog v-model="showWinSvcCheck">
-      <WinSvcCheck @close="showWinSvcCheck = false" :agentpk="selectedAgentPk" :mode="mode" :checkpk="checkpk" />
-    </q-dialog>
-    <q-dialog v-model="showEventLogCheck">
-      <EventLogCheck @close="showEventLogCheck = false" :agentpk="selectedAgentPk" :mode="mode" :checkpk="checkpk" />
-    </q-dialog>
-    <q-dialog v-model="showScriptCheck">
-      <ScriptCheck @close="showScriptCheck = false" :agentpk="selectedAgentPk" :mode="mode" :checkpk="checkpk" />
-    </q-dialog>
-    <q-dialog v-model="showEventLogOutput">
-      <EventLogCheckOutput
-        @close="
-          showEventLogOutput = false;
-          evtlogdata = {};
-        "
-        :evtlogdata="evtlogdata"
-      />
-    </q-dialog>
-  </div>
-</template>
-
-<script>
-import { mapGetters } from "vuex";
-import mixins from "@/mixins/mixins";
-import DiskSpaceCheck from "@/components/modals/checks/DiskSpaceCheck";
-import MemCheck from "@/components/modals/checks/MemCheck";
-import CpuLoadCheck from "@/components/modals/checks/CpuLoadCheck";
-import PingCheck from "@/components/modals/checks/PingCheck";
-import WinSvcCheck from "@/components/modals/checks/WinSvcCheck";
-import EventLogCheck from "@/components/modals/checks/EventLogCheck";
-import ScriptCheck from "@/components/modals/checks/ScriptCheck";
-import ScriptOutput from "@/components/modals/checks/ScriptOutput";
-import EventLogCheckOutput from "@/components/modals/checks/EventLogCheckOutput";
-import CheckGraph from "@/components/graphs/CheckGraph";
-
-import { truncateText } from "@/utils/format";
-
-export default {
-  name: "ChecksTab",
-  emits: ["edit"],
-  components: {
-    DiskSpaceCheck,
-    MemCheck,
-    CpuLoadCheck,
-    PingCheck,
-    WinSvcCheck,
-    EventLogCheck,
-    ScriptCheck,
-    EventLogCheckOutput,
-  },
-  mixins: [mixins],
-  data() {
-    return {
-      mode: "add",
-      checkpk: null,
-      showDiskSpaceCheck: false,
-      showMemCheck: false,
-      showCpuLoadCheck: false,
-      showPingCheck: false,
-      showWinSvcCheck: false,
-      showEventLogCheck: false,
-      showScriptCheck: false,
-      showEventLogOutput: false,
-      evtlogdata: {},
-      columns: [
-        { name: "smsalert", field: "text_alert", align: "left" },
-        { name: "emailalert", field: "email_alert", align: "left" },
-        { name: "dashboardalert", field: "dashboard_alert", align: "left" },
-        { name: "policystatus", align: "left" },
-        { name: "statusicon", align: "left" },
-        { name: "desc", field: "readable_desc", label: "Description", align: "left", sortable: true },
-        {
-          name: "moreinfo",
-          label: "More Info",
-          field: "more_info",
-          align: "left",
-          sortable: true,
-        },
-        {
-          name: "datetime",
-          label: "Date / Time",
-          field: "last_run",
-          align: "left",
-          sortable: true,
-        },
-        { name: "assignedtasks", label: "Assigned Tasks", field: "assigned_task", align: "left", sortable: true },
-      ],
-      pagination: {
-        rowsPerPage: 9999,
-        sortBy: "status",
-        descending: false,
-      },
-    };
-  },
-  methods: {
-    showCheck(mode, type) {
-      switch (mode) {
-        case "add":
-          this.mode = "add";
-          break;
-        case "edit":
-          this.mode = "edit";
-          break;
-      }
-
-      switch (type) {
-        case "diskspace":
-          this.showDiskSpaceCheck = true;
-          break;
-        case "memory":
-          this.showMemCheck = true;
-          break;
-        case "cpuload":
-          this.showCpuLoadCheck = true;
-          break;
-        case "ping":
-          this.showPingCheck = true;
-          break;
-        case "winsvc":
-          this.showWinSvcCheck = true;
-          break;
-        case "eventlog":
-          this.showEventLogCheck = true;
-          break;
-        case "script":
-          this.showScriptCheck = true;
-          break;
-      }
-    },
-    checkAlert(id, alert_type, action, managed_by_policy) {
-      if (managed_by_policy) {
-        return;
-      }
-
-      const data = {};
-      if (alert_type === "Email") {
-        data.email_alert = !action;
-      } else if (alert_type === "Text") {
-        data.text_alert = !action;
-      } else {
-        data.dashboard_alert = !action;
-      }
-
-      data.check_alert = true;
-      const act = !action ? "enabled" : "disabled";
-      const color = !action ? "positive" : "warning";
-      this.$axios
-        .patch(`/checks/${id}/check/`, data)
-        .then(r => {
-          this.$q.notify({
-            color: color,
-            icon: "fas fa-check-circle",
-            message: `${alert_type} alerts ${act}`,
-          });
-        })
-        .catch(e => {});
-    },
-    resetCheck(check) {
-      const data = {
-        check_reset: true,
-        status: "passing",
-      };
-
-      this.$axios
-        .patch(`/checks/${check}/check/`, data)
-        .then(r => {
-          this.$emit("edit");
-          this.$store.dispatch("loadChecks", this.selectedAgentPk);
-          this.notifySuccess("The check was reset");
-        })
-        .catch(e => {});
-    },
-    onRefresh(id) {
-      this.$emit("edit");
-      this.$store.dispatch("loadChecks", id);
-      this.$store.dispatch("loadAutomatedTasks", id);
-    },
-    pingInfo(desc, output) {
-      this.$q.dialog({
-        title: desc,
-        style: "width: 50vw; max-width: 60vw",
-        message: `<pre>${output}</pre>`,
-        html: true,
-      });
-    },
-    eventLogMoreInfo(props) {
-      this.evtlogdata = props;
-      this.showEventLogOutput = true;
-    },
-    deleteCheck(pk, desc) {
-      this.$q
-        .dialog({
-          title: "Are you sure?",
-          message: `Delete ${desc}`,
-          cancel: true,
-          ok: { label: "Delete", color: "negative" },
-          persistent: true,
-        })
-        .onOk(() => {
-          this.$axios
-            .delete(`/checks/${pk}/check/`)
-            .then(r => {
-              this.$store.dispatch("loadChecks", this.selectedAgentPk);
-              this.$store.dispatch("loadAutomatedTasks", this.selectedAgentPk);
-              this.notifySuccess(r.data);
-            })
-            .catch(e => {});
-        });
-    },
-    showCheckGraphModal(check) {
-      this.$q.dialog({
-        component: CheckGraph,
-        componentProps: {
-          check: check,
-        },
-      });
-    },
-    showScriptOutput(script) {
-      this.$q.dialog({
-        component: ScriptOutput,
-        componentProps: {
-          scriptInfo: script,
-        },
-      });
-    },
-  },
-  computed: {
-    ...mapGetters(["selectedAgentPk", "checks", "tabsTableHeight"]),
-  },
-};
-</script>
-
diff --git a/src/components/EventLog.vue b/src/components/EventLog.vue
deleted file mode 100644
index cb4d2c5..0000000
--- a/src/components/EventLog.vue
+++ /dev/null
@@ -1,134 +0,0 @@
-<template>
-  <div class="q-pa-md">
-    <div class="row">
-      <div class="col-2">
-        <q-select
-          dense
-          options-dense
-          outlined
-          v-model="days"
-          :options="lastDays"
-          :label="showDays"
-          @update:model-value="getEventLog"
-        />
-      </div>
-      <div class="col-7"></div>
-      <div class="col-3">
-        <code>{{ logType }} log total records: {{ totalRecords }}</code>
-      </div>
-    </div>
-    <q-table
-      dense
-      :table-class="{ 'table-bgcolor': !$q.dark.isActive, 'table-bgcolor-dark': $q.dark.isActive }"
-      class="remote-bg-tbl-sticky"
-      :rows="events"
-      :columns="columns"
-      v-model:pagination="pagination"
-      :filter="filter"
-      row-key="uid"
-      binary-state-sort
-      hide-bottom
-      virtual-scroll
-    >
-      <template v-slot:top>
-        <q-btn dense flat push @click="getEventLog" icon="refresh" />
-        <q-space />
-        <q-radio
-          v-model="logType"
-          color="cyan"
-          val="Application"
-          label="Application"
-          @update:model-value="getEventLog"
-        />
-        <q-radio v-model="logType" color="cyan" val="System" label="System" @update:model-value="getEventLog" />
-        <q-radio v-model="logType" color="cyan" val="Security" label="Security" @update:model-value="getEventLog" />
-        <q-space />
-        <q-input v-model="filter" outlined label="Search" dense clearable>
-          <template v-slot:prepend>
-            <q-icon name="search" />
-          </template>
-        </q-input>
-      </template>
-      <template v-slot:body="props">
-        <q-tr :props="props">
-          <q-td>{{ props.row.eventType }}</q-td>
-          <q-td>{{ props.row.source }}</q-td>
-          <q-td>{{ props.row.eventID }}</q-td>
-          <q-td>{{ props.row.time }}</q-td>
-          <q-td @click="showFullMsg(props.row.message)">
-            <span style="cursor: pointer; text-decoration: underline" class="text-primary">{{
-              formatMessage(props.row.message)
-            }}</span>
-          </q-td>
-        </q-tr>
-      </template>
-    </q-table>
-  </div>
-</template>
-
-<script>
-import mixins from "@/mixins/mixins";
-
-export default {
-  name: "EventLog",
-  props: ["pk"],
-  mixins: [mixins],
-  data() {
-    return {
-      events: [],
-      logType: "Application",
-      days: 1,
-      lastDays: [1, 2, 3, 4, 5, 10, 30, 60, 90, 180, 360, 9999],
-      filter: "",
-      pagination: {
-        rowsPerPage: 0,
-        sortBy: "record",
-        descending: true,
-      },
-      columns: [
-        { name: "eventType", label: "Type", field: "eventType", align: "left", sortable: true },
-        { name: "source", label: "Source", field: "source", align: "left", sortable: true },
-        { name: "eventID", label: "Event ID", field: "eventID", align: "left", sortable: true },
-        { name: "time", label: "Time", field: "time", align: "left", sortable: true },
-        { name: "message", label: "Message (click to view full)", field: "message", align: "left", sortable: true },
-      ],
-    };
-  },
-  computed: {
-    totalRecords() {
-      return this.events.length;
-    },
-    showDays() {
-      return `Show last ${this.days} days`;
-    },
-  },
-  methods: {
-    formatMessage(msg) {
-      return msg.substring(0, 60) + "...";
-    },
-    showFullMsg(msg) {
-      this.$q.dialog({
-        message: `<pre>${msg}</pre>`,
-        html: true,
-        fullWidth: true,
-      });
-    },
-    getEventLog() {
-      this.events = [];
-      this.$q.loading.show({ message: `Loading ${this.logType} event log...please wait` });
-      this.$axios
-        .get(`/agents/${this.pk}/geteventlog/${this.logType}/${this.days}/`)
-        .then(r => {
-          this.events = Object.freeze(r.data);
-          this.$q.loading.hide();
-        })
-        .catch(e => {
-          this.$q.loading.hide();
-        });
-    },
-  },
-  mounted() {
-    this.getEventLog();
-  },
-};
-</script>
\ No newline at end of file
diff --git a/src/components/FileBar.vue b/src/components/FileBar.vue
index 8e577fe..bf194c7 100644
--- a/src/components/FileBar.vue
+++ b/src/components/FileBar.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="q-pa-xs q-ma-xs">
+  <div class="q-pb-sm">
     <q-bar>
       <q-btn-group flat>
         <q-btn size="md" dense no-caps flat label="File">
@@ -204,7 +204,7 @@ import BulkAction from "@/components/modals/agents/BulkAction";
 import Deployment from "@/components/Deployment";
 import ServerMaintenance from "@/components/modals/core/ServerMaintenance";
 import CodeSign from "@/components/modals/coresettings/CodeSign";
-import PermissionsManager from "@/components/PermissionsManager";
+import PermissionsManager from "@/components/accounts/PermissionsManager";
 
 export default {
   name: "FileBar",
diff --git a/src/components/NotesTab.vue b/src/components/NotesTab.vue
deleted file mode 100644
index 8cedee4..0000000
--- a/src/components/NotesTab.vue
+++ /dev/null
@@ -1,220 +0,0 @@
-<template>
-  <div v-if="!selectedAgentPk">No agent selected</div>
-  <div v-else class="q-pa-xs">
-    <q-btn size="sm" color="grey-5" icon="fas fa-plus" label="Add Note" text-color="black" @click="addNote" />
-    <q-btn dense flat push @click="refreshNotes" icon="refresh" />
-    <q-btn class="q-ml-xl" size="sm" color="primary" icon-right="archive" label="Export to csv" @click="exportTable" />
-    <template v-if="notes === undefined || notes.length === 0">
-      <p>No Notes</p>
-    </template>
-    <template v-else>
-      <q-table
-        grid
-        class="tabs-tbl-sticky"
-        :style="{ 'max-height': tabsTableHeight }"
-        :rows="notes"
-        :columns="columns"
-        :visible-columns="visibleColumns"
-        v-model:pagination="pagination"
-        row-key="id"
-        :rows-per-page-options="[0]"
-        hide-bottom
-      >
-        <template v-slot:top-right></template>
-        <template v-slot:item="props">
-          <q-card class="notes-card q-pa-none q-ma-xs" bordered>
-            <q-card-section>
-              <div class="row">
-                <div class="col">
-                  <div class="text-subtitle2">{{ props.row.entry_time }}</div>
-                  <div class="text-caption">{{ props.row.username }}</div>
-                </div>
-                <div class="col-auto">
-                  <q-btn color="grey-7" round flat icon="more_vert">
-                    <q-menu cover auto-close>
-                      <q-list>
-                        <q-btn color="primary" push flat icon="edit" label="Edit" @click="editNote(props.row.id)" />
-                        <br />
-                        <q-btn
-                          color="negative"
-                          push
-                          flat
-                          icon="delete"
-                          label="Delete"
-                          @click="deleteNote(props.row.id)"
-                        />
-                      </q-list>
-                    </q-menu>
-                  </q-btn>
-                </div>
-              </div>
-            </q-card-section>
-            <q-card-section style="max-height: 20vh" class="scroll">
-              <pre>{{ props.row.note }}</pre>
-            </q-card-section>
-          </q-card>
-        </template>
-      </q-table>
-    </template>
-  </div>
-</template>
-
-<script>
-import { mapState, mapGetters } from "vuex";
-import mixins from "@/mixins/mixins";
-import { exportFile } from "quasar";
-
-function wrapCsvValue(val, formatFn) {
-  let formatted = formatFn !== void 0 ? formatFn(val) : val;
-
-  formatted = formatted === void 0 || formatted === null ? "" : String(formatted);
-
-  formatted = formatted.split('"').join('""').split("\n").join("\\n").split("\r").join("\\r");
-
-  return `"${formatted}"`;
-}
-
-export default {
-  name: "NotesTab",
-  mixins: [mixins],
-  data() {
-    return {
-      note: {},
-      pagination: {
-        rowsPerPage: 0,
-        sortBy: "id",
-        descending: false,
-      },
-      columns: [
-        { name: "id", label: "ID", field: "id" },
-        {
-          name: "entry_time",
-          label: "Date",
-          field: "entry_time",
-        },
-        {
-          name: "username",
-          label: "User",
-          field: "username",
-        },
-        {
-          name: "note",
-          label: "Note",
-          field: "note",
-        },
-      ],
-      visibleColumns: ["entry_time", "username", "note"],
-    };
-  },
-  methods: {
-    addNote() {
-      this.$q
-        .dialog({
-          title: "Add Note",
-          prompt: {
-            type: "textarea",
-          },
-          style: "width: 30vw; max-width: 50vw;",
-          ok: { label: "Add" },
-        })
-        .onOk(data => {
-          this.$axios
-            .post(`/agents/${this.selectedAgentPk}/notes/`, { note: data })
-            .then(r => {
-              this.refreshNotes();
-              this.notifySuccess(r.data);
-            })
-            .catch(e => {});
-        });
-    },
-    editNote(pk) {
-      this.$axios.get(`/agents/${pk}/note/`).then(r => {
-        this.note = r.data;
-        this.$q
-          .dialog({
-            title: "Edit Note",
-            prompt: {
-              model: this.note.note,
-              type: "textarea",
-            },
-            style: "width: 30vw; max-width: 50vw;",
-            ok: { label: "Save" },
-            cancel: true,
-          })
-          .onOk(data => {
-            this.note.note = data;
-            this.$axios
-              .patch(`/agents/${pk}/note/`, this.note)
-              .then(r => {
-                this.refreshNotes();
-                this.notifySuccess(r.data);
-              })
-              .catch(e => {});
-          })
-          .onDismiss(() => {
-            this.note = {};
-          });
-      });
-    },
-    deleteNote(pk) {
-      this.$q
-        .dialog({
-          title: "Delete note?",
-          cancel: true,
-          ok: { label: "Delete", color: "negative" },
-        })
-        .onOk(() => {
-          this.$axios
-            .delete(`/agents/${pk}/note/`)
-            .then(r => {
-              this.refreshNotes();
-              this.notifySuccess(r.data);
-            })
-            .catch(e => {});
-        });
-    },
-    refreshNotes() {
-      this.$store.dispatch("loadNotes", this.selectedAgentPk);
-    },
-    exportTable() {
-      // naive encoding to csv format
-      const content = [this.columns.map(col => wrapCsvValue(col.label))]
-        .concat(
-          this.notes.map(row =>
-            this.columns
-              .map(col =>
-                wrapCsvValue(
-                  typeof col.field === "function" ? col.field(row) : row[col.field === void 0 ? col.name : col.field],
-                  col.format
-                )
-              )
-              .join(",")
-          )
-        )
-        .join("\r\n");
-
-      const status = exportFile(`${this.agentHostname}-notes.csv`, content, "text/csv");
-
-      if (status !== true) {
-        this.$q.notify({
-          message: "Browser denied file download...",
-          color: "negative",
-          icon: "warning",
-        });
-      }
-    },
-  },
-  computed: {
-    ...mapState({
-      notes: state => state.notes,
-    }),
-    ...mapGetters(["selectedAgentPk", "tabsTableHeight", "agentHostname"]),
-  },
-};
-</script>
-
-<style lang="sass" scoped>
-.notes-card
-  width: 100%
-  max-width: 20vw
-</style>
\ No newline at end of file
diff --git a/src/components/PermissionsManager.vue b/src/components/PermissionsManager.vue
deleted file mode 100644
index a26aed3..0000000
--- a/src/components/PermissionsManager.vue
+++ /dev/null
@@ -1,127 +0,0 @@
-<template>
-  <q-dialog ref="dialog" @hide="onHide">
-    <q-card style="min-width: 30vw">
-      <q-bar>
-        <q-btn @click="getRoles" class="q-mr-sm" dense flat push icon="refresh" />
-        <q-space />Manage Roles
-        <q-space />
-        <q-btn dense flat icon="close" v-close-popup />
-      </q-bar>
-      <div class="row">
-        <div class="q-pa-sm q-ml-sm">
-          <q-btn color="primary" icon="add" label="New Role" @click="showRolesForm = true" />
-        </div>
-      </div>
-      <q-separator />
-      <q-card-section>
-        <q-table
-          dense
-          :table-class="{ 'table-bgcolor': !$q.dark.isActive, 'table-bgcolor-dark': $q.dark.isActive }"
-          class="audit-mgr-tbl-sticky"
-          binary-state-sort
-          virtual-scroll
-          :rows="roles"
-          :columns="columns"
-          :visible-columns="visibleColumns"
-          row-key="id"
-          v-model:pagination="pagination"
-          no-data-label="No Roles"
-        >
-          <template v-slot:body="props">
-            <q-tr>
-              <q-td key="name" :props="props">{{ props.row.name }}</q-td>
-              <q-td class="q-pa-md q-gutter-sm" key="actions" :props="props"
-                ><q-btn size="sm" color="primary" icon="edit" @click="editRole(props.row.id)" />
-                <q-btn size="sm" color="negative" icon="delete" @click="deleteRole(props.row.id, props.row.name)"
-              /></q-td>
-            </q-tr>
-          </template>
-        </q-table>
-      </q-card-section>
-
-      <!-- Roles Form -->
-      <q-dialog v-model="showRolesForm">
-        <RolesForm :pk="editRoleID" @close="closeRoleFormModal" />
-      </q-dialog>
-    </q-card>
-  </q-dialog>
-</template>
-
-<script>
-import mixins from "@/mixins/mixins";
-import RolesForm from "@/components/modals/admin/RolesForm";
-
-export default {
-  name: "PermissionsManager",
-  emits: ["hide", "ok", "cancel"],
-  mixins: [mixins],
-  components: { RolesForm },
-  data() {
-    return {
-      editRoleID: null,
-      showRolesForm: false,
-      roles: [],
-      columns: [
-        { name: "id", field: "id" },
-        { name: "name", label: "Name", field: "name", align: "left", sortable: true },
-        { name: "actions", label: "Actions", align: "left" },
-      ],
-      visibleColumns: ["name", "actions"],
-
-      pagination: {
-        rowsPerPage: 50,
-        sortBy: "name",
-        descending: false,
-      },
-    };
-  },
-  methods: {
-    getRoles() {
-      this.$axios
-        .get("/accounts/roles/")
-        .then(r => {
-          this.roles = r.data;
-        })
-        .catch(() => {});
-    },
-    editRole(id) {
-      this.editRoleID = id;
-      this.showRolesForm = true;
-    },
-    deleteRole(pk, name) {
-      this.$q
-        .dialog({
-          title: `Delete role ${name}?`,
-          cancel: true,
-          ok: { label: "Delete", color: "negative" },
-        })
-        .onOk(() => {
-          this.$axios
-            .delete(`/accounts/${pk}/role/`)
-            .then(() => {
-              this.getRoles();
-              this.notifySuccess(`Role ${name} was deleted!`);
-            })
-            .catch(() => {});
-        });
-    },
-    closeRoleFormModal() {
-      this.editRoleID = null;
-      this.showRolesForm = false;
-      this.getRoles();
-    },
-    show() {
-      this.$refs.dialog.show();
-    },
-    hide() {
-      this.$refs.dialog.hide();
-    },
-    onHide() {
-      this.$emit("hide");
-    },
-  },
-  mounted() {
-    this.getRoles();
-  },
-};
-</script>
\ No newline at end of file
diff --git a/src/components/ProcessManager.vue b/src/components/ProcessManager.vue
deleted file mode 100644
index c0af526..0000000
--- a/src/components/ProcessManager.vue
+++ /dev/null
@@ -1,220 +0,0 @@
-<template>
-  <div class="q-pa-md">
-    <q-table
-      dense
-      :table-class="{ 'table-bgcolor': !$q.dark.isActive, 'table-bgcolor-dark': $q.dark.isActive }"
-      class="remote-bg-tbl-sticky"
-      :rows="procs"
-      :columns="columns"
-      v-model:pagination="pagination"
-      :filter="filter"
-      row-key="id"
-      binary-state-sort
-      hide-bottom
-    >
-      <template v-slot:top>
-        <q-btn v-if="poll" dense flat push @click="stopPoll" icon="stop" label="Stop Live Refresh" />
-        <q-btn v-else dense flat push @click="startPoll" icon="play_arrow" label="Resume Live Refresh" />
-
-        <q-space />
-
-        <div class="q-pa-md q-gutter-sm">
-          <q-btn dense push icon="add" color="primary" @click="intervalChanged('add')" />
-          <q-btn
-            :disable="pollInterval === 1"
-            dense
-            @click="intervalChanged('subtract')"
-            push
-            icon="remove"
-            color="negative"
-          />
-        </div>
-        <div class="text-overline">
-          <q-badge align="middle" class="text-h6" color="blue" :label="pollInterval" />
-          Refresh interval (seconds)
-        </div>
-
-        <q-space />
-        <q-input v-model="filter" outlined label="Search" dense clearable>
-          <template v-slot:prepend>
-            <q-icon name="search" />
-          </template>
-        </q-input>
-      </template>
-      <template v-slot:body="props">
-        <q-tr :props="props">
-          <q-menu context-menu>
-            <q-list dense style="min-width: 200px">
-              <q-item clickable v-close-popup @click="killProc(props.row.pid, props.row.name)">
-                <q-item-section thumbnail>
-                  <q-icon name="fas fa-trash-alt" size="xs" />
-                </q-item-section>
-                <q-item-section>End task</q-item-section>
-              </q-item>
-            </q-list>
-          </q-menu>
-          <q-td>{{ props.row.name }}</q-td>
-          <q-td>{{ props.row.cpu_percent }}%</q-td>
-          <q-td>{{ bytes2Human(props.row.membytes) }}</q-td>
-          <q-td>{{ props.row.username }}</q-td>
-          <q-td>{{ props.row.pid }}</q-td>
-          <q-td>{{ props.row.status }}</q-td>
-        </q-tr>
-      </template>
-    </q-table>
-  </div>
-</template>
-
-<script>
-import mixins from "@/mixins/mixins";
-
-export default {
-  name: "ProcessManager",
-  props: ["pk"],
-  mixins: [mixins],
-  data() {
-    return {
-      polling: null,
-      pollInterval: 2,
-      mem: null,
-      poll: true,
-      procs: [],
-      filter: "",
-      pagination: {
-        rowsPerPage: 99999,
-        sortBy: "cpu_percent",
-        descending: true,
-      },
-      columns: [
-        {
-          name: "name",
-          label: "Name",
-          field: "name",
-          align: "left",
-          sortable: true,
-        },
-        {
-          name: "cpu_percent",
-          label: "CPU",
-          field: "cpu_percent",
-          align: "left",
-          sortable: true,
-          sort: (a, b, rowA, rowB) => parseInt(b) < parseInt(a),
-        },
-        {
-          name: "membytes",
-          label: "Memory",
-          field: "membytes",
-          align: "left",
-          sortable: true,
-        },
-        {
-          name: "username",
-          label: "User",
-          field: "username",
-          align: "left",
-          sortable: true,
-        },
-        {
-          name: "pid",
-          label: "PID",
-          field: "pid",
-          align: "left",
-          sortable: true,
-        },
-        {
-          name: "status",
-          label: "Status",
-          field: "status",
-          align: "left",
-          sortable: true,
-        },
-      ],
-    };
-  },
-  methods: {
-    getProcesses() {
-      this.procs = [];
-      this.$q.loading.show({ message: "Loading Processes..." });
-      this.$axios
-        .get(`/agents/${this.pk}/getprocs/`)
-        .then(r => {
-          this.procs = r.data;
-          this.$q.loading.hide();
-        })
-        .catch(e => {
-          this.$q.loading.hide();
-        });
-    },
-    refreshProcs() {
-      this.polling = setInterval(() => {
-        this.$axios.get(`/agents/${this.pk}/getprocs/`).then(r => (this.procs = r.data));
-      }, this.pollInterval * 1000);
-    },
-    killProc(pid, name) {
-      this.$q.loading.show({ message: `Attempting to kill process ${name}` });
-      this.$axios
-        .get(`/agents/${this.pk}/${pid}/killproc/`)
-        .then(r => {
-          this.$q.loading.hide();
-          this.notifySuccess(`${name} was terminated!`);
-        })
-        .catch(e => {
-          this.$q.loading.hide();
-        });
-    },
-    stopPoll() {
-      this.poll = false;
-      clearInterval(this.polling);
-    },
-    intervalChanged(action) {
-      if (action === "subtract" && this.pollInterval <= 1) {
-        this.stopPoll();
-        this.startPoll();
-        return;
-      }
-      if (action === "add") {
-        this.pollInterval++;
-      } else {
-        this.pollInterval--;
-      }
-      this.stopPoll();
-      this.startPoll();
-    },
-    startPoll() {
-      this.poll = true;
-      this.$axios.get(`/agents/${this.pk}/getprocs/`).then(r => (this.procs = r.data));
-      this.refreshProcs();
-    },
-    getAgent() {
-      this.$axios
-        .get(`/agents/${this.pk}/agentdetail/`)
-        .then(r => (this.mem = r.data.total_ram))
-        .catch(e => {});
-    },
-    convert(percent) {
-      const mb = this.mem * 1024;
-      return Math.ceil((percent * mb) / 100).toLocaleString();
-    },
-    bytes2Human(bytes) {
-      if (bytes == 0) return "0B";
-      const k = 1024;
-      const sizes = ["B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"];
-      const i = Math.floor(Math.log(bytes) / Math.log(k));
-      return parseFloat((bytes / Math.pow(k, i)).toFixed(2)) + " " + sizes[i];
-    },
-  },
-  beforeUnmount() {
-    clearInterval(this.polling);
-  },
-  mounted() {
-    this.getAgent();
-    // disable loading bar
-    this.$q.loadingBar.setDefaults({ size: "0px" });
-
-    this.getProcesses();
-
-    this.refreshProcs();
-  },
-};
-</script>
\ No newline at end of file
diff --git a/src/components/Services.vue b/src/components/Services.vue
deleted file mode 100644
index 6423f82..0000000
--- a/src/components/Services.vue
+++ /dev/null
@@ -1,329 +0,0 @@
-<template>
-  <div class="q-pa-md">
-    <q-table
-      dense
-      :table-class="{ 'table-bgcolor': !$q.dark.isActive, 'table-bgcolor-dark': $q.dark.isActive }"
-      class="remote-bg-tbl-sticky"
-      :rows="servicesData"
-      :columns="columns"
-      v-model:pagination="pagination"
-      :filter="filter"
-      row-key="display_name"
-      binary-state-sort
-      hide-bottom
-    >
-      <template v-slot:top>
-        <q-btn dense flat push @click="getServices" icon="refresh" />
-        <q-space />
-        <q-input v-model="filter" outlined label="Search" dense clearable>
-          <template v-slot:prepend>
-            <q-icon name="search" />
-          </template>
-        </q-input>
-      </template>
-      <template v-slot:body="props">
-        <q-tr :props="props">
-          <q-menu context-menu>
-            <q-list dense style="min-width: 200px">
-              <q-item clickable v-close-popup @click="serviceAction(props.row.name, 'start', props.row.display_name)">
-                <q-item-section>Start</q-item-section>
-              </q-item>
-              <q-item clickable v-close-popup @click="serviceAction(props.row.name, 'stop', props.row.display_name)">
-                <q-item-section>Stop</q-item-section>
-              </q-item>
-              <q-item clickable v-close-popup @click="serviceAction(props.row.name, 'restart', props.row.display_name)">
-                <q-item-section>Restart</q-item-section>
-              </q-item>
-              <q-separator />
-              <q-item clickable v-close-popup @click="editService(props.row.name)">
-                <q-item-section>Service Details</q-item-section>
-              </q-item>
-            </q-list>
-          </q-menu>
-          <q-td key="display_name" :props="props">
-            <q-icon name="fas fa-cogs" />
-            &nbsp;&nbsp;&nbsp;{{ props.row.display_name }}
-          </q-td>
-          <q-td key="start_type" :props="props">{{ props.row.start_type }}</q-td>
-          <q-td key="pid" :props="props">{{ props.row.pid }}</q-td>
-          <q-td key="status" :props="props">{{ props.row.status }}</q-td>
-          <q-td key="username" :props="props">{{ props.row.username }}</q-td>
-        </q-tr>
-      </template>
-    </q-table>
-
-    <q-dialog v-model="serviceDetailsModal">
-      <q-card style="width: 600px; max-width: 80vw">
-        <q-card-section>
-          <div class="text-h6">Service Details - {{ serviceData.display_name }}</div>
-        </q-card-section>
-
-        <q-card-section>
-          <div class="row">
-            <div class="col-3">Service name:</div>
-            <div class="col-9">{{ serviceData.svc_name }}</div>
-          </div>
-          <br />
-          <div class="row">
-            <div class="col-3">Display name:</div>
-            <div class="col-9">{{ serviceData.display_name }}</div>
-          </div>
-          <br />
-          <div class="row">
-            <div class="col-3">Description:</div>
-            <div class="col-9">
-              <q-field outlined :color="$q.dark.isActive ? 'white' : 'black'">{{ serviceData.description }}</q-field>
-            </div>
-          </div>
-          <br />
-          <div class="row">
-            <div class="col-3">Path:</div>
-            <div class="col-9">
-              <code>{{ serviceData.binpath }}</code>
-            </div>
-          </div>
-          <br />
-          <br />
-          <div class="row">
-            <div class="col-3">Startup type:</div>
-            <div class="col-5">
-              <q-select
-                @update:model-value="startupTypeChanged"
-                dense
-                options-dense
-                outlined
-                v-model="startupType"
-                :options="startupOptions"
-              />
-            </div>
-          </div>
-        </q-card-section>
-        <hr />
-        <q-card-section>
-          <div class="row">
-            <div class="col-3">Service status:</div>
-            <div class="col-9">{{ serviceData.status }}</div>
-          </div>
-          <br />
-          <div class="row">
-            <q-btn-group push>
-              <q-btn
-                color="gray"
-                glossy
-                :text-color="$q.dark.isActive ? 'white' : 'black'"
-                push
-                label="Start"
-                @click="serviceAction(serviceData.svc_name, 'start', serviceData.display_name)"
-              />
-              <q-btn
-                color="gray"
-                glossy
-                :text-color="$q.dark.isActive ? 'white' : 'black'"
-                push
-                label="Stop"
-                @click="serviceAction(serviceData.svc_name, 'stop', serviceData.display_name)"
-              />
-              <q-btn
-                color="gray"
-                glossy
-                :text-color="$q.dark.isActive ? 'white' : 'black'"
-                push
-                label="Restart"
-                @click="serviceAction(serviceData.svc_name, 'restart', serviceData.display_name)"
-              />
-            </q-btn-group>
-          </div>
-        </q-card-section>
-        <hr />
-        <q-card-actions align="left" :class="$q.dark.isActive ? 'text-teal' : 'bg-white text-teal'">
-          <q-btn
-            :disable="saveServiceDetailButton"
-            dense
-            label="Save"
-            color="positive"
-            @click="changeStartupType(startupType, serviceData.svc_name)"
-          />
-          <q-btn dense label="Cancel" color="grey" v-close-popup />
-        </q-card-actions>
-        <q-inner-loading :showing="serviceDetailVisible" />
-      </q-card>
-    </q-dialog>
-  </div>
-</template>
-
-<script>
-import mixins from "@/mixins/mixins";
-
-export default {
-  name: "Services",
-  props: ["pk"],
-  mixins: [mixins],
-  data() {
-    return {
-      servicesData: [],
-      serviceDetailsModal: false,
-      serviceDetailVisible: false,
-      saveServiceDetailButton: true,
-      serviceData: {},
-      startupType: "",
-      startupOptions: ["Automatic (Delayed Start)", "Automatic", "Manual", "Disabled"],
-      filter: "",
-      pagination: {
-        rowsPerPage: 9999,
-        sortBy: "display_name",
-        descending: false,
-      },
-      columns: [
-        {
-          name: "display_name",
-          label: "Name",
-          field: "display_name",
-          align: "left",
-          sortable: true,
-        },
-        {
-          name: "start_type",
-          label: "Startup",
-          field: "start_type",
-          align: "left",
-          sortable: true,
-        },
-        {
-          name: "pid",
-          label: "PID",
-          field: "pid",
-          align: "left",
-          sortable: true,
-        },
-        {
-          name: "status",
-          label: "Status",
-          field: "status",
-          align: "left",
-          sortable: true,
-        },
-        {
-          name: "username",
-          label: "Log On As",
-          field: "username",
-          align: "left",
-          sortable: true,
-        },
-      ],
-    };
-  },
-  methods: {
-    changeStartupType(startuptype, name) {
-      let changed;
-      switch (startuptype) {
-        case "Automatic (Delayed Start)":
-          changed = "autodelay";
-          break;
-        case "Automatic":
-          changed = "auto";
-          break;
-        case "Manual":
-          changed = "manual";
-          break;
-        case "Disabled":
-          changed = "disabled";
-          break;
-        default:
-          changed = "nothing";
-      }
-      const data = {
-        pk: this.pk,
-        sv_name: name,
-        edit_action: changed,
-      };
-      this.serviceDetailVisible = true;
-      this.$axios
-        .post("/services/editservice/", data)
-        .then(r => {
-          this.serviceDetailVisible = false;
-          this.serviceDetailsModal = false;
-          this.getServices();
-          this.notifySuccess(`Service ${name} was edited!`);
-        })
-        .catch(e => {
-          this.serviceDetailVisible = false;
-        });
-    },
-    startupTypeChanged() {
-      this.saveServiceDetailButton = false;
-    },
-    editService(name) {
-      this.saveServiceDetailButton = true;
-      this.serviceDetailsModal = true;
-      this.serviceDetailVisible = true;
-      this.$axios
-        .get(`/services/${this.pk}/${name}/servicedetail/`)
-        .then(r => {
-          this.serviceData = r.data;
-          this.serviceData.svc_name = name;
-          this.startupType = this.serviceData.start_type;
-          if (this.serviceData.start_type === "Automatic" && this.serviceData.autodelay === true) {
-            this.startupType = "Automatic (Delayed Start)";
-          } else if (this.serviceData.start_type === "Automatic" && this.serviceData.autodelay === false) {
-            this.startupType = "Automatic";
-          }
-          this.serviceDetailVisible = false;
-        })
-        .catch(e => {
-          this.serviceDetailVisible = false;
-          this.serviceDetailsModal = false;
-        });
-    },
-    serviceAction(name, action, fullname) {
-      let msg, status;
-      switch (action) {
-        case "start":
-          msg = "Starting";
-          status = "started";
-          break;
-        case "stop":
-          msg = "Stopping";
-          status = "stopped";
-          break;
-        case "restart":
-          msg = "Restarting";
-          status = "restarted";
-          break;
-        default:
-          msg = "error";
-      }
-      this.$q.loading.show({ message: `${msg} service ${fullname}` });
-      const data = {
-        pk: this.pk,
-        sv_name: name,
-        sv_action: action,
-      };
-      this.$axios
-        .post("/services/serviceaction/", data)
-        .then(r => {
-          this.getServices();
-          this.serviceDetailsModal = false;
-          this.notifySuccess(`Service ${fullname} was ${status}!`);
-        })
-        .catch(e => {
-          this.$q.loading.hide();
-        });
-    },
-    getServices() {
-      this.$q.loading.show({ message: "Loading services..." });
-      this.$axios
-        .get(`/services/${this.pk}/services/`)
-        .then(r => {
-          this.servicesData = [r.data][0].services;
-          this.$q.loading.hide();
-        })
-        .catch(e => {
-          this.$q.loading.hide();
-        });
-    },
-  },
-  mounted() {
-    this.getServices();
-  },
-};
-</script>
\ No newline at end of file
diff --git a/src/components/SoftwareTab.vue b/src/components/SoftwareTab.vue
deleted file mode 100644
index 2df0fac..0000000
--- a/src/components/SoftwareTab.vue
+++ /dev/null
@@ -1,133 +0,0 @@
-<template>
-  <div v-if="!this.selectedAgentPk">No agent selected</div>
-  <div v-else>
-    <div class="row q-pt-xs items-start">
-      <q-btn
-        size="xs"
-        color="grey-5"
-        icon="fas fa-plus"
-        label="Install Software"
-        text-color="black"
-        @click="showInstallSoftware = true"
-      />
-      <q-btn dense flat push @click="refreshSoftware" icon="refresh" />
-      <q-space />
-      <q-input v-model="filter" outlined label="Search" dense clearable>
-        <template v-slot:prepend>
-          <q-icon name="search" color="primary" />
-        </template>
-      </q-input>
-    </div>
-
-    <q-table
-      :table-class="{ 'table-bgcolor': !$q.dark.isActive, 'table-bgcolor-dark': $q.dark.isActive }"
-      class="tabs-tbl-sticky"
-      :style="{ 'max-height': tabsTableHeight }"
-      dense
-      :rows="software"
-      :columns="columns"
-      :filter="filter"
-      v-model:pagination="pagination"
-      binary-state-sort
-      hide-bottom
-      row-key="id"
-      :loading="loading"
-    >
-      <template v-slot:loading>
-        <q-inner-loading showing color="primary" />
-      </template>
-    </q-table>
-
-    <q-dialog v-model="showInstallSoftware">
-      <InstallSoftware @close="showInstallSoftware = false" :agentpk="selectedAgentPk" />
-    </q-dialog>
-  </div>
-</template>
-
-<script>
-import mixins from "@/mixins/mixins";
-import { mapGetters } from "vuex";
-import { mapState } from "vuex";
-import InstallSoftware from "@/components/modals/software/InstallSoftware";
-export default {
-  name: "SoftwareTab",
-  components: {
-    InstallSoftware,
-  },
-  mixins: [mixins],
-  data() {
-    return {
-      showInstallSoftware: false,
-      loading: false,
-      filter: "",
-      pagination: {
-        rowsPerPage: 0,
-        sortBy: "name",
-        descending: false,
-      },
-      columns: [
-        {
-          name: "name",
-          align: "left",
-          label: "Name",
-          field: "name",
-          sortable: true,
-        },
-        {
-          name: "publisher",
-          align: "left",
-          label: "Publisher",
-          field: "publisher",
-          sortable: true,
-        },
-        {
-          name: "install_date",
-          align: "left",
-          label: "Installed On",
-          field: "install_date",
-          sortable: false,
-          format: (val, row) => {
-            return val === "01/01/1" || val === "01-1-01" ? "" : val;
-          },
-        },
-        {
-          name: "size",
-          align: "left",
-          label: "Size",
-          field: "size",
-          sortable: false,
-        },
-        {
-          name: "version",
-          align: "left",
-          label: "Version",
-          field: "version",
-          sortable: false,
-        },
-      ],
-    };
-  },
-  methods: {
-    refreshSoftware() {
-      const pk = this.selectedAgentPk;
-      this.loading = true;
-      this.$axios
-        .get(`/software/refresh/${pk}/`)
-        .then(r => {
-          this.$store.dispatch("loadInstalledSoftware", pk);
-          this.loading = false;
-        })
-        .catch(e => {
-          this.loading = false;
-        });
-    },
-  },
-  computed: {
-    ...mapGetters(["selectedAgentPk", "tabsTableHeight"]),
-    ...mapState({
-      software: state => state.installedSoftware,
-    }),
-  },
-};
-</script>
-
diff --git a/src/components/SubTableTabs.vue b/src/components/SubTableTabs.vue
index 7fcf7e5..a28be3a 100644
--- a/src/components/SubTableTabs.vue
+++ b/src/components/SubTableTabs.vue
@@ -1,83 +1,90 @@
 <template>
-  <div class="q-pa-none">
-    <q-tabs
-      v-model="subtab"
-      dense
-      inline-label
-      class="text-grey"
-      active-color="primary"
-      indicator-color="primary"
-      align="left"
-      narrow-indicator
-      no-caps
-    >
-      <q-tab name="summary" icon="fas fa-info-circle" size="xs" label="Summary" />
-      <q-tab name="checks" icon="fas fa-check-double" label="Checks" />
-      <q-tab name="tasks" icon="fas fa-tasks" label="Tasks" />
-      <q-tab name="patches" icon="system_update" label="Patches" />
-      <q-tab name="software" icon="fab fa-windows" label="Software" />
-      <q-tab name="history" icon="history" label="History" />
-      <q-tab name="notes" icon="far fa-sticky-note" label="Notes" />
-      <q-tab name="assets" icon="fas fa-barcode" label="Assets" />
-      <q-tab name="debug" icon="bug_report" label="Debug" />
-      <q-tab name="audit" icon="travel_explore" label="Audit" />
-    </q-tabs>
-    <q-separator />
-    <q-tab-panels v-model="subtab" :animated="false">
-      <q-tab-panel name="summary" class="q-pb-none q-pt-xs">
-        <SummaryTab />
-      </q-tab-panel>
-      <q-tab-panel name="checks" class="q-pb-xs q-pt-none">
-        <ChecksTab @edit="$emit('edit')" />
-      </q-tab-panel>
-      <q-tab-panel name="tasks" class="q-pb-xs q-pt-none">
-        <AutomatedTasksTab />
-      </q-tab-panel>
-      <q-tab-panel name="patches" class="q-pb-xs q-pt-none">
-        <WindowsUpdates />
-      </q-tab-panel>
-      <q-tab-panel name="software" class="q-pb-xs q-pt-none">
-        <SoftwareTab />
-      </q-tab-panel>
-      <q-tab-panel name="history" class="q-pa-none">
-        <HistoryTab />
-      </q-tab-panel>
-      <q-tab-panel name="notes" class="q-pb-xs q-pt-none">
-        <NotesTab />
-      </q-tab-panel>
-      <q-tab-panel name="assets" class="q-pb-xs q-pt-none">
-        <AssetsTab />
-      </q-tab-panel>
-      <q-tab-panel name="debug" class="q-pa-none">
-        <DebugTab />
-      </q-tab-panel>
-      <q-tab-panel name="audit" class="q-pa-none">
-        <AuditTab />
-      </q-tab-panel>
-    </q-tab-panels>
-  </div>
+  <q-layout container view="hHh lpr lfr">
+    <q-header :class="{ 'bg-dark': $q.dark.isActive, 'bg-light': !$q.dark.isActive }">
+      <q-tabs
+        v-model="subtab"
+        dense
+        inline-label
+        class="text-grey"
+        active-color="primary"
+        indicator-color="primary"
+        align="left"
+        narrow-indicator
+        no-caps
+      >
+        <q-tab content-class="min-width" name="summary" icon="fas fa-info-circle" size="xs" label="Summary" />
+        <q-tab content-class="min-width" name="checks" icon="fas fa-check-double" label="Checks" />
+        <q-tab content-class="min-width" name="tasks" icon="fas fa-tasks" label="Tasks" />
+        <q-tab content-class="min-width" name="patches" icon="system_update" label="Patches" />
+        <q-tab content-class="min-width" name="software" icon="fab fa-windows" label="Software" />
+        <q-tab content-class="min-width" name="history" icon="history" label="History" />
+        <q-tab content-class="min-width" name="notes" icon="far fa-sticky-note" label="Notes" />
+        <q-tab content-class="min-width" name="assets" icon="fas fa-barcode" label="Assets" />
+        <q-tab content-class="min-width" name="debug" icon="bug_report" label="Debug" />
+        <q-tab content-class="min-width" name="audit" icon="travel_explore" label="Audit" />
+      </q-tabs>
+      <q-separator />
+    </q-header>
+    <q-page-container>
+      <q-tab-panels v-model="subtab" :animated="false">
+        <q-tab-panel name="summary" class="q-pa-none">
+          <SummaryTab />
+        </q-tab-panel>
+        <q-tab-panel name="checks" class="q-pa-none">
+          <ChecksTab />
+        </q-tab-panel>
+        <q-tab-panel name="tasks" class="q-pa-none">
+          <AutomatedTasksTab />
+        </q-tab-panel>
+        <q-tab-panel name="patches" class="q-pa-none">
+          <WinUpdateTab />
+        </q-tab-panel>
+        <q-tab-panel name="software" class="q-pa-none">
+          <SoftwareTab />
+        </q-tab-panel>
+        <q-tab-panel name="history" class="q-pa-none">
+          <HistoryTab />
+        </q-tab-panel>
+        <q-tab-panel name="notes" class="q-pa-none">
+          <NotesTab />
+        </q-tab-panel>
+        <q-tab-panel name="assets" class="q-pa-none">
+          <AssetsTab />
+        </q-tab-panel>
+        <q-tab-panel name="debug" class="q-pa-none">
+          <DebugTab />
+        </q-tab-panel>
+        <q-tab-panel name="audit" class="q-pa-none">
+          <AuditTab />
+        </q-tab-panel>
+      </q-tab-panels>
+    </q-page-container>
+  </q-layout>
 </template>
 
 <script>
-import SummaryTab from "@/components/SummaryTab";
-import ChecksTab from "@/components/ChecksTab";
-import AutomatedTasksTab from "@/components/AutomatedTasksTab";
-import WindowsUpdates from "@/components/WindowsUpdates";
-import SoftwareTab from "@/components/SoftwareTab";
+// composition imports
+import { ref } from "vue";
+
+// ui imports
+import SummaryTab from "@/components/agents/SummaryTab";
+import ChecksTab from "@/components/agents/ChecksTab";
+import AutomatedTasksTab from "@/components/agents/AutomatedTasksTab";
+import WinUpdateTab from "@/components/agents/WinUpdateTab";
+import SoftwareTab from "@/components/agents/SoftwareTab";
 import HistoryTab from "@/components/agents/HistoryTab";
 import AuditTab from "@/components/agents/AuditTab";
 import DebugTab from "@/components/agents/DebugTab";
-import AssetsTab from "@/components/AssetsTab";
-import NotesTab from "@/components/NotesTab";
+import AssetsTab from "@/components/agents/AssetsTab";
+import NotesTab from "@/components/agents/NotesTab";
 
 export default {
   name: "SubTableTabs",
-  emits: ["edit"],
   components: {
     SummaryTab,
     ChecksTab,
     AutomatedTasksTab,
-    WindowsUpdates,
+    WinUpdateTab,
     SoftwareTab,
     HistoryTab,
     AuditTab,
@@ -85,11 +92,10 @@ export default {
     AssetsTab,
     NotesTab,
   },
-  data() {
+  setup(props) {
     return {
-      subtab: "summary",
+      subtab: ref("summary"),
     };
   },
 };
-</script>
-
+</script>
\ No newline at end of file
diff --git a/src/components/WindowsUpdates.vue b/src/components/WindowsUpdates.vue
deleted file mode 100644
index 9f53d3b..0000000
--- a/src/components/WindowsUpdates.vue
+++ /dev/null
@@ -1,205 +0,0 @@
-<template>
-  <div v-if="!selectedAgentPk">No agent selected</div>
-  <div v-else-if="Object.keys(sortedUpdates).length === 0">No Patches</div>
-  <div v-else class="q-pa-xs">
-    <q-btn dense flat push @click="refreshUpdates(updates.pk)" icon="refresh" class="q-mr-sm" />
-    <span v-if="summary.patches_last_installed" class="text-bold">
-      Patches last installed: {{ summary.patches_last_installed }}
-    </span>
-    <span v-else class="text-bold">Patches last installed: Never</span>
-    <q-table
-      dense
-      :table-class="{ 'table-bgcolor': !$q.dark.isActive, 'table-bgcolor-dark': $q.dark.isActive }"
-      class="tabs-tbl-sticky"
-      :style="{ 'max-height': tabsTableHeight }"
-      :rows="sortedUpdates"
-      :columns="columns"
-      :visible-columns="visibleColumns"
-      v-model:pagination="pagination"
-      :filter="filter"
-      row-key="id"
-      binary-state-sort
-      hide-bottom
-      virtual-scroll
-      :rows-per-page-options="[0]"
-    >
-      <template v-slot:body="props">
-        <q-tr :props="props">
-          <q-menu context-menu>
-            <q-list dense style="min-width: 100px">
-              <q-item v-if="!props.row.installed" clickable v-close-popup @click="editPolicy(props.row.id, 'inherit')">
-                <q-item-section>Inherit</q-item-section>
-              </q-item>
-              <q-item v-if="!props.row.installed" clickable v-close-popup @click="editPolicy(props.row.id, 'approve')">
-                <q-item-section>Approve</q-item-section>
-              </q-item>
-              <q-item v-if="!props.row.installed" clickable v-close-popup @click="editPolicy(props.row.id, 'ignore')">
-                <q-item-section>Ignore</q-item-section>
-              </q-item>
-              <q-item v-if="!props.row.installed" clickable v-close-popup @click="editPolicy(props.row.id, 'nothing')">
-                <q-item-section>Do Nothing</q-item-section>
-              </q-item>
-            </q-list>
-          </q-menu>
-          <!-- policy -->
-          <q-td>
-            <q-icon v-if="props.row.action === 'nothing'" name="fiber_manual_record" color="grey">
-              <q-tooltip>Do Nothing</q-tooltip>
-            </q-icon>
-            <q-icon v-else-if="props.row.action === 'approve'" name="fas fa-check" color="primary">
-              <q-tooltip>Approve</q-tooltip>
-            </q-icon>
-            <q-icon v-else-if="props.row.action === 'ignore'" name="fas fa-check" color="negative">
-              <q-tooltip>Ignore</q-tooltip>
-            </q-icon>
-            <q-icon v-else-if="props.row.action === 'inherit'" name="fiber_manual_record" color="accent">
-              <q-tooltip>Inherit</q-tooltip>
-            </q-icon>
-          </q-td>
-          <q-td>
-            <q-icon v-if="props.row.installed" name="fas fa-check" color="positive">
-              <q-tooltip>Installed</q-tooltip>
-            </q-icon>
-            <q-icon v-else-if="props.row.action == 'approve'" name="fas fa-tasks" color="primary">
-              <q-tooltip>Pending</q-tooltip>
-            </q-icon>
-            <q-icon v-else-if="props.row.action == 'ignore'" name="fas fa-ban" color="negative">
-              <q-tooltip>Ignored</q-tooltip>
-            </q-icon>
-            <q-icon v-else name="fas fa-exclamation" color="warning">
-              <q-tooltip>Missing</q-tooltip>
-            </q-icon>
-          </q-td>
-          <q-td>{{ formatSeverity(props.row.severity) }}</q-td>
-          <q-td>{{ formatMessage(props.row.title) }}</q-td>
-          <q-td
-            @click="showFullMsg(props.row.title, props.row.description, props.row.more_info_urls, props.row.categories)"
-          >
-            <span style="cursor: pointer; text-decoration: underline" class="text-primary">{{
-              formatMessage(props.row.description)
-            }}</span>
-          </q-td>
-          <q-td>{{ formatDjangoDate(props.row.date_installed) }}</q-td>
-        </q-tr>
-      </template>
-    </q-table>
-  </div>
-</template>
-
-<script>
-import { mapGetters, mapState } from "vuex";
-import mixins from "@/mixins/mixins";
-
-export default {
-  name: "WindowsUpdates",
-  mixins: [mixins],
-  data() {
-    return {
-      filter: "",
-      pagination: {
-        rowsPerPage: 0,
-        sortBy: "installed",
-        descending: false,
-      },
-      columns: [
-        { name: "id", label: "ID", field: "id" },
-        {
-          name: "action",
-          field: "action",
-          align: "left",
-        },
-        {
-          name: "installed",
-          field: "installed",
-          align: "left",
-        },
-        {
-          name: "severity",
-          label: "Severity",
-          field: "severity",
-          align: "left",
-          sortable: true,
-        },
-        {
-          name: "title",
-          label: "Name",
-          field: "title",
-          align: "left",
-          sortable: true,
-        },
-        {
-          name: "description",
-          label: "More Info",
-          field: "description",
-          align: "left",
-          sortable: true,
-        },
-        {
-          name: "date_installed",
-          label: "Installed On",
-          field: "date_installed",
-          align: "left",
-          sortable: true,
-          sort: (a, b) => this.dateStringToUnix(a) - this.dateStringToUnix(b),
-        },
-        {
-          name: "more_info_urls",
-          field: "more_info_urls",
-        },
-        {
-          name: "categories",
-          field: "categories",
-        },
-      ],
-      visibleColumns: ["action", "installed", "severity", "title", "description", "date_installed"],
-    };
-  },
-  methods: {
-    formatSeverity(severity) {
-      return !severity ? "Other" : severity;
-    },
-    editPolicy(pk, policy) {
-      const data = { pk: pk, policy: policy };
-      this.$axios
-        .patch(`/winupdate/editpolicy/`, data)
-        .then(r => {
-          this.refreshUpdates(this.updates.pk);
-          this.notifySuccess("Policy edited!");
-        })
-        .catch(e => {});
-    },
-    refreshUpdates(pk) {
-      this.$store.dispatch("loadWinUpdates", pk);
-    },
-    formatMessage(msg) {
-      return msg.substring(0, 80) + "...";
-    },
-    showFullMsg(title, msg, urls, categories) {
-      let support_urls = "";
-      urls.forEach(u => {
-        support_urls += `<a href='${u}' target='_blank'>${u}</a><br/>`;
-      });
-      let cats = categories.join(", ");
-      this.$q.dialog({
-        title: title,
-        message:
-          `<b>Categories:</b> ${cats}<br/><br/>` +
-          "<b>Description</b><br/>" +
-          msg.split(". ").join(".<br />") +
-          `<br/><br/><b>Support Urls</b><br/>${support_urls}`,
-        html: true,
-        fullWidth: true,
-      });
-    },
-  },
-  computed: {
-    summary() {
-      return this.$store.state.agentSummary;
-    },
-    ...mapState({
-      updates: state => Object.freeze(state.winUpdates),
-    }),
-    ...mapGetters(["sortedUpdates", "selectedAgentPk", "tabsTableHeight"]),
-  },
-};
-</script>
\ No newline at end of file
diff --git a/src/components/WmiDetail.vue b/src/components/WmiDetail.vue
deleted file mode 100644
index a14e45f..0000000
--- a/src/components/WmiDetail.vue
+++ /dev/null
@@ -1,32 +0,0 @@
-<template>
-  <div class="scroll" :style="{ 'max-height': tabsTableHeight }">
-    <div v-for="i in info" :key="i + randomID()">
-      <div v-for="j in i" :key="j + randomID()">
-        <div v-for="(v, k) in j" :key="v + randomID()">
-          <span class="text-overline">{{ k }}:</span>
-          <q-badge color="primary" class="q-ml-sm text-caption">{{ v }}</q-badge>
-        </div>
-      </div>
-      <hr v-if="info.length > 1" />
-    </div>
-  </div>
-</template>
-
-<script>
-import { mapGetters } from "vuex";
-import { uid } from "quasar";
-
-export default {
-  name: "WmiDetail",
-  props: ["info"],
-  methods: {
-    randomID() {
-      return uid();
-    },
-  },
-  computed: {
-    ...mapGetters(["tabsTableHeight"]),
-  },
-};
-</script>
-
diff --git a/src/components/accounts/PermissionsManager.vue b/src/components/accounts/PermissionsManager.vue
new file mode 100644
index 0000000..6161f07
--- /dev/null
+++ b/src/components/accounts/PermissionsManager.vue
@@ -0,0 +1,160 @@
+<template>
+  <q-dialog ref="dialogRef" @hide="onDialogHide">
+    <q-card style="min-width: 60vw">
+      <q-bar>
+        <q-btn @click="getRoles" class="q-mr-sm" dense flat push icon="refresh" />
+        <q-space />Manage Roles
+        <q-space />
+        <q-btn dense flat icon="close" v-close-popup />
+      </q-bar>
+      <q-card-section>
+        <q-table
+          dense
+          :table-class="{ 'table-bgcolor': !$q.dark.isActive, 'table-bgcolor-dark': $q.dark.isActive }"
+          class="tabs-tbl-sticky"
+          binary-state-sort
+          virtual-scroll
+          :rows="roles"
+          :columns="columns"
+          row-key="id"
+          v-model:pagination="pagination"
+          no-data-label="No Roles"
+          hide-bottom
+        >
+          <template v-slot:top-left="props">
+            <q-btn color="primary" icon="add" label="New Role" @click="showAddRoleModal" />
+          </template>
+          <template v-slot:body="props">
+            <q-tr>
+              <q-menu context-menu>
+                <q-list dense style="min-width: 200px">
+                  <q-item clickable v-close-popup @click="showEditRoleModal(props.row)">
+                    <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="deleteRole(props.row)" :disable="props.row.user_count > 0">
+                    <q-item-section side>
+                      <q-icon name="delete" />
+                    </q-item-section>
+                    <q-item-section>Delete</q-item-section>
+                  </q-item>
+
+                  <q-separator></q-separator>
+
+                  <q-item clickable v-close-popup>
+                    <q-item-section>Close</q-item-section>
+                  </q-item>
+                </q-list>
+              </q-menu>
+              <q-td key="name" :props="props">{{ props.row.name }}</q-td>
+              <q-td key="is_superuser" :props="props">
+                <q-icon v-if="props.row.is_superuser" name="done" color="primary" size="sm" />
+              </q-td>
+              <q-td key="user_count" :props="props">
+                {{ props.row.user_count }}
+              </q-td>
+            </q-tr>
+          </template>
+        </q-table>
+      </q-card-section>
+    </q-card>
+  </q-dialog>
+</template>
+
+<script>
+import { ref, onMounted } from "vue";
+import { useQuasar, useDialogPluginComponent } from "quasar";
+import { fetchRoles, removeRole } from "@/api/accounts";
+import { notifySuccess } from "@/utils/notify";
+
+// ui imports
+import RolesForm from "@/components/accounts/RolesForm";
+
+// static data
+const columns = [
+  { name: "name", label: "Name", field: "name", align: "left", sortable: true },
+  { name: "is_superuser", label: "Superuser", field: "is_superuser", align: "left", sortable: true },
+  { name: "user_count", label: "Assigned Users", field: "user_count", align: "left", sortable: true },
+];
+
+export default {
+  name: "PermissionsManager",
+  emits: [...useDialogPluginComponent.emits],
+  setup(props) {
+    // setup quasar
+    const $q = useQuasar();
+    const { dialogRef, onDialogHide } = useDialogPluginComponent();
+    const roles = ref([]);
+    const pagination = ref({
+      rowsPerPage: 50,
+      sortBy: "name",
+      descending: false,
+    });
+    const loading = ref(false);
+
+    function showEditRoleModal(role) {
+      $q.dialog({
+        component: RolesForm,
+        componentProps: {
+          role: role,
+        },
+      }).onOk(getRoles);
+    }
+
+    function showAddRoleModal() {
+      $q.dialog({
+        component: RolesForm,
+      }).onOk(getRoles);
+    }
+
+    async function getRoles() {
+      loading.value = true;
+      roles.value = await fetchRoles();
+      loading.value = false;
+    }
+
+    async function deleteRole(role) {
+      $q.dialog({
+        title: `Delete role ${role.name}?`,
+        cancel: true,
+        ok: { label: "Delete", color: "negative" },
+      }).onOk(async () => {
+        try {
+          $q.loading.show();
+          const result = await removeRole(role.id);
+          notifySuccess(result);
+          await getRoles();
+        } catch (e) {
+          console.error(e);
+        }
+        $q.loading.hide();
+      });
+    }
+
+    // vue lifecycle hooks
+    onMounted(getRoles);
+
+    return {
+      // reactive data
+      roles,
+      pagination,
+      loading,
+
+      // non-reactive data
+      columns,
+
+      // methods
+      getRoles,
+      deleteRole,
+      showAddRoleModal,
+      showEditRoleModal,
+
+      // quasar dialog
+      dialogRef,
+      onDialogHide,
+    };
+  },
+};
+</script>
\ No newline at end of file
diff --git a/src/components/accounts/RolesForm.vue b/src/components/accounts/RolesForm.vue
new file mode 100644
index 0000000..cbc349b
--- /dev/null
+++ b/src/components/accounts/RolesForm.vue
@@ -0,0 +1,330 @@
+<template>
+  <q-dialog ref="dialogRef" @hide="onDialogHide">
+    <q-card style="min-width: 75vw; max-heigth: 75vh" class="q-dialog-plugin">
+      <q-bar>
+        {{ localRole ? "Editing Role" : "Adding Role" }}
+        <q-space />
+        <q-btn dense flat icon="close" v-close-popup />
+      </q-bar>
+      <q-form ref="form" @submit="onSubmit">
+        <q-card-section class="row">
+          <q-input
+            label="Role Name"
+            class="col-6"
+            dense
+            outlined
+            v-model="localRole.name"
+            :rules="[val => !!val || '*Required']"
+          />
+        </q-card-section>
+        <q-card-section class="scroll" style="height: 70vh">
+          <!-- Permissions -->
+          <div class="text-subtitle2">Super User</div>
+          <hr />
+          <q-card-section class="row">
+            <div class="q-gutter-sm">
+              <q-checkbox v-model="localRole.is_superuser" label="Super User" />
+            </div>
+          </q-card-section>
+
+          <div class="text-subtitle2">Accounts</div>
+          <hr />
+          <q-card-section class="row">
+            <div class="q-gutter-sm">
+              <q-checkbox v-model="localRole.can_list_accounts" label="List User Accounts" />
+              <q-checkbox v-model="localRole.can_manage_accounts" label="Manage User Accounts" />
+              <q-checkbox v-model="localRole.can_list_roles" label="List Roles" />
+              <q-checkbox v-model="localRole.can_manage_roles" label="Manage Roles" />
+            </div>
+          </q-card-section>
+
+          <div class="text-subtitle2">Agents</div>
+          <hr />
+          <q-card-section class="row">
+            <div class="q-gutter-sm">
+              <q-checkbox v-model="localRole.can_list_agents" label="List Agents" />
+              <q-checkbox v-model="localRole.can_use_mesh" label="Use MeshCentral" />
+              <q-checkbox v-model="localRole.can_uninstall_agents" label="Uninstall Agents" />
+              <q-checkbox v-model="localRole.can_ping_agents" label="Ping Agents" />
+              <q-checkbox v-model="localRole.can_update_agents" label="Update Agents" />
+              <q-checkbox v-model="localRole.can_edit_agent" label="Edit Agents" />
+              <q-checkbox v-model="localRole.can_manage_procs" label="Manage Processes" />
+              <q-checkbox v-model="localRole.can_view_eventlogs" label="View Event Logs" />
+              <q-checkbox v-model="localRole.can_send_cmd" label="Send Command" />
+              <q-checkbox v-model="localRole.can_reboot_agents" label="Reboot Agents" />
+              <q-checkbox v-model="localRole.can_install_agents" label="Install Agents" />
+              <q-checkbox v-model="localRole.can_run_scripts" label="Run Script" />
+              <q-checkbox v-model="localRole.can_run_bulk" label="Bulk Actions" />
+            </div>
+          </q-card-section>
+          <div class="text-subtitle2">Core</div>
+          <hr />
+          <q-card-section class="row">
+            <div class="q-gutter-sm">
+              <q-checkbox v-model="localRole.can_list_notes" label="List Notes" />
+              <q-checkbox v-model="localRole.can_manage_notes" label="Manage Notes" />
+              <q-checkbox v-model="localRole.can_view_core_settings" label="View Global Settings" />
+              <q-checkbox v-model="localRole.can_edit_core_settings" label="Edit Global Settings" />
+              <q-checkbox v-model="localRole.can_do_server_maint" label="Do Server Maintenance" />
+              <q-checkbox v-model="localRole.can_code_sign" label="Manage Code Signing" />
+              <q-checkbox v-model="localRole.can_list_api_keys" label="List API Keys" />
+              <q-checkbox v-model="localRole.can_manage_api_keys" label="Manage API Keys" />
+            </div>
+          </q-card-section>
+
+          <div class="text-subtitle2">Checks</div>
+          <hr />
+          <q-card-section class="row">
+            <div class="q-gutter-sm">
+              <q-checkbox v-model="localRole.can_list_checks" label="List Checks" />
+              <q-checkbox v-model="localRole.can_manage_checks" label="Manage Checks" />
+              <q-checkbox v-model="localRole.can_run_checks" label="Run Checks" />
+            </div>
+          </q-card-section>
+
+          <div class="text-subtitle2">Clients</div>
+          <hr />
+          <q-card-section class="row">
+            <div class="q-gutter-sm">
+              <q-checkbox v-model="localRole.can_list_clients" label="List Clients" />
+              <q-checkbox v-model="localRole.can_manage_clients" label="Manage Clients" />
+              <q-checkbox v-model="localRole.can_list_sites" label="List Sites" />
+              <q-checkbox v-model="localRole.can_manage_sites" label="Manage Sites" />
+              <q-checkbox v-model="localRole.can_list_deployments" label="List Deployments" />
+              <q-checkbox v-model="localRole.can_manage_deployments" label="Manage Deployments" />
+            </div>
+          </q-card-section>
+
+          <q-card-section class="row">
+            <tactical-dropdown
+              class="col-6"
+              label="Allowed Clients"
+              :options="clientOptions"
+              v-model="localRole.can_view_clients"
+              hint="Empty means all clients are allowed"
+              outlined
+              mapOptions
+              multiple
+            />
+          </q-card-section>
+          <q-card-section class="row">
+            <tactical-dropdown
+              class="col-6"
+              label="Allowed Sites"
+              :options="siteOptions"
+              v-model="localRole.can_view_sites"
+              hint="Empty means all sites are allowed"
+              outlined
+              mapOptions
+              multiple
+            />
+          </q-card-section>
+
+          <div class="text-subtitle2">Automation Policies</div>
+          <hr />
+          <q-card-section class="row">
+            <div class="q-gutter-sm">
+              <q-checkbox v-model="localRole.can_list_automation_policies" label="List Automation Policies" />
+              <q-checkbox v-model="localRole.can_manage_automation_policies" label="Manage Automation Policies" />
+            </div>
+          </q-card-section>
+
+          <div class="text-subtitle2">Tasks</div>
+          <hr />
+          <q-card-section class="row">
+            <div class="q-gutter-sm">
+              <q-checkbox v-model="localRole.can_list_autotasks" label="List Tasks" />
+              <q-checkbox v-model="localRole.can_manage_autotasks" label="Manage Tasks" />
+              <q-checkbox v-model="localRole.can_run_autotasks" label="Run Tasks" />
+            </div>
+          </q-card-section>
+
+          <div class="text-subtitle2">Logs</div>
+          <hr />
+          <q-card-section class="row">
+            <div class="q-gutter-sm">
+              <q-checkbox v-model="localRole.can_view_auditlogs" label="View Audit Logs" />
+              <q-checkbox v-model="localRole.can_list_pendingactions" label="List Pending Actions" />
+              <q-checkbox v-model="localRole.can_manage_pendingactions" label="Manage Pending Actions" />
+              <q-checkbox v-model="localRole.can_view_debuglogs" label="View Debug Logs" />
+            </div>
+          </q-card-section>
+
+          <div class="text-subtitle2">Scripts</div>
+          <hr />
+          <q-card-section class="row">
+            <div class="q-gutter-sm">
+              <q-checkbox v-model="localRole.can_list_scripts" label="List Scripts" />
+              <q-checkbox v-model="localRole.can_manage_scripts" label="Manage Scripts" />
+            </div>
+          </q-card-section>
+
+          <div class="text-subtitle2">Alerts</div>
+          <hr />
+          <q-card-section class="row">
+            <div class="q-gutter-sm">
+              <q-checkbox v-model="localRole.can_list_alerts" label="List Alerts" />
+              <q-checkbox v-model="localRole.can_manage_alerts" label="Manage Alerts" />
+            </div>
+          </q-card-section>
+
+          <div class="text-subtitle2">Windows Services</div>
+          <hr />
+          <q-card-section class="row">
+            <div class="q-gutter-sm">
+              <q-checkbox v-model="localRole.can_manage_winsvcs" label="Manage Windows Services" />
+            </div>
+          </q-card-section>
+
+          <div class="text-subtitle2">Software</div>
+          <hr />
+          <q-card-section class="row">
+            <div class="q-gutter-sm">
+              <q-checkbox v-model="localRole.can_list_software" label="List Software" />
+              <q-checkbox v-model="localRole.can_manage_software" label="Manage Software" />
+            </div>
+          </q-card-section>
+
+          <div class="text-subtitle2">Windows Updates</div>
+          <hr />
+          <q-card-section class="row">
+            <div class="q-gutter-sm">
+              <q-checkbox v-model="localRole.can_manage_winupdates" label="Manage Windows Updates" />
+            </div>
+          </q-card-section>
+        </q-card-section>
+        <q-card-actions align="right">
+          <q-btn dense flat label="Cancel" v-close-popup />
+          <q-btn :loading="loading" dense flat label="Save" color="primary" type="submit" />
+        </q-card-actions>
+      </q-form>
+    </q-card>
+  </q-dialog>
+</template>
+
+<script>
+// composition imports
+import { ref, watch } from "vue";
+import { useDialogPluginComponent } from "quasar";
+import { saveRole, editRole } from "@/api/accounts";
+import { useClientDropdown, useSiteDropdown } from "@/composables/clients";
+import { notifySuccess } from "@/utils/notify";
+
+// ui imports
+import TacticalDropdown from "@/components/ui/TacticalDropdown.vue";
+
+export default {
+  components: { TacticalDropdown },
+  name: "RolesForm",
+  emits: [...useDialogPluginComponent.emits],
+  props: { role: Object },
+  setup(props) {
+    // quasar setup
+    const { dialogRef, onDialogHide, onDialogOK } = useDialogPluginComponent();
+
+    // dropdown setup
+    const { clientOptions } = useClientDropdown(true);
+    const { siteOptions } = useSiteDropdown(true);
+
+    const role = props.role
+      ? ref(Object.assign({}, props.role))
+      : ref({
+          name: "",
+          is_superuser: false,
+          can_list_agents: false,
+          can_recover_agents: false,
+          can_use_mesh: false,
+          can_uninstall_agents: false,
+          can_update_agents: false,
+          can_edit_agent: false,
+          can_ping_agents: false,
+          can_manage_procs: false,
+          can_view_eventlogs: false,
+          can_list_software: false,
+          can_send_cmd: false,
+          can_reboot_agents: false,
+          can_install_agents: false,
+          can_run_scripts: false,
+          can_run_bulk: false,
+          can_list_notes: false,
+          can_manage_notes: false,
+          can_view_core_settings: false,
+          can_edit_core_settings: false,
+          can_list_api_keys: false,
+          can_manage_api_keys: false,
+          can_do_server_maint: false,
+          can_code_sign: false,
+          can_list_checks: false,
+          can_manage_checks: false,
+          can_run_checks: false,
+          can_list_clients: false,
+          can_manage_clients: false,
+          can_list_sites: false,
+          can_manage_sites: false,
+          can_list_deployments: false,
+          can_manage_deployments: false,
+          can_list_automation_policies: false,
+          can_manage_automation_policies: false,
+          can_list_autotasks: false,
+          can_manage_autotasks: false,
+          can_run_autotasks: false,
+          can_view_auditlogs: false,
+          can_list_pendingactions: false,
+          can_manage_pendingactions: false,
+          can_view_debuglogs: false,
+          can_list_scripts: false,
+          can_manage_scripts: false,
+          can_list_alerts: false,
+          can_manage_alerts: false,
+          can_manage_winsvcs: false,
+          can_manage_software: false,
+          can_manage_winupdates: false,
+          can_list_accounts: false,
+          can_manage_accounts: false,
+          can_list_roles: false,
+          can_manage_roles: false,
+          can_view_clients: [],
+          can_view_sites: [],
+        });
+
+    const loading = ref(false);
+
+    async function onSubmit() {
+      loading.value = true;
+      try {
+        const result = props.role ? await editRole(role.value.id, role.value) : await saveRole(role.value);
+        notifySuccess(result);
+        onDialogOK();
+      } catch (e) {
+        console.error(e);
+      }
+      loading.value = false;
+    }
+
+    watch(
+      () => role.value.is_superuser,
+      (newValue, oldValue) => {
+        Object.keys(role.value).forEach((key, index) => {
+          if (typeof role.value[key] === "boolean") {
+            role.value[key] = newValue;
+          }
+        });
+      }
+    );
+
+    return {
+      // reactive data
+      localRole: role,
+      loading,
+      clientOptions,
+      siteOptions,
+
+      onSubmit,
+
+      // quasar dialog
+      dialogRef,
+      onDialogHide,
+    };
+  },
+};
+</script>
\ No newline at end of file
diff --git a/src/components/agents/AssetsTab.vue b/src/components/agents/AssetsTab.vue
new file mode 100644
index 0000000..560d131
--- /dev/null
+++ b/src/components/agents/AssetsTab.vue
@@ -0,0 +1,123 @@
+<template>
+  <div v-if="!selectedAgent" class="q-pa-sm">No agent selected</div>
+  <div v-else>
+    <q-tabs
+      v-model="tab"
+      dense
+      class="text-grey"
+      active-color="primary"
+      indicator-color="primary"
+      align="justify"
+      narrow-indicator
+      no-caps
+    >
+      <q-tab name="os" label="Operating System" />
+      <q-tab name="cpu" label="CPU" />
+      <q-tab name="mem" label="Memory" />
+      <q-tab name="usb" label="USB" />
+      <q-tab name="bios" label="Bios" />
+      <q-tab name="disk" label="Disks" />
+      <q-tab name="comp_sys" label="Computer System" />
+      <q-tab name="base_board" label="Motherboard" />
+      <q-tab name="comp_sys_prod" label="Computer System Product" />
+      <q-tab name="network_config" label="Network Config" />
+      <q-tab name="graphics" label="Graphics" />
+      <q-tab name="desktop_monitor" label="Monitors" />
+      <q-tab name="network_adapter" label="Network Adapters" />
+    </q-tabs>
+
+    <q-separator />
+
+    <q-tab-panels v-model="tab">
+      <q-tab-panel name="os">
+        <WmiDetail :info="assets.os" />
+      </q-tab-panel>
+      <q-tab-panel name="cpu">
+        <WmiDetail :info="assets.cpu" />
+      </q-tab-panel>
+      <q-tab-panel name="mem">
+        <WmiDetail :info="assets.mem" />
+      </q-tab-panel>
+      <q-tab-panel name="usb">
+        <WmiDetail :info="assets.usb" />
+      </q-tab-panel>
+      <q-tab-panel name="bios">
+        <WmiDetail :info="assets.bios" />
+      </q-tab-panel>
+      <q-tab-panel name="disk">
+        <WmiDetail :info="assets.disk" />
+      </q-tab-panel>
+      <q-tab-panel name="comp_sys">
+        <WmiDetail :info="assets.comp_sys" />
+      </q-tab-panel>
+      <q-tab-panel name="base_board">
+        <WmiDetail :info="assets.base_board" />
+      </q-tab-panel>
+      <q-tab-panel name="comp_sys_prod">
+        <WmiDetail :info="assets.comp_sys_prod" />
+      </q-tab-panel>
+      <q-tab-panel name="network_config">
+        <WmiDetail :info="assets.network_config" />
+      </q-tab-panel>
+      <q-tab-panel name="desktop_monitor">
+        <WmiDetail :info="assets.desktop_monitor" />
+      </q-tab-panel>
+      <q-tab-panel name="graphics">
+        <WmiDetail :info="assets.graphics" />
+      </q-tab-panel>
+      <q-tab-panel name="network_adapter">
+        <WmiDetail :info="assets.network_adapter" />
+      </q-tab-panel>
+    </q-tab-panels>
+  </div>
+</template>
+
+<script>
+// composition imports
+import { ref, computed, watch, onMounted } from "vue";
+import { useStore } from "vuex";
+import { fetchAgent } from "@/api/agents";
+
+// ui imports
+import WmiDetail from "@/components/agents/WmiDetail";
+
+export default {
+  name: "AssetsTab",
+  components: { WmiDetail },
+  setup(props) {
+    // setup vuex
+    const store = useStore();
+    const selectedAgent = computed(() => store.state.selectedRow);
+    const loading = ref(false);
+
+    // assets tab logic
+    const assets = ref({});
+    const tab = ref("os");
+
+    async function getWMIData() {
+      loading.value = true;
+      const { wmi_detail } = await fetchAgent(selectedAgent.value);
+      assets.value = wmi_detail;
+      loading.value = false;
+    }
+
+    watch(selectedAgent, (newValue, oldValue) => {
+      if (newValue) {
+        getWMIData();
+      }
+    });
+
+    onMounted(() => {
+      if (selectedAgent.value) getWMIData();
+    });
+
+    return {
+      // reactive data
+      assets,
+      tab,
+      selectedAgent,
+    };
+  },
+};
+</script>
+
diff --git a/src/components/agents/AutomatedTasksTab.vue b/src/components/agents/AutomatedTasksTab.vue
new file mode 100644
index 0000000..5dec532
--- /dev/null
+++ b/src/components/agents/AutomatedTasksTab.vue
@@ -0,0 +1,435 @@
+<template>
+  <div v-if="!selectedAgent" class="q-pa-sm">No agent selected</div>
+  <div v-else>
+    <q-table
+      dense
+      :table-class="{ 'table-bgcolor': !$q.dark.isActive, 'table-bgcolor-dark': $q.dark.isActive }"
+      class="tabs-tbl-sticky"
+      :style="{ 'max-height': tabHeight }"
+      :rows="tasks"
+      :columns="columns"
+      row-key="id"
+      binary-state-sort
+      v-model:pagination="pagination"
+      :loading="loading"
+      :rows-per-page-options="[0]"
+      no-data-label="No tasks"
+    >
+      <template v-slot:top>
+        <q-btn class="q-mr-sm" dense flat push @click="getTasks" icon="refresh" />
+        <q-btn icon="add" label="Add Task" no-caps dense flat push @click="showAddTask" />
+      </template>
+
+      <template v-slot:loading>
+        <q-inner-loading showing color="primary" />
+      </template>
+
+      <!-- header slots -->
+      <template v-slot:header-cell-enabled="props">
+        <q-th auto-width :props="props">
+          <small>Enabled</small>
+        </q-th>
+      </template>
+
+      <template v-slot:header-cell-smsalert="props">
+        <q-th auto-width :props="props">
+          <q-icon name="phone_android" size="1.5em">
+            <q-tooltip>SMS Alert</q-tooltip>
+          </q-icon>
+        </q-th>
+      </template>
+
+      <template v-slot:header-cell-emailalert="props">
+        <q-th auto-width :props="props">
+          <q-icon name="email" size="1.5em">
+            <q-tooltip>Email Alert</q-tooltip>
+          </q-icon>
+        </q-th>
+      </template>
+
+      <template v-slot:header-cell-dashboardalert="props">
+        <q-th auto-width :props="props">
+          <q-icon name="notifications" size="1.5em">
+            <q-tooltip>Dashboard Alert</q-tooltip>
+          </q-icon>
+        </q-th>
+      </template>
+
+      <template v-slot:header-cell-policystatus="props">
+        <q-th auto-width :props="props"></q-th>
+      </template>
+
+      <template v-slot:header-cell-collector="props">
+        <q-th auto-width :props="props">
+          <q-icon name="mdi-database-arrow-up" size="1.5em">
+            <q-tooltip>Collector Task</q-tooltip>
+          </q-icon>
+        </q-th>
+      </template>
+
+      <template v-slot:header-cell-status="props">
+        <q-th auto-width :props="props"></q-th>
+      </template>
+
+      <!-- body slots -->
+      <template v-slot:body="props">
+        <q-tr :props="props">
+          <!-- context menu -->
+          <q-menu context-menu>
+            <q-list dense style="min-width: 200px">
+              <q-item clickable v-close-popup @click="runTask(props.row)">
+                <q-item-section side>
+                  <q-icon name="play_arrow" />
+                </q-item-section>
+                <q-item-section>Run task now</q-item-section>
+              </q-item>
+              <q-item clickable v-close-popup @click="showEditTask(props.row)" v-if="!props.row.managed_by_policy">
+                <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="deleteTask(props.row)" v-if="!props.row.managed_by_policy">
+                <q-item-section side>
+                  <q-icon name="delete" />
+                </q-item-section>
+                <q-item-section>Delete</q-item-section>
+              </q-item>
+              <q-separator></q-separator>
+              <q-item clickable v-close-popup>
+                <q-item-section>Close</q-item-section>
+              </q-item>
+            </q-list>
+          </q-menu>
+          <!-- tds -->
+          <q-td>
+            <q-checkbox
+              dense
+              @update:model-value="editTask(props.row, { enabled: !props.row.enabled })"
+              v-model="props.row.enabled"
+              :disable="props.row.managed_by_policy"
+            />
+          </q-td>
+          <!-- text alert -->
+          <q-td>
+            <q-checkbox
+              v-if="props.row.alert_template && props.row.alert_template.always_text !== null"
+              :value="props.row.alert_template.always_text"
+              disable
+              dense
+            >
+              <q-tooltip> Setting is overidden by alert template: {{ props.row.alert_template.name }} </q-tooltip>
+            </q-checkbox>
+
+            <q-checkbox
+              v-else
+              dense
+              @update:model-value="editTask(props.row, { text_alert: props.row.text_alert })"
+              v-model="props.row.text_alert"
+              :disable="props.row.managed_by_policy"
+            />
+          </q-td>
+          <!-- email alert -->
+          <q-td>
+            <q-checkbox
+              v-if="props.row.alert_template && props.row.alert_template.always_email !== null"
+              :value="props.row.alert_template.always_email"
+              disable
+              dense
+            >
+              <q-tooltip> Setting is overidden by alert template: {{ props.row.alert_template.name }} </q-tooltip>
+            </q-checkbox>
+
+            <q-checkbox
+              v-else
+              dense
+              @update:model-value="editTask(props.row, { email_alert: props.row.email_alert })"
+              v-model="props.row.email_alert"
+              :disable="props.row.managed_by_policy"
+            />
+          </q-td>
+          <!-- dashboard alert -->
+          <q-td>
+            <q-checkbox
+              v-if="props.row.alert_template && props.row.alert_template.always_alert !== null"
+              :value="props.row.alert_template.always_alert"
+              disable
+              dense
+            >
+              <q-tooltip> Setting is overidden by alert template: {{ props.row.alert_template.name }} </q-tooltip>
+            </q-checkbox>
+
+            <q-checkbox
+              v-else
+              dense
+              @update:model-value="editTask(props.row, { dashboard_alert: props.row.dashboard_alert })"
+              v-model="props.row.dashboard_alert"
+              :disable="props.row.managed_by_policy"
+            />
+          </q-td>
+          <!-- policy check icon -->
+          <q-td>
+            <q-icon v-if="props.row.managed_by_policy" style="font-size: 1.3rem" name="policy">
+              <q-tooltip>This task is managed by a policy</q-tooltip>
+            </q-icon>
+          </q-td>
+
+          <!-- is collector task -->
+          <q-td>
+            <q-icon v-if="!!props.row.custom_field" style="font-size: 1.3rem" name="check">
+              <q-tooltip>The task updates a custom field on the agent</q-tooltip>
+            </q-icon>
+          </q-td>
+          <!-- status icon -->
+          <q-td v-if="props.row.status === 'passing'">
+            <q-icon style="font-size: 1.3rem" color="positive" name="check_circle">
+              <q-tooltip>Passing</q-tooltip>
+            </q-icon>
+          </q-td>
+          <q-td v-else-if="props.row.status === 'failing'">
+            <q-icon v-if="props.row.alert_severity === 'info'" style="font-size: 1.3rem" color="info" name="info">
+              <q-tooltip>Informational</q-tooltip>
+            </q-icon>
+            <q-icon
+              v-else-if="props.row.alert_severity === 'warning'"
+              style="font-size: 1.3rem"
+              color="warning"
+              name="warning"
+            >
+              <q-tooltip>Warning</q-tooltip>
+            </q-icon>
+            <q-icon v-else style="font-size: 1.3rem" color="negative" name="error">
+              <q-tooltip>Error</q-tooltip>
+            </q-icon>
+          </q-td>
+          <q-td v-else></q-td>
+          <!-- name -->
+          <q-td>{{ props.row.name }}</q-td>
+          <!-- sync status -->
+          <q-td v-if="props.row.sync_status === 'notsynced'">Will sync on next agent checkin</q-td>
+          <q-td v-else-if="props.row.sync_status === 'synced'">Synced with agent</q-td>
+          <q-td v-else-if="props.row.sync_status === 'pendingdeletion'">Pending deletion on agent</q-td>
+          <q-td v-else-if="props.row.sync_status === 'initial'">Waiting for task creation on agent</q-td>
+          <q-td v-else></q-td>
+          <q-td v-if="props.row.retcode !== null || props.row.stdout || props.row.stderr">
+            <span
+              style="cursor: pointer; text-decoration: underline"
+              class="text-primary"
+              @click="showScriptOutput(props.row)"
+              >output</span
+            >
+          </q-td>
+          <q-td v-else>Awaiting output</q-td>
+          <q-td v-if="props.row.last_run">{{ props.row.last_run }}</q-td>
+          <q-td v-else>Has not run yet</q-td>
+          <q-td>{{ props.row.schedule }}</q-td>
+          <q-td v-if="props.row.assigned_check">{{ props.row.assigned_check.readable_desc }}</q-td>
+          <q-td v-else></q-td>
+        </q-tr>
+      </template>
+    </q-table>
+  </div>
+</template>
+
+<script>
+// composition imports
+import { ref, computed, watch, onMounted } from "vue";
+import { useStore } from "vuex";
+import { useQuasar } from "quasar";
+import { updateTask, removeTask, runTask } from "@/api/tasks";
+import { fetchAgentTasks } from "@/api/agents";
+import { notifySuccess, notifyError } from "@/utils/notify";
+
+// ui imports
+import AddAutomatedTask from "@/components/tasks/AddAutomatedTask";
+import EditAutomatedTask from "@/components/tasks/EditAutomatedTask";
+import ScriptOutput from "@/components/checks/ScriptOutput";
+
+// static data
+const columns = [
+  { name: "enabled", align: "left", field: "enabled" },
+  { name: "smsalert", field: "text_alert", align: "left" },
+  { name: "emailalert", field: "email_alert", align: "left" },
+  { name: "dashboardalert", field: "dashboard_alert", align: "left" },
+  { name: "policystatus", align: "left" },
+  { name: "collector", label: "Collector", field: "custom_field", align: "left", sortable: true },
+  { name: "status", align: "left" },
+  { name: "name", label: "Name", field: "name", align: "left", sortable: true },
+  { name: "sync_status", label: "Sync Status", field: "sync_status", align: "left", sortable: true },
+  {
+    name: "moreinfo",
+    label: "More Info",
+    field: "more_info",
+    align: "left",
+    sortable: true,
+  },
+  {
+    name: "datetime",
+    label: "Last Run Time",
+    field: "last_run",
+    align: "left",
+    sortable: true,
+  },
+  {
+    name: "schedule",
+    label: "Schedule",
+    field: "schedule",
+    align: "left",
+    sortable: true,
+  },
+  {
+    name: "assignedcheck",
+    label: "Assigned Check",
+    field: "assigned_check",
+    align: "left",
+    sortable: true,
+  },
+];
+
+export default {
+  name: "AutomatedTasksTab",
+  setup(props) {
+    // setup vuex
+    const store = useStore();
+    const selectedAgent = computed(() => store.state.selectedRow);
+    const tabHeight = computed(() => store.state.tabHeight);
+
+    // setup quasar
+    const $q = useQuasar();
+
+    // automated tasks logic
+    const tasks = ref([]);
+    const loading = ref(false);
+
+    const pagination = ref({
+      rowsPerPage: 0,
+      sortBy: "name",
+      descending: false,
+    });
+
+    async function getTasks() {
+      loading.value = true;
+      const result = await fetchAgentTasks(selectedAgent.value);
+      tasks.value = result.filter(task => task.sync_status !== "pendingdeletion");
+      loading.value = false;
+    }
+
+    async function editTask(task, data) {
+      if (task.managed_by_policy) return;
+
+      loading.value = true;
+      try {
+        const result = await updateTask(task.id, data);
+        notifySuccess(result);
+        getTasks();
+      } catch (e) {
+        console.error(e);
+      }
+
+      loading.value = false;
+    }
+
+    function deleteTask(task) {
+      if (task.managed_by_policy) return;
+
+      $q.dialog({
+        title: "Are you sure?",
+        message: `Delete ${task.name} task`,
+        cancel: true,
+        persistent: true,
+      }).onOk(async () => {
+        loading.value = true;
+        try {
+          const result = await removeTask(task.pk);
+          notifySuccess(result);
+          getTasks();
+        } catch (e) {
+          console.error(e);
+        }
+        loading.value = false;
+      });
+    }
+
+    async function runWinTask(task) {
+      if (!task.enabled) {
+        notifyError("Task cannot be run when it's disabled. Enable it first.");
+        return;
+      }
+
+      loading.value = true;
+      try {
+        const result = await runTask(task.pk);
+        notifySuccess(result);
+      } catch (e) {
+        console.error(e);
+      }
+      loading.value = false;
+    }
+
+    function showAddTask() {
+      $q.dialog({
+        component: AddAutomatedTask,
+        componentProps: {
+          parent: { agent: selectedAgent.value },
+        },
+      }).onOk(() => {
+        getTasks();
+      });
+    }
+
+    function showEditTask(task) {
+      if (task.managed_by_policy) return;
+
+      $q.dialog({
+        component: EditAutomatedTask,
+        componentProps: {
+          task: task,
+        },
+      }).onOk(() => {
+        getTasks();
+      });
+    }
+
+    function showScriptOutput(script) {
+      $q.dialog({
+        component: ScriptOutput,
+        componentProps: {
+          scriptInfo: script,
+        },
+      });
+    }
+
+    watch(selectedAgent, (newValue, oldValue) => {
+      if (newValue) {
+        getTasks();
+      }
+    });
+
+    onMounted(() => {
+      if (selectedAgent.value) getTasks();
+    });
+
+    return {
+      // reactive data
+      tasks,
+      loading,
+      pagination,
+      selectedAgent,
+      tabHeight,
+
+      // non-reactive data
+      columns,
+
+      // methods
+      getTasks,
+      editTask,
+      runWinTask,
+      deleteTask,
+      showAddTask,
+      showEditTask,
+      showScriptOutput,
+    };
+  },
+};
+</script>
+
diff --git a/src/components/agents/ChecksTab.vue b/src/components/agents/ChecksTab.vue
new file mode 100644
index 0000000..f331e95
--- /dev/null
+++ b/src/components/agents/ChecksTab.vue
@@ -0,0 +1,495 @@
+<template>
+  <div v-if="!selectedAgent" class="q-pa-sm">No agent selected</div>
+  <div v-else>
+    <q-table
+      dense
+      :table-class="{ 'table-bgcolor': !$q.dark.isActive, 'table-bgcolor-dark': $q.dark.isActive }"
+      class="tabs-tbl-sticky"
+      :style="{ 'max-height': tabHeight }"
+      :rows="checks"
+      :columns="columns"
+      row-key="id"
+      binary-state-sort
+      v-model:pagination="pagination"
+      :loading="loading"
+      :rows-per-page-options="[0]"
+      no-data-label="No checks"
+    >
+      <!-- table top slot -->
+      <template v-slot:top>
+        <q-btn class="q-mr-sm" dense flat push @click="getChecks" icon="refresh" />
+        <q-btn-dropdown icon="add" label="New" no-caps dense flat>
+          <q-list dense style="min-width: 200px">
+            <q-item clickable v-close-popup @click="showCheckModal('diskspace')">
+              <q-item-section side>
+                <q-icon size="xs" name="far fa-hdd" />
+              </q-item-section>
+              <q-item-section>Disk Space Check</q-item-section>
+            </q-item>
+            <q-item clickable v-close-popup @click="showCheckModal('ping')">
+              <q-item-section side>
+                <q-icon size="xs" name="fas fa-network-wired" />
+              </q-item-section>
+              <q-item-section>Ping Check</q-item-section>
+            </q-item>
+            <q-item clickable v-close-popup @click="showCheckModal('cpuload')">
+              <q-item-section side>
+                <q-icon size="xs" name="fas fa-microchip" />
+              </q-item-section>
+              <q-item-section>CPU Load Check</q-item-section>
+            </q-item>
+            <q-item clickable v-close-popup @click="showCheckModal('memory')">
+              <q-item-section side>
+                <q-icon size="xs" name="fas fa-memory" />
+              </q-item-section>
+              <q-item-section>Memory Check</q-item-section>
+            </q-item>
+            <q-item clickable v-close-popup @click="showCheckModal('winsvc')">
+              <q-item-section side>
+                <q-icon size="xs" name="fas fa-cogs" />
+              </q-item-section>
+              <q-item-section>Windows Service Check</q-item-section>
+            </q-item>
+            <q-item clickable v-close-popup @click="showCheckModal('script')">
+              <q-item-section side>
+                <q-icon size="xs" name="fas fa-terminal" />
+              </q-item-section>
+              <q-item-section>Script Check</q-item-section>
+            </q-item>
+            <q-item clickable v-close-popup @click="showCheckModal('eventlog')">
+              <q-item-section side>
+                <q-icon size="xs" name="fas fa-clipboard-list" />
+              </q-item-section>
+              <q-item-section>Event Log Check</q-item-section>
+            </q-item>
+          </q-list>
+        </q-btn-dropdown>
+      </template>
+
+      <!-- header slots -->
+      <template v-slot:header-cell-smsalert="props">
+        <q-th auto-width :props="props">
+          <q-icon name="phone_android" size="1.5em">
+            <q-tooltip>SMS Alert</q-tooltip>
+          </q-icon>
+        </q-th>
+      </template>
+      <template v-slot:header-cell-emailalert="props">
+        <q-th auto-width :props="props">
+          <q-icon name="email" size="1.5em">
+            <q-tooltip>Email Alert</q-tooltip>
+          </q-icon>
+        </q-th>
+      </template>
+      <template v-slot:header-cell-dashboardalert="props">
+        <q-th auto-width :props="props">
+          <q-icon name="notifications" size="1.5em">
+            <q-tooltip>Dashboard Alert</q-tooltip>
+          </q-icon>
+        </q-th>
+      </template>
+      <template v-slot:header-cell-statusicon="props">
+        <q-th auto-width :props="props"></q-th>
+      </template>
+      <template v-slot:header-cell-policystatus="props">
+        <q-th auto-width :props="props"></q-th>
+      </template>
+      <!-- body slots -->
+      <template v-slot:body="props">
+        <q-tr :props="props" class="cursor-pointer" @dblclick="showCheckModal(props.row.check_type, props.row)">
+          <!-- context menu -->
+          <q-menu context-menu>
+            <q-list dense style="min-width: 200px">
+              <q-item
+                clickable
+                v-close-popup
+                @click="showCheckModal(props.row.check_type, props.row)"
+                :disable="props.row.managed_by_policy"
+              >
+                <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="deleteCheck(props.row)" :disable="props.row.managed_by_policy">
+                <q-item-section side>
+                  <q-icon name="delete" />
+                </q-item-section>
+                <q-item-section>Delete</q-item-section>
+              </q-item>
+              <q-separator></q-separator>
+              <q-item clickable v-close-popup @click="resetCheckStatus(props.row)">
+                <q-item-section side>
+                  <q-icon name="info" />
+                </q-item-section>
+                <q-item-section>Reset Check Status</q-item-section>
+              </q-item>
+              <q-separator></q-separator>
+              <q-item clickable v-close-popup>
+                <q-item-section>Close</q-item-section>
+              </q-item>
+            </q-list>
+          </q-menu>
+          <!-- tds -->
+          <!-- text alert -->
+          <q-td>
+            <q-checkbox
+              v-if="props.row.alert_template && props.row.alert_template.always_text !== null"
+              :value="props.row.alert_template.always_text"
+              disable
+              dense
+            >
+              <q-tooltip> Setting is overidden by alert template: {{ props.row.alert_template.name }} </q-tooltip>
+            </q-checkbox>
+
+            <q-checkbox
+              v-else
+              dense
+              @update:model-value="editCheck(props.row, { text_alert: props.row.text_alert })"
+              v-model="props.row.text_alert"
+              :disable="props.row.managed_by_policy"
+            />
+          </q-td>
+          <!-- email alert -->
+          <q-td>
+            <q-checkbox
+              v-if="props.row.alert_template && props.row.alert_template.always_email !== null"
+              :value="props.row.alert_template.always_email"
+              disable
+              dense
+            >
+              <q-tooltip> Setting is overidden by alert template: {{ props.row.alert_template.name }} </q-tooltip>
+            </q-checkbox>
+
+            <q-checkbox
+              v-else
+              dense
+              @update:model-value="editCheck(props.row, { email_alert: props.row.email_alert })"
+              v-model="props.row.email_alert"
+              :disable="props.row.managed_by_policy"
+            />
+          </q-td>
+          <!-- dashboard alert -->
+          <q-td>
+            <q-checkbox
+              v-if="props.row.alert_template && props.row.alert_template.always_alert !== null"
+              :value="props.row.alert_template.always_alert"
+              disable
+              dense
+            >
+              <q-tooltip> Setting is overidden by alert template: {{ props.row.alert_template.name }} </q-tooltip>
+            </q-checkbox>
+
+            <q-checkbox
+              v-else
+              dense
+              @update:model-value="editCheck(props.row, { dashboard_alert: props.row.dashboard_alert })"
+              v-model="props.row.dashboard_alert"
+              :disable="props.row.managed_by_policy"
+            />
+          </q-td>
+          <!-- policy check icon -->
+          <q-td v-if="props.row.managed_by_policy">
+            <q-icon style="font-size: 1.3rem" name="policy">
+              <q-tooltip>This check is managed by a policy</q-tooltip>
+            </q-icon>
+          </q-td>
+          <q-td v-else-if="props.row.overriden_by_policy">
+            <q-icon style="font-size: 1.3rem" name="remove_circle_outline">
+              <q-tooltip>This check is overriden by a policy</q-tooltip>
+            </q-icon>
+          </q-td>
+          <q-td v-else></q-td>
+          <!-- status icon -->
+          <q-td v-if="props.row.status === 'passing'">
+            <q-icon style="font-size: 1.3rem" color="positive" name="check_circle">
+              <q-tooltip>Passing</q-tooltip>
+            </q-icon>
+          </q-td>
+          <q-td v-else-if="props.row.status === 'failing'">
+            <q-icon v-if="props.row.alert_severity === 'info'" style="font-size: 1.3rem" color="info" name="info">
+              <q-tooltip>Informational</q-tooltip>
+            </q-icon>
+            <q-icon
+              v-else-if="props.row.alert_severity === 'warning'"
+              style="font-size: 1.3rem"
+              color="warning"
+              name="warning"
+            >
+              <q-tooltip>Warning</q-tooltip>
+            </q-icon>
+            <q-icon v-else style="font-size: 1.3rem" color="negative" name="error">
+              <q-tooltip>Error</q-tooltip>
+            </q-icon>
+          </q-td>
+          <q-td v-else></q-td>
+          <!-- check description -->
+          <q-td>
+            <span>
+              {{ truncateText(props.row.readable_desc, 40) }}
+              <q-tooltip v-if="props.row.readable_desc.length > 40">{{ props.row.readable_desc }}</q-tooltip>
+            </span></q-td
+          >
+          <!-- more info -->
+          <q-td>
+            <span
+              style="cursor: pointer; text-decoration: underline"
+              class="text-primary"
+              @click="showCheckGraphModal(props.row)"
+              >Show Run History</span
+            >
+            &nbsp;&nbsp;&nbsp;
+            <span
+              v-if="props.row.check_type === 'ping'"
+              style="cursor: pointer; text-decoration: underline"
+              class="text-primary"
+              @click="showPingInfo(props.row)"
+              >Last Output</span
+            >
+            <span
+              v-else-if="props.row.check_type === 'script'"
+              style="cursor: pointer; text-decoration: underline"
+              class="text-primary"
+              @click="showScriptOutput(props.row)"
+              >Last Output</span
+            >
+            <span
+              v-else-if="props.row.check_type === 'eventlog'"
+              style="cursor: pointer; text-decoration: underline"
+              class="text-primary"
+              @click="showEventInfo(props.row)"
+              >Last Output</span
+            >
+            <span v-else-if="props.row.check_type === 'diskspace' || props.row.check_type === 'winsvc'">{{
+              props.row.more_info
+            }}</span>
+          </q-td>
+          <q-td>{{ props.row.last_run || "Never" }}</q-td>
+          <q-td v-if="props.row.assigned_task !== null && props.row.assigned_task.length > 1"
+            >{{ props.row.assigned_task.length }} Tasks</q-td
+          >
+          <q-td v-else-if="props.row.assigned_task">{{ props.row.assigned_task.name }}</q-td>
+          <q-td v-else></q-td>
+        </q-tr>
+      </template>
+    </q-table>
+  </div>
+</template>
+
+<script>
+// composition imports
+import { ref, computed, watch, onMounted } from "vue";
+import { useStore } from "vuex";
+import { useQuasar } from "quasar";
+import { updateCheck, removeCheck, resetCheck } from "@/api/checks";
+import { fetchAgentChecks } from "@/api/agents";
+import { truncateText } from "@/utils/format";
+import { notifySuccess } from "@/utils/notify";
+
+// ui imports
+import DiskSpaceCheck from "@/components/checks/DiskSpaceCheck";
+import MemCheck from "@/components/checks/MemCheck";
+import CpuLoadCheck from "@/components/checks/CpuLoadCheck";
+import PingCheck from "@/components/checks/PingCheck";
+import WinSvcCheck from "@/components/checks/WinSvcCheck";
+import EventLogCheck from "@/components/checks/EventLogCheck";
+import ScriptCheck from "@/components/checks/ScriptCheck";
+import ScriptOutput from "@/components/checks/ScriptOutput";
+import EventLogCheckOutput from "@/components/checks/EventLogCheckOutput";
+import CheckGraph from "@/components/graphs/CheckGraph";
+
+// static data
+const columns = [
+  { name: "smsalert", field: "text_alert", align: "left" },
+  { name: "emailalert", field: "email_alert", align: "left" },
+  { name: "dashboardalert", field: "dashboard_alert", align: "left" },
+  { name: "policystatus", align: "left" },
+  { name: "statusicon", align: "left" },
+  { name: "desc", field: "readable_desc", label: "Description", align: "left", sortable: true },
+  {
+    name: "moreinfo",
+    label: "More Info",
+    field: "more_info",
+    align: "left",
+    sortable: true,
+  },
+  {
+    name: "datetime",
+    label: "Last Run",
+    field: "last_run",
+    align: "left",
+    sortable: true,
+  },
+  { name: "assignedtasks", label: "Assigned Tasks", field: "assigned_task", align: "left", sortable: true },
+];
+
+export default {
+  name: "ChecksTab",
+  setup(props) {
+    // setup vuex
+    const store = useStore();
+    const selectedAgent = computed(() => store.state.selectedRow);
+    const tabHeight = computed(() => store.state.tabHeight);
+
+    // setup quasar
+    const $q = useQuasar();
+
+    // setup checks tab logic
+    const checks = ref([]);
+    const loading = ref(false);
+    const pagination = ref({
+      rowsPerPage: 0,
+      sortBy: "status",
+      descending: false,
+    });
+
+    async function getChecks() {
+      loading.value = true;
+      checks.value = await fetchAgentChecks(selectedAgent.value);
+      loading.value = false;
+    }
+
+    async function editCheck(check, data) {
+      if (check.managed_by_policy) {
+        return;
+      }
+
+      loading.value = false;
+      try {
+        const result = await updateCheck(check.id, data);
+        await getChecks();
+        notifySuccess(result);
+      } catch (e) {
+        console.error(e);
+      }
+
+      loading.value = false;
+    }
+
+    function deleteCheck(check) {
+      $q.dialog({
+        title: "Are you sure?",
+        message: `Delete ${check.readable_desc}`,
+        cancel: true,
+        ok: { label: "Delete", color: "negative" },
+        persistent: true,
+      }).onOk(async () => {
+        loading.value = true;
+        try {
+          const result = await removeCheck(check.id);
+          await getChecks();
+          notifySuccess(result);
+        } catch (e) {
+          console.error(e);
+        }
+        loading.value = false;
+      });
+    }
+
+    async function resetCheckStatus(check) {
+      loading.value = true;
+      try {
+        const result = await resetCheck(check.id);
+        await getChecks();
+        notifySuccess(result);
+      } catch (e) {
+        console.error(e);
+      }
+    }
+
+    function showEventInfo(data) {
+      $q.dialog({
+        component: EventLogCheckOutput,
+        componentProps: {
+          evtLogData: data,
+        },
+      });
+    }
+
+    function showCheckGraphModal(check) {
+      $q.dialog({
+        component: CheckGraph,
+        componentProps: {
+          check: check,
+        },
+      });
+    }
+
+    function showScriptOutput(script) {
+      $q.dialog({
+        component: ScriptOutput,
+        componentProps: {
+          scriptInfo: script,
+        },
+      });
+    }
+
+    function showPingInfo(check) {
+      $q.dialog({
+        title: check.readable_desc,
+        style: "width: 50vw; max-width: 60vw",
+        message: `<pre>${check.output}</pre>`,
+        html: true,
+      });
+    }
+
+    function showCheckModal(type, check) {
+      let component;
+
+      if (type === "diskspace") component = DiskSpaceCheck;
+      else if (type === "memory") component = MemCheck;
+      else if (type === "cpuload") component = CpuLoadCheck;
+      else if (type === "ping") component = PingCheck;
+      else if (type === "winsvc") component = WinSvcCheck;
+      else if (type === "eventlog") component = EventLogCheck;
+      else if (type === "script") component = ScriptCheck;
+      else return;
+
+      $q.dialog({
+        component: component,
+        componentProps: {
+          check: check,
+          parent: !check ? { agent: selectedAgent.value } : undefined,
+        },
+      }).onOk(getChecks);
+    }
+
+    watch(selectedAgent, (newValue, oldValue) => {
+      if (newValue) {
+        getChecks();
+      }
+    });
+
+    onMounted(() => {
+      if (selectedAgent.value) getChecks();
+    });
+
+    return {
+      // reactive data
+      checks,
+      loading,
+      pagination,
+      tabHeight,
+      selectedAgent,
+
+      // non-reactive data
+      columns,
+
+      // methods
+      getChecks,
+      editCheck,
+      deleteCheck,
+      resetCheckStatus,
+      truncateText,
+
+      // dialogs
+      showScriptOutput,
+      showCheckModal,
+      showCheckGraphModal,
+      showEventInfo,
+      showPingInfo,
+    };
+  },
+};
+</script>
+
diff --git a/src/components/agents/HistoryTab.vue b/src/components/agents/HistoryTab.vue
index 800895a..79a37ec 100644
--- a/src/components/agents/HistoryTab.vue
+++ b/src/components/agents/HistoryTab.vue
@@ -6,16 +6,19 @@
       :rows="history"
       :columns="columns"
       :pagination="{ sortBy: 'time', descending: true, rowsPerPage: 10 }"
+      :style="{ 'max-height': tabHeight }"
       :loading="loading"
       dense
       binary-state-sort
     >
-      <template v-slot:top-left>
+      <template v-slot:top>
         <q-btn dense flat push @click="getHistory" icon="refresh" />
+        <q-space />
+        <export-table-btn :data="history" :columns="columns" />
       </template>
 
-      <template v-slot:top-right>
-        <export-table-btn :data="history" :columns="columns" />
+      <template v-slot:loading>
+        <q-inner-loading showing color="primary" />
       </template>
 
       <template v-slot:body-cell-command="props">
@@ -62,7 +65,7 @@ import { formatDate, formatTableColumnText, truncateText } from "@/utils/format"
 import { fetchAgentHistory } from "@/api/agents";
 
 // ui imports
-import ScriptOutput from "@/components/modals/checks/ScriptOutput";
+import ScriptOutput from "@/components/checks/ScriptOutput";
 import ExportTableBtn from "@/components/ui/ExportTableBtn";
 
 // static data
@@ -106,6 +109,7 @@ export default {
 
     const store = useStore();
     const selectedAgent = computed(() => store.state.selectedRow);
+    const tabHeight = computed(() => store.state.tabHeight);
 
     // setup main history functionality
     const history = ref([]);
@@ -135,13 +139,14 @@ export default {
 
     // vue component hooks
     onMounted(() => {
-      if (!!selectedAgent.value) getHistory();
+      if (selectedAgent.value) getHistory();
     });
 
     return {
       // reactive
       history,
       loading,
+      tabHeight,
 
       // non-reactive data
       columns,
diff --git a/src/components/agents/NotesTab.vue b/src/components/agents/NotesTab.vue
new file mode 100644
index 0000000..fde982e
--- /dev/null
+++ b/src/components/agents/NotesTab.vue
@@ -0,0 +1,225 @@
+<template>
+  <div v-if="!selectedAgent" class="q-pa-sm">No agent selected</div>
+  <div v-else>
+    <q-table
+      grid
+      class="tabs-tbl-sticky"
+      :style="{ 'max-height': tabHeight }"
+      :rows="notes"
+      :columns="columns"
+      v-model:pagination="pagination"
+      row-key="id"
+      :rows-per-page-options="[0]"
+      :loading="loading"
+      hide-bottom
+      no-data-label="No notes"
+    >
+      <template v-slot:top>
+        <q-btn class="q-mr-sm" dense flat push @click="getNotes" icon="refresh" />
+        <q-btn icon="add" label="Add Note" no-caps dense flat push @click="addNote" />
+        <q-space />
+        <export-table-btn :data="notes" :columns="columns" />
+      </template>
+
+      <template v-slot:loading>
+        <q-inner-loading showing color="primary" />
+      </template>
+
+      <template v-slot:item="props">
+        <q-card class="notes-card q-pa-none q-ma-xs" bordered>
+          <q-card-section>
+            <div class="row">
+              <div class="col">
+                <div class="text-subtitle2">{{ props.row.entry_time }}</div>
+                <div class="text-caption">{{ props.row.username }}</div>
+              </div>
+              <div class="col-auto">
+                <q-btn color="grey-7" round flat icon="more_vert">
+                  <q-menu cover auto-close>
+                    <q-list dense>
+                      <q-item clickable v-close-popup @click="editNote(props.row)">
+                        <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="deleteNote(props.row)">
+                        <q-item-section side>
+                          <q-icon name="delete" />
+                        </q-item-section>
+                        <q-item-section>Delete</q-item-section>
+                      </q-item>
+                    </q-list>
+                  </q-menu>
+                </q-btn>
+              </div>
+            </div>
+          </q-card-section>
+          <q-card-section style="max-height: 20vh" class="scroll">
+            <pre>{{ props.row.note }}</pre>
+          </q-card-section>
+        </q-card>
+      </template>
+    </q-table>
+  </div>
+</template>
+
+<script>
+// composition imports
+import { ref, computed, watch, onMounted } from "vue";
+import { useStore } from "vuex";
+import { useQuasar } from "quasar";
+import { fetchAgentNotes, editAgentNote, saveAgentNote, removeAgentNote } from "@/api/agents";
+import { notifySuccess } from "@/utils/notify";
+
+// ui imports
+import ExportTableBtn from "@/components/ui/ExportTableBtn";
+
+// static data
+const columns = [
+  {
+    name: "entry_time",
+    label: "Date",
+    field: "entry_time",
+  },
+  {
+    name: "username",
+    label: "User",
+    field: "username",
+  },
+  {
+    name: "note",
+    label: "Note",
+    field: "note",
+  },
+];
+
+export default {
+  name: "NotesTab",
+  components: {
+    ExportTableBtn,
+  },
+  setup(props) {
+    // setup vuex
+    const store = useStore();
+    const selectedAgent = computed(() => store.state.selectedRow);
+    const tabHeight = computed(() => store.state.tabHeight);
+
+    // setup quasar
+    const $q = useQuasar();
+
+    // notes tab logic
+    const notes = ref([]);
+    const loading = ref(false);
+    const pagination = ref({
+      rowsPerPage: 0,
+      sortBy: "id",
+      descending: false,
+    });
+
+    async function getNotes() {
+      loading.value = true;
+      notes.value = await fetchAgentNotes(selectedAgent.value);
+      loading.value = false;
+    }
+
+    function addNote() {
+      $q.dialog({
+        title: "Add Note",
+        prompt: {
+          type: "textarea",
+        },
+        style: "width: 30vw; max-width: 50vw;",
+        ok: { label: "Add" },
+      }).onOk(async data => {
+        loading.value = true;
+        try {
+          const result = await saveAgentNote({ agent_id: selectedAgent.value, note: data });
+          notifySuccess(result);
+          await getNotes();
+        } catch (e) {
+          console.error(e);
+        }
+        loading.value = false;
+      });
+    }
+
+    function editNote(note) {
+      $q.dialog({
+        title: "Edit Note",
+        prompt: {
+          model: note.note,
+          type: "textarea",
+        },
+        style: "width: 30vw; max-width: 50vw;",
+        ok: { label: "Save" },
+        cancel: true,
+      }).onOk(async data => {
+        console.log(data);
+        loading.value = true;
+        try {
+          const result = await editAgentNote(note.pk, { note: data });
+          notifySuccess(result);
+          await getNotes();
+        } catch (e) {
+          console.error(e);
+        }
+        loading.value = false;
+      });
+    }
+
+    function deleteNote(note) {
+      $q.dialog({
+        title: "Delete note?",
+        cancel: true,
+        ok: { label: "Delete", color: "negative" },
+      }).onOk(async () => {
+        loading.value = true;
+        try {
+          const result = await removeAgentNote(note.pk);
+          notifySuccess(result);
+          await getNotes();
+        } catch (e) {
+          console.error(e);
+        }
+        loading.value = false;
+      });
+    }
+
+    watch(selectedAgent, (newValue, oldValue) => {
+      if (newValue) {
+        getNotes();
+      }
+    });
+
+    onMounted(() => {
+      if (selectedAgent.value) getNotes();
+    });
+
+    return {
+      // reactive data
+      notes,
+      loading,
+      pagination,
+      selectedAgent,
+      tabHeight,
+
+      // non-reactive data
+      columns,
+
+      // methods
+      getNotes,
+      addNote,
+      editNote,
+      deleteNote,
+    };
+  },
+};
+</script>
+
+<style lang="sass" scoped>
+.notes-card
+  width: 100%
+  max-width: 20vw
+</style>
\ No newline at end of file
diff --git a/src/components/agents/SoftwareTab.vue b/src/components/agents/SoftwareTab.vue
new file mode 100644
index 0000000..db3ad7d
--- /dev/null
+++ b/src/components/agents/SoftwareTab.vue
@@ -0,0 +1,167 @@
+<template>
+  <div v-if="!selectedAgent" class="q-pa-sm">No agent selected</div>
+  <div v-else>
+    <q-table
+      :table-class="{ 'table-bgcolor': !$q.dark.isActive, 'table-bgcolor-dark': $q.dark.isActive }"
+      class="tabs-tbl-sticky"
+      dense
+      :rows="software"
+      :columns="columns"
+      :filter="filter"
+      :style="{ 'max-height': tabHeight }"
+      v-model:pagination="pagination"
+      binary-state-sort
+      row-key="id"
+      :rows-per-page-options="[0]"
+      :loading="loading"
+    >
+      <template v-slot:loading>
+        <q-inner-loading showing color="primary" />
+      </template>
+
+      <template v-slot:top>
+        <q-btn class="q-mr-sm" dense flat push @click="refreshSoftware" icon="refresh" />
+        <q-btn icon="add" label="Install Software" no-caps dense flat push @click="showInstallSoftwareModal" />
+
+        <q-space />
+
+        <q-input v-model="filter" outlined label="Search" dense clearable class="q-pr-sm">
+          <template v-slot:prepend>
+            <q-icon name="search" color="primary" />
+          </template>
+        </q-input>
+        <export-table-btn :data="software" :columns="columns" />
+      </template>
+    </q-table>
+  </div>
+</template>
+
+<script>
+// composition imports
+import { ref, computed, watch, onMounted } from "vue";
+import { useQuasar } from "quasar";
+import { useStore } from "vuex";
+import { fetchAgentSoftware, refreshAgentSoftware } from "@/api/software";
+
+// ui imports
+import InstallSoftware from "@/components/software/InstallSoftware";
+import ExportTableBtn from "@/components/ui/ExportTableBtn";
+
+// static data
+const columns = [
+  {
+    name: "name",
+    align: "left",
+    label: "Name",
+    field: "name",
+    sortable: true,
+  },
+  {
+    name: "publisher",
+    align: "left",
+    label: "Publisher",
+    field: "publisher",
+    sortable: true,
+  },
+  {
+    name: "install_date",
+    align: "left",
+    label: "Installed On",
+    field: "install_date",
+    sortable: false,
+    format: (val, row) => {
+      return val === "01/01/1" || val === "01-1-01" ? "" : val;
+    },
+  },
+  {
+    name: "size",
+    align: "left",
+    label: "Size",
+    field: "size",
+    sortable: false,
+  },
+  {
+    name: "version",
+    align: "left",
+    label: "Version",
+    field: "version",
+    sortable: false,
+  },
+];
+
+export default {
+  name: "SoftwareTab",
+  components: {
+    ExportTableBtn,
+  },
+  setup(props) {
+    // setup quasar
+    const $q = useQuasar();
+
+    // setup vuex
+    const store = useStore();
+    const selectedAgent = computed(() => store.state.selectedRow);
+    const tabHeight = computed(() => store.state.tabHeight);
+
+    // software tab logic
+    const software = ref([]);
+    const loading = ref(false);
+    const filter = ref("");
+    const pagination = ref({
+      rowsPerPage: 0,
+      sortBy: "name",
+      descending: false,
+    });
+
+    async function getSoftware() {
+      loading.value = true;
+      software.value = await fetchAgentSoftware(selectedAgent.value);
+      loading.value = false;
+    }
+
+    async function refreshSoftware() {
+      loading.value = true;
+      await refreshAgentSoftware(selectedAgent.value);
+      await getSoftware();
+      loading.value = false;
+    }
+
+    function showInstallSoftwareModal() {
+      $q.dialog({
+        component: InstallSoftware,
+        componentProps: {
+          agent_id: selectedAgent.value,
+        },
+      });
+    }
+
+    watch(selectedAgent, (newValue, oldValue) => {
+      if (newValue) {
+        getSoftware();
+      }
+    });
+
+    onMounted(() => {
+      if (selectedAgent.value) getSoftware();
+    });
+
+    return {
+      // reactive data
+      software,
+      loading,
+      filter,
+      pagination,
+      selectedAgent,
+      tabHeight,
+
+      // non-reactive data
+      columns,
+
+      // methods
+      refreshSoftware,
+      showInstallSoftwareModal,
+    };
+  },
+};
+</script>
+
diff --git a/src/components/SummaryTab.vue b/src/components/agents/SummaryTab.vue
similarity index 67%
rename from src/components/SummaryTab.vue
rename to src/components/agents/SummaryTab.vue
index 3094a57..a4a0f8e 100644
--- a/src/components/SummaryTab.vue
+++ b/src/components/agents/SummaryTab.vue
@@ -1,6 +1,9 @@
 <template>
-  <div v-if="Object.keys(summary).length === 0">No agent selected</div>
-  <div v-else>
+  <div v-if="!selectedAgent" class="q-pa-sm">No agent selected</div>
+  <div v-else-if="!summary && loading" class="q-pa-md flex flex-center">
+    <q-circular-progress indeterminate size="50px" color="primary" class="q-ma-md" />
+  </div>
+  <div v-else-if="summary" class="q-pa-sm">
     <q-btn class="q-mr-sm" dense flat push icon="refresh" @click="refreshSummary" />
     <span>
       <b>{{ summary.hostname }}</b>
@@ -63,7 +66,7 @@
       <div class="col-2">
         <span class="text-subtitle2 text-bold">Checks Status</span>
         <br />
-        <template v-if="summary.checks.total !== 0">
+        <div v-if="summary.checks.total !== 0">
           <q-chip v-if="summary.checks.passing" square size="lg">
             <q-avatar size="lg" square icon="done" color="green" text-color="white" />
             <small>{{ summary.checks.passing }} checks passing</small>
@@ -82,18 +85,16 @@
           </q-chip>
           <span
             v-if="
-              awaitingSync(
-                summary.checks.total,
-                summary.checks.passing,
-                summary.checks.failing,
-                summary.checks.warning,
-                summary.checks.info
-              )
+              summary.checks.total !== 0 &&
+              summary.checks.passing === 0 &&
+              summary.checks.failing === 0 &&
+              summary.checks.warning === 0 &&
+              summary.checks.info === 0
             "
             >{{ summary.checks.total }} checks awaiting first synchronization</span
           >
-        </template>
-        <template v-else>No checks</template>
+        </div>
+        <div v-else>No checks</div>
       </div>
       <div class="col-1"></div>
       <!-- right -->
@@ -108,53 +109,79 @@
       </div>
       <div class="col-2"></div>
     </div>
+    <q-inner-loading :showing="loading" color="primary" />
   </div>
 </template>
 
 <script>
-import { mapGetters } from "vuex";
-import mixins from "@/mixins/mixins";
+import { ref, computed, watch, onMounted } from "vue";
+import { useStore } from "vuex";
+import { fetchAgent, refreshAgentWMI } from "@/api/agents";
+import { notifySuccess } from "@/utils/notify";
 
 export default {
   name: "SummaryTab",
-  mixins: [mixins],
-  data() {
-    return {};
-  },
-  methods: {
-    awaitingSync(total, passing, failing, warning, info) {
-      return total !== 0 && passing === 0 && failing === 0 && warning === 0 && info === 0;
-    },
-    refreshSummary() {
-      this.$q.loading.show();
-      this.$axios
-        .get(`/agents/${this.selectedAgentPk}/wmi/`)
-        .then(r => {
-          this.$store.dispatch("loadSummary", this.selectedAgentPk);
-          this.$q.loading.hide();
-        })
-        .catch(e => {
-          this.$q.loading.hide();
-        });
-    },
-  },
-  computed: {
-    ...mapGetters(["selectedAgentPk"]),
-    summary() {
-      return this.$store.state.agentSummary;
-    },
-    disks() {
-      if (this.summary.disks === undefined) {
+  setup(props) {
+    // vuex setup
+    const store = useStore();
+    const selectedAgent = computed(() => store.state.selectedRow);
+
+    // summary tab logic
+    const summary = ref(null);
+    const loading = ref(false);
+
+    const disks = computed(() => {
+      if (!summary.value.disks) {
         return [];
       }
 
-      const entries = Object.entries(this.summary.disks);
+      const entries = Object.entries(summary.value.disks);
       const ret = [];
       for (let [k, v] of entries) {
         ret.push(v);
       }
       return ret;
-    },
+    });
+
+    async function getSummary() {
+      loading.value = true;
+      summary.value = await fetchAgent(selectedAgent.value);
+      loading.value = false;
+    }
+
+    async function refreshSummary() {
+      loading.value = true;
+      try {
+        const result = await refreshAgentWMI(selectedAgent.value);
+        await getSummary();
+        notifySuccess(result);
+      } catch (e) {
+        console.error(e);
+      }
+      loading.value = false;
+    }
+
+    watch(selectedAgent, (newValue, oldValue) => {
+      if (newValue) {
+        getSummary();
+      }
+    });
+
+    onMounted(() => {
+      if (selectedAgent.value) getSummary();
+    });
+
+    return {
+      // reactive data
+      summary,
+      loading,
+      selectedAgent,
+      disks,
+
+      // methods
+      getSummary,
+      refreshSummary,
+    };
   },
 };
 </script>
diff --git a/src/components/agents/WinUpdateTab.vue b/src/components/agents/WinUpdateTab.vue
new file mode 100644
index 0000000..567a663
--- /dev/null
+++ b/src/components/agents/WinUpdateTab.vue
@@ -0,0 +1,276 @@
+<template>
+  <div v-if="!selectedAgent" class="q-pa-sm">No agent selected</div>
+  <div v-else>
+    <q-table
+      dense
+      :table-class="{ 'table-bgcolor': !$q.dark.isActive, 'table-bgcolor-dark': $q.dark.isActive }"
+      class="tabs-tbl-sticky"
+      :style="{ 'max-height': tabHeight }"
+      :rows="updates"
+      :columns="columns"
+      v-model:pagination="pagination"
+      :filter="filter"
+      row-key="id"
+      binary-state-sort
+      virtual-scroll
+      :loading="loading"
+      :rows-per-page-options="[0]"
+      no-data-label="No Windows Updates"
+    >
+      <template v-slot:top>
+        <q-btn dense flat push @click="getUpdates" icon="refresh" class="q-mr-sm" />
+        <q-btn label="Run Update Scan" dense flat push no-caps @click="updateScan" class="q-mr-sm" />
+        <q-space />
+
+        <q-input v-model="filter" outlined label="Search" dense clearable class="q-pr-sm">
+          <template v-slot:prepend>
+            <q-icon name="search" color="primary" />
+          </template>
+        </q-input>
+        <export-table-btn :data="updates" :columns="columns" />
+      </template>
+
+      <template v-slot:loading>
+        <q-inner-loading showing color="primary" />
+      </template>
+
+      <template v-slot:body="props">
+        <q-tr :props="props">
+          <q-menu context-menu>
+            <q-list dense style="min-width: 100px">
+              <q-item
+                v-if="!props.row.installed"
+                clickable
+                v-close-popup
+                @click="editWinUpdate(props.row.id, 'inherit')"
+              >
+                <q-item-section>Inherit</q-item-section>
+              </q-item>
+              <q-item
+                v-if="!props.row.installed"
+                clickable
+                v-close-popup
+                @click="editWinUpdate(props.row.id, 'approve')"
+              >
+                <q-item-section>Approve</q-item-section>
+              </q-item>
+              <q-item
+                v-if="!props.row.installed"
+                clickable
+                v-close-popup
+                @click="editWinUpdate(props.row.id, 'ignore')"
+              >
+                <q-item-section>Ignore</q-item-section>
+              </q-item>
+              <q-item
+                v-if="!props.row.installed"
+                clickable
+                v-close-popup
+                @click="editWinUpdate(props.row.id, 'nothing')"
+              >
+                <q-item-section>Do Nothing</q-item-section>
+              </q-item>
+            </q-list>
+          </q-menu>
+          <!-- policy -->
+          <q-td>
+            <q-icon v-if="props.row.action === 'nothing'" name="fiber_manual_record" color="grey">
+              <q-tooltip>Do Nothing</q-tooltip>
+            </q-icon>
+            <q-icon v-else-if="props.row.action === 'approve'" name="fas fa-check" color="primary">
+              <q-tooltip>Approve</q-tooltip>
+            </q-icon>
+            <q-icon v-else-if="props.row.action === 'ignore'" name="fas fa-check" color="negative">
+              <q-tooltip>Ignore</q-tooltip>
+            </q-icon>
+            <q-icon v-else-if="props.row.action === 'inherit'" name="fiber_manual_record" color="accent">
+              <q-tooltip>Inherit</q-tooltip>
+            </q-icon>
+          </q-td>
+          <q-td>
+            <q-icon v-if="props.row.installed" name="fas fa-check" color="positive">
+              <q-tooltip>Installed</q-tooltip>
+            </q-icon>
+            <q-icon v-else-if="props.row.action == 'approve'" name="fas fa-tasks" color="primary">
+              <q-tooltip>Pending</q-tooltip>
+            </q-icon>
+            <q-icon v-else-if="props.row.action == 'ignore'" name="fas fa-ban" color="negative">
+              <q-tooltip>Ignored</q-tooltip>
+            </q-icon>
+            <q-icon v-else name="fas fa-exclamation" color="warning">
+              <q-tooltip>Missing</q-tooltip>
+            </q-icon>
+          </q-td>
+          <q-td>{{ !props.row.severity ? "Other" : props.row.severity }}</q-td>
+          <q-td>{{ truncateText(props.row.title, 50) }}</q-td>
+          <q-td @click="showUpdateDetails(props.row)">
+            <span style="cursor: pointer; text-decoration: underline" class="text-primary">{{
+              truncateText(props.row.description, 50)
+            }}</span>
+          </q-td>
+          <q-td>{{ formatDate(props.row.date_installed) }}</q-td>
+        </q-tr>
+      </template>
+    </q-table>
+  </div>
+</template>
+
+<script>
+// composition imports
+import { ref, computed, watch, onMounted } from "vue";
+import { useStore } from "vuex";
+import { useQuasar } from "quasar";
+import { fetchAgentUpdates, editAgentUpdate, runAgentUpdateScan } from "@/api/winupdates";
+import { notifySuccess } from "@/utils/notify";
+import { truncateText, formatDate } from "@/utils/format";
+
+// ui imports
+import ExportTableBtn from "@/components/ui/ExportTableBtn";
+
+// static data
+const columns = [
+  {
+    name: "action",
+    field: "action",
+    align: "left",
+  },
+  {
+    name: "installed",
+    field: "installed",
+    align: "left",
+  },
+  {
+    name: "severity",
+    label: "Severity",
+    field: "severity",
+    align: "left",
+    sortable: true,
+  },
+  {
+    name: "title",
+    label: "Name",
+    field: "title",
+    align: "left",
+    sortable: true,
+  },
+  {
+    name: "description",
+    label: "More Info",
+    field: "description",
+    align: "left",
+    sortable: true,
+  },
+  {
+    name: "date_installed",
+    label: "Installed On",
+    field: "date_installed",
+    align: "left",
+    sortable: true,
+    sort: (a, b) => this.dateStringToUnix(a) - this.dateStringToUnix(b),
+  },
+];
+
+export default {
+  name: "WindowsUpdates",
+  components: { ExportTableBtn },
+  setup(props) {
+    // setup vuex
+    const store = useStore();
+    const selectedAgent = computed(() => store.state.selectedRow);
+    const tabHeight = computed(() => store.state.tabHeight);
+
+    // setup quasar
+    const $q = useQuasar();
+
+    // setup win update tab component
+    const updates = ref([]);
+    const filter = ref("");
+    const pagination = ref({
+      rowsPerPage: 0,
+      sortBy: "installed",
+      descending: false,
+    });
+    const loading = ref(false);
+
+    async function getUpdates() {
+      loading.value = true;
+      updates.value = await fetchAgentUpdates(selectedAgent.value);
+      loading.value = false;
+    }
+
+    async function editWinUpdate(pk, action) {
+      loading.value = true;
+      try {
+        const result = await editAgentUpdate(pk, { action: action });
+        await getUpdates(selectedAgent.value);
+        notifySuccess(result);
+      } catch (e) {
+        console.error(e);
+      }
+      loading.value = false;
+    }
+
+    async function updateScan() {
+      loading.value = true;
+      try {
+        const result = await runAgentUpdateScan(selectedAgent.value);
+        notifySuccess(result);
+      } catch (e) {
+        console.error(e);
+      }
+      loading.value = false;
+    }
+
+    function showUpdateDetails(update) {
+      let support_urls = "";
+      update.more_info_urls.forEach(u => {
+        support_urls += `<a href='${u}' target='_blank'>${u}</a><br/>`;
+      });
+      let cats = update.categories.join(", ");
+      $q.dialog({
+        title: update.title,
+        message:
+          `<b>Categories:</b> ${cats}<br/><br/>` +
+          "<b>Description</b><br/>" +
+          update.description.split(". ").join(".<br />") +
+          `<br/><br/><b>Support Urls</b><br/>${support_urls}`,
+        html: true,
+        fullWidth: true,
+      });
+    }
+
+    watch(selectedAgent, (newValue, oldValue) => {
+      if (newValue) {
+        getUpdates();
+      }
+    });
+
+    // vue lifecycle hooks
+    onMounted(() => {
+      if (selectedAgent.value) getUpdates();
+    });
+
+    return {
+      // reactive data
+      updates,
+      filter,
+      pagination,
+      loading,
+      selectedAgent,
+      tabHeight,
+
+      // non-reactive data
+      columns,
+
+      // methods
+      getUpdates,
+      editWinUpdate,
+      updateScan,
+      showUpdateDetails,
+      notifySuccess,
+      truncateText,
+      formatDate,
+    };
+  },
+};
+</script>
\ No newline at end of file
diff --git a/src/components/agents/WmiDetail.vue b/src/components/agents/WmiDetail.vue
new file mode 100644
index 0000000..dbd2b2c
--- /dev/null
+++ b/src/components/agents/WmiDetail.vue
@@ -0,0 +1,36 @@
+<template>
+  <div class="scroll" :style="{ 'max-height': tabHeight - 10 }">
+    <div v-for="i in info" :key="i + uid()">
+      <div v-for="j in i" :key="j + uid()">
+        <div v-for="(v, k) in j" :key="v + uid()">
+          <span class="text-overline">{{ k }}:</span>
+          <q-badge color="primary" class="q-ml-sm text-caption">{{ v }}</q-badge>
+        </div>
+      </div>
+      <q-separator v-if="info.length > 1" />
+    </div>
+  </div>
+</template>
+
+<script>
+// composition imports
+import { computed } from "vue";
+import { useStore } from "vuex";
+import { uid } from "quasar";
+
+export default {
+  name: "WmiDetail",
+  props: { info: !Object },
+  setup(props) {
+    // setup vuex
+    const store = useStore();
+    const tabHeight = computed(() => store.state.tabHeight);
+
+    return {
+      tabHeight,
+      uid,
+    };
+  },
+};
+</script>
+
diff --git a/src/components/agents/remotebg/EventLogManager.vue b/src/components/agents/remotebg/EventLogManager.vue
new file mode 100644
index 0000000..f6c1e03
--- /dev/null
+++ b/src/components/agents/remotebg/EventLogManager.vue
@@ -0,0 +1,140 @@
+<template>
+  <div class="q-pa-md">
+    <div class="row">
+      <div class="col-2">
+        <q-select dense options-dense outlined v-model="days" :options="lastDaysOptions" :label="showDays" />
+      </div>
+      <div class="col-7"></div>
+      <div class="col-3">
+        <code>{{ logType }} log total records: {{ events.length }}</code>
+      </div>
+    </div>
+    <q-table
+      dense
+      :table-class="{ 'table-bgcolor': !$q.dark.isActive, 'table-bgcolor-dark': $q.dark.isActive }"
+      class="remote-bg-tbl-sticky"
+      :rows="events"
+      :columns="columns"
+      v-model:pagination="pagination"
+      :filter="filter"
+      row-key="uid"
+      binary-state-sort
+      hide-bottom
+      virtual-scroll
+    >
+      <template v-slot:top>
+        <q-btn dense flat push @click="getEventLog" icon="refresh" />
+        <q-space />
+        <q-radio
+          v-model="logType"
+          color="cyan"
+          val="Application"
+          label="Application"
+          @update:model-value="getEventLog"
+        />
+        <q-radio v-model="logType" color="cyan" val="System" label="System" />
+        <q-radio v-model="logType" color="cyan" val="Security" label="Security" />
+        <q-space />
+        <q-input v-model="filter" outlined label="Search" dense clearable>
+          <template v-slot:prepend>
+            <q-icon name="search" />
+          </template>
+        </q-input>
+      </template>
+      <template v-slot:body="props">
+        <q-tr :props="props">
+          <q-td>{{ props.row.eventType }}</q-td>
+          <q-td>{{ props.row.source }}</q-td>
+          <q-td>{{ props.row.eventID }}</q-td>
+          <q-td>{{ props.row.time }}</q-td>
+          <q-td @click="showEventMessage(props.row.message)">
+            <span style="cursor: pointer; text-decoration: underline" class="text-primary">{{
+              truncateText(props.row.message, 30)
+            }}</span>
+          </q-td>
+        </q-tr>
+      </template>
+    </q-table>
+  </div>
+</template>
+
+<script>
+// compisition imports
+import { ref, computed, watch, onMounted } from "vue";
+import { useQuasar } from "quasar";
+import { fetchAgentEventLog } from "@/api/agents";
+import { truncateText } from "@/utils/format";
+
+// static data
+const columns = [
+  { name: "eventType", label: "Type", field: "eventType", align: "left", sortable: true },
+  { name: "source", label: "Source", field: "source", align: "left", sortable: true },
+  { name: "eventID", label: "Event ID", field: "eventID", align: "left", sortable: true },
+  { name: "time", label: "Time", field: "time", align: "left", sortable: true },
+  { name: "message", label: "Message (click to view full)", field: "message", align: "left", sortable: true },
+];
+
+const lastDaysOptions = [1, 2, 3, 4, 5, 10, 30, 60, 90, 180, 360, 9999];
+
+export default {
+  name: "EventLogManager",
+  props: {
+    agent_id: !String,
+  },
+  setup(props) {
+    // quasar setup
+    const $q = useQuasar();
+
+    // eventlog manager
+    const events = ref([]);
+    const logType = ref("Application");
+    const days = ref(1);
+    const filter = ref("");
+    const pagination = ref({
+      rowsPerPage: 0,
+      sortBy: "record",
+      descending: true,
+    });
+
+    const showDays = computed(() => `Show last ${days.value} days`);
+
+    watch([logType, days], getEventLog);
+
+    async function getEventLog() {
+      $q.loading.show({ message: `Loading ${logType.value} event log...please wait` });
+      events.value = await fetchAgentEventLog(props.agent_id, logType.value, days.value);
+      $q.loading.hide();
+    }
+
+    function showEventMessage(message) {
+      $q.dialog({
+        message: `<pre>${message}</pre>`,
+        html: true,
+        fullWidth: true,
+      });
+    }
+
+    // vue lifecycle hooks
+    onMounted(getEventLog);
+
+    return {
+      // reactive data
+      events,
+      logType,
+      days,
+      filter,
+      pagination,
+      showDays,
+
+      // non-reactive data
+      columns,
+      lastDaysOptions,
+
+      // methods
+      getEventLog,
+      showEventMessage,
+      truncateText,
+    };
+  },
+};
+</script>
\ No newline at end of file
diff --git a/src/components/agents/remotebg/ProcessManager.vue b/src/components/agents/remotebg/ProcessManager.vue
new file mode 100644
index 0000000..8391386
--- /dev/null
+++ b/src/components/agents/remotebg/ProcessManager.vue
@@ -0,0 +1,231 @@
+<template>
+  <div class="q-pa-md">
+    <q-table
+      dense
+      :table-class="{ 'table-bgcolor': !$q.dark.isActive, 'table-bgcolor-dark': $q.dark.isActive }"
+      class="remote-bg-tbl-sticky"
+      :rows="processes"
+      :columns="columns"
+      v-model:pagination="pagination"
+      :filter="filter"
+      row-key="id"
+      binary-state-sort
+      hide-bottom
+    >
+      <template v-slot:top>
+        <q-btn v-if="isPolling" dense flat push @click="stopPoll" icon="stop" label="Stop Live Refresh" />
+        <q-btn v-else dense flat push @click="startPoll" icon="play_arrow" label="Resume Live Refresh" />
+
+        <q-space />
+
+        <div class="q-pa-md q-gutter-sm">
+          <q-btn
+            :disable="pollInterval === 1"
+            dense
+            @click="pollIntervalChanged('subtract')"
+            push
+            icon="remove"
+            size="sm"
+            color="grey"
+          />
+          <q-btn dense push icon="add" size="sm" color="grey" @click="pollIntervalChanged('add')" />
+        </div>
+        <div class="text-overline">
+          <q-badge align="middle" size="sm" class="text-h6" color="blue" :label="pollInterval" />
+          Refresh interval (seconds)
+        </div>
+
+        <q-space />
+        <q-input v-model="filter" outlined label="Search" dense clearable>
+          <template v-slot:prepend>
+            <q-icon name="search" />
+          </template>
+        </q-input>
+      </template>
+      <template v-slot:body="props">
+        <q-tr :props="props">
+          <q-menu context-menu>
+            <q-list dense style="min-width: 200px">
+              <q-item clickable v-close-popup @click="killProcess(props.row.pid, props.row.name)">
+                <q-item-section thumbnail>
+                  <q-icon name="fas fa-trash-alt" size="xs" />
+                </q-item-section>
+                <q-item-section>End task</q-item-section>
+              </q-item>
+            </q-list>
+          </q-menu>
+          <q-td>{{ props.row.name }}</q-td>
+          <q-td>{{ props.row.cpu_percent }}%</q-td>
+          <q-td>{{ bytes2Human(props.row.membytes) }}</q-td>
+          <q-td>{{ props.row.username }}</q-td>
+          <q-td>{{ props.row.pid }}</q-td>
+          <q-td>{{ props.row.status }}</q-td>
+        </q-tr>
+      </template>
+    </q-table>
+  </div>
+</template>
+
+<script>
+import { ref, computed, onMounted, onBeforeUnmount } from "vue";
+import { useQuasar } from "quasar";
+import { fetchAgent, fetchAgentProcesses, killAgentProcess } from "@/api/agents";
+import { bytes2Human } from "@/utils/format";
+import { notifySuccess } from "@/utils/notify";
+
+const columns = [
+  {
+    name: "name",
+    label: "Name",
+    field: "name",
+    align: "left",
+    sortable: true,
+  },
+  {
+    name: "cpu_percent",
+    label: "CPU",
+    field: "cpu_percent",
+    align: "left",
+    sortable: true,
+    sort: (a, b, rowA, rowB) => parseInt(b) < parseInt(a),
+  },
+  {
+    name: "membytes",
+    label: "Memory",
+    field: "membytes",
+    align: "left",
+    sortable: true,
+  },
+  {
+    name: "username",
+    label: "User",
+    field: "username",
+    align: "left",
+    sortable: true,
+  },
+  {
+    name: "pid",
+    label: "PID",
+    field: "pid",
+    align: "left",
+    sortable: true,
+  },
+  {
+    name: "status",
+    label: "Status",
+    field: "status",
+    align: "left",
+    sortable: true,
+  },
+];
+
+export default {
+  name: "ProcessManager",
+  props: {
+    agent_id: !String,
+  },
+  setup(props) {
+    // setup quasar
+    const $q = useQuasar();
+
+    // polling setup
+    const pollInterval = ref(2);
+    const poll = ref(null);
+    const isPolling = computed(() => !!poll.value);
+
+    function startPoll() {
+      getProcesses();
+      refreshProcesses();
+    }
+
+    function stopPoll() {
+      clearInterval(poll.value);
+      poll.value = null;
+    }
+
+    function pollIntervalChanged(action) {
+      if (action === "subtract" && pollInterval.value <= 1) {
+        stopPoll();
+        startPoll();
+        return;
+      }
+      if (action === "add") {
+        pollInterval.value++;
+      } else {
+        pollInterval.value--;
+      }
+      stopPoll();
+      startPoll();
+    }
+
+    // process manager logic
+    const processes = ref([]);
+    const filter = ref("");
+    const memory = ref(null);
+
+    async function getProcesses() {
+      $q.loading.show({ message: "Loading Processes..." });
+      processes.value = await fetchAgentProcesses(props.agent_id);
+      $q.loading.hide();
+    }
+
+    function refreshProcesses() {
+      poll.value = setInterval(() => {
+        getProcesses(props.agent_id);
+      }, pollInterval.value * 1000);
+    }
+
+    async function killProcess(pid, name) {
+      $q.loading.show({ message: `Attempting to kill process ${name}` });
+      let result = "";
+      try {
+        result = await killAgentProcess(props.agent_id, pid);
+        notifySuccess(result);
+      } catch (e) {
+        console.log(error);
+      }
+      $q.loading.hide();
+    }
+
+    // table setup
+    const pagination = ref({
+      rowsPerPage: 99999,
+      sortBy: "cpu_percent",
+      descending: true,
+    });
+
+    // lifecycle hooks
+    onMounted(async () => {
+      // disable loading bar
+      $q.loadingBar.setDefaults({ size: "0px" });
+
+      memory.value = await fetchAgent(props.agent_id).total_ram;
+      getProcesses();
+      refreshProcesses();
+    });
+
+    onBeforeUnmount(() => clearInterval(poll.value));
+
+    return {
+      // reactive data
+      processes,
+      pagination,
+      filter,
+      memory,
+      isPolling,
+      pollInterval,
+
+      // non-reactive data
+      columns,
+
+      //methods
+      getProcesses,
+      killProcess,
+      startPoll,
+      stopPoll,
+      pollIntervalChanged,
+      bytes2Human,
+    };
+  },
+};
+</script>
\ No newline at end of file
diff --git a/src/components/agents/remotebg/ServicesManager.vue b/src/components/agents/remotebg/ServicesManager.vue
new file mode 100644
index 0000000..54acacc
--- /dev/null
+++ b/src/components/agents/remotebg/ServicesManager.vue
@@ -0,0 +1,373 @@
+<template>
+  <div class="q-pa-md">
+    <q-table
+      dense
+      :table-class="{ 'table-bgcolor': !$q.dark.isActive, 'table-bgcolor-dark': $q.dark.isActive }"
+      class="remote-bg-tbl-sticky"
+      :rows="services"
+      :columns="columns"
+      v-model:pagination="pagination"
+      :filter="filter"
+      row-key="display_name"
+      binary-state-sort
+      hide-bottom
+    >
+      <template v-slot:top>
+        <q-btn dense flat push @click="getServices" icon="refresh" />
+        <q-space />
+        <q-input v-model="filter" outlined label="Search" dense clearable>
+          <template v-slot:prepend>
+            <q-icon name="search" />
+          </template>
+        </q-input>
+      </template>
+      <template v-slot:body="props">
+        <q-tr :props="props">
+          <q-menu context-menu>
+            <q-list dense style="min-width: 200px">
+              <q-item clickable v-close-popup @click="sendServiceAction(props.row, 'start')">
+                <q-item-section>Start</q-item-section>
+              </q-item>
+              <q-item clickable v-close-popup @click="sendServiceAction(props.row, 'stop')">
+                <q-item-section>Stop</q-item-section>
+              </q-item>
+              <q-item clickable v-close-popup @click="sendServiceAction(props.row, 'restart')">
+                <q-item-section>Restart</q-item-section>
+              </q-item>
+              <q-separator />
+              <q-item clickable v-close-popup @click="showServiceDetail(props.row)">
+                <q-item-section>Service Details</q-item-section>
+              </q-item>
+            </q-list>
+          </q-menu>
+          <q-td key="display_name" :props="props">
+            <q-icon name="fas fa-cogs" />
+            &nbsp;&nbsp;&nbsp;{{ truncateText(props.row.display_name, 30) }}
+          </q-td>
+          <q-td key="name" :props="props">{{ props.row.name }}</q-td>
+          <q-td key="start_type" :props="props">{{
+            props.row.start_type.toLowerCase() === "automatic" && props.row.autodelay
+              ? `${props.row.start_type} (Delayed)`
+              : `${props.row.start_type}`
+          }}</q-td>
+          <q-td key="pid" :props="props">{{ props.row.pid === 0 ? "" : props.row.pid }}</q-td>
+          <q-td key="status" :props="props">{{ props.row.status }}</q-td>
+          <q-td key="username" :props="props">{{ props.row.username ? props.row.username : "LocalSystem" }}</q-td>
+        </q-tr>
+      </template>
+    </q-table>
+
+    <q-dialog v-if="service" v-model="showServiceDetailModal" @hide="closeServiceDetail">
+      <q-card style="width: 600px; max-width: 80vw">
+        <q-bar>
+          Service Details - {{ service.display_name }}
+          <q-space />
+          <q-btn dense flat icon="close" v-close-popup>
+            <q-tooltip class="bg-white text-primary">Close</q-tooltip>
+          </q-btn>
+        </q-bar>
+
+        <q-card-section>
+          <div class="row">
+            <div class="col-3">Service name:</div>
+            <div class="col-9">{{ service.name }}</div>
+          </div>
+          <br />
+          <div class="row">
+            <div class="col-3">Display name:</div>
+            <div class="col-9">{{ service.display_name }}</div>
+          </div>
+          <br />
+          <div class="row">
+            <div class="col-3">Description:</div>
+            <div class="col-9">
+              <q-field outlined :color="$q.dark.isActive ? 'white' : 'black'">{{ service.description }}</q-field>
+            </div>
+          </div>
+          <br />
+          <div class="row">
+            <div class="col-3">Path:</div>
+            <div class="col-9">
+              <code>{{ service.binpath }}</code>
+            </div>
+          </div>
+          <br />
+          <br />
+          <div class="row">
+            <div class="col-3">Startup type:</div>
+            <div class="col-5">
+              <q-select
+                dense
+                options-dense
+                outlined
+                v-model="startupType"
+                :options="startupOptions"
+                map-options
+                emit-value
+              />
+            </div>
+          </div>
+        </q-card-section>
+        <hr />
+        <q-card-section>
+          <div class="row">
+            <div class="col-3">Service status:</div>
+            <div class="col-9">{{ service.status }}</div>
+          </div>
+          <br />
+          <div class="row">
+            <q-btn-group push>
+              <q-btn
+                color="gray"
+                glossy
+                :text-color="$q.dark.isActive ? 'white' : 'black'"
+                push
+                label="Start"
+                @click="sendServiceAction(service, 'start')"
+              />
+              <q-btn
+                color="gray"
+                glossy
+                :text-color="$q.dark.isActive ? 'white' : 'black'"
+                push
+                label="Stop"
+                @click="sendServiceAction(service, 'stop')"
+              />
+              <q-btn
+                color="gray"
+                glossy
+                :text-color="$q.dark.isActive ? 'white' : 'black'"
+                push
+                label="Restart"
+                @click="sendServiceAction(service, 'restart')"
+              />
+            </q-btn-group>
+          </div>
+        </q-card-section>
+        <hr />
+        <q-card-actions align="right">
+          <q-btn
+            :loading="modalLoading"
+            :disable="!startupTypeEdited"
+            dense
+            label="Save"
+            color="primary"
+            @click="editServiceStartup()"
+          />
+          <q-btn dense label="Cancel" v-close-popup />
+        </q-card-actions>
+      </q-card>
+    </q-dialog>
+  </div>
+</template>
+
+<script>
+// composition imports
+import { ref, computed, onMounted } from "vue";
+import { useQuasar } from "quasar";
+import { getAgentServices, editAgentServiceStartType, sendAgentServiceAction } from "@/api/services";
+import { notifySuccess } from "@/utils/notify";
+import { truncateText } from "@/utils/format";
+
+// static data
+const columns = [
+  {
+    name: "display_name",
+    label: "Display Name",
+    field: "display_name",
+    align: "left",
+    sortable: true,
+  },
+  {
+    name: "name",
+    label: "Name",
+    field: "name",
+    align: "left",
+    sortable: true,
+  },
+  {
+    name: "start_type",
+    label: "Startup",
+    field: "start_type",
+    align: "left",
+    sortable: true,
+  },
+  {
+    name: "pid",
+    label: "PID",
+    field: "pid",
+    align: "left",
+    sortable: true,
+  },
+  {
+    name: "status",
+    label: "Status",
+    field: "status",
+    align: "left",
+    sortable: true,
+  },
+  {
+    name: "username",
+    label: "Log On As",
+    field: "username",
+    align: "left",
+    sortable: true,
+  },
+];
+
+// static data
+const startupOptions = [
+  {
+    label: "Automatic (Delayed Start)",
+    value: "autodelay",
+  },
+  {
+    label: "Automatic",
+    value: "automatic",
+  },
+  {
+    label: "Manual",
+    value: "manual",
+  },
+  {
+    label: "Disabled",
+    value: "disabled",
+  },
+];
+
+export default {
+  name: "ServicesManager",
+  props: {
+    agent_id: !String,
+  },
+  setup(props) {
+    // quasar setup
+    const $q = useQuasar();
+
+    // services manager setup
+    const services = ref([]);
+    const filter = ref("");
+    const pagination = ref({
+      rowsPerPage: 9999,
+      sortBy: "display_name",
+      descending: false,
+    });
+
+    // services detail modal
+    const service = ref(null);
+    const showServiceDetailModal = ref(false);
+    const startupType = ref("");
+    const modalLoading = ref(false);
+
+    const startupTypeEdited = computed(() => {
+      if (!service.value) return false;
+      else if (service.value.start_type.toLowerCase() === "automatic" && service.value.autodelay)
+        return startupType.value !== "autodelay";
+      else return service.value.start_type.toLowerCase() !== startupType.value;
+    });
+
+    function showServiceDetail(svc) {
+      service.value = svc;
+
+      if (svc.start_type.toLowerCase() === "automatic" && svc.autodelay) startupType.value = "autodelay";
+      else startupType.value = svc.start_type.toLowerCase();
+      showServiceDetailModal.value = true;
+    }
+
+    function closeServiceDetail() {
+      service.value = null;
+      startupType.value = false;
+      showServiceDetailModal.value = false;
+    }
+
+    async function getServices() {
+      $q.loading.show({ message: "Loading services..." });
+      services.value = await getAgentServices(props.agent_id);
+      $q.loading.hide();
+    }
+
+    async function sendServiceAction(service, action) {
+      let msg, status;
+      switch (action) {
+        case "start":
+          msg = "Starting";
+          status = "started";
+          break;
+        case "stop":
+          msg = "Stopping";
+          status = "stopped";
+          break;
+        case "restart":
+          msg = "Restarting";
+          status = "restarted";
+          break;
+        default:
+          msg = "error";
+      }
+      $q.loading.show({ message: `${msg} service ${service.display_name}` });
+      const data = {
+        sv_action: action,
+      };
+
+      try {
+        modalLoading.value = true;
+        await sendAgentServiceAction(props.agent_id, service.name, data);
+        getServices();
+        notifySuccess(`Service ${service.display_name} was ${status}!`);
+      } catch (e) {
+        console.error(e);
+      }
+      modalLoading.value = false;
+      $q.loading.hide();
+    }
+
+    async function editServiceStartup() {
+      const data = {
+        startType: startupType.value === "automatic" ? "auto" : startupType.value,
+      };
+
+      console.log(data);
+
+      try {
+        modalLoading.value = true;
+        await editAgentServiceStartType(props.agent_id, service.value.name, data);
+        notifySuccess(`Service ${service.value.name} was edited!`);
+        getServices();
+        closeServiceDetail();
+      } catch (e) {
+        console.error(e);
+      }
+      modalLoading.value = false;
+    }
+
+    // vue lifecycle hooks
+    onMounted(getServices);
+
+    return {
+      // reactive data
+      services,
+      service,
+      filter,
+      pagination,
+      startupType,
+      modalLoading,
+      startupTypeEdited,
+
+      // dialogs
+      showServiceDetailModal,
+      showServiceDetail,
+      closeServiceDetail,
+
+      // non-reactive data
+      columns,
+      startupOptions,
+
+      // methods
+      getServices,
+      sendServiceAction,
+      editServiceStartup,
+      truncateText,
+    };
+  },
+};
+</script>
\ No newline at end of file
diff --git a/src/components/automation/PolicyAutomatedTasksTab.vue b/src/components/automation/PolicyAutomatedTasksTab.vue
index 7643c71..b24bca9 100644
--- a/src/components/automation/PolicyAutomatedTasksTab.vue
+++ b/src/components/automation/PolicyAutomatedTasksTab.vue
@@ -175,8 +175,8 @@
 
 <script>
 import mixins from "@/mixins/mixins";
-import AddAutomatedTask from "@/components/modals/tasks/AddAutomatedTask";
-import EditAutomatedTask from "@/components/modals/tasks/EditAutomatedTask";
+import AddAutomatedTask from "@/components/tasks/AddAutomatedTask";
+import EditAutomatedTask from "@/components/tasks/EditAutomatedTask";
 import PolicyStatus from "@/components/automation/modals/PolicyStatus";
 
 export default {
diff --git a/src/components/automation/PolicyChecksTab.vue b/src/components/automation/PolicyChecksTab.vue
index 69da1ea..ee52e40 100644
--- a/src/components/automation/PolicyChecksTab.vue
+++ b/src/components/automation/PolicyChecksTab.vue
@@ -188,13 +188,13 @@
 <script>
 import mixins from "@/mixins/mixins";
 import PolicyStatus from "@/components/automation/modals/PolicyStatus";
-import DiskSpaceCheck from "@/components/modals/checks/DiskSpaceCheck";
-import PingCheck from "@/components/modals/checks/PingCheck";
-import CpuLoadCheck from "@/components/modals/checks/CpuLoadCheck";
-import MemCheck from "@/components/modals/checks/MemCheck";
-import WinSvcCheck from "@/components/modals/checks/WinSvcCheck";
-import ScriptCheck from "@/components/modals/checks/ScriptCheck";
-import EventLogCheck from "@/components/modals/checks/EventLogCheck";
+import DiskSpaceCheck from "@/components/checks/DiskSpaceCheck";
+import PingCheck from "@/components/checks/PingCheck";
+import CpuLoadCheck from "@/components/checks/CpuLoadCheck";
+import MemCheck from "@/components/checks/MemCheck";
+import WinSvcCheck from "@/components/checks/WinSvcCheck";
+import ScriptCheck from "@/components/checks/ScriptCheck";
+import EventLogCheck from "@/components/checks/EventLogCheck";
 
 export default {
   name: "PolicyChecksTab",
@@ -216,7 +216,7 @@ export default {
       checks: [],
       dialogComponent: null,
       showDialog: false,
-      editCheckPK: null,
+      editCheck: null,
       columns: [
         { name: "smsalert", field: "text_alert", align: "left" },
         { name: "emailalert", field: "email_alert", align: "left" },
@@ -309,7 +309,7 @@ export default {
         default:
           return null;
       }
-      this.editCheckPK = check.id;
+      this.editCheck = check;
       this.showDialog = true;
     },
     hideDialog() {
diff --git a/src/components/automation/modals/PolicyAdd.vue b/src/components/automation/modals/PolicyAdd.vue
index 1c940b0..2f72a44 100644
--- a/src/components/automation/modals/PolicyAdd.vue
+++ b/src/components/automation/modals/PolicyAdd.vue
@@ -48,7 +48,7 @@
         </q-card-section>
         <q-card-actions align="right">
           <q-btn dense flat label="Cancel" v-close-popup />
-          <q-btn v-if="options.length > 0" flat label="Submit" color="primary" type="submit" />
+          <q-btn v-if="options.length > 0" dense flat label="Submit" color="primary" type="submit" />
         </q-card-actions>
       </q-form>
     </q-card>
@@ -132,9 +132,8 @@ export default {
           },
         };
       } else if (this.type === "agent") {
-        url = "/agents/editagent/";
+        url = `/agents/${this.object.agent_id}/`;
         data = {
-          id: this.object.id,
           policy: this.selectedAgentPolicy,
           block_policy_inheritance: this.blockInheritance,
         };
diff --git a/src/components/automation/modals/PolicyStatus.vue b/src/components/automation/modals/PolicyStatus.vue
index d8d998f..462e745 100644
--- a/src/components/automation/modals/PolicyStatus.vue
+++ b/src/components/automation/modals/PolicyStatus.vue
@@ -113,8 +113,8 @@
 </template>
 
 <script>
-import ScriptOutput from "@/components/modals/checks/ScriptOutput";
-import EventLogCheckOutput from "@/components/modals/checks/EventLogCheckOutput";
+import ScriptOutput from "@/components/checks/ScriptOutput";
+import EventLogCheckOutput from "@/components/checks/EventLogCheckOutput";
 
 export default {
   name: "PolicyStatus",
diff --git a/src/components/checks/CpuLoadCheck.vue b/src/components/checks/CpuLoadCheck.vue
new file mode 100644
index 0000000..d6753e8
--- /dev/null
+++ b/src/components/checks/CpuLoadCheck.vue
@@ -0,0 +1,110 @@
+<template>
+  <q-dialog ref="dialogRef" @hide="onDialogHide">
+    <q-card class="q-dialog-plugin" style="width: 60vw">
+      <q-bar>
+        {{ check ? `Edit CPU Check` : "Add CPU Check" }}
+        <q-space />
+        <q-btn dense flat icon="close" v-close-popup>
+          <q-tooltip class="bg-white text-primary">Close</q-tooltip>
+        </q-btn>
+      </q-bar>
+      <q-form @submit.prevent="submit">
+        <div style="max-height: 70vh" class="scroll">
+          <q-card-section>
+            <q-input
+              dense
+              outlined
+              type="number"
+              v-model.number="localCheck.warning_threshold"
+              label="Warning Threshold (%)"
+              :rules="[val => val >= 0 || 'Minimum threshold is 0', val => val < 100 || 'Maximum threshold is 99']"
+            />
+          </q-card-section>
+          <q-card-section>
+            <q-input
+              dense
+              outlined
+              type="number"
+              v-model.number="localCheck.error_threshold"
+              label="Error Threshold (%)"
+              :rules="[val => val >= 0 || 'Minimum threshold is 0', val => val < 100 || 'Maximum threshold is 99']"
+            />
+          </q-card-section>
+          <q-card-section>
+            <q-select
+              outlined
+              dense
+              options-dense
+              v-model="localCheck.fails_b4_alert"
+              :options="failOptions"
+              label="Number of consecutive failures before alert"
+            />
+          </q-card-section>
+          <q-card-section>
+            <q-input
+              dense
+              outlined
+              type="number"
+              v-model.number="localCheck.run_interval"
+              label="Run this check every (seconds)"
+              hint="Setting this value to anything other than 0 will override the 'Run checks every' setting on the agent"
+            />
+          </q-card-section>
+        </div>
+        <q-card-actions align="right">
+          <q-btn dense flat label="Cancel" v-close-popup />
+          <q-btn :loading="loading" dense flat label="Save" color="primary" type="submit" />
+        </q-card-actions>
+      </q-form>
+    </q-card>
+  </q-dialog>
+</template>
+
+<script>
+// composition imports
+import { useDialogPluginComponent } from "quasar";
+import { useCheckModal } from "@/composables/checks";
+
+export default {
+  name: "CpuLoadCheck",
+  emits: [...useDialogPluginComponent.emits],
+  props: {
+    check: Object,
+    parent: Object, // {agent: agent.agent_id} or {policy: policy.id}
+  },
+  setup(props) {
+    // setup quasar dialog
+    const { dialogRef, onDialogHide, onDialogOK } = useDialogPluginComponent();
+
+    // check logic
+    const { check, loading, submit, failOptions } = useCheckModal({
+      editCheck: props.check,
+      initialState: {
+        ...props.parent,
+        check_type: "cpuload",
+        warning_threshold: 70,
+        error_threshold: 90,
+        run_interval: 0,
+        fails_b4_alert: 1,
+      },
+      onDialogOK,
+    });
+
+    return {
+      // reactive data
+      localCheck: check,
+      loading,
+
+      // non-reactive data
+      failOptions,
+
+      // methods
+      submit,
+
+      // quasar dialog
+      dialogRef,
+      onDialogHide,
+    };
+  },
+};
+</script>
\ No newline at end of file
diff --git a/src/components/checks/DiskSpaceCheck.vue b/src/components/checks/DiskSpaceCheck.vue
new file mode 100644
index 0000000..18d9f0d
--- /dev/null
+++ b/src/components/checks/DiskSpaceCheck.vue
@@ -0,0 +1,116 @@
+<template>
+  <q-dialog ref="dialogRef" @hide="onDialogHide">
+    <q-card class="q-dialog-plugin" style="width: 60vw">
+      <q-bar>
+        {{ check ? `Edit Disk Check` : "Add Disk Check" }}
+        <q-space />
+        <q-btn dense flat icon="close" v-close-popup>
+          <q-tooltip class="bg-white text-primary">Close</q-tooltip>
+        </q-btn>
+      </q-bar>
+
+      <q-form @submit.prevent="submit">
+        <div style="max-height: 70vh" class="scroll">
+          <q-card-section>
+            <q-select dense :disable="!!check" outlined v-model="localCheck.disk" :options="diskOptions" label="Disk" />
+          </q-card-section>
+          <q-card-section>
+            <q-input
+              dense
+              outlined
+              type="number"
+              v-model.number="localCheck.warning_threshold"
+              label="Warning Threshold Remaining (%)"
+              :rules="[val => val >= 0 || 'Minimum threshold is 0', val => val < 100 || 'Maximum threshold is 99']"
+            />
+          </q-card-section>
+          <q-card-section>
+            <q-input
+              dense
+              outlined
+              type="number"
+              v-model.number="localCheck.error_threshold"
+              label="Error Threshold Remaining (%)"
+              :rules="[val => val >= 0 || 'Minimum threshold is 0', val => val < 100 || 'Maximum threshold is 99']"
+            />
+          </q-card-section>
+          <q-card-section>
+            <q-select
+              outlined
+              dense
+              options-dense
+              v-model="localCheck.fails_b4_alert"
+              :options="failOptions"
+              label="Number of consecutive failures before alert"
+            />
+          </q-card-section>
+          <q-card-section>
+            <q-input
+              dense
+              outlined
+              type="number"
+              v-model.number="localCheck.run_interval"
+              label="Run this check every (seconds)"
+              hint="Setting this value to anything other than 0 will override the 'Run checks every' setting on the agent"
+            />
+          </q-card-section>
+        </div>
+        <q-card-actions align="right">
+          <q-btn dense flat label="Cancel" v-close-popup />
+          <q-btn :loading="loading" dense flat label="Save" color="primary" type="submit" />
+        </q-card-actions>
+      </q-form>
+    </q-card>
+  </q-dialog>
+</template>
+
+<script>
+// composition imports
+import { useDialogPluginComponent } from "quasar";
+import { useCheckModal } from "@/composables/checks";
+
+export default {
+  name: "DiskSpaceCheck",
+  emits: [...useDialogPluginComponent.emits],
+  props: {
+    check: Object,
+    parent: Object, // {agent: agent.agent_id} or {policy: policy.id} only when adding
+  },
+  setup(props) {
+    // setup quasar dialog
+    const { dialogRef, onDialogHide, onDialogOK } = useDialogPluginComponent();
+
+    // check logic
+    const { check, loading, submit, failOptions, diskOptions } = useCheckModal({
+      editCheck: props.check,
+      initialState: {
+        ...props.parent,
+        disk: null,
+        check_type: "diskspace",
+        warning_threshold: 25,
+        error_threshold: 10,
+        fails_b4_alert: 1,
+        run_interval: 0,
+      },
+      onDialogOK,
+    });
+
+    return {
+      // reactive data
+      localCheck: check,
+      loading,
+
+      // non-reactive data
+      failOptions,
+      diskOptions,
+
+      // methods
+      submit,
+
+      // quasar dialog
+      dialogRef,
+      onDialogHide,
+    };
+  },
+};
+</script>
\ No newline at end of file
diff --git a/src/components/checks/EventLogCheck.vue b/src/components/checks/EventLogCheck.vue
new file mode 100644
index 0000000..379e567
--- /dev/null
+++ b/src/components/checks/EventLogCheck.vue
@@ -0,0 +1,232 @@
+<template>
+  <q-dialog ref="dialogRef" @hide="onDialogHide">
+    <q-card class="q-dialog-plugin" style="width: 60vw">
+      <q-bar>
+        {{ check ? `Edit Event Log Check` : "Add Event Log Check" }}
+        <q-space />
+        <q-btn dense flat icon="close" v-close-popup>
+          <q-tooltip class="bg-white text-primary">Close</q-tooltip>
+        </q-btn>
+      </q-bar>
+
+      <q-form @submit.prevent="beforeSubmit">
+        <div style="max-height: 70vh" class="scroll">
+          <q-card-section>
+            <q-input
+              dense
+              outlined
+              v-model="localCheck.name"
+              label="Descriptive Name"
+              :rules="[val => !!val || '*Required']"
+            />
+          </q-card-section>
+          <q-card-section>
+            <q-select
+              dense
+              options-dense
+              outlined
+              v-model="localCheck.log_name"
+              :options="logNameOptions"
+              label="Event log to query"
+            />
+          </q-card-section>
+          <q-card-section>
+            <q-select
+              dense
+              options-dense
+              outlined
+              v-model="localCheck.fail_when"
+              :options="failWhenOptions"
+              label="Fail When"
+              emit-value
+              map-options
+            />
+          </q-card-section>
+          <q-card-section>
+            <q-input
+              dense
+              outlined
+              v-model="localCheck.event_id"
+              label="Event ID (Use * to match every event ID)"
+              :rules="[val => validateEventID(val) || 'Invalid Event ID']"
+            />
+          </q-card-section>
+          <q-card-section>
+            <q-checkbox v-model="eventSource" label="Event source" />
+            <q-input dense outlined v-model="localCheck.event_source" :disable="!eventSource" />
+          </q-card-section>
+          <q-card-section>
+            <q-checkbox v-model="eventMessage" label="Message contains string" />
+            <q-input dense outlined v-model="localCheck.event_message" :disable="!eventMessage" />
+          </q-card-section>
+          <q-card-section>
+            <q-input
+              dense
+              outlined
+              v-model.number="localCheck.search_last_days"
+              label="How many previous days to search (Enter 0 for the entire log)"
+              :rules="[
+                val => !!val.toString() || '*Required',
+                val => val >= 0 || 'Min 0',
+                val => val <= 9999 || 'Max 9999',
+              ]"
+            />
+          </q-card-section>
+          <q-card-section>
+            <span>Event Type:</span>
+            <div class="q-gutter-sm">
+              <q-radio dense v-model="localCheck.event_type" val="INFO" label="Information" />
+              <q-radio dense v-model="localCheck.event_type" val="WARNING" label="Warning" />
+              <q-radio dense v-model="localCheck.event_type" val="ERROR" label="Error" />
+              <q-radio dense v-model="localCheck.event_type" val="AUDIT_SUCCESS" label="Success Audit" />
+              <q-radio dense v-model="localCheck.event_type" val="AUDIT_FAILURE" label="Failure Audit" />
+            </div>
+          </q-card-section>
+          <q-card-section>
+            <q-select
+              outlined
+              dense
+              options-dense
+              map-options
+              emit-value
+              v-model="localCheck.alert_severity"
+              :options="severityOptions"
+              label="Alert Severity"
+            />
+          </q-card-section>
+          <q-card-section>
+            <q-input
+              label="Number of events found before alert"
+              dense
+              outlined
+              type="number"
+              v-model.number="localCheck.number_of_events_b4_alert"
+            />
+          </q-card-section>
+          <q-card-section>
+            <q-select
+              outlined
+              dense
+              options-dense
+              v-model="localCheck.fails_b4_alert"
+              :options="failOptions"
+              label="Number of consecutive failures before alert"
+            />
+          </q-card-section>
+          <q-card-section>
+            <q-input
+              outlined
+              dense
+              type="number"
+              v-model.number="localCheck.run_interval"
+              label="Run this check every (seconds)"
+              hint="Setting this value to anything other than 0 will override the 'Run checks every' setting on the agent"
+            />
+          </q-card-section>
+        </div>
+        <q-card-actions align="right">
+          <q-btn dense flat label="Cancel" v-close-popup />
+          <q-btn :loading="loading" dense flat label="Save" color="primary" type="submit" />
+        </q-card-actions>
+      </q-form>
+    </q-card>
+  </q-dialog>
+</template>
+
+<script>
+// composition imports
+import { ref, watch } from "vue";
+import { useDialogPluginComponent } from "quasar";
+import { useCheckModal } from "@/composables/checks";
+import { validateEventID } from "@/utils/validation";
+
+export default {
+  name: "EventLogCheck",
+  emits: [...useDialogPluginComponent.emits],
+  props: {
+    check: Object,
+    parent: Object, // {agent: agent.agent_id} or {policy: policy.id}
+  },
+  setup(props) {
+    // setup quasar dialog
+    const { dialogRef, onDialogHide, onDialogOK } = useDialogPluginComponent();
+
+    // check logic
+    const { check, loading, submit, failOptions, logNameOptions, failWhenOptions, severityOptions } = useCheckModal({
+      editCheck: props.check,
+      initialState: {
+        ...props.parent,
+        check_type: "eventlog",
+        log_name: "Application",
+        event_id: null,
+        event_source: null,
+        event_message: null,
+        event_type: "INFO",
+        fail_when: "contains",
+        search_last_days: 1,
+        fails_b4_alert: 1,
+        number_of_events_b4_alert: 1,
+        event_id_is_wildcard: false,
+        alert_severity: "warning",
+        run_interval: 0,
+      },
+      onDialogOK,
+    });
+
+    const eventMessage = ref(false);
+    const eventSource = ref(false);
+
+    // set check boxes on load
+    if (props.check) {
+      if (check.value.event_id_is_wildcard) {
+        check.value.event_id = "*";
+      }
+      if (check.value.event_source) {
+        eventSource.value = true;
+      }
+      if (check.value.event_message) {
+        eventMessage.value = true;
+      }
+    }
+
+    watch(eventMessage, (newValue, oldValue) => {
+      check.value.event_message = null;
+    });
+
+    watch(eventSource, (newValue, oldValue) => {
+      check.value.event_source = null;
+    });
+
+    function beforeSubmit() {
+      // format check data for saving
+      check.value.event_id_is_wildcard = check.value.event_id === "*" ? true : false;
+      if (check.value.event_source === "") check.value.event_source = null;
+      if (check.value.event_message === "") check.value.event_message = null;
+
+      submit();
+    }
+
+    return {
+      // reactive data
+      localCheck: check,
+      eventMessage,
+      eventSource,
+      loading,
+
+      // non-reactive data
+      failOptions,
+      logNameOptions,
+      failWhenOptions,
+      severityOptions,
+
+      // methods
+      beforeSubmit,
+      validateEventID,
+
+      // quasar dialog
+      dialogRef,
+      onDialogHide,
+    };
+  },
+};
+</script>
\ No newline at end of file
diff --git a/src/components/checks/EventLogCheckOutput.vue b/src/components/checks/EventLogCheckOutput.vue
new file mode 100644
index 0000000..39c92bd
--- /dev/null
+++ b/src/components/checks/EventLogCheckOutput.vue
@@ -0,0 +1,87 @@
+<template>
+  <q-dialog ref="dialogRef" @hide="onDialogHide">
+    <q-card class="q-dialog-plugin" style="min-width: 80vw">
+      <q-bar>
+        {{ evtLogData.readable_desc }}
+        <q-space />
+        <q-btn dense flat icon="close" v-close-popup>
+          <q-tooltip class="bg-white text-primary">Close</q-tooltip>
+        </q-btn>
+      </q-bar>
+      <q-card-section style="max-height: 70vh" class="scroll">
+        <div v-if="evtLogData.extra_details !== null">
+          <q-table
+            dense
+            style="height: 65vh"
+            :table-class="{ 'table-bgcolor': !$q.dark.isActive, 'table-bgcolor-dark': $q.dark.isActive }"
+            class="tabs-tbl-sticky"
+            :filter="filter"
+            :rows="evtLogData.extra_details.log"
+            :columns="columns"
+            v-model:pagination="pagination"
+            row-key="uid"
+            binary-state-sort
+            virtual-scroll
+            :rows-per-page-options="[0]"
+            no-data-label="No event logs"
+          >
+            <template v-slot:top>
+              <q-space />
+              <q-input v-model="filter" outlined label="Search" dense clearable class="q-pr-sm">
+                <template v-slot:prepend>
+                  <q-icon name="search" color="primary" />
+                </template>
+              </q-input>
+              <export-table-btn :data="evtLogData.extra_details.log" :columns="columns" />
+            </template>
+          </q-table>
+        </div>
+        <div v-else>Check has not run yet</div>
+      </q-card-section>
+    </q-card>
+  </q-dialog>
+</template>
+
+<script>
+// composition imports
+import { ref } from "vue";
+import { useDialogPluginComponent } from "quasar";
+
+//ui imports
+import ExportTableBtn from "@/components/ui/ExportTableBtn";
+
+// static data
+const columns = [
+  { name: "eventType", label: "Type", field: "eventType", align: "left", sortable: true },
+  { name: "source", label: "Source", field: "source", align: "left", sortable: true },
+  { name: "eventID", label: "Event ID", field: "eventID", align: "left", sortable: true },
+  { name: "time", label: "Time", field: "time", align: "left", sortable: true },
+  { name: "message", label: "Message", field: "message", align: "left", sortable: true },
+];
+export default {
+  name: "EventLogCheckOutput",
+  components: { ExportTableBtn },
+  emits: [...useDialogPluginComponent.emits],
+  props: { evtLogData: !Object },
+  setup(props) {
+    // setup quasar
+    const { dialogRef, onDialogHide } = useDialogPluginComponent();
+
+    const filter = ref("");
+    const pagination = ref({ rowsPerPage: 0, sortBy: "time", descending: true });
+
+    return {
+      // reactive data
+      filter,
+      pagination,
+
+      // non-reactive data
+      columns,
+
+      // quasar dialog
+      dialogRef,
+      onDialogHide,
+    };
+  },
+};
+</script>
\ No newline at end of file
diff --git a/src/components/checks/MemCheck.vue b/src/components/checks/MemCheck.vue
new file mode 100644
index 0000000..7afcb34
--- /dev/null
+++ b/src/components/checks/MemCheck.vue
@@ -0,0 +1,110 @@
+<template>
+  <q-dialog ref="dialogRef" @hide="onDialogHide">
+    <q-card class="q-dialog-plugin" style="width: 60vw">
+      <q-bar>
+        {{ check ? `Edit Memory Check` : "Add Memory Check" }}
+        <q-space />
+        <q-btn dense flat icon="close" v-close-popup>
+          <q-tooltip class="bg-white text-primary">Close</q-tooltip>
+        </q-btn>
+      </q-bar>
+      <q-form @submit.prevent="submit">
+        <div style="max-height: 70vh" class="scroll">
+          <q-card-section>
+            <q-input
+              dense
+              outlined
+              type="number"
+              v-model.number="localCheck.warning_threshold"
+              label="Warning Threshold (%)"
+              :rules="[val => val >= 0 || 'Minimum threshold is 0', val => val < 100 || 'Maximum threshold is 99']"
+            />
+          </q-card-section>
+          <q-card-section>
+            <q-input
+              dense
+              outlined
+              type="number"
+              v-model.number="localCheck.error_threshold"
+              label="Error Threshold (%)"
+              :rules="[val => val >= 0 || 'Minimum threshold is 0', val => val < 100 || 'Maximum threshold is 99']"
+            />
+          </q-card-section>
+          <q-card-section>
+            <q-select
+              outlined
+              dense
+              options-dense
+              v-model="localCheck.fails_b4_alert"
+              :options="failOptions"
+              label="Number of consecutive failures before alert"
+            />
+          </q-card-section>
+          <q-card-section>
+            <q-input
+              outlined
+              dense
+              type="number"
+              v-model.number="localCheck.run_interval"
+              label="Run this check every (seconds)"
+              hint="Setting this value to anything other than 0 will override the 'Run checks every' setting on the agent"
+            />
+          </q-card-section>
+        </div>
+        <q-card-actions align="right">
+          <q-btn dense flat label="Cancel" v-close-popup />
+          <q-btn :loading="loading" dense flat label="Save" color="primary" type="submit" />
+        </q-card-actions>
+      </q-form>
+    </q-card>
+  </q-dialog>
+</template>
+
+<script>
+// composition imports
+import { useDialogPluginComponent } from "quasar";
+import { useCheckModal } from "@/composables/checks";
+
+export default {
+  name: "MemCheck",
+  emits: [...useDialogPluginComponent.emits],
+  props: {
+    check: Object,
+    parent: Object, // {agent: agent.agent_id} or {policy: policy.id}
+  },
+  setup(props) {
+    // setup quasar dialog
+    const { dialogRef, onDialogHide, onDialogOK } = useDialogPluginComponent();
+
+    // check logic
+    const { check, loading, submit, failOptions } = useCheckModal({
+      editCheck: props.check,
+      initialState: {
+        ...props.parent,
+        check_type: "memory",
+        warning_threshold: 70,
+        error_threshold: 85,
+        fails_b4_alert: 1,
+        run_interval: 0,
+      },
+      onDialogOK,
+    });
+
+    return {
+      // reactive data
+      localCheck: check,
+      loading,
+
+      // non-reactive data
+      failOptions,
+
+      // methods
+      submit,
+
+      // quasar dialog
+      dialogRef,
+      onDialogHide,
+    };
+  },
+};
+</script>
\ No newline at end of file
diff --git a/src/components/checks/PingCheck.vue b/src/components/checks/PingCheck.vue
new file mode 100644
index 0000000..72d7567
--- /dev/null
+++ b/src/components/checks/PingCheck.vue
@@ -0,0 +1,143 @@
+<template>
+  <q-dialog ref="dialogRef" @hide="onDialogHide">
+    <q-card class="q-dialog-plugin" style="width: 60vw">
+      <q-bar>
+        {{ check ? `Edit Ping Check` : "Add Ping Check" }}
+        <q-space />
+        <q-btn dense flat icon="close" v-close-popup>
+          <q-tooltip class="bg-white text-primary">Close</q-tooltip>
+        </q-btn>
+      </q-bar>
+
+      <q-form @submit.prevent="submit">
+        <div style="max-height: 70vh" class="scroll">
+          <q-card-section>
+            <q-input
+              outlined
+              dense
+              v-model="localCheck.name"
+              label="Descriptive Name"
+              :rules="[val => !!val || '*Required']"
+            />
+          </q-card-section>
+          <q-card-section>
+            <q-input
+              dense
+              outlined
+              v-model="localCheck.ip"
+              label="Hostname or IP"
+              :rules="[val => !!val || '*Required']"
+            />
+          </q-card-section>
+          <q-card-section>
+            <q-select
+              outlined
+              dense
+              options-dense
+              emit-value
+              map-options
+              v-model="localCheck.alert_severity"
+              :options="severityOptions"
+              label="Alert Severity"
+            />
+          </q-card-section>
+          <q-card-section>
+            <q-select
+              outlined
+              dense
+              options-dense
+              map-options
+              emit-value
+              v-model="localCheck.fails_b4_alert"
+              :options="failOptions"
+              label="Number of consecutive failures before alert"
+            />
+          </q-card-section>
+          <q-card-section>
+            <q-input
+              outlined
+              dense
+              type="number"
+              v-model.number="localCheck.run_interval"
+              label="Run this check every (seconds)"
+              hint="Setting this value to anything other than 0 will override the 'Run checks every' setting on the agent"
+            />
+          </q-card-section>
+        </div>
+        <q-card-actions align="right">
+          <q-btn dense flat label="Cancel" v-close-popup />
+          <q-btn :loading="loading" dense flat label="Save" color="primary" type="submit" />
+        </q-card-actions>
+      </q-form>
+    </q-card>
+  </q-dialog>
+</template>
+
+<script>
+// composition imports
+import { useDialogPluginComponent } from "quasar";
+import { useCheckModal } from "@/composables/checks";
+
+export default {
+  name: "PingCheck",
+  emits: [...useDialogPluginComponent.emits],
+  props: {
+    check: Object,
+    parent: Object, // {agent: agent.agent_id} or {policy: policy.id}
+  },
+  setup(props) {
+    // setup quasar dialog
+    const { dialogRef, onDialogHide, onDialogOK } = useDialogPluginComponent();
+
+    // check logic
+    const { check, loading, submit, failOptions, severityOptions } = useCheckModal({
+      editCheck: props.check,
+      initialState: {
+        ...props.parent,
+        check_type: "ping",
+        name: null,
+        ip: null,
+        alert_severity: "warning",
+        fails_b4_alert: 1,
+        run_interval: 0,
+      },
+      onDialogOK,
+    });
+
+    return {
+      // reactive data
+      localCheck: check,
+      loading,
+
+      // non-reactive data
+      failOptions,
+      severityOptions,
+
+      // methods
+      submit,
+
+      // quasar dialog
+      dialogRef,
+      onDialogHide,
+    };
+  },
+  data() {
+    return {
+      pingcheck: {
+        check_type: "ping",
+        name: null,
+        ip: null,
+        alert_severity: "warning",
+        fails_b4_alert: 1,
+        run_interval: 0,
+      },
+      severityOptions: [
+        { label: "Informational", value: "info" },
+        { label: "Warning", value: "warning" },
+        { label: "Error", value: "error" },
+      ],
+      failOptions: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
+    };
+  },
+};
+</script>
\ No newline at end of file
diff --git a/src/components/checks/ScriptCheck.vue b/src/components/checks/ScriptCheck.vue
new file mode 100644
index 0000000..50541f8
--- /dev/null
+++ b/src/components/checks/ScriptCheck.vue
@@ -0,0 +1,186 @@
+<template>
+  <q-dialog ref="dialogRef" @hide="onDialogHide">
+    <q-card class="q-dialog-plugin" style="width: 60vw">
+      <q-bar>
+        {{ check ? `Edit Script Check` : "Add Script Check" }}
+        <q-space />
+        <q-btn dense flat icon="close" v-close-popup>
+          <q-tooltip class="bg-white text-primary">Close</q-tooltip>
+        </q-btn>
+      </q-bar>
+      <q-card-section v-if="scriptOptions.length === 0">
+        <p>You need to upload a script first</p>
+        <p>Settings -> Script Manager</p>
+      </q-card-section>
+
+      <q-form v-else @submit.prevent="beforeSubmit">
+        <q-card-section>
+          <tactical-dropdown
+            :rules="[val => !!val || '*Required']"
+            outlined
+            v-model="script"
+            :options="scriptOptions"
+            label="Select script"
+            mapOptions
+            :disable="!!check"
+          />
+        </q-card-section>
+        <q-card-section>
+          <q-select
+            dense
+            label="Script Arguments (press Enter after typing each argument)"
+            filled
+            v-model="args"
+            use-input
+            use-chips
+            multiple
+            hide-dropdown-icon
+            input-debounce="0"
+            new-value-mode="add"
+          />
+        </q-card-section>
+        <q-card-section>
+          <tactical-dropdown
+            label="Informational return codes (press Enter after typing each code)"
+            filled
+            v-model="localCheck.info_return_codes"
+            multiple
+            hide-dropdown-icon
+            use-input
+            input-debounce="0"
+            new-value-mode="add-unique"
+            @new-value="validateRetcode"
+          />
+        </q-card-section>
+        <q-card-section>
+          <tactical-dropdown
+            label="Warning return codes (press Enter after typing each code)"
+            filled
+            v-model="localCheck.warning_return_codes"
+            use-input
+            multiple
+            hide-dropdown-icon
+            input-debounce="0"
+            new-value-mode="add-unique"
+            @new-value="validateRetcode"
+          />
+        </q-card-section>
+        <q-card-section>
+          <q-input outlined dense v-model.number="timeout" label="Script Timeout (seconds)" />
+        </q-card-section>
+        <q-card-section>
+          <q-select
+            outlined
+            dense
+            options-dense
+            v-model="localCheck.fails_b4_alert"
+            :options="failOptions"
+            label="Number of consecutive failures before alert"
+          />
+        </q-card-section>
+        <q-card-section>
+          <q-input
+            outlined
+            dense
+            type="number"
+            v-model.number="localCheck.run_interval"
+            label="Run this check every (seconds)"
+            hint="Setting this value to anything other than 0 will override the 'Run checks every' setting on the agent"
+          />
+        </q-card-section>
+        <q-card-actions align="right">
+          <q-btn dense flat label="Cancel" v-close-popup />
+          <q-btn :loading="loading" dense flat label="Save" color="primary" type="submit" />
+        </q-card-actions>
+      </q-form>
+    </q-card>
+  </q-dialog>
+</template>
+
+<script>
+// composition imports
+import { computed, onMounted } from "vue";
+import { useStore } from "vuex";
+import { useDialogPluginComponent } from "quasar";
+import { useCheckModal } from "@/composables/checks";
+import { useScriptDropdown } from "@/composables/scripts";
+import { validateRetcode } from "@/utils/validation";
+
+// ui imports
+import TacticalDropdown from "@/components/ui/TacticalDropdown.vue";
+
+export default {
+  components: { TacticalDropdown },
+  name: "ScriptCheck",
+  emits: [...useDialogPluginComponent.emits],
+  props: {
+    check: Object,
+    parent: Object, // {agent: agent.agent_id} or {policy: policy.id}
+  },
+  setup(props) {
+    // setup vuex
+    const store = useStore();
+    const showCommunityScripts = computed(() => store.state.showCommunityScripts);
+
+    // setup quasar dialog
+    const { dialogRef, onDialogHide, onDialogOK } = useDialogPluginComponent();
+
+    // setup script dropdown
+    const { script, scriptOptions, defaultTimeout, defaultArgs, getScriptOptions } = useScriptDropdown(undefined, true);
+
+    // check logic
+
+    // set script if editing
+    if (props.check) {
+      script.value = props.check.script;
+    }
+
+    const { check, loading, submit, failOptions, severityOptions } = useCheckModal({
+      editCheck: props.check,
+      initialState: {
+        ...props.parent,
+        check_type: "script",
+        fails_b4_alert: 1,
+        info_return_codes: [],
+        warning_return_codes: [],
+        run_interval: 0,
+      },
+      onDialogOK,
+    });
+
+    function beforeSubmit() {
+      check.value.script = script.value;
+      check.value.script_args = defaultArgs.value;
+      check.value.timeout = defaultTimeout.value;
+
+      submit();
+    }
+
+    onMounted(() => {
+      getScriptOptions(showCommunityScripts.value);
+    });
+
+    return {
+      // reactive data
+      localCheck: check,
+      loading,
+      script,
+      timeout: defaultTimeout,
+      args: defaultArgs,
+
+      // non-reactive data
+      failOptions,
+      scriptOptions,
+      severityOptions,
+
+      // methods
+      beforeSubmit,
+      validateRetcode,
+
+      // quasar dialog
+      dialogRef,
+      onDialogHide,
+    };
+  },
+};
+</script>
\ No newline at end of file
diff --git a/src/components/modals/checks/ScriptOutput.vue b/src/components/checks/ScriptOutput.vue
similarity index 72%
rename from src/components/modals/checks/ScriptOutput.vue
rename to src/components/checks/ScriptOutput.vue
index 0e86fb1..77f95f0 100644
--- a/src/components/modals/checks/ScriptOutput.vue
+++ b/src/components/checks/ScriptOutput.vue
@@ -1,6 +1,6 @@
 <template>
-  <q-dialog ref="dialog" @hide="onHide">
-    <q-card class="q-dialog-plugin q-pa-xs" style="min-width: 70vw">
+  <q-dialog ref="dialogRef" @hide="onDialogHide">
+    <q-card class="q-dialog-plugin" style="min-width: 70vw">
       <q-bar>
         {{ scriptInfo.readable_desc }}
         <q-space />
@@ -38,20 +38,21 @@
 </template>
 
 <script>
+// composition imports
+import { useDialogPluginComponent } from "quasar";
+
 export default {
   name: "ScriptOutput",
-  emits: ["hide", "ok", "cancel"],
-  props: ["scriptInfo"],
-  methods: {
-    show() {
-      this.$refs.dialog.show();
-    },
-    hide() {
-      this.$refs.dialog.hide();
-    },
-    onHide() {
-      this.$emit("hide");
-    },
+  emits: [...useDialogPluginComponent.emits],
+  props: { scriptInfo: !Object },
+  setup(props) {
+    // quasar dialog setup
+    const { dialogRef, onDialogHide } = useDialogPluginComponent();
+
+    return {
+      dialogRef,
+      onDialogHide,
+    };
   },
 };
 </script>
\ No newline at end of file
diff --git a/src/components/checks/WinSvcCheck.vue b/src/components/checks/WinSvcCheck.vue
new file mode 100644
index 0000000..e8774ef
--- /dev/null
+++ b/src/components/checks/WinSvcCheck.vue
@@ -0,0 +1,204 @@
+<template>
+  <q-dialog ref="dialogRef" @hide="onDialogHide">
+    <q-card class="q-dialog-plugin" style="width: 60vw">
+      <q-bar>
+        {{ check ? `Edit Memory Check` : "Add Memory Check" }}
+        <q-space />
+        <q-btn dense flat icon="close" v-close-popup>
+          <q-tooltip class="bg-white text-primary">Close</q-tooltip>
+        </q-btn>
+      </q-bar>
+
+      <q-form @submit.prevent="submit">
+        <div style="max-height: 70vh" class="scroll">
+          <q-card-section>
+            <!-- policy check, either choose from a list of default services or enter manually -->
+            <q-radio
+              v-if="isPolicy && !check"
+              v-model="localCheck.svc_policy_mode"
+              val="default"
+              label="Choose from defaults"
+            />
+            <q-radio
+              v-if="isPolicy && !check"
+              v-model="localCheck.svc_policy_mode"
+              val="manual"
+              label="Enter manually"
+            />
+            <q-select
+              v-if="isPolicy && localCheck.svc_policy_mode === 'default' && !check"
+              :rules="[val => !!val || '*Required']"
+              dense
+              options-dense
+              outlined
+              v-model="localCheck.svc_name"
+              :options="serviceOptions"
+              label="Service"
+              map-options
+              emit-value
+              :disable="!!check"
+            />
+            <q-input
+              v-if="isPolicy && localCheck.svc_policy_mode === 'manual'"
+              :rules="[val => !!val || '*Required']"
+              outlined
+              dense
+              v-model="localCheck.svc_name"
+              label="Service Name"
+            />
+            <q-input
+              v-if="isPolicy && localCheck.svc_policy_mode === 'manual'"
+              :rules="[val => !!val || '*Required']"
+              outlined
+              dense
+              v-model="localCheck.svc_display_name"
+              label="Display Name"
+            />
+            <!-- agent check -->
+            <!-- disable selection if editing -->
+            <q-select
+              v-if="isAgent"
+              :rules="[val => !!val || '*Required']"
+              dense
+              options-dense
+              outlined
+              v-model="localCheck.svc_name"
+              :options="serviceOptions"
+              label="Service"
+              map-options
+              emit-value
+              :disable="!!check"
+            />
+          </q-card-section>
+          <q-card-section>
+            <q-checkbox v-model="localCheck.pass_if_start_pending" label="PASS if service is in 'Start Pending' mode" />
+            <br />
+            <q-checkbox v-model="localCheck.pass_if_svc_not_exist" label="PASS if service doesn't exist" />
+            <br />
+            <q-checkbox v-model="localCheck.restart_if_stopped" label="Restart service if it's stopped" />
+          </q-card-section>
+          <q-card-section>
+            <q-select
+              outlined
+              dense
+              options-dense
+              map-options
+              emit-value
+              v-model="localCheck.alert_severity"
+              :options="severityOptions"
+              label="Alert Severity"
+            />
+          </q-card-section>
+          <q-card-section>
+            <q-select
+              outlined
+              dense
+              options-dense
+              v-model="localCheck.fails_b4_alert"
+              :options="failOptions"
+              label="Number of consecutive failures before alert"
+            />
+          </q-card-section>
+          <q-card-section>
+            <q-input
+              dense
+              outlined
+              type="number"
+              v-model.number="localCheck.run_interval"
+              label="Run this check every (seconds)"
+              hint="Setting this value to anything other than 0 will override the 'Run checks every' setting on the agent"
+            />
+          </q-card-section>
+        </div>
+        <q-card-actions align="right">
+          <q-btn dense flat label="Cancel" v-close-popup />
+          <q-btn :loading="loading" dense flat label="Save" color="primary" type="submit" />
+        </q-card-actions>
+      </q-form>
+    </q-card>
+  </q-dialog>
+</template>
+
+<script>
+// composition imports
+import { computed, watch } from "vue";
+import { useDialogPluginComponent } from "quasar";
+import { useCheckModal } from "@/composables/checks";
+
+export default {
+  name: "WinSvcCheck",
+  emits: [...useDialogPluginComponent.emits],
+  props: {
+    check: Object,
+    parent: Object, // {agent: agent.agent_id} or {policy: policy.id}
+  },
+  setup(props) {
+    // setup quasar dialog
+    const { dialogRef, onDialogHide, onDialogOK } = useDialogPluginComponent();
+
+    // check logic
+    const { check, loading, submit, failOptions, severityOptions, serviceOptions } = useCheckModal({
+      editCheck: props.check,
+      initialState: {
+        ...props.parent,
+        check_type: "winsvc",
+        svc_name: null,
+        svc_display_name: null,
+        svc_policy_mode: null,
+        pass_if_start_pending: false,
+        pass_if_svc_not_exist: false,
+        restart_if_stopped: false,
+        fails_b4_alert: 1,
+        alert_severity: "warning",
+        run_interval: 0,
+      },
+      onDialogOK,
+    });
+
+    watch(
+      () => check.value.svc_name,
+      (newvalue, oldValue) => {
+        check.value.svc_display_name = serviceOptions.value.find(i => i.value === check.value.svc_name).label;
+      }
+    );
+
+    watch(
+      () => check.value.svc_policy_mode,
+      (newValue, oldValue) => {
+        check.value.svc_name = null;
+        check.value.svc_display_name = null;
+      }
+    );
+
+    const isPolicy = computed(() => {
+      if (props.check) return !!props.check.policy;
+      else return !!props.parent.policy;
+    });
+
+    const isAgent = computed(() => {
+      if (props.check) return !!props.check.agent;
+      else return !!props.parent.agent;
+    });
+
+    return {
+      // reactive data
+      localCheck: check,
+      loading,
+      isPolicy,
+      isAgent,
+
+      // non-reactive data
+      failOptions,
+      severityOptions,
+      serviceOptions,
+
+      // methods
+      submit,
+
+      // quasar dialog
+      dialogRef,
+      onDialogHide,
+    };
+  },
+};
+</script>
\ No newline at end of file
diff --git a/src/components/graphs/CheckGraph.vue b/src/components/graphs/CheckGraph.vue
index eda38f3..7a4d4c0 100644
--- a/src/components/graphs/CheckGraph.vue
+++ b/src/components/graphs/CheckGraph.vue
@@ -124,7 +124,7 @@ export default {
       this.$q.loading.show();
 
       this.$axios
-        .patch(`/checks/history/${this.check.id}/`, { timeFilter: this.timeFilter })
+        .patch(`/checks/${this.check.id}/history/`, { timeFilter: this.timeFilter })
         .then(r => {
           this.history = Object.freeze(r.data);
 
diff --git a/src/components/modals/admin/RolesForm.vue b/src/components/modals/admin/RolesForm.vue
deleted file mode 100644
index 5f3a9b4..0000000
--- a/src/components/modals/admin/RolesForm.vue
+++ /dev/null
@@ -1,266 +0,0 @@
-<template>
-  <q-card style="min-width: 85vh" class="q-pa-md">
-    <q-form ref="form" @submit="onSubmit">
-      <q-card-section class="row items-center">
-        <div class="text-h6">{{ title }}</div>
-        <q-space />
-        <q-btn icon="close" flat round dense v-close-popup />
-      </q-card-section>
-      <q-card-section class="row">
-        <div class="col-2">Name:</div>
-        <q-input dense outlined v-model="role.name" class="col-8" :rules="[val => !!val || '*Required']" />
-        <div class="col-2"></div>
-      </q-card-section>
-      <q-card-section class="scroll" style="height: 75vh">
-        <!-- Permissions -->
-        <div class="text-subtitle2">Super User</div>
-        <hr />
-        <q-card-section class="row">
-          <div class="q-gutter-sm">
-            <q-checkbox v-model="role.is_superuser" label="Super User" @update:model-value="superUser" />
-          </div>
-        </q-card-section>
-
-        <div class="text-subtitle2">Accounts</div>
-        <hr />
-        <q-card-section class="row">
-          <div class="q-gutter-sm">
-            <q-checkbox v-model="role.can_manage_accounts" label="Manage User Accounts" />
-            <q-checkbox v-model="role.can_manage_roles" label="Manage Permissions" />
-          </div>
-        </q-card-section>
-
-        <div class="text-subtitle2">Agents</div>
-        <hr />
-        <q-card-section class="row">
-          <div class="q-gutter-sm">
-            <q-checkbox v-model="role.can_use_mesh" label="Use MeshCentral" />
-            <q-checkbox v-model="role.can_uninstall_agents" label="Uninstall Agents" />
-            <q-checkbox v-model="role.can_update_agents" label="Update Agents" />
-            <q-checkbox v-model="role.can_edit_agent" label="Edit Agents" />
-            <q-checkbox v-model="role.can_manage_procs" label="Manage Processes" />
-            <q-checkbox v-model="role.can_view_eventlogs" label="View Event Logs" />
-            <q-checkbox v-model="role.can_send_cmd" label="Send Command" />
-            <q-checkbox v-model="role.can_reboot_agents" label="Reboot Agents" />
-            <q-checkbox v-model="role.can_install_agents" label="Install Agents" />
-            <q-checkbox v-model="role.can_run_scripts" label="Run Script" />
-            <q-checkbox v-model="role.can_run_bulk" label="Bulk Actions" />
-          </div>
-        </q-card-section>
-        <div class="text-subtitle2">Core</div>
-        <hr />
-        <q-card-section class="row">
-          <div class="q-gutter-sm">
-            <q-checkbox v-model="role.can_manage_notes" label="Manage Notes" />
-            <q-checkbox v-model="role.can_view_core_settings" label="View Global Settings" />
-            <q-checkbox v-model="role.can_edit_core_settings" label="Edit Global Settings" />
-            <q-checkbox v-model="role.can_do_server_maint" label="Do Server Maintenance" />
-            <q-checkbox v-model="role.can_code_sign" label="Manage Code Signing" />
-            <q-checkbox v-model="role.can_manage_api_keys" label="Manage API Keys" />
-          </div>
-        </q-card-section>
-
-        <div class="text-subtitle2">Checks</div>
-        <hr />
-        <q-card-section class="row">
-          <div class="q-gutter-sm">
-            <q-checkbox v-model="role.can_manage_checks" label="Manage Checks" />
-            <q-checkbox v-model="role.can_run_checks" label="Run Checks" />
-          </div>
-        </q-card-section>
-
-        <div class="text-subtitle2">Clients</div>
-        <hr />
-        <q-card-section class="row">
-          <div class="q-gutter-sm">
-            <q-checkbox v-model="role.can_manage_clients" label="Manage Clients" />
-            <q-checkbox v-model="role.can_manage_sites" label="Manage Sites" />
-            <q-checkbox v-model="role.can_manage_deployments" label="Manage Deployments" />
-          </div>
-        </q-card-section>
-
-        <div class="text-subtitle2">Automation Policies</div>
-        <hr />
-        <q-card-section class="row">
-          <div class="q-gutter-sm">
-            <q-checkbox v-model="role.can_manage_automation_policies" label="Manage Automation Policies" />
-          </div>
-        </q-card-section>
-
-        <div class="text-subtitle2">Tasks</div>
-        <hr />
-        <q-card-section class="row">
-          <div class="q-gutter-sm">
-            <q-checkbox v-model="role.can_manage_autotasks" label="Manage Tasks" />
-            <q-checkbox v-model="role.can_run_autotasks" label="Run Tasks" />
-          </div>
-        </q-card-section>
-
-        <div class="text-subtitle2">Logs</div>
-        <hr />
-        <q-card-section class="row">
-          <div class="q-gutter-sm">
-            <q-checkbox v-model="role.can_view_auditlogs" label="View Audit Logs" />
-            <q-checkbox v-model="role.can_manage_pendingactions" label="Manage Pending Actions" />
-            <q-checkbox v-model="role.can_view_debuglogs" label="View Debug Logs" />
-          </div>
-        </q-card-section>
-
-        <div class="text-subtitle2">Scripts</div>
-        <hr />
-        <q-card-section class="row">
-          <div class="q-gutter-sm">
-            <q-checkbox v-model="role.can_manage_scripts" label="Manage Scripts" />
-          </div>
-        </q-card-section>
-
-        <div class="text-subtitle2">Alerts</div>
-        <hr />
-        <q-card-section class="row">
-          <div class="q-gutter-sm">
-            <q-checkbox v-model="role.can_manage_alerts" label="Manage Alerts" />
-          </div>
-        </q-card-section>
-
-        <div class="text-subtitle2">Windows Services</div>
-        <hr />
-        <q-card-section class="row">
-          <div class="q-gutter-sm">
-            <q-checkbox v-model="role.can_manage_winsvcs" label="Manage Windows Services" />
-          </div>
-        </q-card-section>
-
-        <div class="text-subtitle2">Software</div>
-        <hr />
-        <q-card-section class="row">
-          <div class="q-gutter-sm">
-            <q-checkbox v-model="role.can_manage_software" label="Manage Software" />
-          </div>
-        </q-card-section>
-
-        <div class="text-subtitle2">Windows Updates</div>
-        <hr />
-        <q-card-section class="row">
-          <div class="q-gutter-sm">
-            <q-checkbox v-model="role.can_manage_winupdates" label="Manage Windows Updates" />
-          </div>
-        </q-card-section>
-      </q-card-section>
-      <q-card-section class="row items-center">
-        <q-btn label="Save" color="primary" type="submit" />
-      </q-card-section>
-    </q-form>
-  </q-card>
-</template>
-
-<script>
-import mixins from "@/mixins/mixins";
-
-export default {
-  name: "RolesForm",
-  emits: ["close"],
-  mixins: [mixins],
-  props: { pk: Number },
-  data() {
-    return {
-      roles: [],
-      role: {
-        name: "",
-        is_superuser: false,
-        can_use_mesh: false,
-        can_uninstall_agents: false,
-        can_update_agents: false,
-        can_edit_agent: false,
-        can_manage_procs: false,
-        can_view_eventlogs: false,
-        can_send_cmd: false,
-        can_reboot_agents: false,
-        can_install_agents: false,
-        can_run_scripts: false,
-        can_run_bulk: false,
-        can_manage_notes: false,
-        can_view_core_settings: false,
-        can_edit_core_settings: false,
-        can_manage_api_keys: false,
-        can_do_server_maint: false,
-        can_code_sign: false,
-        can_manage_checks: false,
-        can_run_checks: false,
-        can_manage_clients: false,
-        can_manage_sites: false,
-        can_manage_deployments: false,
-        can_manage_automation_policies: false,
-        can_manage_autotasks: false,
-        can_run_autotasks: false,
-        can_view_auditlogs: false,
-        can_manage_pendingactions: false,
-        can_view_debuglogs: false,
-        can_manage_scripts: false,
-        can_manage_alerts: false,
-        can_manage_winsvcs: false,
-        can_manage_software: false,
-        can_manage_winupdates: false,
-        can_manage_accounts: false,
-        can_manage_roles: false,
-      },
-    };
-  },
-  computed: {
-    title() {
-      return this.pk ? "Edit Role" : "Add Role";
-    },
-  },
-  methods: {
-    getRole() {
-      this.$q.loading.show();
-      this.$axios.get(`/accounts/${this.pk}/role/`).then(r => {
-        this.$q.loading.hide();
-        this.role = r.data;
-      });
-    },
-    getPerms() {
-      this.$axios.get("/accounts/permslist/").then(r => (this.roles = r.data));
-    },
-    superUser(val) {
-      for (const prop in this.role) {
-        if (this.roles.indexOf(`${prop}`) > -1) {
-          this.role[prop] = val;
-        }
-      }
-    },
-    onSubmit() {
-      this.$q.loading.show();
-      if (this.pk) {
-        this.$axios
-          .put(`/accounts/${this.pk}/role/`, this.role)
-          .then(() => {
-            this.$q.loading.hide();
-            this.$emit("close");
-            this.notifySuccess("Role edited!");
-          })
-          .catch(() => {
-            this.$q.loading.hide();
-          });
-      } else {
-        this.$axios
-          .post("/accounts/roles/", this.role)
-          .then(() => {
-            this.$q.loading.hide();
-            this.$emit("close");
-            this.notifySuccess(`Role was added!`);
-          })
-          .catch(() => {
-            this.$q.loading.hide();
-          });
-      }
-    },
-  },
-  mounted() {
-    // If pk prop is set that means we are editting
-    if (this.pk) {
-      this.getRole();
-    }
-    this.getPerms();
-  },
-};
-</script>
\ No newline at end of file
diff --git a/src/components/modals/agents/AgentRecovery.vue b/src/components/modals/agents/AgentRecovery.vue
index 91cf35c..30dd94b 100644
--- a/src/components/modals/agents/AgentRecovery.vue
+++ b/src/components/modals/agents/AgentRecovery.vue
@@ -57,7 +57,7 @@ export default {
   emits: ["close"],
   mixins: [mixins],
   props: {
-    pk: Number,
+    agent_id: !String,
   },
   data() {
     return {
@@ -82,12 +82,11 @@ export default {
     recover() {
       this.$q.loading.show();
       const data = {
-        pk: this.pk,
         cmd: this.cmd,
         mode: this.mode,
       };
       this.$axios
-        .post("/agents/recover/", data)
+        .post(`/agents/${this.agent_id}/recover/`, data)
         .then(r => {
           this.$q.loading.hide();
           this.$emit("close");
diff --git a/src/components/modals/agents/EditAgent.vue b/src/components/modals/agents/EditAgent.vue
index 12a0e1a..1f62200 100644
--- a/src/components/modals/agents/EditAgent.vue
+++ b/src/components/modals/agents/EditAgent.vue
@@ -155,7 +155,7 @@ export default {
   methods: {
     getAgentInfo() {
       this.$axios
-        .get(`/agents/${this.selectedAgentPk}/agenteditdetails/`)
+        .get(`/agents/${this.selectedAgentId}/`)
         .then(r => {
           this.agent = r.data;
           this.allTimezones = Object.freeze(r.data.all_timezones);
@@ -218,7 +218,7 @@ export default {
       }
 
       this.$axios
-        .patch("/agents/editagent/", {
+        .put(`/agents/${this.selectedAgentId}/`, {
           ...this.agent,
           custom_fields: this.formatCustomFields(this.customFields, this.custom_fields),
         })
@@ -231,7 +231,7 @@ export default {
     },
   },
   computed: {
-    ...mapGetters(["selectedAgentPk"]),
+    ...mapGetters(["selectedAgentId"]),
   },
   mounted() {
     // Get custom fields
diff --git a/src/components/modals/agents/InstallAgent.vue b/src/components/modals/agents/InstallAgent.vue
index 2765da0..390dd90 100644
--- a/src/components/modals/agents/InstallAgent.vue
+++ b/src/components/modals/agents/InstallAgent.vue
@@ -165,7 +165,7 @@ export default {
 
       if (this.installMethod === "manual") {
         this.$axios
-          .post("/agents/installagent/", data)
+          .post("/agents/installer/", data)
           .then(r => {
             this.info = {
               expires: this.expires,
@@ -179,7 +179,7 @@ export default {
         this.$q.loading.show({ message: "Generating executable..." });
 
         this.$axios
-          .post("/agents/installagent/", data, { responseType: "blob" })
+          .post("/agents/installer/", data, { responseType: "blob" })
           .then(r => {
             this.$q.loading.hide();
             const blob = new Blob([r.data], { type: "application/vnd.microsoft.portable-executable" });
@@ -195,7 +195,7 @@ export default {
       } else if (this.installMethod === "powershell") {
         const psName = `rmm-${clientStripped}-${siteStripped}-${this.agenttype}.ps1`;
         this.$axios
-          .post("/agents/installagent/", data, { responseType: "blob" })
+          .post("/agents/installer/", data, { responseType: "blob" })
           .then(({ data }) => {
             const blob = new Blob([data], { type: "text/plain" });
             let link = document.createElement("a");
diff --git a/src/components/modals/agents/RebootLater.vue b/src/components/modals/agents/RebootLater.vue
index ed13c34..4e118c9 100644
--- a/src/components/modals/agents/RebootLater.vue
+++ b/src/components/modals/agents/RebootLater.vue
@@ -48,9 +48,9 @@ export default {
   methods: {
     scheduleReboot() {
       this.$q.loading.show({ message: "Contacting agent..." });
-      const data = { pk: this.selectedAgentPk, datetime: this.datetime };
+      const data = { pk: this.selectedAgentId, datetime: this.datetime };
       this.$axios
-        .patch("/agents/reboot/", data)
+        .patch(`/agents/${this.selectedAgentId}reboot/`, data)
         .then(r => {
           this.$q.loading.hide();
           this.$emit("close");
@@ -76,7 +76,7 @@ export default {
     },
   },
   computed: {
-    ...mapGetters(["selectedAgentPk"]),
+    ...mapGetters(["selectedAgentId"]),
   },
   mounted() {
     this.getCurrentDate();
diff --git a/src/components/modals/agents/SendCommand.vue b/src/components/modals/agents/SendCommand.vue
index 9f9e5ee..63b4128 100644
--- a/src/components/modals/agents/SendCommand.vue
+++ b/src/components/modals/agents/SendCommand.vue
@@ -58,7 +58,7 @@ export default {
   name: "SendCommand",
   mixins: [mixins],
   props: {
-    pk: Number,
+    agent_id: !String,
   },
   data() {
     return {
@@ -82,13 +82,12 @@ export default {
       this.ret = null;
       this.loading = true;
       const data = {
-        pk: this.pk,
         cmd: this.cmd,
         shell: this.shell,
         timeout: this.timeout,
       };
       this.$axios
-        .post("/agents/sendrawcmd/", data)
+        .post(`/agents/${this.agent_id}/cmd/`, data)
         .then(r => {
           this.loading = false;
           this.ret = r.data;
diff --git a/src/components/modals/alerts/AlertsOverview.vue b/src/components/modals/alerts/AlertsOverview.vue
index 2ba0286..528507e 100644
--- a/src/components/modals/alerts/AlertsOverview.vue
+++ b/src/components/modals/alerts/AlertsOverview.vue
@@ -158,7 +158,7 @@
 
 <script>
 import mixins from "@/mixins/mixins";
-import ScriptOutput from "@/components/modals/checks/ScriptOutput";
+import ScriptOutput from "@/components/checks/ScriptOutput";
 
 export default {
   name: "AlertsOverview",
diff --git a/src/components/modals/checks/CpuLoadCheck.vue b/src/components/modals/checks/CpuLoadCheck.vue
deleted file mode 100644
index 8738ac6..0000000
--- a/src/components/modals/checks/CpuLoadCheck.vue
+++ /dev/null
@@ -1,134 +0,0 @@
-<template>
-  <q-card style="min-width: 400px">
-    <q-card-section class="row items-center">
-      <div v-if="mode === 'add'" class="text-h6">Add CPU Load Check</div>
-      <div v-else-if="mode === 'edit'" class="text-h6">Edit CPU Load Check</div>
-      <q-space />
-      <q-btn icon="close" flat round dense v-close-popup />
-    </q-card-section>
-
-    <q-form @submit.prevent="mode === 'add' ? addCheck() : editCheck()">
-      <q-card-section>
-        <q-input
-          outlined
-          type="number"
-          v-model.number="cpuloadcheck.warning_threshold"
-          label="Warning Threshold (%)"
-          :rules="[val => val >= 0 || 'Minimum threshold is 0', val => val < 100 || 'Maximum threshold is 99']"
-        />
-      </q-card-section>
-      <q-card-section>
-        <q-input
-          outlined
-          type="number"
-          v-model.number="cpuloadcheck.error_threshold"
-          label="Error Threshold (%)"
-          :rules="[val => val >= 0 || 'Minimum threshold is 0', val => val < 100 || 'Maximum threshold is 99']"
-        />
-      </q-card-section>
-      <q-card-section>
-        <q-select
-          outlined
-          dense
-          options-dense
-          v-model="cpuloadcheck.fails_b4_alert"
-          :options="failOptions"
-          label="Number of consecutive failures before alert"
-        />
-      </q-card-section>
-      <q-card-section>
-        <q-input
-          dense
-          outlined
-          type="number"
-          v-model.number="cpuloadcheck.run_interval"
-          label="Run this check every (seconds)"
-          hint="Setting this value to anything other than 0 will override the 'Run checks every' setting on the agent"
-        />
-      </q-card-section>
-      <q-card-actions align="right">
-        <q-btn v-if="mode === 'add'" label="Add" color="primary" type="submit" />
-        <q-btn v-else-if="mode === 'edit'" label="Edit" color="primary" type="submit" />
-        <q-btn label="Cancel" v-close-popup />
-      </q-card-actions>
-    </q-form>
-  </q-card>
-</template>
-
-<script>
-import mixins from "@/mixins/mixins";
-export default {
-  name: "CpuLoadCheck",
-  emits: ["close"],
-  props: {
-    agentpk: Number,
-    policypk: Number,
-    mode: String,
-    checkpk: Number,
-  },
-  mixins: [mixins],
-  data() {
-    return {
-      cpuloadcheck: {
-        check_type: "cpuload",
-        warning_threshold: 70,
-        error_threshold: 90,
-        run_interval: 0,
-        fails_b4_alert: 1,
-      },
-      failOptions: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
-    };
-  },
-  methods: {
-    getCheck() {
-      this.$axios
-        .get(`/checks/${this.checkpk}/check/`)
-        .then(r => (this.cpuloadcheck = r.data))
-        .catch(e => {});
-    },
-    addCheck() {
-      if (!this.isValidThreshold(this.cpuloadcheck.warning_threshold, this.cpuloadcheck.error_threshold)) {
-        return;
-      }
-
-      const pk = this.policypk ? { policy: this.policypk } : { pk: this.agentpk };
-      const data = {
-        ...pk,
-        check: this.cpuloadcheck,
-      };
-      this.$axios
-        .post("/checks/checks/", data)
-        .then(r => {
-          this.$emit("close");
-          this.reloadChecks();
-          this.notifySuccess(r.data);
-        })
-        .catch(e => {});
-    },
-    editCheck() {
-      if (!this.isValidThreshold(this.cpuloadcheck.warning_threshold, this.cpuloadcheck.error_threshold)) {
-        return;
-      }
-
-      this.$axios
-        .patch(`/checks/${this.checkpk}/check/`, this.cpuloadcheck)
-        .then(r => {
-          this.$emit("close");
-          this.reloadChecks();
-          this.notifySuccess(r.data);
-        })
-        .catch(e => {});
-    },
-    reloadChecks() {
-      if (this.agentpk) {
-        this.$store.dispatch("loadChecks", this.agentpk);
-      }
-    },
-  },
-  mounted() {
-    if (this.mode === "edit") {
-      this.getCheck();
-    }
-  },
-};
-</script>
\ No newline at end of file
diff --git a/src/components/modals/checks/DiskSpaceCheck.vue b/src/components/modals/checks/DiskSpaceCheck.vue
deleted file mode 100644
index df347f9..0000000
--- a/src/components/modals/checks/DiskSpaceCheck.vue
+++ /dev/null
@@ -1,165 +0,0 @@
-<template>
-  <q-card style="min-width: 400px">
-    <q-card-section class="row items-center">
-      <div v-if="mode === 'add'" class="text-h6">Add Disk Space Check</div>
-      <div v-else-if="mode === 'edit'" class="text-h6">Edit Disk Space Check</div>
-      <q-space />
-      <q-btn icon="close" flat round dense v-close-popup />
-    </q-card-section>
-
-    <q-form @submit.prevent="mode === 'add' ? addCheck() : editCheck()">
-      <q-card-section>
-        <q-select
-          :disable="this.mode === 'edit'"
-          outlined
-          v-model="diskcheck.disk"
-          :options="diskOptions"
-          label="Disk"
-        />
-      </q-card-section>
-      <q-card-section>
-        <q-input
-          outlined
-          type="number"
-          v-model.number="diskcheck.warning_threshold"
-          label="Warning Threshold Remaining (%)"
-          :rules="[val => val >= 0 || 'Minimum threshold is 0', val => val < 100 || 'Maximum threshold is 99']"
-        />
-      </q-card-section>
-      <q-card-section>
-        <q-input
-          outlined
-          type="number"
-          v-model.number="diskcheck.error_threshold"
-          label="Error Threshold Remaining (%)"
-          :rules="[val => val >= 0 || 'Minimum threshold is 0', val => val < 100 || 'Maximum threshold is 99']"
-        />
-      </q-card-section>
-      <q-card-section>
-        <q-select
-          outlined
-          dense
-          options-dense
-          v-model="diskcheck.fails_b4_alert"
-          :options="failOptions"
-          label="Number of consecutive failures before alert"
-        />
-      </q-card-section>
-      <q-card-section>
-        <q-input
-          dense
-          outlined
-          type="number"
-          v-model.number="diskcheck.run_interval"
-          label="Run this check every (seconds)"
-          hint="Setting this value to anything other than 0 will override the 'Run checks every' setting on the agent"
-        />
-      </q-card-section>
-      <q-card-actions align="right">
-        <q-btn v-if="mode === 'add'" label="Add" color="primary" type="submit" />
-        <q-btn v-else-if="mode === 'edit'" label="Edit" color="primary" type="submit" />
-        <q-btn label="Cancel" v-close-popup />
-      </q-card-actions>
-    </q-form>
-  </q-card>
-</template>
-
-<script>
-import { mapGetters } from "vuex";
-import mixins from "@/mixins/mixins";
-export default {
-  name: "DiskSpaceCheck",
-  emits: ["close"],
-  props: {
-    agentpk: Number,
-    policypk: Number,
-    mode: String,
-    checkpk: Number,
-  },
-  mixins: [mixins],
-  data() {
-    return {
-      diskcheck: {
-        disk: null,
-        check_type: "diskspace",
-        warning_threshold: 25,
-        error_threshold: 10,
-        fails_b4_alert: 1,
-        run_interval: 0,
-      },
-      diskOptions: [],
-      failOptions: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
-    };
-  },
-  methods: {
-    setDiskOptions() {
-      if (this.policypk) {
-        this.$axios
-          .get("/checks/getalldisks/")
-          .then(r => {
-            this.diskOptions = r.data;
-            this.diskcheck.disk = "C:";
-          })
-          .catch(e => {});
-      } else {
-        this.diskOptions = this.agentDisks.map(i => i.device);
-        this.diskcheck.disk = this.diskOptions[0];
-      }
-    },
-    getCheck() {
-      this.$axios
-        .get(`/checks/${this.checkpk}/check/`)
-        .then(r => (this.diskcheck = r.data))
-        .catch(e => {});
-    },
-    addCheck() {
-      if (!this.isValidThreshold(this.diskcheck.warning_threshold, this.diskcheck.error_threshold, true)) {
-        return;
-      }
-
-      const pk = this.policypk ? { policy: this.policypk } : { pk: this.agentpk };
-      const data = {
-        ...pk,
-        check: this.diskcheck,
-      };
-      this.$axios
-        .post("/checks/checks/", data)
-        .then(r => {
-          this.$emit("close");
-          this.reloadChecks();
-          this.notifySuccess(r.data);
-        })
-        .catch(e => {});
-    },
-    editCheck() {
-      if (!this.isValidThreshold(this.diskcheck.warning_threshold, this.diskcheck.error_threshold, true)) {
-        return;
-      }
-
-      this.$axios
-        .patch(`/checks/${this.checkpk}/check/`, this.diskcheck)
-        .then(r => {
-          this.$emit("close");
-          this.reloadChecks();
-          this.notifySuccess(r.data);
-        })
-        .catch(e => {});
-    },
-    reloadChecks() {
-      if (this.agentpk) {
-        this.$store.dispatch("loadChecks", this.agentpk);
-      }
-    },
-  },
-  computed: {
-    ...mapGetters(["agentDisks"]),
-  },
-  mounted() {
-    if (this.mode === "add") {
-      this.setDiskOptions();
-    } else if (this.mode === "edit") {
-      this.getCheck();
-    }
-  },
-};
-</script>
\ No newline at end of file
diff --git a/src/components/modals/checks/EventLogCheck.vue b/src/components/modals/checks/EventLogCheck.vue
deleted file mode 100644
index aa023f7..0000000
--- a/src/components/modals/checks/EventLogCheck.vue
+++ /dev/null
@@ -1,270 +0,0 @@
-<template>
-  <q-card style="min-width: 40vw">
-    <q-card-section class="row items-center">
-      <div v-if="mode === 'add'" class="text-h6">Add Event Log Check</div>
-      <div v-else-if="mode === 'edit'" class="text-h6">Edit Event Log Check</div>
-      <q-space />
-      <q-btn icon="close" flat round dense v-close-popup />
-    </q-card-section>
-
-    <q-form @submit.prevent="mode === 'add' ? addCheck() : editCheck()">
-      <q-card-section>
-        <q-input
-          dense
-          outlined
-          v-model="eventlogcheck.name"
-          label="Descriptive Name"
-          :rules="[val => !!val || '*Required']"
-        />
-      </q-card-section>
-      <q-card-section>
-        <q-select
-          dense
-          options-dense
-          outlined
-          v-model="eventlogcheck.log_name"
-          :options="logNameOptions"
-          label="Event log to query"
-        />
-      </q-card-section>
-      <q-card-section>
-        <q-select
-          dense
-          options-dense
-          outlined
-          v-model="eventlogcheck.fail_when"
-          :options="failWhenOptions"
-          label="Fail When"
-          emit-value
-          map-options
-        />
-      </q-card-section>
-      <q-card-section>
-        <q-input
-          dense
-          outlined
-          v-model="eventlogcheck.event_id"
-          label="Event ID (Use * to match every event ID)"
-          :rules="[val => validateEventID(val) || 'Invalid Event ID']"
-        />
-      </q-card-section>
-      <q-card-section>
-        <q-checkbox
-          v-model="eventSource"
-          label="Event source"
-          @update:model-value="eventlogcheck.event_source = null"
-        />
-        <q-input dense outlined v-model="eventlogcheck.event_source" :disable="!eventSource" />
-      </q-card-section>
-      <q-card-section>
-        <q-checkbox
-          v-model="eventMessage"
-          label="Message contains string"
-          @update:model-value="eventlogcheck.event_message = null"
-        />
-        <q-input dense outlined v-model="eventlogcheck.event_message" :disable="!eventMessage" />
-      </q-card-section>
-      <q-card-section>
-        <q-input
-          dense
-          outlined
-          v-model.number="eventlogcheck.search_last_days"
-          label="How many previous days to search (Enter 0 for the entire log)"
-          :rules="[
-            val => !!val.toString() || '*Required',
-            val => val >= 0 || 'Min 0',
-            val => val <= 9999 || 'Max 9999',
-          ]"
-        />
-      </q-card-section>
-      <q-card-section>
-        <span>Event Type:</span>
-        <div class="q-gutter-sm">
-          <q-radio dense v-model="eventlogcheck.event_type" val="INFO" label="Information" />
-          <q-radio dense v-model="eventlogcheck.event_type" val="WARNING" label="Warning" />
-          <q-radio dense v-model="eventlogcheck.event_type" val="ERROR" label="Error" />
-          <q-radio dense v-model="eventlogcheck.event_type" val="AUDIT_SUCCESS" label="Success Audit" />
-          <q-radio dense v-model="eventlogcheck.event_type" val="AUDIT_FAILURE" label="Failure Audit" />
-        </div>
-      </q-card-section>
-      <q-card-section>
-        <q-select
-          outlined
-          dense
-          options-dense
-          map-options
-          emit-value
-          v-model="eventlogcheck.alert_severity"
-          :options="severityOptions"
-          label="Alert Severity"
-        />
-      </q-card-section>
-      <q-card-section>
-        <q-input
-          label="Number of events found before alert"
-          dense
-          outlined
-          type="number"
-          v-model.number="eventlogcheck.number_of_events_b4_alert"
-        />
-      </q-card-section>
-      <q-card-section>
-        <q-select
-          outlined
-          dense
-          options-dense
-          v-model="eventlogcheck.fails_b4_alert"
-          :options="failOptions"
-          label="Number of consecutive failures before alert"
-        />
-      </q-card-section>
-      <q-card-section>
-        <q-input
-          outlined
-          dense
-          type="number"
-          v-model.number="eventlogcheck.run_interval"
-          label="Run this check every (seconds)"
-          hint="Setting this value to anything other than 0 will override the 'Run checks every' setting on the agent"
-        />
-      </q-card-section>
-      <q-card-actions align="right">
-        <q-btn v-if="mode === 'add'" label="Add" color="primary" type="submit" />
-        <q-btn v-else-if="mode === 'edit'" label="Edit" color="primary" type="submit" />
-        <q-btn label="Cancel" v-close-popup />
-      </q-card-actions>
-    </q-form>
-  </q-card>
-</template>
-
-<script>
-import mixins from "@/mixins/mixins";
-export default {
-  name: "EventLogCheck",
-  emits: ["close"],
-  props: {
-    agentpk: Number,
-    policypk: Number,
-    mode: String,
-    checkpk: Number,
-  },
-  mixins: [mixins],
-  data() {
-    return {
-      eventlogcheck: {
-        check_type: "eventlog",
-        log_name: "Application",
-        event_id: null,
-        event_source: null,
-        event_message: null,
-        event_type: "INFO",
-        fail_when: "contains",
-        search_last_days: 1,
-        fails_b4_alert: 1,
-        number_of_events_b4_alert: 1,
-        event_id_is_wildcard: false,
-        alert_severity: "warning",
-        run_interval: 0,
-      },
-      eventMessage: false,
-      eventSource: false,
-      logNameOptions: ["Application", "System", "Security"],
-      failWhenOptions: [
-        { label: "Log contains", value: "contains" },
-        { label: "Log does not contain", value: "not_contains" },
-      ],
-      severityOptions: [
-        { label: "Informational", value: "info" },
-        { label: "Warning", value: "warning" },
-        { label: "Error", value: "error" },
-      ],
-      failOptions: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
-    };
-  },
-  methods: {
-    getCheck() {
-      this.$axios
-        .get(`/checks/${this.checkpk}/check/`)
-        .then(r => {
-          this.eventlogcheck = r.data;
-          if (r.data.check_type === "eventlog" && r.data.event_id_is_wildcard) {
-            this.eventlogcheck.event_id = "*";
-          }
-          if (r.data.check_type === "eventlog" && r.data.event_source !== null && r.data.event_source !== "") {
-            this.eventSource = true;
-          }
-          if (r.data.check_type === "eventlog" && r.data.event_message !== null && r.data.event_message !== "") {
-            this.eventMessage = true;
-          }
-        })
-        .catch(e => {});
-    },
-    addCheck() {
-      const pk = this.policypk ? { policy: this.policypk } : { pk: this.agentpk };
-      this.eventlogcheck.event_id_is_wildcard = this.eventlogcheck.event_id === "*" ? true : false;
-
-      if (this.eventlogcheck.event_source === "") {
-        this.eventlogcheck.event_source = null;
-      }
-
-      if (this.eventlogcheck.event_message === "") {
-        this.eventlogcheck.event_message = null;
-      }
-
-      const data = {
-        ...pk,
-        check: this.eventlogcheck,
-      };
-      this.$axios
-        .post("/checks/checks/", data)
-        .then(r => {
-          this.$emit("close");
-          this.reloadChecks();
-          this.notifySuccess(r.data);
-        })
-        .catch(e => {});
-    },
-    editCheck() {
-      this.eventlogcheck.event_id_is_wildcard = this.eventlogcheck.event_id === "*" ? true : false;
-
-      if (this.eventlogcheck.event_source === "") {
-        this.eventlogcheck.event_source = null;
-      }
-
-      if (this.eventlogcheck.event_message === "") {
-        this.eventlogcheck.event_message = null;
-      }
-
-      this.$axios
-        .patch(`/checks/${this.checkpk}/check/`, this.eventlogcheck)
-        .then(r => {
-          this.$emit("close");
-          this.reloadChecks();
-          this.notifySuccess(r.data);
-        })
-        .catch(e => {});
-    },
-    reloadChecks() {
-      if (this.agentpk) {
-        this.$store.dispatch("loadChecks", this.agentpk);
-      }
-    },
-    validateEventID(val) {
-      if (val === null || val.toString().replace(/\s/g, "") === "") {
-        return false;
-      } else if (val === "*") {
-        return true;
-      } else if (!isNaN(val)) {
-        return true;
-      } else {
-        return false;
-      }
-    },
-  },
-  mounted() {
-    if (this.mode === "edit") {
-      this.getCheck();
-    }
-  },
-};
-</script>
\ No newline at end of file
diff --git a/src/components/modals/checks/EventLogCheckOutput.vue b/src/components/modals/checks/EventLogCheckOutput.vue
deleted file mode 100644
index 41248e3..0000000
--- a/src/components/modals/checks/EventLogCheckOutput.vue
+++ /dev/null
@@ -1,52 +0,0 @@
-<template>
-  <q-card style="min-width: 90vw" class="q-pa-xs">
-    <q-card-section>
-      <div class="row items-center">
-        <div class="text-h6">{{ evtlogdata.desc }}</div>
-        <q-space />
-        <q-btn icon="close" flat round dense v-close-popup />
-      </div>
-      <div v-if="evtlogdata.extra_details !== null">
-        <q-table
-          dense
-          :table-class="{ 'table-bgcolor': !$q.dark.isActive, 'table-bgcolor-dark': $q.dark.isActive }"
-          class="remote-bg-tbl-sticky"
-          :rows="evtlogdata.extra_details.log"
-          :columns="columns"
-          v-model:pagination="pagination"
-          row-key="uid"
-          binary-state-sort
-          virtual-scroll
-          no-data-label="No event logs"
-        />
-      </div>
-      <div v-else>Check has not run yet</div>
-    </q-card-section>
-  </q-card>
-</template>
-
-<script>
-export default {
-  name: "EventLogCheckOutput",
-  props: ["evtlogdata"],
-  data() {
-    return {
-      pagination: {
-        rowsPerPage: 0,
-        sortBy: "time",
-        descending: true,
-      },
-      columns: [
-        { name: "eventType", label: "Type", field: "eventType", align: "left", sortable: true },
-        { name: "source", label: "Source", field: "source", align: "left", sortable: true },
-        { name: "eventID", label: "Event ID", field: "eventID", align: "left", sortable: true },
-        { name: "time", label: "Time", field: "time", align: "left", sortable: true },
-        { name: "message", label: "Message", field: "message", align: "left", sortable: true },
-      ],
-    };
-  },
-  beforeUnmount() {
-    this.$emit("close");
-  },
-};
-</script>
\ No newline at end of file
diff --git a/src/components/modals/checks/MemCheck.vue b/src/components/modals/checks/MemCheck.vue
deleted file mode 100644
index 6e8a334..0000000
--- a/src/components/modals/checks/MemCheck.vue
+++ /dev/null
@@ -1,134 +0,0 @@
-<template>
-  <q-card style="min-width: 400px">
-    <q-card-section class="row items-center">
-      <div v-if="mode === 'add'" class="text-h6">Add Memory Check</div>
-      <div v-else-if="mode === 'edit'" class="text-h6">Edit Memory Check</div>
-      <q-space />
-      <q-btn icon="close" flat round dense v-close-popup />
-    </q-card-section>
-
-    <q-form @submit.prevent="mode === 'add' ? addCheck() : editCheck()">
-      <q-card-section>
-        <q-input
-          outlined
-          type="number"
-          v-model.number="memcheck.warning_threshold"
-          label="Warning Threshold (%)"
-          :rules="[val => val >= 0 || 'Minimum threshold is 0', val => val < 100 || 'Maximum threshold is 99']"
-        />
-      </q-card-section>
-      <q-card-section>
-        <q-input
-          outlined
-          type="number"
-          v-model.number="memcheck.error_threshold"
-          label="Error Threshold (%)"
-          :rules="[val => val >= 0 || 'Minimum threshold is 0', val => val < 100 || 'Maximum threshold is 99']"
-        />
-      </q-card-section>
-      <q-card-section>
-        <q-select
-          outlined
-          dense
-          options-dense
-          v-model="memcheck.fails_b4_alert"
-          :options="failOptions"
-          label="Number of consecutive failures before alert"
-        />
-      </q-card-section>
-      <q-card-section>
-        <q-input
-          outlined
-          dense
-          type="number"
-          v-model.number="memcheck.run_interval"
-          label="Run this check every (seconds)"
-          hint="Setting this value to anything other than 0 will override the 'Run checks every' setting on the agent"
-        />
-      </q-card-section>
-      <q-card-actions align="right">
-        <q-btn v-if="mode === 'add'" label="Add" color="primary" type="submit" />
-        <q-btn v-else-if="mode === 'edit'" label="Edit" color="primary" type="submit" />
-        <q-btn label="Cancel" v-close-popup />
-      </q-card-actions>
-    </q-form>
-  </q-card>
-</template>
-
-<script>
-import mixins from "@/mixins/mixins";
-export default {
-  name: "MemCheck",
-  emits: ["close"],
-  props: {
-    agentpk: Number,
-    policypk: Number,
-    mode: String,
-    checkpk: Number,
-  },
-  mixins: [mixins],
-  data() {
-    return {
-      memcheck: {
-        check_type: "memory",
-        warning_threshold: 70,
-        error_threshold: 85,
-        fails_b4_alert: 1,
-        run_interval: 0,
-      },
-      failOptions: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
-    };
-  },
-  methods: {
-    getCheck() {
-      this.$axios
-        .get(`/checks/${this.checkpk}/check/`)
-        .then(r => (this.memcheck = r.data))
-        .catch(e => {});
-    },
-    addCheck() {
-      if (!this.isValidThreshold(this.memcheck.warning_threshold, this.memcheck.error_threshold)) {
-        return;
-      }
-
-      const pk = this.policypk ? { policy: this.policypk } : { pk: this.agentpk };
-      const data = {
-        ...pk,
-        check: this.memcheck,
-      };
-      this.$axios
-        .post("/checks/checks/", data)
-        .then(r => {
-          this.$emit("close");
-          this.reloadChecks();
-          this.notifySuccess(r.data);
-        })
-        .catch(e => {});
-    },
-    editCheck() {
-      if (!this.isValidThreshold(this.memcheck.warning_threshold, this.memcheck.error_threshold)) {
-        return;
-      }
-
-      this.$axios
-        .patch(`/checks/${this.checkpk}/check/`, this.memcheck)
-        .then(r => {
-          this.$emit("close");
-          this.reloadChecks();
-          this.notifySuccess(r.data);
-        })
-        .catch(e => {});
-    },
-    reloadChecks() {
-      if (this.agentpk) {
-        this.$store.dispatch("loadChecks", this.agentpk);
-      }
-    },
-  },
-  mounted() {
-    if (this.mode === "edit") {
-      this.getCheck();
-    }
-  },
-};
-</script>
\ No newline at end of file
diff --git a/src/components/modals/checks/PingCheck.vue b/src/components/modals/checks/PingCheck.vue
deleted file mode 100644
index 737a671..0000000
--- a/src/components/modals/checks/PingCheck.vue
+++ /dev/null
@@ -1,134 +0,0 @@
-<template>
-  <q-card style="min-width: 400px">
-    <q-card-section class="row items-center">
-      <div v-if="mode === 'add'" class="text-h6">Add Ping Check</div>
-      <div v-else-if="mode === 'edit'" class="text-h6">Edit Ping Check</div>
-      <q-space />
-      <q-btn icon="close" flat round dense v-close-popup />
-    </q-card-section>
-
-    <q-form @submit.prevent="mode === 'add' ? addCheck() : editCheck()">
-      <q-card-section>
-        <q-input outlined v-model="pingcheck.name" label="Descriptive Name" :rules="[val => !!val || '*Required']" />
-      </q-card-section>
-      <q-card-section>
-        <q-input outlined v-model="pingcheck.ip" label="Hostname or IP" :rules="[val => !!val || '*Required']" />
-      </q-card-section>
-      <q-card-section>
-        <q-select
-          outlined
-          dense
-          options-dense
-          emit-value
-          map-options
-          v-model="pingcheck.alert_severity"
-          :options="severityOptions"
-          label="Alert Severity"
-        />
-      </q-card-section>
-      <q-card-section>
-        <q-select
-          outlined
-          dense
-          options-dense
-          map-options
-          emit-value
-          v-model="pingcheck.fails_b4_alert"
-          :options="failOptions"
-          label="Number of consecutive failures before alert"
-        />
-      </q-card-section>
-      <q-card-section>
-        <q-input
-          outlined
-          dense
-          type="number"
-          v-model.number="pingcheck.run_interval"
-          label="Run this check every (seconds)"
-          hint="Setting this value to anything other than 0 will override the 'Run checks every' setting on the agent"
-        />
-      </q-card-section>
-      <q-card-actions align="right">
-        <q-btn v-if="mode === 'add'" label="Add" color="primary" type="submit" />
-        <q-btn v-else-if="mode === 'edit'" label="Edit" color="primary" type="submit" />
-        <q-btn label="Cancel" v-close-popup />
-      </q-card-actions>
-    </q-form>
-  </q-card>
-</template>
-
-<script>
-import mixins from "@/mixins/mixins";
-export default {
-  name: "PingCheck",
-  emits: ["close"],
-  props: {
-    agentpk: Number,
-    policypk: Number,
-    mode: String,
-    checkpk: Number,
-  },
-  mixins: [mixins],
-  data() {
-    return {
-      pingcheck: {
-        check_type: "ping",
-        name: null,
-        ip: null,
-        alert_severity: "warning",
-        fails_b4_alert: 1,
-        run_interval: 0,
-      },
-      severityOptions: [
-        { label: "Informational", value: "info" },
-        { label: "Warning", value: "warning" },
-        { label: "Error", value: "error" },
-      ],
-      failOptions: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
-    };
-  },
-  methods: {
-    getCheck() {
-      this.$axios
-        .get(`/checks/${this.checkpk}/check/`)
-        .then(r => (this.pingcheck = r.data))
-        .catch(e => {});
-    },
-    addCheck() {
-      const pk = this.policypk ? { policy: this.policypk } : { pk: this.agentpk };
-      const data = {
-        ...pk,
-        check: this.pingcheck,
-      };
-      this.$axios
-        .post("/checks/checks/", data)
-        .then(r => {
-          this.$emit("close");
-          this.reloadChecks();
-          this.notifySuccess(r.data);
-        })
-        .catch(e => {});
-    },
-    editCheck() {
-      this.$axios
-        .patch(`/checks/${this.checkpk}/check/`, this.pingcheck)
-        .then(r => {
-          this.$emit("close");
-          this.reloadChecks();
-          this.notifySuccess(r.data);
-        })
-        .catch(e => {});
-    },
-    reloadChecks() {
-      if (this.agentpk) {
-        this.$store.dispatch("loadChecks", this.agentpk);
-      }
-    },
-  },
-  mounted() {
-    if (this.mode === "edit") {
-      this.getCheck();
-    }
-  },
-};
-</script>
\ No newline at end of file
diff --git a/src/components/modals/checks/ScriptCheck.vue b/src/components/modals/checks/ScriptCheck.vue
deleted file mode 100644
index 2afa21b..0000000
--- a/src/components/modals/checks/ScriptCheck.vue
+++ /dev/null
@@ -1,213 +0,0 @@
-<template>
-  <q-card v-if="scriptOptions.length === 0" style="min-width: 400px">
-    <q-card-section class="row items-center">
-      <div class="text-h6">Add Script Check</div>
-      <q-space />
-      <q-btn icon="close" flat round dense v-close-popup />
-    </q-card-section>
-    <q-card-section>
-      <p>You need to upload a script first</p>
-      <p>Settings -> Script Manager</p>
-    </q-card-section>
-  </q-card>
-  <q-card v-else style="min-width: 50vw">
-    <q-card-section class="row items-center">
-      <div v-if="mode === 'add'" class="text-h6">Add Script Check</div>
-      <div v-else-if="mode === 'edit'" class="text-h6">Edit Script Check</div>
-      <q-space />
-      <q-btn icon="close" flat round dense v-close-popup />
-    </q-card-section>
-
-    <q-form @submit.prevent="mode === 'add' ? addCheck() : editCheck()">
-      <q-card-section>
-        <q-select
-          :rules="[val => !!val || '*Required']"
-          dense
-          options-dense
-          outlined
-          v-model="scriptcheck.script"
-          :options="scriptOptions"
-          label="Select script"
-          map-options
-          emit-value
-          :disable="this.mode === 'edit'"
-          @update:model-value="setScriptDefaults"
-        >
-          <template v-slot:option="scope">
-            <q-item v-if="!scope.opt.category" v-bind="scope.itemProps" class="q-pl-lg">
-              <q-item-section>
-                <q-item-label v-html="scope.opt.label"></q-item-label>
-              </q-item-section>
-            </q-item>
-            <q-item-label v-if="scope.opt.category" v-bind="scope.itemProps" header class="q-pa-sm">{{
-              scope.opt.category
-            }}</q-item-label>
-          </template>
-        </q-select>
-      </q-card-section>
-      <q-card-section>
-        <q-select
-          dense
-          label="Script Arguments (press Enter after typing each argument)"
-          filled
-          v-model="scriptcheck.script_args"
-          use-input
-          use-chips
-          multiple
-          hide-dropdown-icon
-          input-debounce="0"
-          new-value-mode="add"
-        />
-      </q-card-section>
-      <q-card-section>
-        <q-select
-          dense
-          label="Informational return codes (press Enter after typing each code)"
-          filled
-          v-model="scriptcheck.info_return_codes"
-          use-input
-          use-chips
-          multiple
-          hide-dropdown-icon
-          input-debounce="0"
-          new-value-mode="add-unique"
-          @new-value="validateRetcode"
-        />
-      </q-card-section>
-      <q-card-section>
-        <q-select
-          dense
-          label="Warning return codes (press Enter after typing each code)"
-          filled
-          v-model="scriptcheck.warning_return_codes"
-          use-input
-          use-chips
-          multiple
-          hide-dropdown-icon
-          input-debounce="0"
-          new-value-mode="add-unique"
-          @new-value="validateRetcode"
-        />
-      </q-card-section>
-      <q-card-section>
-        <q-input outlined dense v-model.number="scriptcheck.timeout" label="Timeout (seconds)" />
-      </q-card-section>
-      <q-card-section>
-        <q-select
-          outlined
-          dense
-          options-dense
-          v-model="scriptcheck.fails_b4_alert"
-          :options="failOptions"
-          label="Number of consecutive failures before alert"
-        />
-      </q-card-section>
-      <q-card-section>
-        <q-input
-          outlined
-          dense
-          type="number"
-          v-model.number="scriptcheck.run_interval"
-          label="Run this check every (seconds)"
-          hint="Setting this value to anything other than 0 will override the 'Run checks every' setting on the agent"
-        />
-      </q-card-section>
-      <q-card-actions align="right">
-        <q-btn v-if="mode === 'add'" label="Add" color="primary" type="submit" />
-        <q-btn v-else-if="mode === 'edit'" label="Edit" color="primary" type="submit" />
-        <q-btn label="Cancel" v-close-popup />
-      </q-card-actions>
-    </q-form>
-  </q-card>
-</template>
-
-<script>
-import mixins from "@/mixins/mixins";
-import { mapGetters } from "vuex";
-
-export default {
-  name: "ScriptCheck",
-  emits: ["close"],
-  props: {
-    agentpk: Number,
-    policypk: Number,
-    mode: String,
-    checkpk: Number,
-  },
-  mixins: [mixins],
-  data() {
-    return {
-      scriptcheck: {
-        check_type: "script",
-        script: null,
-        script_args: [],
-        timeout: 120,
-        fails_b4_alert: 1,
-        info_return_codes: [],
-        warning_return_codes: [],
-        run_interval: 0,
-      },
-      scriptOptions: [],
-      failOptions: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
-    };
-  },
-  computed: {
-    ...mapGetters(["showCommunityScripts"]),
-  },
-  methods: {
-    getCheck() {
-      this.$axios
-        .get(`/checks/${this.checkpk}/check/`)
-        .then(r => {
-          this.scriptcheck = r.data;
-          this.scriptcheck.script = r.data.script.id;
-        })
-        .catch(e => {});
-    },
-    addCheck() {
-      const pk = this.policypk ? { policy: this.policypk } : { pk: this.agentpk };
-      const data = {
-        ...pk,
-        check: this.scriptcheck,
-      };
-      this.$axios
-        .post("/checks/checks/", data)
-        .then(r => {
-          this.$emit("close");
-          this.reloadChecks();
-          this.notifySuccess(r.data);
-        })
-        .catch(e => {});
-    },
-    editCheck() {
-      this.$axios
-        .patch(`/checks/${this.checkpk}/check/`, this.scriptcheck)
-        .then(r => {
-          this.$emit("close");
-          this.reloadChecks();
-          this.notifySuccess(r.data);
-        })
-        .catch(e => {});
-    },
-    setScriptDefaults() {
-      const script = this.scriptOptions.find(i => i.value === this.scriptcheck.script);
-
-      this.scriptcheck.timeout = script.timeout;
-      this.scriptcheck.script_args = script.args;
-    },
-    reloadChecks() {
-      if (this.agentpk) {
-        this.$store.dispatch("loadChecks", this.agentpk);
-      }
-    },
-    validateRetcode(val, done) {
-      /^\d+$/.test(val) ? done(val) : done();
-    },
-  },
-  mounted() {
-    this.getScriptOptions(this.showCommunityScripts).then(options => (this.scriptOptions = Object.freeze(options)));
-
-    if (this.mode === "edit") this.getCheck();
-  },
-};
-</script>
\ No newline at end of file
diff --git a/src/components/modals/checks/WinSvcCheck.vue b/src/components/modals/checks/WinSvcCheck.vue
deleted file mode 100644
index 423339f..0000000
--- a/src/components/modals/checks/WinSvcCheck.vue
+++ /dev/null
@@ -1,247 +0,0 @@
-<template>
-  <q-card style="min-width: 40vw">
-    <q-card-section class="row items-center">
-      <div v-if="mode === 'add'" class="text-h6">Add Service Check</div>
-      <div v-else-if="mode === 'edit'" class="text-h6">Edit Service Check</div>
-      <q-space />
-      <q-btn icon="close" flat round dense v-close-popup />
-    </q-card-section>
-
-    <q-form @submit.prevent="mode === 'add' ? addCheck() : editCheck()">
-      <q-card-section>
-        <!-- policy check, either choose from a list of default services or enter manually -->
-        <q-radio
-          v-if="policypk && this.mode !== 'edit'"
-          v-model="winsvccheck.svc_policy_mode"
-          val="default"
-          label="Choose from defaults"
-          @update:model-value="clearServiceOptions"
-        />
-        <q-radio
-          v-if="policypk && this.mode !== 'edit'"
-          v-model="winsvccheck.svc_policy_mode"
-          val="manual"
-          label="Enter manually"
-          @update:model-value="clearServiceOptions"
-        />
-        <q-select
-          v-if="policypk && winsvccheck.svc_policy_mode === 'default' && this.mode !== 'edit'"
-          :rules="[val => !!val || '*Required']"
-          dense
-          options-dense
-          outlined
-          v-model="winsvccheck.svc_name"
-          :options="serviceOptions"
-          label="Service"
-          map-options
-          emit-value
-          @update:model-value="getDisplayName"
-        />
-        <!-- disable selection if editing -->
-        <q-select
-          v-if="policypk && winsvccheck.svc_policy_mode === 'default' && this.mode === 'edit'"
-          disable
-          dense
-          options-dense
-          outlined
-          v-model="winsvccheck.svc_name"
-          :options="serviceOptions"
-          label="Service"
-          map-options
-          emit-value
-        />
-        <q-input
-          v-if="policypk && winsvccheck.svc_policy_mode === 'manual'"
-          :rules="[val => !!val || '*Required']"
-          outlined
-          dense
-          v-model="winsvccheck.svc_name"
-          label="Service Name"
-        />
-        <q-input
-          v-if="policypk && winsvccheck.svc_policy_mode === 'manual'"
-          :rules="[val => !!val || '*Required']"
-          outlined
-          dense
-          v-model="winsvccheck.svc_display_name"
-          label="Display Name"
-        />
-        <!-- agent check -->
-        <!-- disable selection if editing -->
-        <q-select
-          v-if="agentpk"
-          :rules="[val => !!val || '*Required']"
-          dense
-          options-dense
-          outlined
-          v-model="winsvccheck.svc_name"
-          :options="serviceOptions"
-          label="Service"
-          map-options
-          emit-value
-          @update:model-value="getDisplayName"
-          :disable="this.mode === 'edit'"
-        />
-      </q-card-section>
-      <q-card-section>
-        <q-checkbox v-model="winsvccheck.pass_if_start_pending" label="PASS if service is in 'Start Pending' mode" />
-        <br />
-        <q-checkbox v-model="winsvccheck.pass_if_svc_not_exist" label="PASS if service doesn't exist" />
-        <br />
-        <q-checkbox v-model="winsvccheck.restart_if_stopped" label="Restart service if it's stopped" />
-      </q-card-section>
-      <q-card-section>
-        <q-select
-          outlined
-          dense
-          options-dense
-          map-options
-          emit-value
-          v-model="winsvccheck.alert_severity"
-          :options="severityOptions"
-          label="Alert Severity"
-        />
-      </q-card-section>
-      <q-card-section>
-        <q-select
-          outlined
-          dense
-          options-dense
-          v-model="winsvccheck.fails_b4_alert"
-          :options="failOptions"
-          label="Number of consecutive failures before alert"
-        />
-      </q-card-section>
-      <q-card-section>
-        <q-input
-          dense
-          outlined
-          type="number"
-          v-model.number="winsvccheck.run_interval"
-          label="Run this check every (seconds)"
-          hint="Setting this value to anything other than 0 will override the 'Run checks every' setting on the agent"
-        />
-      </q-card-section>
-      <q-card-actions align="right">
-        <q-btn v-if="mode === 'add'" label="Add" color="primary" type="submit" />
-        <q-btn v-else-if="mode === 'edit'" label="Edit" color="primary" type="submit" />
-        <q-btn label="Cancel" v-close-popup />
-      </q-card-actions>
-    </q-form>
-  </q-card>
-</template>
-
-<script>
-import mixins from "@/mixins/mixins";
-import { mapGetters } from "vuex";
-export default {
-  name: "WinSvcCheck",
-  emits: ["close"],
-  props: {
-    agentpk: Number,
-    policypk: Number,
-    mode: String,
-    checkpk: Number,
-  },
-  mixins: [mixins],
-  data() {
-    return {
-      winsvccheck: {
-        check_type: "winsvc",
-        svc_name: null,
-        svc_display_name: null,
-        svc_policy_mode: null,
-        pass_if_start_pending: false,
-        pass_if_svc_not_exist: false,
-        restart_if_stopped: false,
-        fails_b4_alert: 1,
-        alert_severity: "warning",
-        run_interval: 0,
-      },
-      severityOptions: [
-        { label: "Informational", value: "info" },
-        { label: "Warning", value: "warning" },
-        { label: "Error", value: "error" },
-      ],
-      svcData: [],
-      failOptions: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
-    };
-  },
-  computed: {
-    ...mapGetters(["agentServices"]),
-
-    serviceOptions() {
-      const ret = [];
-      this.svcData.forEach(i => {
-        ret.push({ label: i.display_name, value: i.name });
-      });
-      // sort alphabetically by display name
-      return ret.sort((a, b) => a.label.localeCompare(b.label));
-    },
-  },
-  methods: {
-    clearServiceOptions() {
-      this.winsvccheck.svc_name = null;
-      this.winsvccheck.svc_display_name = null;
-    },
-    setServices() {
-      if (this.policypk) {
-        this.$axios
-          .get("/services/defaultservices/")
-          .then(r => {
-            this.svcData = r.data;
-            this.winsvccheck.svc_policy_mode = "default";
-          })
-          .catch(e => {});
-      } else {
-        this.svcData = this.agentServices;
-      }
-    },
-    getDisplayName() {
-      this.winsvccheck.svc_display_name = this.serviceOptions.find(i => i.value === this.winsvccheck.svc_name).label;
-    },
-    getCheck() {
-      this.$axios
-        .get(`/checks/${this.checkpk}/check/`)
-        .then(r => (this.winsvccheck = r.data))
-        .catch(e => {});
-    },
-    addCheck() {
-      const pk = this.policypk ? { policy: this.policypk } : { pk: this.agentpk };
-      const data = {
-        ...pk,
-        check: this.winsvccheck,
-      };
-      this.$axios
-        .post("/checks/checks/", data)
-        .then(r => {
-          this.$emit("close");
-          this.reloadChecks();
-          this.notifySuccess(r.data);
-        })
-        .catch(e => {});
-    },
-    editCheck() {
-      this.$axios
-        .patch(`/checks/${this.checkpk}/check/`, this.winsvccheck)
-        .then(r => {
-          this.$emit("close");
-          this.reloadChecks();
-          this.notifySuccess(r.data);
-        })
-        .catch(e => {});
-    },
-    reloadChecks() {
-      if (this.agentpk) {
-        this.$store.dispatch("loadChecks", this.agentpk);
-      }
-    },
-  },
-  mounted() {
-    this.setServices();
-    if (this.mode === "edit") {
-      this.getCheck();
-    }
-  },
-};
-</script>
\ No newline at end of file
diff --git a/src/components/modals/software/InstallSoftware.vue b/src/components/modals/software/InstallSoftware.vue
deleted file mode 100644
index f65ce27..0000000
--- a/src/components/modals/software/InstallSoftware.vue
+++ /dev/null
@@ -1,112 +0,0 @@
-<template>
-  <q-card style="width: 40vw; max-width: 50vw">
-    <q-card-section>
-      <q-table
-        class="remote-bg-tbl-sticky"
-        :table-class="{ 'table-bgcolor': !$q.dark.isActive, 'table-bgcolor-dark': $q.dark.isActive }"
-        title="Software"
-        dense
-        :rows="chocos"
-        :columns="columns"
-        v-model:pagination="pagination"
-        :filter="filter"
-        binary-state-sort
-        hide-bottom
-        virtual-scroll
-        :rows-per-page-options="[0]"
-        row-key="name"
-      >
-        <template v-slot:top>
-          <q-input v-model="filter" outlined label="Search" dense clearable>
-            <template v-slot:prepend>
-              <q-icon name="search" />
-            </template>
-          </q-input>
-          <q-space />
-          <q-btn icon="close" flat round dense v-close-popup />
-        </template>
-        <template v-slot:body="props">
-          <q-tr :props="props">
-            <q-td auto-width>
-              <q-btn size="sm" color="grey-5" icon="fas fa-plus" text-color="black" @click="install(props.row.name)" />
-            </q-td>
-            <q-td @click="showDescription(props.row.name)">
-              <span style="cursor: pointer; text-decoration: underline" class="text-primary">{{ props.row.name }}</span>
-            </q-td>
-          </q-tr>
-        </template>
-      </q-table>
-    </q-card-section>
-  </q-card>
-</template>
-
-<script>
-import { mapGetters } from "vuex";
-import mixins from "@/mixins/mixins";
-export default {
-  name: "InstallSoftware",
-  emits: ["close"],
-  props: ["agentpk"],
-  mixins: [mixins],
-  data() {
-    return {
-      filter: "",
-      chocos: [],
-      pagination: {
-        rowsPerPage: 0,
-        sortBy: "name",
-        descending: false,
-      },
-      columns: [
-        { name: "install", align: "left", label: "Install", sortable: false },
-        {
-          name: "name",
-          align: "left",
-          label: "Name",
-          field: "name",
-          sortable: true,
-        },
-      ],
-    };
-  },
-  methods: {
-    getChocos() {
-      this.$axios.get("/software/chocos/").then(r => {
-        this.chocos = r.data;
-      });
-    },
-    showDescription(name) {
-      window.open(`https://chocolatey.org/packages/${name}`, "_blank");
-    },
-    install(name) {
-      const data = { name: name, pk: this.agentpk };
-      this.$q
-        .dialog({
-          title: `Install ${name} on ${this.agentHostname}?`,
-          persistent: true,
-          ok: { label: "Install" },
-          cancel: true,
-        })
-        .onOk(() => {
-          this.$q.loading.show();
-          this.$axios
-            .post("/software/install/", data)
-            .then(r => {
-              this.$q.loading.hide();
-              this.$emit("close");
-              this.notifySuccess(r.data, 5000);
-            })
-            .catch(e => {
-              this.$q.loading.hide();
-            });
-        });
-    },
-  },
-  computed: {
-    ...mapGetters(["agentHostname"]),
-  },
-  mounted() {
-    this.getChocos();
-  },
-};
-</script>
\ No newline at end of file
diff --git a/src/components/scripts/TestScriptModal.vue b/src/components/scripts/TestScriptModal.vue
index 66775a7..d25a896 100644
--- a/src/components/scripts/TestScriptModal.vue
+++ b/src/components/scripts/TestScriptModal.vue
@@ -92,14 +92,13 @@ export default {
     async function runTestScript() {
       loading.value = true;
       const data = {
-        agent: agent.value,
         code: props.script.code,
         timeout: timeout.value,
         args: args.value,
         shell: props.script.shell,
       };
 
-      ret.value = await testScript(data);
+      ret.value = await testScript(agent.value, data);
       loading.value = false;
     }
 
diff --git a/src/components/software/InstallSoftware.vue b/src/components/software/InstallSoftware.vue
new file mode 100644
index 0000000..d713bb5
--- /dev/null
+++ b/src/components/software/InstallSoftware.vue
@@ -0,0 +1,136 @@
+<template>
+  <q-dialog ref="dialogRef" @hide="onDialogHide">
+    <q-card class="q-dialog-plugin" style="width: 40vw; max-width: 50vw">
+      <q-bar>
+        Install Software
+        <q-space />
+        <q-btn dense flat icon="close" v-close-popup>
+          <q-tooltip class="bg-white text-primary">Close</q-tooltip>
+        </q-btn>
+      </q-bar>
+      <q-card-section>
+        <q-table
+          class="remote-bg-tbl-sticky"
+          :table-class="{ 'table-bgcolor': !$q.dark.isActive, 'table-bgcolor-dark': $q.dark.isActive }"
+          dense
+          :rows="chocos"
+          :columns="columns"
+          v-model:pagination="pagination"
+          :filter="filter"
+          binary-state-sort
+          hide-bottom
+          virtual-scroll
+          :rows-per-page-options="[0]"
+          row-key="name"
+        >
+          <template v-slot:top-left>
+            <q-input v-model="filter" outlined label="Search" dense clearable>
+              <template v-slot:prepend>
+                <q-icon name="search" />
+              </template>
+            </q-input>
+          </template>
+          <template v-slot:body="props">
+            <q-tr :props="props">
+              <q-td auto-width>
+                <q-btn dense flat push icon="add" @click="installSoftware(props.row.name)" />
+              </q-td>
+              <q-td @click="showDescription(props.row.name)">
+                <span style="cursor: pointer; text-decoration: underline">{{ props.row.name }}</span>
+              </q-td>
+            </q-tr>
+          </template>
+        </q-table>
+      </q-card-section>
+    </q-card>
+  </q-dialog>
+</template>
+
+<script>
+import { ref, onMounted } from "vue";
+import { useDialogPluginComponent, useQuasar } from "quasar";
+import { fetchChocosSoftware, installAgentSoftware } from "@/api/software";
+import { notifySuccess } from "@/utils/notify";
+
+// static data
+const columns = [
+  { name: "install", align: "left", label: "Install", sortable: false },
+  {
+    name: "name",
+    align: "left",
+    label: "Name",
+    field: "name",
+    sortable: true,
+  },
+];
+export default {
+  name: "InstallSoftware",
+  emits: [...useDialogPluginComponent.emits],
+  props: {
+    agent_id: !String,
+  },
+  setup(props) {
+    // quasar setup
+    const { dialogRef, onDialogHide } = useDialogPluginComponent();
+    const $q = useQuasar();
+
+    // install software logic
+    const chocos = ref([]);
+    const filter = ref("");
+    const pagination = ref({
+      rowsPerPage: 0,
+      sortBy: "name",
+      descending: false,
+    });
+
+    async function getChocos() {
+      chocos.value = Object.freeze(await fetchChocosSoftware());
+    }
+
+    function showDescription(name) {
+      window.open(`https://chocolatey.org/packages/${name}`, "_blank");
+    }
+
+    function installSoftware(name) {
+      const data = { name: name };
+      $q.dialog({
+        title: `Install ${name}?`,
+        persistent: true,
+        ok: { label: "Install" },
+        cancel: true,
+      }).onOk(async () => {
+        $q.loading.show();
+        try {
+          const result = await installAgentSoftware(props.agent_id, data);
+          onDialogHide();
+          notifySuccess(result, 5000);
+        } catch (e) {
+          console.error(e);
+        }
+        $q.loading.hide();
+      });
+    }
+
+    onMounted(getChocos);
+
+    return {
+      // reactive data
+      chocos,
+      filter,
+      pagination,
+
+      // non-reactive data
+      columns,
+
+      // methods
+      getChocos,
+      showDescription,
+      installSoftware,
+
+      // quasar dialog
+      onDialogHide,
+      dialogRef,
+    };
+  },
+};
+</script>
\ No newline at end of file
diff --git a/src/components/modals/tasks/AddAutomatedTask.vue b/src/components/tasks/AddAutomatedTask.vue
similarity index 96%
rename from src/components/modals/tasks/AddAutomatedTask.vue
rename to src/components/tasks/AddAutomatedTask.vue
index 1a6b3cb..81e3348 100644
--- a/src/components/modals/tasks/AddAutomatedTask.vue
+++ b/src/components/tasks/AddAutomatedTask.vue
@@ -273,7 +273,7 @@ export default {
       if (!this.step1Done || !this.step2Done) {
         this.notifyError("Some steps incomplete");
       } else {
-        const pk = this.policypk ? { policy: this.policypk } : { agent: this.selectedAgentPk };
+        const pk = this.policypk ? { policy: this.policypk } : { agent: this.selectedAgentId };
 
         const data = {
           ...pk,
@@ -286,8 +286,8 @@ export default {
             this.$emit("close");
 
             if (!this.policypk) {
-              this.$store.dispatch("loadAutomatedTasks", this.selectedAgentPk);
-              this.$store.dispatch("loadChecks", this.selectedAgentPk);
+              this.$store.dispatch("loadAutomatedTasks", this.selectedAgentId);
+              this.$store.dispatch("loadChecks", this.selectedAgentId);
             }
             this.notifySuccess(r.data);
           })
@@ -316,7 +316,7 @@ export default {
     },
   },
   computed: {
-    ...mapGetters(["selectedAgentPk", "showCommunityScripts"]),
+    ...mapGetters(["selectedAgentId", "showCommunityScripts"]),
     checks() {
       return this.policypk
         ? this.policyChecks
diff --git a/src/components/modals/tasks/EditAutomatedTask.vue b/src/components/tasks/EditAutomatedTask.vue
similarity index 100%
rename from src/components/modals/tasks/EditAutomatedTask.vue
rename to src/components/tasks/EditAutomatedTask.vue
diff --git a/src/composables/checks.js b/src/composables/checks.js
new file mode 100644
index 0000000..bf09d13
--- /dev/null
+++ b/src/composables/checks.js
@@ -0,0 +1,1174 @@
+
+import { ref, onMounted } from "vue"
+import { updateCheck, saveCheck } from "@/api/checks"
+import { fetchAgent } from "@/api/agents"
+import { isValidThreshold } from "@/utils/validation";
+import { notifySuccess } from "@/utils/notify"
+
+// for check add/edit modals
+// pass as an object {editCheck: props.check, initialState: {default form values for adding check}, onDialogOK: callback for submit function }
+export function useCheckModal({ editCheck, initialState, onDialogOK }) {
+
+  const check = editCheck
+    ? ref(Object.assign({}, editCheck))
+    : ref(initialState);
+
+  const loading = ref(false)
+
+  // save check function
+  async function submit() {
+    if (check.value.check_type === "cpuload" || check.value.check_type === "memory") {
+      if (!isValidThreshold(check.value.warning_threshold, check.value.error_threshold)) return;
+    }
+    else if (check.value.check_type === "diskspace") {
+      if (!isValidThreshold(check.value.warning_threshold, check.value.error_threshold, true)) return;
+    }
+
+    loading.value = true;
+    try {
+      const result = editCheck ? await updateCheck(check.value.id, check.value) : await saveCheck(check.value);
+      notifySuccess(result);
+      onDialogOK();
+    } catch (e) {
+      console.error(e);
+    }
+    loading.value = false;
+  }
+
+  // dropdown options
+  const failOptions = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
+
+  const severityOptions = [
+    { label: "Informational", value: "info" },
+    { label: "Warning", value: "warning" },
+    { label: "Error", value: "error" },
+  ]
+
+  const logNameOptions = ["Application", "System", "Security"]
+  const failWhenOptions = [
+    { label: "Log contains", value: "contains" },
+    { label: "Log does not contain", value: "not_contains" },
+  ]
+
+  const diskOptions = ref('A:,B:,C:,D:,E:,F:,G:,H:,I:,J:,K:,L:,M:,N:,O:,P:,Q:,R:,S:,T:,U:,V:,W:,X:,Y:,Z:'.split(','))
+
+  const serviceOptions = ref(Object.freeze(defaultServiceOptions))
+
+  async function getAgentDiskOptions() {
+    const { disks } = await fetchAgent(check.value.agent)
+    diskOptions.value = disks.map(disk => disk.device)
+    check.value.disk = diskOptions.value[0]
+  }
+
+  async function getAgentServiceOptions() {
+    const { services } = await fetchAgent(check.value.agent)
+    serviceOptions.value = Object.freeze(services.map(service => ({ label: service.display_name, value: service.name })))
+    check.value.svc_name = serviceOptions.value[0].value
+    check.value.svc_display_name = serviceOptions.value[0].label
+  }
+
+  onMounted(async () => {
+    if (!editCheck && check.value.check_type === "diskspace" && check.value.agent) {
+      await getAgentDiskOptions()
+    }
+
+    else if (!editCheck && check.value.check_type === "winsvc" && check.value.agent) {
+      await getAgentServiceOptions()
+    }
+  })
+
+  return {
+    //data
+    check,
+    loading,
+    failOptions,
+    diskOptions,
+    logNameOptions,
+    failWhenOptions,
+    severityOptions,
+    serviceOptions,
+
+    // methods
+    submit
+  }
+}
+
+
+export const defaultServiceOptions = [
+  {
+    value: "AJRouter",
+    label: "AllJoyn Router Service"
+  },
+  {
+    value: "ALG",
+    label: "Application Layer Gateway Service"
+  },
+  {
+    value: "AppIDSvc",
+    label: "Application Identity"
+  },
+  {
+    value: "Appinfo",
+    label: "Application Information"
+  },
+  {
+    value: "AppMgmt",
+    label: "Application Management"
+  },
+  {
+    value: "AppReadiness",
+    label: "App Readiness"
+  },
+  {
+    value: "AppVClient",
+    label: "Microsoft App-V Client"
+  },
+  {
+    value: "AppXSvc",
+    label: "AppX Deployment Service (AppXSVC)"
+  },
+  {
+    value: "AssignedAccessManagerSvc",
+    label: "AssignedAccessManager Service"
+  },
+  {
+    value: "atashost",
+    label: "WebEx Service Host for Support Center"
+  },
+  {
+    value: "AudioEndpointBuilder",
+    label: "Windows Audio Endpoint Builder"
+  },
+  {
+    value: "Audiosrv",
+    label: "Windows Audio"
+  },
+  {
+    value: "autotimesvc",
+    label: "Cellular Time"
+  },
+  {
+    value: "AxInstSV",
+    label: "ActiveX Installer (AxInstSV)"
+  },
+  {
+    value: "BDESVC",
+    label: "BitLocker Drive Encryption Service"
+  },
+  {
+    value: "BFE",
+    label: "Base Filtering Engine"
+  },
+  {
+    value: "BITS",
+    label: "Background Intelligent Transfer Service"
+  },
+  {
+    value: "Bonjour Service",
+    label: "Bonjour Service"
+  },
+  {
+    value: "BrokerInfrastructure",
+    label: "Background Tasks Infrastructure Service"
+  },
+  {
+    value: "BTAGService",
+    label: "Bluetooth Audio Gateway Service"
+  },
+  {
+    value: "BthAvctpSvc",
+    label: "AVCTP service"
+  },
+  {
+    value: "bthserv",
+    label: "Bluetooth Support Service"
+  },
+  {
+    value: "camsvc",
+    label: "Capability Access Manager Service"
+  },
+  {
+    value: "CDPSvc",
+    label: "Connected Devices Platform Service"
+  },
+  {
+    value: "CertPropSvc",
+    label: "Certificate Propagation"
+  },
+  {
+    value: "ClipSVC",
+    label: "Client License Service (ClipSVC)"
+  },
+  {
+    value: "COMSysApp",
+    label: "COM+ System Application"
+  },
+  {
+    value: "CoreMessagingRegistrar",
+    label: "CoreMessaging"
+  },
+  {
+    value: "cphs",
+    label: "Intel(R) Content Protection HECI Service"
+  },
+  {
+    value: "cplspcon",
+    label: "Intel(R) Content Protection HDCP Service"
+  },
+  {
+    value: "CryptSvc",
+    label: "Cryptographic Services"
+  },
+  {
+    value: "CscService",
+    label: "Offline Files"
+  },
+  {
+    value: "DcomLaunch",
+    label: "DCOM Server Process Launcher"
+  },
+  {
+    value: "defragsvc",
+    label: "Optimize drives"
+  },
+  {
+    value: "DeviceAssociationService",
+    label: "Device Association Service"
+  },
+  {
+    value: "DeviceInstall",
+    label: "Device Install Service"
+  },
+  {
+    value: "DevQueryBroker",
+    label: "DevQuery Background Discovery Broker"
+  },
+  {
+    value: "Dhcp",
+    label: "DHCP Client"
+  },
+  {
+    value: "diagnosticshub.standardcollector.service",
+    label: "Microsoft (R) Diagnostics Hub Standard Collector Service"
+  },
+  {
+    value: "diagsvc",
+    label: "Diagnostic Execution Service"
+  },
+  {
+    value: "DiagTrack",
+    label: "Connected User Experiences and Telemetry"
+  },
+  {
+    value: "DispBrokerDesktopSvc",
+    label: "Display Policy Service"
+  },
+  {
+    value: "DisplayEnhancementService",
+    label: "Display Enhancement Service"
+  },
+  {
+    value: "DmEnrollmentSvc",
+    label: "Device Management Enrollment Service"
+  },
+  {
+    value: "dmwappushservice",
+    label: "Device Management Wireless Application Protocol (WAP) Push message Routing Service"
+  },
+  {
+    value: "Dnscache",
+    label: "DNS Client"
+  },
+  {
+    value: "DoSvc",
+    label: "Delivery Optimization"
+  },
+  {
+    value: "dot3svc",
+    label: "Wired AutoConfig"
+  },
+  {
+    value: "DPS",
+    label: "Diagnostic Policy Service"
+  },
+  {
+    value: "DsmSvc",
+    label: "Device Setup Manager"
+  },
+  {
+    value: "DsSvc",
+    label: "Data Sharing Service"
+  },
+  {
+    value: "DusmSvc",
+    label: "Data Usage"
+  },
+  {
+    value: "Eaphost",
+    label: "Extensible Authentication Protocol"
+  },
+  {
+    value: "EFS",
+    label: "Encrypting File System (EFS)"
+  },
+  {
+    value: "embeddedmode",
+    label: "Embedded Mode"
+  },
+  {
+    value: "EntAppSvc",
+    label: "Enterprise App Management Service"
+  },
+  {
+    value: "EventLog",
+    label: "Windows Event Log"
+  },
+  {
+    value: "EventSystem",
+    label: "COM+ Event System"
+  },
+  {
+    value: "Fax",
+    label: "Fax"
+  },
+  {
+    value: "fdPHost",
+    label: "Function Discovery Provider Host"
+  },
+  {
+    value: "FDResPub",
+    label: "Function Discovery Resource Publication"
+  },
+  {
+    value: "fhsvc",
+    label: "File History Service"
+  },
+  {
+    value: "FontCache",
+    label: "Windows Font Cache Service"
+  },
+  {
+    value: "FrameServer",
+    label: "Windows Camera Frame Server"
+  },
+  {
+    value: "GoogleChromeElevationService",
+    label: "Google Chrome Elevation Service"
+  },
+  {
+    value: "gpsvc",
+    label: "Group Policy Client"
+  },
+  {
+    value: "GraphicsPerfSvc",
+    label: "GraphicsPerfSvc"
+  },
+  {
+    value: "hidserv",
+    label: "Human Interface Device Service"
+  },
+  {
+    value: "hns",
+    label: "Host Network Service"
+  },
+  {
+    value: "HvHost",
+    label: "HV Host Service"
+  },
+  {
+    value: "ibtsiva",
+    label: "Intel Bluetooth Service"
+  },
+  {
+    value: "icssvc",
+    label: "Windows Mobile Hotspot Service"
+  },
+  {
+    value: "IKEEXT",
+    label: "IKE and AuthIP IPsec Keying Modules"
+  },
+  {
+    value: "InstallService",
+    label: "Microsoft Store Install Service"
+  },
+  {
+    value: "iphlpsvc",
+    label: "IP Helper"
+  },
+  {
+    value: "IpxlatCfgSvc",
+    label: "IP Translation Configuration Service"
+  },
+  {
+    value: "KeyIso",
+    label: "CNG Key Isolation"
+  },
+  {
+    value: "KtmRm",
+    label: "KtmRm for Distributed Transaction Coordinator"
+  },
+  {
+    value: "LanmanServer",
+    label: "Server"
+  },
+  {
+    value: "LanmanWorkstation",
+    label: "Workstation"
+  },
+  {
+    value: "lfsvc",
+    label: "Geolocation Service"
+  },
+  {
+    value: "LicenseManager",
+    label: "Windows License Manager Service"
+  },
+  {
+    value: "lltdsvc",
+    label: "Link-Layer Topology Discovery Mapper"
+  },
+  {
+    value: "lmhosts",
+    label: "TCP/IP NetBIOS Helper"
+  },
+  {
+    value: "LSM",
+    label: "Local Session Manager"
+  },
+  {
+    value: "LxpSvc",
+    label: "Language Experience Service"
+  },
+  {
+    value: "LxssManager",
+    label: "LxssManager"
+  },
+  {
+    value: "MapsBroker",
+    label: "Downloaded Maps Manager"
+  },
+  {
+    value: "mpssvc",
+    label: "Windows Defender Firewall"
+  },
+  {
+    value: "MSDTC",
+    label: "Distributed Transaction Coordinator"
+  },
+  {
+    value: "MSiSCSI",
+    label: "Microsoft iSCSI Initiator Service"
+  },
+  {
+    value: "msiserver",
+    label: "Windows Installer"
+  },
+  {
+    value: "NaturalAuthentication",
+    label: "Natural Authentication"
+  },
+  {
+    value: "NcaSvc",
+    label: "Network Connectivity Assistant"
+  },
+  {
+    value: "NcbService",
+    label: "Network Connection Broker"
+  },
+  {
+    value: "NcdAutoSetup",
+    label: "Network Connected Devices Auto-Setup"
+  },
+  {
+    value: "Net Driver HPZ12",
+    label: "Net Driver HPZ12"
+  },
+  {
+    value: "Netlogon",
+    label: "Netlogon"
+  },
+  {
+    value: "Netman",
+    label: "Network Connections"
+  },
+  {
+    value: "netprofm",
+    label: "Network List Service"
+  },
+  {
+    value: "NetSetupSvc",
+    label: "Network Setup Service"
+  },
+  {
+    value: "NetTcpPortSharing",
+    label: "Net.Tcp Port Sharing Service"
+  },
+  {
+    value: "NgcCtnrSvc",
+    label: "Microsoft Passport Container"
+  },
+  {
+    value: "NgcSvc",
+    label: "Microsoft Passport"
+  },
+  {
+    value: "NlaSvc",
+    label: "Network Location Awareness"
+  },
+  {
+    value: "nsi",
+    label: "Network Store Interface Service"
+  },
+  {
+    value: "nvagent",
+    label: "Network Virtualization Service"
+  },
+  {
+    value: "OpenVPNService",
+    label: "OpenVPNService"
+  },
+  {
+    value: "OpenVPNServiceInteractive",
+    label: "OpenVPN Interactive Service"
+  },
+  {
+    value: "OpenVPNServiceLegacy",
+    label: "OpenVPN Legacy Service"
+  },
+  {
+    value: "ose64",
+    label: "Office 64 Source Engine"
+  },
+  {
+    value: "p2pimsvc",
+    label: "Peer Networking Identity Manager"
+  },
+  {
+    value: "p2psvc",
+    label: "Peer Networking Grouping"
+  },
+  {
+    value: "PcaSvc",
+    label: "Program Compatibility Assistant Service"
+  },
+  {
+    value: "PeerDistSvc",
+    label: "BranchCache"
+  },
+  {
+    value: "perceptionsimulation",
+    label: "Windows Perception Simulation Service"
+  },
+  {
+    value: "PerfHost",
+    label: "Performance Counter DLL Host"
+  },
+  {
+    value: "PhoneSvc",
+    label: "Phone Service"
+  },
+  {
+    value: "pla",
+    label: "Performance Logs & Alerts"
+  },
+  {
+    value: "PlugPlay",
+    label: "Plug and Play"
+  },
+  {
+    value: "Pml Driver HPZ12",
+    label: "Pml Driver HPZ12"
+  },
+  {
+    value: "PNRPAutoReg",
+    label: "PNRP Machine Name Publication Service"
+  },
+  {
+    value: "PNRPsvc",
+    label: "Peer Name Resolution Protocol"
+  },
+  {
+    value: "PolicyAgent",
+    label: "IPsec Policy Agent"
+  },
+  {
+    value: "Power",
+    label: "Power"
+  },
+  {
+    value: "PrintNotify",
+    label: "Printer Extensions and Notifications"
+  },
+  {
+    value: "ProfSvc",
+    label: "User Profile Service"
+  },
+  {
+    value: "PushToInstall",
+    label: "Windows PushToInstall Service"
+  },
+  {
+    value: "QWAVE",
+    label: "Quality Windows Audio Video Experience"
+  },
+  {
+    value: "RasAuto",
+    label: "Remote Access Auto Connection Manager"
+  },
+  {
+    value: "RasMan",
+    label: "Remote Access Connection Manager"
+  },
+  {
+    value: "RemoteAccess",
+    label: "Routing and Remote Access"
+  },
+  {
+    value: "RemoteRegistry",
+    label: "Remote Registry"
+  },
+  {
+    value: "RetailDemo",
+    label: "Retail Demo Service"
+  },
+  {
+    value: "RmSvc",
+    label: "Radio Management Service"
+  },
+  {
+    value: "RpcEptMapper",
+    label: "RPC Endpoint Mapper"
+  },
+  {
+    value: "RpcLocator",
+    label: "Remote Procedure Call (RPC) Locator"
+  },
+  {
+    value: "RpcSs",
+    label: "Remote Procedure Call (RPC)"
+  },
+  {
+    value: "SamSs",
+    label: "Security Accounts Manager"
+  },
+  {
+    value: "SCardSvr",
+    label: "Smart Card"
+  },
+  {
+    value: "ScDeviceEnum",
+    label: "Smart Card Device Enumeration Service"
+  },
+  {
+    value: "Schedule",
+    label: "Task Scheduler"
+  },
+  {
+    value: "SCPolicySvc",
+    label: "Smart Card Removal Policy"
+  },
+  {
+    value: "SDRSVC",
+    label: "Windows Backup"
+  },
+  {
+    value: "seclogon",
+    label: "Secondary Logon"
+  },
+  {
+    value: "SecurityHealthService",
+    label: "Windows Security Service"
+  },
+  {
+    value: "SEMgrSvc",
+    label: "Payments and NFC/SE Manager"
+  },
+  {
+    value: "SENS",
+    label: "System Event Notification Service"
+  },
+  {
+    value: "Sense",
+    label: "Windows Defender Advanced Threat Protection Service"
+  },
+  {
+    value: "SensorDataService",
+    label: "Sensor Data Service"
+  },
+  {
+    value: "SensorService",
+    label: "Sensor Service"
+  },
+  {
+    value: "SensrSvc",
+    label: "Sensor Monitoring Service"
+  },
+  {
+    value: "SessionEnv",
+    label: "Remote Desktop Configuration"
+  },
+  {
+    value: "SgrmBroker",
+    label: "System Guard Runtime Monitor Broker"
+  },
+  {
+    value: "SharedAccess",
+    label: "Internet Connection Sharing (ICS)"
+  },
+  {
+    value: "SharedRealitySvc",
+    label: "Spatial Data Service"
+  },
+  {
+    value: "ShellHWDetection",
+    label: "Shell Hardware Detection"
+  },
+  {
+    value: "shpamsvc",
+    label: "Shared PC Account Manager"
+  },
+  {
+    value: "smphost",
+    label: "Microsoft Storage Spaces SMP"
+  },
+  {
+    value: "SmsRouter",
+    label: "Microsoft Windows SMS Router Service."
+  },
+  {
+    value: "SNMPTRAP",
+    label: "SNMP Trap"
+  },
+  {
+    value: "spectrum",
+    label: "Windows Perception Service"
+  },
+  {
+    value: "Spooler",
+    label: "Print Spooler"
+  },
+  {
+    value: "sppsvc",
+    label: "Software Protection"
+  },
+  {
+    value: "SSDPSRV",
+    label: "SSDP Discovery"
+  },
+  {
+    value: "ssh-agent",
+    label: "OpenSSH Authentication Agent"
+  },
+  {
+    value: "sshd",
+    label: "OpenSSH SSH Server"
+  },
+  {
+    value: "SstpSvc",
+    label: "Secure Socket Tunneling Protocol Service"
+  },
+  {
+    value: "StateRepository",
+    label: "State Repository Service"
+  },
+  {
+    value: "stisvc",
+    label: "Windows Image Acquisition (WIA)"
+  },
+  {
+    value: "StorSvc",
+    label: "Storage Service"
+  },
+  {
+    value: "svsvc",
+    label: "Spot Verifier"
+  },
+  {
+    value: "swprv",
+    label: "Microsoft Software Shadow Copy Provider"
+  },
+  {
+    value: "SynTPEnhService",
+    label: "SynTPEnh Caller Service"
+  },
+  {
+    value: "SysMain",
+    label: "SysMain"
+  },
+  {
+    value: "SystemEventsBroker",
+    label: "System Events Broker"
+  },
+  {
+    value: "TabletInputService",
+    label: "Touch Keyboard and Handwriting Panel Service"
+  },
+  {
+    value: "TapiSrv",
+    label: "Telephony"
+  },
+  {
+    value: "TermService",
+    label: "Remote Desktop Services"
+  },
+  {
+    value: "Themes",
+    label: "Themes"
+  },
+  {
+    value: "TieringEngineService",
+    label: "Storage Tiers Management"
+  },
+  {
+    value: "TimeBrokerSvc",
+    label: "Time Broker"
+  },
+  {
+    value: "TokenBroker",
+    label: "Web Account Manager"
+  },
+  {
+    value: "TrkWks",
+    label: "Distributed Link Tracking Client"
+  },
+  {
+    value: "TroubleshootingSvc",
+    label: "Recommended Troubleshooting Service"
+  },
+  {
+    value: "TrustedInstaller",
+    label: "Windows Modules Installer"
+  },
+  {
+    value: "tzautoupdate",
+    label: "Auto Time Zone Updater"
+  },
+  {
+    value: "UevAgentService",
+    label: "User Experience Virtualization Service"
+  },
+  {
+    value: "UmRdpService",
+    label: "Remote Desktop Services UserMode Port Redirector"
+  },
+  {
+    value: "upnphost",
+    label: "UPnP Device Host"
+  },
+  {
+    value: "UserManager",
+    label: "User Manager"
+  },
+  {
+    value: "UsoSvc",
+    label: "Update Orchestrator Service"
+  },
+  {
+    value: "VacSvc",
+    label: "Volumetric Audio Compositor Service"
+  },
+  {
+    value: "VaultSvc",
+    label: "Credential Manager"
+  },
+  {
+    value: "vds",
+    label: "Virtual Disk"
+  },
+  {
+    value: "vmcompute",
+    label: "Hyper-V Host Compute Service"
+  },
+  {
+    value: "vmicguestinterface",
+    label: "Hyper-V Guest Service Interface"
+  },
+  {
+    value: "vmicheartbeat",
+    label: "Hyper-V Heartbeat Service"
+  },
+  {
+    value: "vmickvpexchange",
+    label: "Hyper-V Data Exchange Service"
+  },
+  {
+    value: "vmicrdv",
+    label: "Hyper-V Remote Desktop Virtualization Service"
+  },
+  {
+    value: "vmicshutdown",
+    label: "Hyper-V Guest Shutdown Service"
+  },
+  {
+    value: "vmictimesync",
+    label: "Hyper-V Time Synchronization Service"
+  },
+  {
+    value: "vmicvmsession",
+    label: "Hyper-V PowerShell Direct Service"
+  },
+  {
+    value: "vmicvss",
+    label: "Hyper-V Volume Shadow Copy Requestor"
+  },
+  {
+    value: "VSS",
+    label: "Volume Shadow Copy"
+  },
+  {
+    value: "W32Time",
+    label: "Windows Time"
+  },
+  {
+    value: "WaaSMedicSvc",
+    label: "Windows Update Medic Service"
+  },
+  {
+    value: "WalletService",
+    label: "WalletService"
+  },
+  {
+    value: "WarpJITSvc",
+    label: "WarpJITSvc"
+  },
+  {
+    value: "wbengine",
+    label: "Block Level Backup Engine Service"
+  },
+  {
+    value: "WbioSrvc",
+    label: "Windows Biometric Service"
+  },
+  {
+    value: "Wcmsvc",
+    label: "Windows Connection Manager"
+  },
+  {
+    value: "wcncsvc",
+    label: "Windows Connect Now - Config Registrar"
+  },
+  {
+    value: "WdiServiceHost",
+    label: "Diagnostic Service Host"
+  },
+  {
+    value: "WdiSystemHost",
+    label: "Diagnostic System Host"
+  },
+  {
+    value: "WdNisSvc",
+    label: "Windows Defender Antivirus Network Inspection Service"
+  },
+  {
+    value: "WebClient",
+    label: "WebClient"
+  },
+  {
+    value: "Wecsvc",
+    label: "Windows Event Collector"
+  },
+  {
+    value: "WEPHOSTSVC",
+    label: "Windows Encryption Provider Host Service"
+  },
+  {
+    value: "wercplsupport",
+    label: "Problem Reports and Solutions Control Panel Support"
+  },
+  {
+    value: "WerSvc",
+    label: "Windows Error Reporting Service"
+  },
+  {
+    value: "WFDSConMgrSvc",
+    label: "Wi-Fi Direct Services Connection Manager Service"
+  },
+  {
+    value: "WiaRpc",
+    label: "Still Image Acquisition Events"
+  },
+  {
+    value: "WinDefend",
+    label: "Windows Defender Antivirus Service"
+  },
+  {
+    value: "WinHttpAutoProxySvc",
+    label: "WinHTTP Web Proxy Auto-Discovery Service"
+  },
+  {
+    value: "Winmgmt",
+    label: "Windows Management Instrumentation"
+  },
+  {
+    value: "WinRM",
+    label: "Windows Remote Management (WS-Management)"
+  },
+  {
+    value: "wisvc",
+    label: "Windows Insider Service"
+  },
+  {
+    value: "WlanSvc",
+    label: "WLAN AutoConfig"
+  },
+  {
+    value: "wlidsvc",
+    label: "Microsoft Account Sign-in Assistant"
+  },
+  {
+    value: "wlpasvc",
+    label: "Local Profile Assistant Service"
+  },
+  {
+    value: "WManSvc",
+    label: "Windows Management Service"
+  },
+  {
+    value: "wmiApSrv",
+    label: "WMI Performance Adapter"
+  },
+  {
+    value: "WMPNetworkSvc",
+    label: "Windows Media Player Network Sharing Service"
+  },
+  {
+    value: "workfolderssvc",
+    label: "Work Folders"
+  },
+  {
+    value: "WpcMonSvc",
+    label: "Parental Controls"
+  },
+  {
+    value: "WPDBusEnum",
+    label: "Portable Device Enumerator Service"
+  },
+  {
+    value: "WpnService",
+    label: "Windows Push Notifications System Service"
+  },
+  {
+    value: "wscsvc",
+    label: "Security Center"
+  },
+  {
+    value: "WSearch",
+    label: "Windows Search"
+  },
+  {
+    value: "wuauserv",
+    label: "Windows Update"
+  },
+  {
+    value: "WwanSvc",
+    label: "WWAN AutoConfig"
+  },
+  {
+    value: "XblAuthManager",
+    label: "Xbox Live Auth Manager"
+  },
+  {
+    value: "XblGameSave",
+    label: "Xbox Live Game Save"
+  },
+  {
+    value: "XboxGipSvc",
+    label: "Xbox Accessory Management Service"
+  },
+  {
+    value: "XboxNetApiSvc",
+    label: "Xbox Live Networking Service"
+  },
+  {
+    value: "YMC",
+    label: "YMC"
+  },
+  {
+    value: "AarSvc_35b28a",
+    label: "Agent Activation Runtime_35b28a"
+  },
+  {
+    value: "BcastDVRUserService_35b28a",
+    label: "GameDVR and Broadcast User Service_35b28a"
+  },
+  {
+    value: "BluetoothUserService_35b28a",
+    label: "Bluetooth User Support Service_35b28a"
+  },
+  {
+    value: "CaptureService_35b28a",
+    label: "CaptureService_35b28a"
+  },
+  {
+    value: "cbdhsvc_35b28a",
+    label: "Clipboard User Service_35b28a"
+  },
+  {
+    value: "CDPUserSvc_35b28a",
+    label: "Connected Devices Platform User Service_35b28a"
+  },
+  {
+    value: "ConsentUxUserSvc_35b28a",
+    label: "ConsentUX_35b28a"
+  },
+  {
+    value: "CredentialEnrollmentManagerUserSvc_35b28a",
+    label: "CredentialEnrollmentManagerUserSvc_35b28a"
+  },
+  {
+    value: "DeviceAssociationBrokerSvc_35b28a",
+    label: "DeviceAssociationBroker_35b28a"
+  },
+  {
+    value: "DevicePickerUserSvc_35b28a",
+    label: "DevicePicker_35b28a"
+  },
+  {
+    value: "DevicesFlowUserSvc_35b28a",
+    label: "DevicesFlow_35b28a"
+  },
+  {
+    value: "LxssManagerUser_35b28a",
+    label: "LxssManagerUser_35b28a"
+  },
+  {
+    value: "MessagingService_35b28a",
+    label: "MessagingService_35b28a"
+  },
+  {
+    value: "OneSyncSvc_35b28a",
+    label: "Sync Host_35b28a"
+  },
+  {
+    value: "PimIndexMaintenanceSvc_35b28a",
+    label: "Contact Data_35b28a"
+  },
+  {
+    value: "PrintWorkflowUserSvc_35b28a",
+    label: "PrintWorkflow_35b28a"
+  },
+  {
+    value: "UnistoreSvc_35b28a",
+    label: "User Data Storage_35b28a"
+  },
+  {
+    value: "UserDataSvc_35b28a",
+    label: "User Data Access_35b28a"
+  },
+  {
+    value: "WpnUserService_35b28a",
+    label: "Windows Push Notifications User Service_35b28a"
+  },
+  {
+    value: "Mesh Agent",
+    label: "Mesh Agent background service"
+  },
+  {
+    value: "salt-minion",
+    label: "salt-minion"
+  },
+  {
+    value: "tacticalagent",
+    label: "Tactical RMM Agent"
+  }
+]
\ No newline at end of file
diff --git a/src/composables/clients.js b/src/composables/clients.js
index eb44223..a09ce67 100644
--- a/src/composables/clients.js
+++ b/src/composables/clients.js
@@ -1,9 +1,9 @@
 
-import { ref } from "vue"
+import { ref, onMounted } from "vue"
 import { fetchClients } from "@/api/clients"
 import { formatClientOptions, formatSiteOptions } from "@/utils/format"
 
-export function useClientDropdown() {
+export function useClientDropdown(onMount = false) {
   const client = ref(null)
   const clients = ref([])
   const clientOptions = ref([])
@@ -12,6 +12,8 @@ export function useClientDropdown() {
     clientOptions.value = formatClientOptions(await fetchClients(), flat)
   }
 
+  if (onMount) onMounted(getClientOptions)
+
   return {
     //data
     client,
@@ -23,7 +25,7 @@ export function useClientDropdown() {
   }
 }
 
-export function useSiteDropdown() {
+export function useSiteDropdown(onMount = false) {
   const site = ref(null)
   const sites = ref([])
   const siteOptions = ref([])
@@ -32,6 +34,8 @@ export function useSiteDropdown() {
     siteOptions.value = formatSiteOptions(await fetchClients())
   }
 
+  if (onMount) onMounted(getSiteOptions)
+
   return {
     //data
     site,
diff --git a/src/composables/scripts.js b/src/composables/scripts.js
index a8f67da..808a6c8 100644
--- a/src/composables/scripts.js
+++ b/src/composables/scripts.js
@@ -11,7 +11,7 @@ export function useScriptDropdown(setScript = null) {
 
   // specifing flat returns an array of script names versus {value:id, label: hostname}
   async function getScriptOptions(showCommunityScripts = false, flat = false) {
-    scriptOptions.value = formatScriptOptions(await fetchScripts({ showCommunityScripts }), flat)
+    scriptOptions.value = Object.freeze(formatScriptOptions(await fetchScripts({ showCommunityScripts }), flat))
   }
 
   // watch scriptPk for changes and update the default timeout and args
diff --git a/src/mixins/mixins.js b/src/mixins/mixins.js
index 4f202d4..ca55ae2 100644
--- a/src/mixins/mixins.js
+++ b/src/mixins/mixins.js
@@ -197,7 +197,7 @@ export default {
     },
     async getAgentOptions() {
 
-      const { data } = await axios.get("/agents/listagentsnodetail/")
+      const { data } = await axios.get("/agents/?detail=false")
 
       return formatAgentOptions(data)
     },
diff --git a/src/router/routes.js b/src/router/routes.js
index 87b42e6..3d36372 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -24,7 +24,7 @@ const routes = [
     }
   },
   {
-    path: "/takecontrol/:pk",
+    path: "/takecontrol/:agent_id",
     name: "TakeControl",
     component: () => import("@/views/TakeControl"),
     meta: {
@@ -32,7 +32,7 @@ const routes = [
     }
   },
   {
-    path: "/remotebackground/:pk",
+    path: "/remotebackground/:agent_id",
     name: "RemoteBackground",
     component: () => import("@/views/RemoteBackground"),
     meta: {
diff --git a/src/store/index.js b/src/store/index.js
index ff72ced..f368119 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1,4 +1,5 @@
 import { createStore } from 'vuex'
+import { Screen } from 'quasar'
 import axios from "axios";
 
 export default function () {
@@ -11,17 +12,11 @@ export default function () {
         tree: [],
         treeReady: false,
         selectedRow: null,
-        agentSummary: {},
-        winUpdates: {},
-        agentChecks: null,
-        automatedTasks: {},
         agentTableLoading: false,
         treeLoading: false,
-        installedSoftware: [],
-        notes: [],
         needrefresh: false,
-        tableHeight: "35vh",
-        tabHeight: "35vh",
+        tableHeight: "300px",
+        tabHeight: "300px",
         showCommunityScripts: false,
         agentDblClickAction: "",
         agentUrlAction: null,
@@ -39,37 +34,12 @@ export default function () {
       loggedIn(state) {
         return state.token !== null;
       },
-      selectedAgentPk(state) {
-        return state.agentSummary.id;
-      },
-      agentDisks(state) {
-        return state.agentSummary.disks;
-      },
-      agentServices(state) {
-        return state.agentSummary.services;
-      },
-      checks(state) {
-        return state.agentChecks;
+      selectedAgentId(state) {
+        return state.selectedRow.agent_id;
       },
       showCommunityScripts(state) {
         return state.showCommunityScripts;
       },
-      sortedUpdates(state) {
-        // sort patches by latest then not installed
-        if (!state.winUpdates.winupdates) {
-          return [];
-        }
-        const sortedByID = state.winUpdates.winupdates.sort((a, b) =>
-          a.id > b.id ? 1 : -1
-        );
-        const sortedByInstall = sortedByID.sort(a =>
-          a.installed === false ? -1 : 1
-        );
-        return sortedByInstall;
-      },
-      agentHostname(state) {
-        return state.agentSummary.hostname;
-      },
       needRefresh(state) {
         return state.needrefresh;
       },
@@ -84,8 +54,8 @@ export default function () {
       AGENT_TABLE_LOADING(state, visible) {
         state.agentTableLoading = visible;
       },
-      setActiveRow(state, pk) {
-        state.selectedRow = pk;
+      setActiveRow(state, agent_id) {
+        state.selectedRow = agent_id;
       },
       retrieveToken(state, { token, username }) {
         state.token = token;
@@ -102,43 +72,22 @@ export default function () {
         state.tree = treebar;
         state.treeReady = true;
       },
-      setSummary(state, summary) {
-        state.agentSummary = summary;
-      },
-      SET_WIN_UPDATE(state, updates) {
-        state.winUpdates = updates;
-      },
-      SET_INSTALLED_SOFTWARE(state, software) {
-        state.installedSoftware = software;
-      },
-      setChecks(state, checks) {
-        state.agentChecks = checks;
-      },
-      SET_AUTOMATED_TASKS(state, tasks) {
-        state.automatedTasks = tasks;
-      },
       destroySubTable(state) {
-        (state.agentSummary = {}),
-          (state.agentChecks = null),
-          (state.winUpdates = {});
-        (state.installedSoftware = []);
         state.selectedRow = "";
       },
       SET_REFRESH_NEEDED(state, action) {
         state.needrefresh = action;
       },
       SET_SPLITTER(state, val) {
-        const agentHeight = Math.abs(100 - val - 15);
-        const tabsHeight = Math.abs(val - 10);
-        agentHeight <= 15.0 ? state.tableHeight = "15vh" : state.tableHeight = `${agentHeight}vh`;
-        tabsHeight <= 15.0 ? state.tabHeight = "15vh" : state.tabHeight = `${tabsHeight}vh`;
+        // top toolbar is 50px. Filebar is 40px and agent filter tabs are 44px 
+        state.tableHeight = `${Screen.height - 50 - 40 - 78 - val}px`;
+
+        // q-tabs are 37px
+        state.tabHeight = `${val - 37}px`;
       },
       SET_CLIENT_SPLITTER(state, val) {
         state.clientTreeSplitter = val;
       },
-      SET_NOTES(state, notes) {
-        state.notes = notes;
-      },
       setShowCommunityScripts(state, show) {
         state.showCommunityScripts = show
       },
@@ -177,60 +126,6 @@ export default function () {
       getDashInfo(context) {
         return axios.get("/core/dashinfo/");
       },
-      loadAutomatedTasks(context, pk) {
-        axios.get(`/tasks/${pk}/automatedtasks/`).then(r => {
-          context.commit("SET_AUTOMATED_TASKS", r.data);
-        })
-          .catch(e => { })
-      },
-      loadInstalledSoftware(context, pk) {
-        axios.get(`/software/installed/${pk}/`).then(r => {
-          context.commit("SET_INSTALLED_SOFTWARE", r.data.software);
-        })
-          .catch(e => { });
-      },
-      loadWinUpdates(context, pk) {
-        axios.get(`/winupdate/${pk}/getwinupdates/`).then(r => {
-          context.commit("SET_WIN_UPDATE", r.data);
-        })
-          .catch(e => { });
-      },
-      loadSummary(context, pk) {
-        axios.get(`/agents/${pk}/agentdetail/`).then(r => {
-          context.commit("setSummary", r.data);
-        })
-          .catch(e => { });
-      },
-      loadChecks(context, pk) {
-        axios.get(`/checks/${pk}/loadchecks/`).then(r => {
-          context.commit("setChecks", r.data);
-        })
-          .catch(e => { });
-      },
-      loadNotes(context, pk) {
-        axios.get(`/agents/${pk}/notes/`).then(r => {
-          context.commit("SET_NOTES", r.data.notes);
-        })
-          .catch(e => { });
-      },
-      loadDefaultServices(context) {
-        return axios.get("/services/getdefaultservices/");
-      },
-      loadAgentServices(context, agentpk) {
-        return axios.get(`/services/${agentpk}/services/`);
-      },
-      editCheckAlert(context, { pk, data }) {
-        return axios.patch(`/checks/${pk}/check/`, data);
-      },
-      deleteCheck(context, pk) {
-        return axios.delete(`/checks/${pk}/check/`);
-      },
-      editAutoTask(context, data) {
-        return axios.patch(`/tasks/${data.id}/automatedtasks/`, data);
-      },
-      deleteAutoTask(context, pk) {
-        return axios.delete(`/tasks/${pk}/automatedtasks/`);
-      },
       getUpdatedSites(context) {
         axios.get("/clients/clients/").then(r => {
           context.commit("getUpdatedSites", r.data);
@@ -259,7 +154,7 @@ export default function () {
               let siteNode = {
                 label: site.name,
                 id: site.id,
-                raw: `Site|${site.id}`,
+                raw: `Site | ${site.id} `,
                 header: "generic",
                 icon: "apartment",
                 client: client.id,
@@ -280,7 +175,7 @@ export default function () {
             let clientNode = {
               label: client.name,
               id: client.id,
-              raw: `Client|${client.id}`,
+              raw: `Client | ${client.id} `,
               header: "root",
               icon: "business",
               server_policy: client.server_policy,
diff --git a/src/utils/format.js b/src/utils/format.js
index 4cb6fd0..88ec724 100644
--- a/src/utils/format.js
+++ b/src/utils/format.js
@@ -141,20 +141,10 @@ export function formatUserOptions(data, flat = false) {
 
 // date formatting
 
-function _appendLeadingZeroes(n) {
-  if (n <= 9) {
-    return "0" + n;
-  }
-  return n
-}
-
-export function formatDate(date, includeSeconds = false) {
-  if (!date) return
-  const months = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
-  let dt = new Date(date)
-  let formatted = months[dt.getMonth()] + "-" + _appendLeadingZeroes(dt.getDate()) + "-" + _appendLeadingZeroes(dt.getFullYear()) + " - " + _appendLeadingZeroes(dt.getHours()) + ":" + _appendLeadingZeroes(dt.getMinutes())
-
-  return includeSeconds ? formatted + ":" + _appendLeadingZeroes(dt.getSeconds()) : formatted
+export function formatDate(dateString) {
+  if (!dateString) return "";
+  const d = date.extractDate(dateString, "MM DD YYYY HH:mm");
+  return date.formatDate(d, "MMM-DD-YYYY - HH:mm");
 }
 
 
@@ -178,4 +168,17 @@ export function truncateText(txt, chars) {
   if (!txt) return
 
   return txt.length >= chars ? txt.substring(0, chars) + "..." : txt;
-}
\ No newline at end of file
+}
+
+export function bytes2Human(bytes) {
+  if (bytes == 0) return "0B";
+  const k = 1024;
+  const sizes = ["B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"];
+  const i = Math.floor(Math.log(bytes) / Math.log(k));
+  return parseFloat((bytes / Math.pow(k, i)).toFixed(2)) + " " + sizes[i];
+}
+
+export function convertMemoryToPercent(percent, memory) {
+  const mb = memory * 1024;
+  return Math.ceil((percent * mb) / 100).toLocaleString();
+}
diff --git a/src/utils/validation.js b/src/utils/validation.js
new file mode 100644
index 0000000..8f8ce7a
--- /dev/null
+++ b/src/utils/validation.js
@@ -0,0 +1,37 @@
+import { Notify } from "quasar";
+
+export function isValidThreshold(warning, error, diskcheck = false) {
+  if (warning === 0 && error === 0) {
+    Notify.create({ type: "negative", timeout: 2000, message: "Warning Threshold or Error Threshold need to be set" });
+    return false;
+  }
+
+  if (!diskcheck && warning > error && warning > 0 && error > 0) {
+    Notify.create({ type: "negative", timeout: 2000, message: "Warning Threshold must be less than Error Threshold" });
+    return false;
+  }
+
+  if (diskcheck && warning < error && warning > 0 && error > 0) {
+    Notify.create({ type: "negative", timeout: 2000, message: "Warning Threshold must be more than Error Threshold" });
+    return false;
+  }
+
+  return true;
+}
+
+export function validateEventID(val) {
+  if (val === null || val.toString().replace(/\s/g, "") === "") {
+    return false;
+  } else if (val === "*") {
+    return true;
+  } else if (!isNaN(val)) {
+    return true;
+  } else {
+    return false;
+  }
+}
+
+// validate script return code
+export function validateRetcode(val, done) {
+  /^\d+$/.test(val) ? done(val) : done();
+}
\ No newline at end of file
diff --git a/src/views/Dashboard.vue b/src/views/Dashboard.vue
index dc02c1e..0046289 100644
--- a/src/views/Dashboard.vue
+++ b/src/views/Dashboard.vue
@@ -91,7 +91,7 @@
 
     <q-page-container>
       <FileBar />
-      <q-splitter v-model="clientTreeSplitter">
+      <q-splitter v-model="clientTreeSplitter" :style="{ height: `${$q.screen.height - 50 - 40}px` }">
         <template v-slot:before>
           <div v-if="!treeReady" class="q-pa-sm q-gutter-sm text-center" style="height: 30vh">
             <q-spinner size="40px" color="primary" />
@@ -224,9 +224,12 @@
           <q-splitter
             v-model="innerModel"
             reverse
+            unit="px"
             horizontal
-            style="height: 87vh"
             @update:model-value="setSplitter(innerModel)"
+            after-class="hide-scrollbar"
+            before-class="hide-scrollbar"
+            emit-immediately
           >
             <template v-slot:before>
               <div class="row">
@@ -385,7 +388,7 @@
               <q-avatar color="primary" text-color="white" size="30px" icon="drag_indicator" />
             </template>
             <template v-slot:after>
-              <SubTableTabs @edit="refreshEntireSite" />
+              <SubTableTabs />
             </template>
           </q-splitter>
         </template>
@@ -442,7 +445,7 @@ export default {
       workstationCount: 0,
       workstationOfflineCount: 0,
       selectedTree: "",
-      innerModel: 50,
+      innerModel: (this.$q.screen.height - 82) / 2,
       clientActive: "",
       siteActive: "",
       frame: [],
@@ -629,14 +632,14 @@ export default {
         this.loadFrame(this.selectedTree, false);
       }
 
-      if (this.selectedAgentPk) {
-        const pk = this.selectedAgentPk;
-        this.$store.dispatch("loadSummary", pk);
-        this.$store.dispatch("loadChecks", pk);
-        this.$store.dispatch("loadAutomatedTasks", pk);
-        this.$store.dispatch("loadWinUpdates", pk);
-        this.$store.dispatch("loadInstalledSoftware", pk);
-        this.$store.dispatch("loadNotes", pk);
+      if (this.selectedAgentId) {
+        const agent_id = this.selectedAgentId;
+        this.$store.dispatch("loadSummary", agent_id);
+        this.$store.dispatch("loadChecks", agent_id);
+        this.$store.dispatch("loadAutomatedTasks", agent_id);
+        this.$store.dispatch("loadWinUpdates", agent_id);
+        this.$store.dispatch("loadInstalledSoftware", agent_id);
+        this.$store.dispatch("loadNotes", agent_id);
       }
     },
     loadFrame(activenode, destroySub = true) {
@@ -652,17 +655,17 @@ export default {
         id = activenode.split("|")[1];
 
         if (urlType === "Client") {
-          data.clientPK = id;
+          data.client = id;
           execute = true;
         } else if (urlType === "Site") {
-          data.sitePK = id;
+          data.site = id;
           execute = true;
         }
 
         if (execute) {
           this.$store.commit("AGENT_TABLE_LOADING", true);
           this.$axios
-            .patch("/agents/listagents/", data)
+            .get("/agents/", data)
             .then(r => {
               this.frame = r.data;
               this.$store.commit("AGENT_TABLE_LOADING", false);
@@ -687,7 +690,7 @@ export default {
     loadAllClients() {
       this.$store.commit("AGENT_TABLE_LOADING", true);
       this.$axios
-        .patch("/agents/listagents/")
+        .get("/agents/")
         .then(r => {
           this.frame = r.data;
           this.$store.commit("AGENT_TABLE_LOADING", false);
@@ -894,7 +897,7 @@ export default {
       treeReady: state => state.treeReady,
       clients: state => state.clients,
     }),
-    ...mapGetters(["selectedAgentPk", "needRefresh"]),
+    ...mapGetters(["selectedAgentId", "needRefresh"]),
     latestReleaseURL() {
       return this.latestTRMMVersion !== "error"
         ? `https://github.com/wh1te909/tacticalrmm/releases/tag/v${this.latestTRMMVersion}`
@@ -967,6 +970,9 @@ export default {
     this.$store.dispatch("checkVer");
     this.getTree();
 
+    // set initial value for agent table and agent tabs
+    this.setSplitter(this.innerModel);
+
     this.livePoll();
   },
   beforeUnmount() {
diff --git a/src/views/RemoteBackground.vue b/src/views/RemoteBackground.vue
index 9e40fea..fb22069 100644
--- a/src/views/RemoteBackground.vue
+++ b/src/views/RemoteBackground.vue
@@ -28,13 +28,13 @@
         ></iframe>
       </q-tab-panel>
       <q-tab-panel name="processes">
-        <ProcessManager :pk="pk" />
+        <ProcessManager :agent_id="agent_id" />
       </q-tab-panel>
       <q-tab-panel name="services">
-        <Services :pk="pk" />
+        <ServicesManager :agent_id="agent_id" />
       </q-tab-panel>
       <q-tab-panel name="eventlog">
-        <EventLog :pk="pk" />
+        <EventLogManager :agent_id="agent_id" />
       </q-tab-panel>
       <q-tab-panel name="filebrowser">
         <iframe style="overflow: hidden; height: 715px" :src="file" width="100%" height="100%" scrolling="no"></iframe>
@@ -44,62 +44,65 @@
 </template>
 
 <script>
-import ProcessManager from "@/components/ProcessManager";
-import Services from "@/components/Services";
-import EventLog from "@/components/EventLog";
+// composition imports
+import { ref, computed, onMounted } from "vue";
+import { useRoute } from "vue-router";
+import { useQuasar, useMeta } from "quasar";
+import { fetchAgentMeshCentralURLs } from "@/api/agents";
+import { fetchDashboardInfo } from "@/api/core";
 
-import { createMetaMixin } from "quasar";
+// ui imports
+import ProcessManager from "@/components/agents/remotebg/ProcessManager";
+import ServicesManager from "@/components/agents/remotebg/ServicesManager";
+import EventLogManager from "@/components/agents/remotebg/EventLogManager";
 
 export default {
   name: "RemoteBackground",
-  mixins: [
-    createMetaMixin(function () {
-      return {
-        title: this.title,
-      };
-    }),
-  ],
   components: {
-    Services,
-    EventLog,
+    ServicesManager,
+    EventLogManager,
     ProcessManager,
   },
-  data() {
+  setup(props) {
+    // setup quasar
+    const $q = useQuasar();
+
+    // vue router
+    const { params } = useRoute();
+
+    // meshcentral tabs
+    const terminal = ref("");
+    const file = ref("");
+    const tab = ref("terminal");
+
+    const agent_id = computed(() => params.agent_id);
+
+    async function getMeshURLs() {
+      const data = await fetchAgentMeshCentralURLs(params.agent_id);
+      terminal.value = data.terminal;
+      file.value = data.file;
+      useMeta({ title: `${data.hostname} - ${data.client} - ${data.site} | Remote Background` });
+    }
+
+    async function getDashInfo() {
+      const { dark_mode, loading_bar_color } = await fetchDashboardInfo();
+      $q.dark.set(dark_mode);
+      $q.loadingBar.setDefaults({ color: loading_bar_color });
+    }
+
+    // vue lifecycle hooks
+    onMounted(() => {
+      getDashInfo();
+      getMeshURLs();
+    });
+
     return {
-      terminal: "",
-      file: "",
-      tab: "terminal",
-      title: "",
-      darkMode: true,
+      // reactive data
+      terminal,
+      file,
+      tab,
+      agent_id,
     };
   },
-  methods: {
-    genURLS() {
-      this.$axios
-        .get(`/agents/${this.pk}/meshcentral/`)
-        .then(r => {
-          this.terminal = r.data.terminal;
-          this.file = r.data.file;
-          this.title = `${r.data.hostname} - ${r.data.client} - ${r.data.site} | Remote Background`;
-        })
-        .catch(e => {});
-    },
-    getUI() {
-      this.$store.dispatch("getDashInfo").then(r => {
-        this.darkMode = r.data.dark_mode;
-        this.$q.dark.set(this.darkMode);
-        this.$q.loadingBar.setDefaults({ color: r.data.loading_bar_color });
-      });
-    },
-  },
-  computed: {
-    pk() {
-      return this.$route.params.pk;
-    },
-  },
-  mounted() {
-    this.getUI();
-    this.genURLS();
-  },
 };
 </script>
\ No newline at end of file
diff --git a/src/views/TakeControl.vue b/src/views/TakeControl.vue
index 630f759..0f07223 100644
--- a/src/views/TakeControl.vue
+++ b/src/views/TakeControl.vue
@@ -6,126 +6,122 @@
         <q-badge :color="statusColor" :label="status" />
       </span>
       <q-space />
-      <q-btn class="q-mr-md" color="primary" size="sm" label="Restart Connection" icon="refresh" @click="restart" />
-      <q-btn color="negative" size="sm" label="Recover Connection" icon="fas fa-first-aid" @click="repair" />
+      <q-btn
+        class="q-mr-md"
+        color="primary"
+        size="sm"
+        label="Restart Connection"
+        icon="refresh"
+        @click="restartMeshService"
+      />
+      <q-btn color="negative" size="sm" label="Recover Connection" icon="fas fa-first-aid" @click="repairMeshCentral" />
       <q-space />
     </div>
 
-    <q-video v-show="visible" :ratio="16 / 9" :src="control" style="padding-bottom: 51%"></q-video>
+    <q-video v-show="control" :ratio="16 / 9" :src="control" style="padding-bottom: 51%"></q-video>
   </div>
 </template>
 
 <script>
-import mixins from "@/mixins/mixins";
-
-import { createMetaMixin } from "quasar";
+// composition imports
+import { ref, computed, onMounted } from "vue";
+import { useRoute } from "vue-router";
+import { useMeta, useQuasar } from "quasar";
+import { fetchAgentMeshCentralURLs, sendAgentRecoverMesh } from "@/api/agents";
+import { fetchDashboardInfo } from "@/api/core";
+import { sendAgentServiceAction } from "@/api/services";
+import { notifySuccess } from "@/utils/notify";
 
 export default {
   name: "TakeControl",
-  mixins: [
-    mixins,
-    createMetaMixin(function () {
-      return {
-        title: this.title,
-      };
-    }),
-  ],
-  data() {
-    return {
-      control: "",
-      visible: true,
-      status: null,
-      title: "",
-    };
-  },
-  computed: {
-    statusColor() {
-      if (this.status !== null) {
-        let color;
-        switch (this.status) {
+  setup(props) {
+    // vue lifecycle hooks
+    onMounted(() => {
+      getDashInfo();
+      getMeshURLs();
+    });
+
+    // quasar setup
+    const $q = useQuasar();
+
+    // vue router
+    const { params } = useRoute();
+
+    // take control setup
+    const control = ref("");
+    const status = ref(null);
+
+    const statusColor = computed(() => {
+      if (status.value) {
+        switch (status.value) {
           case "online":
-            color = "positive";
-            break;
+            return "positive";
           case "offline":
-            color = "warning";
-            break;
+            return "warning";
           case "overdue":
-            color = "negative";
-            break;
+            return "negative";
         }
-        return color;
+      } else return "negative";
+    });
+
+    async function getMeshURLs() {
+      $q.loading.show();
+      const data = await fetchAgentMeshCentralURLs(params.agent_id);
+      control.value = data.control;
+      status.value = data.status;
+      useMeta({ title: `${data.hostname} - ${data.client} - ${data.site} | Remote Background` });
+      $q.loading.hide();
+    }
+
+    async function getDashInfo() {
+      const { dark_mode, loading_bar_color } = await fetchDashboardInfo();
+      $q.dark.set(dark_mode);
+      $q.loadingBar.setDefaults({ color: loading_bar_color });
+    }
+
+    async function repairMeshCentral() {
+      control.value = "";
+      $q.loading.show({ message: "Attempting to repair Mesh Agent" });
+      try {
+        const data = await sendAgentRecoverMesh(params.agent_id);
+        await getMeshURLs();
+        setTimeout(() => {
+          notifySuccess(data);
+        }, 500);
+      } catch (e) {
+        console.error(e);
       }
-    },
-  },
-  methods: {
-    getUI() {
-      this.$store.dispatch("getDashInfo").then(r => {
-        this.$q.dark.set(r.data.dark_mode);
-        this.$q.loadingBar.setDefaults({ color: r.data.loading_bar_color });
-      });
-    },
-    genURL() {
-      this.$q.loading.show();
-      this.visible = false;
-      this.$axios
-        .get(`/agents/${this.$route.params.pk}/meshcentral/`)
-        .then(r => {
-          this.title = `${r.data.hostname} - ${r.data.client} - ${r.data.site} | Take Control`;
-          this.control = r.data.control;
-          this.status = r.data.status;
-          this.$q.loading.hide();
-          this.visible = true;
-        })
-        .catch(e => {
-          this.visible = true;
-          this.$q.loading.hide();
-        });
-    },
-    restart() {
-      this.visible = false;
-      this.$q.loading.show({ message: "Restarting Mesh Agent" });
+      $q.loading.hide();
+    }
+
+    async function restartMeshService() {
+      $q.loading.show({ message: "Restarting Mesh Agent" });
       const data = {
-        pk: this.$route.params.pk,
-        sv_name: "mesh agent",
         sv_action: "restart",
       };
 
-      this.$axios
-        .post("/services/serviceaction/", data)
-        .then(r => {
-          setTimeout(() => {
-            this.visible = true;
-            this.$q.loading.hide();
-            this.notifySuccess("Mesh agent service was restarted");
-          }, 500);
-        })
-        .catch(e => {
-          this.visible = true;
-          this.$q.loading.hide();
-        });
-    },
-    repair() {
-      this.visible = false;
-      this.$q.loading.show({ message: "Attempting to repair Mesh Agent" });
-      this.$axios
-        .get(`/agents/${this.$route.params.pk}/recovermesh/`)
-        .then(r => {
-          setTimeout(() => {
-            this.visible = true;
-            this.$q.loading.hide();
-            this.notifySuccess(r.data);
-            this.genURL();
-          }, 500);
-        })
-        .catch(e => {
-          this.visible = true;
-          this.$q.loading.hide();
-        });
-    },
-  },
-  mounted() {
-    this.getUI();
-    this.genURL();
+      try {
+        await sendAgentServiceAction(params.agent_id, "mesh agent", data);
+        setTimeout(() => {
+          notifySuccess("Mesh agent service was restarted");
+        }, 500);
+      } catch (e) {
+        console.error(e);
+      }
+
+      $q.loading.hide();
+    }
+
+    return {
+      // reactive data
+      control,
+      status,
+      statusColor,
+
+      // methods
+      repairMeshCentral,
+      restartMeshService,
+    };
   },
 };
 </script>
\ No newline at end of file