diff --git a/src/main/java/com/divudi/bean/inward/InwardDocumentUploadController.java b/src/main/java/com/divudi/bean/inward/InwardDocumentUploadController.java
index 45dda43848..75c25737d5 100644
--- a/src/main/java/com/divudi/bean/inward/InwardDocumentUploadController.java
+++ b/src/main/java/com/divudi/bean/inward/InwardDocumentUploadController.java
@@ -240,6 +240,7 @@ public List<UploadType> getInwardUploadTypes() {
         types.add(UploadType.Inward_Consent_Form);
         types.add(UploadType.Inward_Insurance_Document);
         types.add(UploadType.Inward_Referral_Letter);
+        types.add(UploadType.Inward_GOP);
         types.add(UploadType.Inward_Other);
         return types;
     }
diff --git a/src/main/java/com/divudi/core/data/UploadType.java b/src/main/java/com/divudi/core/data/UploadType.java
index 2ad4af9d10..13b1a032c3 100644
--- a/src/main/java/com/divudi/core/data/UploadType.java
+++ b/src/main/java/com/divudi/core/data/UploadType.java
@@ -38,6 +38,7 @@ public enum UploadType {
     Inward_Consent_Form("Consent Form"),
     Inward_Insurance_Document("Insurance Document"),
     Inward_Referral_Letter("Referral Letter"),
+    Inward_GOP("GOP"),
     Inward_Other("Other Document");
 
     private final String label;
diff --git a/src/main/webapp/inward/admission_profile.xhtml b/src/main/webapp/inward/admission_profile.xhtml
index 06e7a19e5d..5cf389cede 100644
--- a/src/main/webapp/inward/admission_profile.xhtml
+++ b/src/main/webapp/inward/admission_profile.xhtml
@@ -773,16 +773,6 @@
                                         class="w-100">
                                     </p:commandButton>
                                 </div>
-                                <div class="col-6">
-                                    <p:commandButton
-                                        value="Forms"
-                                        ajax="false"
-                                        rendered="#{webUserController.hasPrivilege('InwardFormFill')}"
-                                        action="#{inwardFormController.navigateToInwardFormsFromAdmissionProfile(admissionController.current)}"
-                                        icon="fa fa-wpforms"
-                                        class="w-100">
-                                    </p:commandButton>
-                                </div>
                                 <div class="col-6">
                                     <p:commandButton
                                         value="Diagnosis Card"
@@ -792,16 +782,6 @@
                                         class="w-100">
                                     </p:commandButton>
                                 </div>
-                                <div class="col-6">
-                                    <p:commandButton
-                                        value="Documents"
-                                        ajax="false"
-                                        rendered="#{webUserController.hasPrivilege('InwardDocumentUpload')}"
-                                        action="#{admissionController.navigateToInpatientDocuments()}"
-                                        icon="fa fa-file-alt"
-                                        class="w-100">
-                                    </p:commandButton>
-                                </div>
                                 <div class="col-12">
                                     <p:commandButton
                                         value="Clinical Discharge"
@@ -962,6 +942,31 @@
                             </div>
                         </p:panel>
 
+                        <p:panel header="Documents" class="m-1">
+                            <div class="row g-2">
+                                <div class="col-6">
+                                    <p:commandButton
+                                        value="Fill Forms"
+                                        ajax="false"
+                                        rendered="#{webUserController.hasPrivilege('InwardFormFill')}"
+                                        action="#{inwardFormController.navigateToInwardFormsFromAdmissionProfile(admissionController.current)}"
+                                        icon="fa fa-wpforms"
+                                        class="w-100">
+                                    </p:commandButton>
+                                </div>
+                                <div class="col-6">
+                                    <p:commandButton
+                                        value="Documents"
+                                        ajax="false"
+                                        rendered="#{webUserController.hasPrivilege('InwardDocumentUpload')}"
+                                        action="#{admissionController.navigateToInpatientDocuments()}"
+                                        icon="fa fa-file-alt"
+                                        class="w-100">
+                                    </p:commandButton>
+                                </div>
+                            </div>
+                        </p:panel>
+
                         <p:panel header="Reports" class="m-1">
                             <div class="row g-2">
                                 <div class="col-6">