diff --git a/locales/index.d.ts b/locales/index.d.ts
index 7047f42eff..1b4f740442 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -1023,6 +1023,9 @@ export interface Locale {
     "accountMovedShort": string;
     "operationForbidden": string;
     "forceShowAds": string;
+    "event": string;
+    "events": string;
+    "reverseChronological": string;
     "addMemo": string;
     "editMemo": string;
     "reactionsList": string;
@@ -1084,6 +1087,31 @@ export interface Locale {
     "_serverRules": {
         "description": string;
     };
+    "_event": {
+        "title": string;
+        "startDateTime": string;
+        "endDateTime": string;
+        "startDate": string;
+        "endDate": string;
+        "startTime": string;
+        "endTime": string;
+        "detailName": string;
+        "detailValue": string;
+        "location": string;
+        "url": string;
+        "doorTime": string;
+        "organizer": string;
+        "organizerLink": string;
+        "audience": string;
+        "language": string;
+        "ageRange": string;
+        "ticketsUrl": string;
+        "isFree": string;
+        "price": string;
+        "availabilityStart": string;
+        "availabilityEnd": string;
+        "keywords": string;
+    };
     "_accountMigration": {
         "moveFrom": string;
         "moveFromSub": string;
diff --git a/packages/frontend/src/components/MkEventEditor.vue b/packages/frontend/src/components/MkEventEditor.vue
index 2130622567..b75d3255ae 100644
--- a/packages/frontend/src/components/MkEventEditor.vue
+++ b/packages/frontend/src/components/MkEventEditor.vue
@@ -9,6 +9,8 @@
 				<MkInput v-model="startDate" small type="date" class="input">
 					<template #label>*{{ i18n.ts._event.startDate }}</template>
 				</MkInput>
+			</section>
+			<section>
 				<MkInput v-model="startTime" small type="time" class="input">
 					<template #label>*{{ i18n.ts._event.startTime }}</template>
 				</MkInput>
@@ -17,12 +19,12 @@
 				<MkInput v-model="endDate" small type="date" class="input">
 					<template #label>{{ i18n.ts._event.endDate }}</template>
 				</MkInput>
+			</section>
+			<section>
 				<MkInput v-model="endTime" small type="time" class="input">
 					<template #label>{{ i18n.ts._event.endTime }}</template>
 				</MkInput>
 			</section>
-		</div>
-		<div>
 			<section>
 				<MkInput v-model="location" small type="text" class="input">
 					<template #label>{{ i18n.ts._event.location }}</template>
@@ -34,6 +36,7 @@
 				</MkInput>
 			</section>
 		</div>
+		<br/>
 		<div>
 			<section>
 				<MkInput v-model="doorTime" small type="time" class="input">
@@ -76,8 +79,8 @@
 				</MkInput>
 			</section>
 			<section>
-				<MkSwitch :model-value="isFree" small type="" class="input">
-					<template #label>{{ i18n.ts._event.isFree }}</template>
+				<MkSwitch v-model="isFree" :disabled="false">
+					{{ i18n.ts._event.isFree }}
 				</MkSwitch>
 			</section>
 			<section>