diff --git a/.gitmodules b/.gitmodules
index 3bee62a..977f21a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,4 @@
-[submodule "server/cofffeemachineConfig"]
-	path = server/cofffeemachineConfig
-	url = ssh://poomipat@kong/1TBHDD/ikong/repo/cofffeemachineConfig
+[submodule "cofffeemachineConfig"]
+	path = cofffeemachineConfig
+	url = ssh://ikong@192.168.10.159/1TBHDD/ikong/repo/cofffeemachineConfig
+	branch = master
diff --git a/client/src/app/core/models/recipe.model.ts b/client/src/app/core/models/recipe.model.ts
index f6e43e7..2a95696 100644
--- a/client/src/app/core/models/recipe.model.ts
+++ b/client/src/app/core/models/recipe.model.ts
@@ -30,7 +30,7 @@ export interface Recipe01 {
   RemainingCups: string;
   StringParam: string;
   TextForWarningBeforePay: string[];
-  cashPrice: string;
+  cashPrice: number;
   changerecipe: string;
   disable: string;
   disable_by_cup: string;
diff --git a/client/src/app/features/dashboard/dashboard.component.html b/client/src/app/features/dashboard/dashboard.component.html
index e512c59..57767c8 100644
--- a/client/src/app/features/dashboard/dashboard.component.html
+++ b/client/src/app/features/dashboard/dashboard.component.html
@@ -1,5 +1,5 @@
 <main
-  class="relative overflow-auto max-h-[610px] shadow-md sm:rounded-lg"
+  class="relative overflow-auto max-h-[900px] shadow-md sm:rounded-lg"
   #table
 >
   <table *ngIf="isLoaded" class="table">
diff --git a/client/src/app/features/dashboard/dashboard.component.ts b/client/src/app/features/dashboard/dashboard.component.ts
index 6202fd8..effe437 100644
--- a/client/src/app/features/dashboard/dashboard.component.ts
+++ b/client/src/app/features/dashboard/dashboard.component.ts
@@ -30,7 +30,7 @@ export class DashboardComponent implements OnInit {
     'Last Updated',
   ];
   private offset = 0;
-  private take = 10;
+  private take = 20;
   private recipeVersionData: string[] = [];
   private currentRecipeVersion: string = 'coffeethai02_580.json';
 
diff --git a/client/src/app/shared/modal/recipe-modal.component.html b/client/src/app/shared/modal/recipe-modal.component.html
index d3c9897..c0a8003 100644
--- a/client/src/app/shared/modal/recipe-modal.component.html
+++ b/client/src/app/shared/modal/recipe-modal.component.html
@@ -18,47 +18,57 @@
 
 <dialog class="modal" #detailModal>
   <div class="modal-box w-11/12 max-w-5xl">
-    <h3 class="font-bold text-lg mb-3">{{ title }}</h3>
-    <form class="flex flex-col gap-2" [formGroup]="recipeDetail">
-      <div class="flex flex-col gap-1">
-        <label>
-          <span class="text-base label-text">Product Code: </span>
-        </label>
-        <input
-          type="text"
-          class="w-full input input-sm input-bordered input-ghost"
-          formControlName="productCode"
-        />
-      </div>
-      <div class="flex flex-col gap-1">
-        <label><span class="text-base label-text">Name: </span> </label>
-        <input
-          type="text"
-          class="w-full input input-sm input-bordered input-ghost"
-          formControlName="name"
-        />
-      </div>
-      <div class="flex flex-col gap-1">
-        <label><span class="text-base label-text"> Other Name:</span> </label>
-        <input
-          type="text"
-          class="w-full input input-sm input-bordered input-ghost"
-          formControlName="otherName"
-        />
-      </div>
-      <div class="flex flex-col gap-1">
-        <label><span class="text-base label-text"> Description:</span> </label>
-        <input
-          type="text"
-          class="w-full input input-sm input-bordered input-ghost"
-          formControlName="description"
-        />
-      </div>
-      <div class="modal-action">
-        <a class="btn px-10" (click)="save()">Save</a>
-        <a class="btn" (click)="close()">Close</a>
-      </div>
-    </form>
+    <div>
+      <h3 class="font-bold text-lg mb-3">{{ title }}</h3>
+    </div>
+    <div class="modal-scroll">
+      <form class="flex flex-col gap-2" [formGroup]="recipeDetail">
+        <div class="flex flex-wrap">
+          <div class="flex flex-col gap-1">
+            <label><span class="text-base label-text">Name: </span> </label>
+            <input
+              type="text"
+              class="w-full input input-sm input-bordered input-ghost"
+              formControlName="name"
+            />
+          </div>
+          <div class="flex flex-col gap-1">
+            <label
+              ><span class="text-base label-text"> Other Name:</span>
+            </label>
+            <input
+              type="text"
+              class="w-full input input-sm input-bordered input-ghost"
+              formControlName="otherName"
+            />
+          </div>
+          <div class="flex flex-row items-center justify-between gap-2">
+            <div class="flex flex-col gap-1 w-1/2">
+              <label
+                ><span class="text-base label-text"> Description:</span>
+              </label>
+              <input
+                type="text"
+                class="w-full input input-sm input-bordered input-ghost"
+                formControlName="description"
+              />
+            </div>
+            <div class="flex flex-col gap-1 w-1/2">
+              <label><span class="text-baase label-text">Price:</span></label>
+              <input
+                type="number"
+                class="w-full input input-sm input-bordered input-ghost"
+                formControlName="price"
+              />
+            </div>
+          </div>
+        </div>
+        <div class="modal-action">
+          <a class="btn px-10" (click)="save()">Save</a>
+          <a class="btn" (click)="close()">Close</a>
+        </div>
+      </form>
+    </div>
   </div>
 </dialog>
 
diff --git a/client/src/app/shared/modal/recipe-modal.component.ts b/client/src/app/shared/modal/recipe-modal.component.ts
index d2a7cf9..312612b 100644
--- a/client/src/app/shared/modal/recipe-modal.component.ts
+++ b/client/src/app/shared/modal/recipe-modal.component.ts
@@ -8,6 +8,7 @@ interface RecipeDetail {
   name: string;
   otherName: string;
   description: string;
+  price: number;
 }
 
 @Component({
@@ -26,6 +27,7 @@ export class RecipeModalComponent {
     name: new FormControl<string>(''),
     otherName: new FormControl<string>(''),
     description: new FormControl<string>(''),
+    price: new FormControl<number>(0),
   });
 
   originalRecipeDetail: RecipeDetail | null = null;
@@ -60,6 +62,7 @@ export class RecipeModalComponent {
             name: recipe.name,
             otherName: recipe.otherName,
             description: recipe.Description,
+            price: recipe.cashPrice,
           },
           { emitEvent: false }
         );
@@ -68,6 +71,7 @@ export class RecipeModalComponent {
           name: recipe.name,
           otherName: recipe.otherName,
           description: recipe.Description,
+          price: recipe.cashPrice,
         };
       });
     }
diff --git a/server/.gitmodules b/server/.gitmodules
deleted file mode 100644
index 977f21a..0000000
--- a/server/.gitmodules
+++ /dev/null
@@ -1,4 +0,0 @@
-[submodule "cofffeemachineConfig"]
-	path = cofffeemachineConfig
-	url = ssh://ikong@192.168.10.159/1TBHDD/ikong/repo/cofffeemachineConfig
-	branch = master