diff --git a/frontend/src/components/Activities/Activities.vue b/frontend/src/components/Activities/Activities.vue
index ee03ad09..def55a2e 100644
--- a/frontend/src/components/Activities/Activities.vue
+++ b/frontend/src/components/Activities/Activities.vue
@@ -365,7 +365,7 @@
       </div>
     </div>
     <div v-else-if="title == 'Data'" class="h-full flex flex-col px-3 sm:px-10">
-      <div>Data</div>
+      <DocFields :doctype="doctype" :docname="doc.data.name" />
     </div>
     <div
       v-else
@@ -457,6 +457,7 @@ import CallArea from '@/components/Activities/CallArea.vue'
 import NoteArea from '@/components/Activities/NoteArea.vue'
 import TaskArea from '@/components/Activities/TaskArea.vue'
 import AttachmentArea from '@/components/Activities/AttachmentArea.vue'
+import DocFields from '@/components/DocFields.vue'
 import UserAvatar from '@/components/UserAvatar.vue'
 import ActivityIcon from '@/components/Icons/ActivityIcon.vue'
 import Email2Icon from '@/components/Icons/Email2Icon.vue'
diff --git a/frontend/src/components/DocFields.vue b/frontend/src/components/DocFields.vue
new file mode 100644
index 00000000..9be707a0
--- /dev/null
+++ b/frontend/src/components/DocFields.vue
@@ -0,0 +1,88 @@
+<template>
+  <div
+    class="my-3 flex items-center justify-between text-lg font-medium sm:mb-4 sm:mt-8"
+  >
+    <div class="flex h-8 items-center text-xl font-semibold text-gray-800">
+      {{ __('Data') }}
+      <Badge
+        v-if="data.isDirty"
+        class="ml-3"
+        :label="'Not Saved'"
+        theme="orange"
+      />
+    </div>
+    <Button
+      label="Save"
+      :disabled="!data.isDirty"
+      variant="solid"
+      :loading="data.save.loading"
+      @click="saveChanges"
+    />
+  </div>
+  <div
+    v-if="data.get.loading"
+    class="flex flex-1 flex-col items-center justify-center gap-3 text-xl font-medium text-gray-500"
+  >
+    <LoadingIndicator class="h-6 w-6" />
+    <span>{{ __('Loading...') }}</span>
+  </div>
+  <div
+    v-else
+    class="flex flex-col gap-3 mb-3 border border-outline-gray-1 p-5 rounded-lg"
+  >
+    <Fields v-if="sections.data" :sections="sections.data" :data="data.doc" />
+  </div>
+</template>
+
+<script setup>
+import Fields from '@/components/Fields.vue'
+import { Badge, createResource, createDocumentResource } from 'frappe-ui'
+import LoadingIndicator from '@/components/Icons/LoadingIndicator.vue'
+import { createToast } from '@/utils'
+
+const props = defineProps({
+  doctype: {
+    type: String,
+    required: true,
+  },
+  docname: {
+    type: String,
+    required: true,
+  },
+})
+
+const data = createDocumentResource({
+  doctype: props.doctype,
+  name: props.docname,
+  cache: ['doc', props.docname],
+  setValue: {
+    onSuccess: () => {
+      data.reload()
+      createToast({
+        title: 'Data Updated',
+        icon: 'check',
+        iconClasses: 'text-green-600',
+      })
+    },
+    onError: (err) => {
+      createToast({
+        title: 'Error',
+        text: err.messages[0],
+        icon: 'x',
+        iconClasses: 'text-red-600',
+      })
+    },
+  },
+})
+
+const sections = createResource({
+  url: 'crm.fcrm.doctype.crm_fields_layout.crm_fields_layout.get_fields_layout',
+  cache: ['DataFields', props.doctype],
+  params: { doctype: props.doctype, type: 'Data Fields' },
+  auto: true,
+})
+
+function saveChanges() {
+  data.save.submit()
+}
+</script>