diff --git a/frontend/src/app/pages/event-root/create-event/steps/basic-step.component.html b/frontend/src/app/pages/event-root/create-event/steps/basic-step.component.html
index 6813275..6e0dc06 100644
--- a/frontend/src/app/pages/event-root/create-event/steps/basic-step.component.html
+++ b/frontend/src/app/pages/event-root/create-event/steps/basic-step.component.html
@@ -16,7 +16,7 @@
     </div>
   </label>
 
-  <div class="form-control w-full mb-4">
+  <div class="form-control w-full">
     <app-dropdown
       label="Event Location"
       placeholder="Search for a Location"
@@ -27,74 +27,29 @@
       [items]="items"></app-dropdown>
   </div>
 
-  <!-- <div class="grid grid-cols-1 md:grid-cols-2 gap-4 mb-4">
-    <div class="form-control">
-      <label class="label" for="event-date">
+  <div class="grid grid-cols-1 md:grid-cols-2 gap-4 mb-4">
+    <label class="form-control w-full">
+      <div class="label">
         <span class="label-text">Date</span>
-      </label>
-      <input type="date" id="event-date" class="input input-bordered" />
-    </div>
-    <div class="form-control">
-      <label class="label" for="event-time">
+        <span class="label-text-alt">Select the event date</span>
+      </div>
+      <input type="date" id="event-date" class="input input-bordered w-full" />
+      <div class="label">
+        <span class="label-text-alt"></span>
+        <span class="label-text-alt"></span>
+      </div>
+    </label>
+
+    <label class="form-control w-full">
+      <div class="label">
         <span class="label-text">Time</span>
-      </label>
-      <input type="time" id="event-time" class="input input-bordered" />
-    </div>
-  </div> -->
-  <!--
-  <div class="form-control mb-4">
-    <label class="label" for="location-title">
-      <span class="label-text">Location</span>
+        <span class="label-text-alt">Choose the event time</span>
+      </div>
+      <input type="time" id="event-time" class="input input-bordered w-full" />
+      <div class="label">
+        <span class="label-text-alt"></span>
+        <span class="label-text-alt"></span>
+      </div>
     </label>
-    <input
-      type="text"
-      id="location-title"
-      placeholder="Enter your event title"
-      class="input input-bordered w-full" />
-  </div> -->
-
-  <!-- <div class="form-control mb-4">
-    <label class="label" for="event-street">
-      <span class="label-text">Street</span>
-    </label>
-    <input
-      type="text"
-      id="event-street"
-      placeholder="Street name"
-      class="input input-bordered" />
-  </div> -->
-
-  <!-- <div class="grid grid-cols-1 md:grid-cols-2 gap-4 mb-4">
-    <div class="form-control">
-      <label class="label" for="event-number">
-        <span class="label-text">Street Number</span>
-      </label>
-      <input
-        type="text"
-        id="event-number"
-        placeholder="Street number"
-        class="input input-bordered" />
-    </div>
-    <div class="form-control">
-      <label class="label" for="event-zip">
-        <span class="label-text">Postal Code</span>
-      </label>
-      <input
-        type="text"
-        id="event-zip"
-        placeholder="Postal code"
-        class="input input-bordered" />
-    </div>
-  </div> -->
-
-  <!-- <div class="form-control mb-6">
-    <label class="label" for="event-city">
-      <span class="label-text">City</span>
-    </label>
-    <input
-      type="text"
-      id="event-city"
-      placeholder="City"
-      class="input input-bordered" />
-  </div> -->
+  </div>
 </form>