diff --git a/backend/package.json b/backend/package.json
index 58bc2d786f79aa49a2f4bcf2b37344991bafc2ce..dd63f3333b6d50735f4759f41e4aa5b7dace0bdd 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -5,7 +5,7 @@
   "main": "index.js",
   "scripts": {
     "test": "NODE_ENV=test && ./node_modules/mocha/bin/mocha src/test",
-    "start": "node src/index.js"
+    "start": "NODE_ENV=development && node src/index.js"
   },
   "author": "Group B",
   "license": "MIT",
diff --git a/frontend/src/App.scss b/frontend/src/App.scss
index 3af9143cb8d84d6e65305280809d12a9c196364a..bf0b1a2e5db142b6b61987e95dec2b76a8e31a32 100644
--- a/frontend/src/App.scss
+++ b/frontend/src/App.scss
@@ -401,4 +401,14 @@ tr:hover {
       }
     }
   }
+
+  input.vue__time-picker-input {
+    border: none !important;
+    height: 100% !important;
+    font-size: 16px !important;
+    background-color: #F1F5F8;
+    border-radius: 4px;
+    appearance: none;
+    outline: none;
+  }
 }
\ No newline at end of file
diff --git a/frontend/src/views/CourseEnrollment/CreateEditClass.vue b/frontend/src/views/CourseEnrollment/CreateEditClass.vue
index 2de552b2ffaeeaa09bb5176c0850c10bc381b059..e90bf8dd44f08121c6d91912ffe5265f0f28b969 100644
--- a/frontend/src/views/CourseEnrollment/CreateEditClass.vue
+++ b/frontend/src/views/CourseEnrollment/CreateEditClass.vue
@@ -179,7 +179,6 @@
                     src="@/assets/empty-class.png"
                   />
                   <!-- Not Empty Case -->
-                  <!-- Looping in here -->
                   <div
                     v-for="(singleClass, index) in classList"
                     :key="singleClass.id"
@@ -229,9 +228,23 @@
                       </div>
                     </div>
                     <!-- Set Schedule -->
-                    <!-- @TODO: Modify here -->
                     <div class="col-12 mt-2">
-                      <label>Jadwal Perkuliahan</label>
+                      <div class="row">
+                        <div class="col">
+                          <label>Jadwal Perkuliahan</label>
+                        </div>
+                        <div class="col-auto">
+                          <button
+                            type="button"
+                            class="btn p-0"
+                            @click="addNewSchedule(index)"
+                          >
+                            <p class="text-blue-six mb-0">
+                              + Tambah Jadwal
+                            </p>
+                          </button>
+                        </div>
+                      </div>
                       <div
                         class="row"
                         v-for="(schedule, childIndex) in singleClass.schedules"
@@ -290,17 +303,6 @@
                           ></vue-timepicker>
                         </div>
                       </div>
-                      <div class="col-12 d-flex justify-content-end">
-                        <button
-                          type="button"
-                          class="btn px-0 pt-2"
-                          @click="addNewSchedule(index)"
-                        >
-                          <p class="text-blue-six">
-                            + Tambah Jadwal
-                          </p>
-                        </button>
-                      </div>
                     </div>
                   </div>
                   <div class="row">
@@ -311,7 +313,7 @@
                         class="btn px-0 pt-2"
                         @click="addNewClass"
                       >
-                        <p class="text-blue-six">
+                        <p class="text-blue-six mb-0">
                           + Tambah Kelas
                         </p>
                       </button>