diff --git a/src/components/accounts/RolesForm.vue b/src/components/accounts/RolesForm.vue
index f736544..22c628a 100644
--- a/src/components/accounts/RolesForm.vue
+++ b/src/components/accounts/RolesForm.vue
@@ -20,7 +20,7 @@
         <q-card-section class="scroll" style="height: 70vh">
           <!-- Permissions -->
           <div class="text-subtitle2">Super User</div>
-          <hr />
+          <q-separator />
           <q-card-section class="row">
             <div class="q-gutter-sm">
               <q-checkbox v-model="localRole.is_superuser" label="Super User" />
@@ -28,7 +28,7 @@
           </q-card-section>
 
           <div class="text-subtitle2">Accounts</div>
-          <hr />
+          <q-separator />
           <q-card-section class="row">
             <div class="q-gutter-sm">
               <q-checkbox v-model="localRole.can_list_accounts" label="List User Accounts" />
@@ -39,7 +39,7 @@
           </q-card-section>
 
           <div class="text-subtitle2">Agents</div>
-          <hr />
+          <q-separator />
           <q-card-section class="row">
             <div class="q-gutter-sm">
               <q-checkbox v-model="localRole.can_list_agents" label="List Agents" />
@@ -60,7 +60,7 @@
             </div>
           </q-card-section>
           <div class="text-subtitle2">Core</div>
-          <hr />
+          <q-separator />
           <q-card-section class="row">
             <div class="q-gutter-sm">
               <q-checkbox v-model="localRole.can_list_notes" label="List Notes" />
@@ -72,11 +72,13 @@
               <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" />
               <q-checkbox v-model="localRole.can_run_urlactions" label="Run URL Actions" />
+              <q-checkbox v-model="localRole.can_view_customfields" label="View Custom Fields" />
+              <q-checkbox v-model="localRole.can_manage_customfields" label="Edit Custom Fields" />
             </div>
           </q-card-section>
 
           <div class="text-subtitle2">Checks</div>
-          <hr />
+          <q-separator />
           <q-card-section class="row">
             <div class="q-gutter-sm">
               <q-checkbox v-model="localRole.can_list_checks" label="List Checks" />
@@ -86,7 +88,7 @@
           </q-card-section>
 
           <div class="text-subtitle2">Clients</div>
-          <hr />
+          <q-separator />
           <q-card-section class="row">
             <div class="q-gutter-sm">
               <q-checkbox v-model="localRole.can_list_clients" label="List Clients" />
@@ -124,7 +126,7 @@
           </q-card-section>
 
           <div class="text-subtitle2">Automation Policies</div>
-          <hr />
+          <q-separator />
           <q-card-section class="row">
             <div class="q-gutter-sm">
               <q-checkbox v-model="localRole.can_list_automation_policies" label="List Automation Policies" />
@@ -133,7 +135,7 @@
           </q-card-section>
 
           <div class="text-subtitle2">Tasks</div>
-          <hr />
+          <q-separator />
           <q-card-section class="row">
             <div class="q-gutter-sm">
               <q-checkbox v-model="localRole.can_list_autotasks" label="List Tasks" />
@@ -143,7 +145,7 @@
           </q-card-section>
 
           <div class="text-subtitle2">Logs</div>
-          <hr />
+          <q-separator />
           <q-card-section class="row">
             <div class="q-gutter-sm">
               <q-checkbox v-model="localRole.can_view_auditlogs" label="View Audit Logs" />
@@ -154,7 +156,7 @@
           </q-card-section>
 
           <div class="text-subtitle2">Scripts</div>
-          <hr />
+          <q-separator />
           <q-card-section class="row">
             <div class="q-gutter-sm">
               <q-checkbox v-model="localRole.can_list_scripts" label="List Scripts" />
@@ -163,7 +165,7 @@
           </q-card-section>
 
           <div class="text-subtitle2">Alerts</div>
-          <hr />
+          <q-separator />
           <q-card-section class="row">
             <div class="q-gutter-sm">
               <q-checkbox v-model="localRole.can_list_alerts" label="List Alerts" />
@@ -174,7 +176,7 @@
           </q-card-section>
 
           <div class="text-subtitle2">Windows Services</div>
-          <hr />
+          <q-separator />
           <q-card-section class="row">
             <div class="q-gutter-sm">
               <q-checkbox v-model="localRole.can_manage_winsvcs" label="Manage Windows Services" />
@@ -182,7 +184,7 @@
           </q-card-section>
 
           <div class="text-subtitle2">Software</div>
-          <hr />
+          <q-separator />
           <q-card-section class="row">
             <div class="q-gutter-sm">
               <q-checkbox v-model="localRole.can_list_software" label="List Software" />
@@ -191,7 +193,7 @@
           </q-card-section>
 
           <div class="text-subtitle2">Windows Updates</div>
-          <hr />
+          <q-separator />
           <q-card-section class="row">
             <div class="q-gutter-sm">
               <q-checkbox v-model="localRole.can_manage_winupdates" label="Manage Windows Updates" />
@@ -266,6 +268,8 @@ export default {
           can_do_server_maint: false,
           can_code_sign: false,
           can_run_urlactions: false,
+          can_view_customfields: false,
+          can_manage_customfields: false,
           // api key perms
           can_list_api_keys: false,
           can_manage_api_keys: false,
diff --git a/src/components/agents/SummaryTab.vue b/src/components/agents/SummaryTab.vue
index a4a0f8e..173a6fe 100644
--- a/src/components/agents/SummaryTab.vue
+++ b/src/components/agents/SummaryTab.vue
@@ -10,7 +10,7 @@
       <span v-if="summary.maintenance_mode"> &bull; <q-badge color="green"> Maintenance Mode </q-badge> </span>
       &bull; {{ summary.operating_system }} &bull; Agent v{{ summary.version }}
     </span>
-    <hr />
+    <q-separator />
     <div class="row">
       <div class="col-4">
         <!-- left -->
@@ -104,7 +104,7 @@
           <span>{{ disk.device }} ({{ disk.fstype }})</span>
           <q-linear-progress rounded size="15px" :value="disk.percent / 100" color="green" class="q-mt-sm" />
           <span>{{ disk.free }} free of {{ disk.total }}</span>
-          <hr />
+          <q-separator />
         </div>
       </div>
       <div class="col-2"></div>
diff --git a/src/components/agents/remotebg/ServiceDetail.vue b/src/components/agents/remotebg/ServiceDetail.vue
index 7c12e8c..c2951fb 100644
--- a/src/components/agents/remotebg/ServiceDetail.vue
+++ b/src/components/agents/remotebg/ServiceDetail.vue
@@ -50,7 +50,7 @@
           </div>
         </div>
       </q-card-section>
-      <hr />
+      <q-separator />
       <q-card-section>
         <div class="row">
           <div class="col-3">Service status:</div>
@@ -65,7 +65,7 @@
           </q-btn-group>
         </div>
       </q-card-section>
-      <hr />
+      <q-separator />
       <q-card-actions align="right">
         <q-btn flat dense label="Cancel" v-close-popup />
         <q-btn
diff --git a/src/components/core/APIKeysTable.vue b/src/components/core/APIKeysTable.vue
index 2e03ccf..89fb888 100644
--- a/src/components/core/APIKeysTable.vue
+++ b/src/components/core/APIKeysTable.vue
@@ -5,7 +5,7 @@
       <q-space />
       <q-btn size="sm" color="grey-5" icon="fas fa-plus" text-color="black" label="Add key" @click="addAPIKey" />
     </div>
-    <hr />
+    <q-separator />
     <q-table
       dense
       :rows="keys"
diff --git a/src/components/modals/agents/PatchPolicyForm.vue b/src/components/modals/agents/PatchPolicyForm.vue
index b41db19..0f40fae 100644
--- a/src/components/modals/agents/PatchPolicyForm.vue
+++ b/src/components/modals/agents/PatchPolicyForm.vue
@@ -2,7 +2,7 @@
   <div class="q-pa-md">
     <!-- Auto Approval -->
     <div class="text-subtitle2">Auto Approval</div>
-    <hr />
+    <q-separator />
     <q-card-section class="row">
       <div class="col-3">Severity</div>
       <div class="col-4"></div>
@@ -75,7 +75,7 @@
     </q-card-section>
     <!-- Installation Schedule -->
     <div class="text-subtitle2">Installation Schedule</div>
-    <hr />
+    <q-separator />
     <q-card-section class="row">
       <div class="col-3">Schedule Frequency:</div>
       <div class="col-4"></div>
@@ -132,7 +132,7 @@
     </q-card-section>
     <!-- Reboot After Installation -->
     <div class="text-subtitle2">Reboot After Installation</div>
-    <hr />
+    <q-separator />
     <q-card-section class="row">
       <div class="col-3"></div>
       <div class="col-4"></div>
@@ -148,7 +148,7 @@
     </q-card-section>
     <!-- Failed Patches -->
     <div class="text-subtitle2">Failed Patches</div>
-    <hr />
+    <q-separator />
     <q-card-section class="row" v-if="!policy">
       <div class="col-5">
         <q-checkbox v-model="winupdatepolicy.reprocess_failed_inherit" label="Inherit failed patch settings" />
diff --git a/src/components/modals/agents/UpdateAgents.vue b/src/components/modals/agents/UpdateAgents.vue
index 36a1cac..c220c5e 100644
--- a/src/components/modals/agents/UpdateAgents.vue
+++ b/src/components/modals/agents/UpdateAgents.vue
@@ -21,10 +21,10 @@
     <q-card-section v-show="version !== null">
       Select Agent
       <br />
-      <hr />
+      <q-separator />
       <q-checkbox v-model="selectAll" label="Select All" @update:model-value="selectAllAction" />
       <q-btn v-show="group.length !== 0" label="Update" color="primary" @click="update" class="q-ml-xl" />
-      <hr />
+      <q-separator />
       <q-option-group
         v-model="group"
         :options="agentOptions"
@@ -41,7 +41,7 @@
 import mixins from "@/mixins/mixins";
 export default {
   name: "UpdateAgents",
-  emits: ["close", "edit"],
+  emits: ["close"],
   mixins: [mixins],
   data() {
     return {
@@ -76,7 +76,6 @@ export default {
         .post("/agents/update/", data)
         .then(r => {
           this.$emit("close");
-          this.$emit("edit");
           this.notifySuccess("Agents will now be updated");
         })
         .catch(e => {});
diff --git a/src/components/modals/coresettings/CustomFields.vue b/src/components/modals/coresettings/CustomFields.vue
index d310f8f..bb9fbaa 100644
--- a/src/components/modals/coresettings/CustomFields.vue
+++ b/src/components/modals/coresettings/CustomFields.vue
@@ -12,7 +12,7 @@
         @click="addCustomField"
       />
     </div>
-    <hr />
+    <q-separator />
     <div>
       <q-tabs
         v-model="tab"
diff --git a/src/components/modals/coresettings/EditCoreSettings.vue b/src/components/modals/coresettings/EditCoreSettings.vue
index 7d1d8a2..a861285 100644
--- a/src/components/modals/coresettings/EditCoreSettings.vue
+++ b/src/components/modals/coresettings/EditCoreSettings.vue
@@ -26,7 +26,7 @@
               <!-- general -->
               <q-tab-panel name="general">
                 <div class="text-subtitle2">General</div>
-                <hr />
+                <q-separator />
                 <q-card-section class="row">
                   <q-checkbox v-model="settings.agent_auto_update" label="Enable agent automatic self update">
                     <q-tooltip> Runs at 35mins past every hour </q-tooltip>
@@ -137,7 +137,7 @@
                     />
                   </div>
                 </div>
-                <hr />
+                <q-separator />
                 <q-card-section class="row">
                   <div class="col-3">Recipients</div>
                   <div class="col-4"></div>
@@ -167,7 +167,7 @@
                 </q-card-section>
                 <!-- smtp -->
                 <div class="text-subtitle2">SMTP Settings</div>
-                <hr />
+                <q-separator />
                 <q-card-section class="row">
                   <div class="col-2">From:</div>
                   <div class="col-4"></div>
@@ -244,7 +244,7 @@
                     />
                   </div>
                 </div>
-                <hr />
+                <q-separator />
                 <q-card-section class="row">
                   <div class="col-3">Recipients</div>
                   <div class="col-4"></div>
@@ -274,7 +274,7 @@
                 </q-card-section>
                 <!-- smtp -->
                 <div class="text-subtitle2">Twilio Settings</div>
-                <hr />
+                <q-separator />
                 <q-card-section class="row">
                   <div class="col-3">Twilio Number:</div>
                   <div class="col-3"></div>
@@ -300,7 +300,7 @@
               <!-- meshcentral -->
               <q-tab-panel name="meshcentral">
                 <div class="text-subtitle2">MeshCentral Settings</div>
-                <hr />
+                <q-separator />
                 <q-card-section class="row">
                   <div class="col-4">Username:</div>
                   <div class="col-2"></div>
diff --git a/src/components/modals/coresettings/KeyStoreTable.vue b/src/components/modals/coresettings/KeyStoreTable.vue
index 2599b44..c645413 100644
--- a/src/components/modals/coresettings/KeyStoreTable.vue
+++ b/src/components/modals/coresettings/KeyStoreTable.vue
@@ -5,7 +5,7 @@
       <q-space />
       <q-btn size="sm" color="grey-5" icon="fas fa-plus" text-color="black" label="Add key" @click="addKey" />
     </div>
-    <hr />
+    <q-separator />
     <q-table
       dense
       :rows="keystore"
diff --git a/src/components/modals/coresettings/URLActionsTable.vue b/src/components/modals/coresettings/URLActionsTable.vue
index b49e6fa..d8c1480 100644
--- a/src/components/modals/coresettings/URLActionsTable.vue
+++ b/src/components/modals/coresettings/URLActionsTable.vue
@@ -5,7 +5,7 @@
       <q-space />
       <q-btn size="sm" color="grey-5" icon="fas fa-plus" text-color="black" label="Add URL Action" @click="addAction" />
     </div>
-    <hr />
+    <q-separator />
     <q-table
       dense
       :rows="actions"
diff --git a/src/components/modals/coresettings/UserPreferences.vue b/src/components/modals/coresettings/UserPreferences.vue
index 2350015..0ebe97f 100644
--- a/src/components/modals/coresettings/UserPreferences.vue
+++ b/src/components/modals/coresettings/UserPreferences.vue
@@ -17,7 +17,7 @@
             <!-- UI -->
             <q-tab-panel name="ui">
               <div class="text-subtitle2">User Interface</div>
-              <hr />
+              <q-separator />
               <q-card-section class="row">
                 <div class="col-6">Agent double-click action:</div>
                 <div class="col-2"></div>