diff --git a/payroll/forms/component_forms.py b/payroll/forms/component_forms.py
index a412e8f65..4858c1cfe 100644
--- a/payroll/forms/component_forms.py
+++ b/payroll/forms/component_forms.py
@@ -810,6 +810,9 @@ class ReimbursementForm(ModelForm):
 
     def get_employee(self):
         """Resolves employee either from form data or request."""
+        if hasattr(self.instance, "employee_id") and self.instance.employee_id:
+            return self.instance.employee_id
+
         employee_qs = self.fields["employee_id"].queryset
         employee_id = self.data.get("employee_id") if self.data else None
 
@@ -852,7 +855,7 @@ class ReimbursementForm(ModelForm):
         self.fields["attachment"] = MultipleFileField(label="Attachments")
         self.fields["attachment"].widget.attrs["accept"] = ".jpg, .jpeg, .png, .pdf"
 
-        self.exclude_fields_by_type(exclude_fields)
+        # self.exclude_fields_by_type(exclude_fields)
 
         for field in exclude_fields:
             self.fields.pop(field, None)
@@ -901,9 +904,6 @@ class ReimbursementForm(ModelForm):
                 "ad_to_encash",
             ]
 
-        if is_edit:
-            exclude_fields += ["type", "employee_id"]
-
     def as_p(self):
         """
         Render the form fields as HTML table rows with Bootstrap styling.
diff --git a/payroll/templates/payroll/reimbursement/attachments.html b/payroll/templates/payroll/reimbursement/attachments.html
index c35a3aa76..3772dede9 100644
--- a/payroll/templates/payroll/reimbursement/attachments.html
+++ b/payroll/templates/payroll/reimbursement/attachments.html
@@ -1,16 +1,33 @@
 {% load i18n %}
+{% load static %}
 <h3 class="oh-faq-card__title">{% trans 'Attachments' %}</h3>
 <span class="oh-card__footer--border-top pt-1 mb-3" style="display: block;"></span>
-{% for attachment in reimbursement.other_attachments.all %}
-<div id="attachmentContainer{{forloop.counter}}">
-    <div class="oh-btn-group" style="width: 10%;">
-        <button onclick="window.open('{{ protocol }}://{{ host }}{{ attachment.attachment.url }}', '_blank')" class="oh-btn oh-btn--light text-dark"><ion-icon name="eye-outline"></ion-icon></button>
-        <a href="{% url "delete-attachments" reimbursement.id  %}?ids={{attachment.id}}"  onclick="return confirm('Do you want to delete this attachment?')" class="oh-btn oh-btn--light"><ion-icon name="trash"></ion-icon></a>
-    </div>
-    <iframe style="width: 100%;height: 200px;" height="100" src="{{ protocol }}://{{ host }}{{ attachment.attachment.url }}" frameborder="0">adsf</iframe>
 
-</div>
+{% if not reimbursement.other_attachments.all %}
+    <div class="oh-empty h-100">
+        <img src="{% static 'images/ui/search.svg' %}" class="oh-404__image" alt="Page not found. 404." />
+        <h1 class="oh-empty__title">{% trans "No Files found." %}</h1>
+        <p class="oh-empty__subtitle">{% trans "No files available at the moment." %}</p>
+    </div>
+{% endif %}
+
+{% for attachment in reimbursement.other_attachments.all %}
+    <div id="attachmentContainer{{ forloop.counter }}">
+        <div class="oh-btn-group" style="width: 10%;">
+            <button onclick="window.open('{{ protocol }}://{{ host }}{{ attachment.attachment.url }}', '_blank')"
+                class="oh-btn oh-btn--light text-dark"><ion-icon name="eye-outline"></ion-icon></button>
+            <a href="{% url 'delete-attachments' reimbursement.id %}?ids={{ attachment.id }}"
+                onclick="return confirm('Do you want to delete this attachment?')" class="oh-btn oh-btn--light"><ion-icon
+                    name="trash"></ion-icon></a>
+        </div>
+        <iframe style="width: 100%;height: 200px;" height="100"
+            src="{{ protocol }}://{{ host }}{{ attachment.attachment.url }}" frameborder="0">
+        </iframe>
+    </div>
 {% endfor %}
+
 <div class="d-flex flex-row-reverse">
-  <button onclick="$('.oh-modal--show').toggleClass('oh-modal--show');" class="oh-btn oh-btn--secondary mt-2 mr-0 pl-4 pr-5 oh-btn--w-100-resp">{% trans 'Close' %}</button>
+    <button onclick="$('.oh-modal--show').toggleClass('oh-modal--show');"
+        class="oh-btn oh-btn--secondary mt-2 mr-0 pl-4 pr-5 oh-btn--w-100-resp">{% trans 'Close' %}
+    </button>
 </div>
diff --git a/payroll/templates/payroll/reimbursement/reimbursement_comment.html b/payroll/templates/payroll/reimbursement/reimbursement_comment.html
index 97bca9945..a56f4e7ea 100644
--- a/payroll/templates/payroll/reimbursement/reimbursement_comment.html
+++ b/payroll/templates/payroll/reimbursement/reimbursement_comment.html
@@ -95,13 +95,10 @@
 			</li>
 		{% endfor %}
 	{% else %}
-		<div class="oh-timeoff-modal__profile-content">
-			<div class="oh-404">
-				<div class="">
-					<span class="oh-timeoff-title fw-bold" style="display: block">{% trans "There are no comments to show." %}</span>
-					<img style="display: block; width: 100px; margin: 20px auto" src="{% static '/images/ui/comment.png' %}" class="" />
-				</div>
-			</div>
-		</div>
+		<div class="oh-empty h-100" style="padding-top: 30%;">
+			<img src="{% static 'images/ui/search.svg' %}" class="oh-404__image" alt="Page not found. 404." />
+			<h1 class="oh-empty__title">{% trans "No Records found." %}</h1>
+			<p class="oh-empty__subtitle">{% trans "No comments available at the moment." %}</p>
+    	</div>
 	{% endif %}
 </ol>