diff --git a/src/app/ajakava/page.tsx b/src/app/ajakava/page.tsx
index 8bd1850..9e9cac5 100644
--- a/src/app/ajakava/page.tsx
+++ b/src/app/ajakava/page.tsx
@@ -26,7 +26,7 @@ export default function Timetable() {
                         <button
                             key={tab}
                             onClick={() => setActiveTab(tab)}
-                            className={`${vipnagorgialla.className} uppercase italic px-4 py-2 text-lg font-semibold ${
+                            className={`${vipnagorgialla.className} cursor-pointer uppercase italic px-4 py-2 text-lg font-semibold ${
                                 activeTab === tab
                                     ? "bg-[#00A3E0] text-white"
                                     : "bg-[#007CAB] dark:bg-[#007CAB] text-[#EEE5E5] hover:bg-[#00A3E0] dark:hover:bg-[#007CAB]"
@@ -42,26 +42,30 @@ export default function Timetable() {
                     {schedule.map((item, idx) => (
                         <div
                             key={idx}
-                            className="border-l-3 border-[#007CAB] pl-4 flex flex-row gap-12"
+                            className="border-l-3 border-[#007CAB] pl-4 flex flex-row flex-wrap gap-5 items-stretch"
                         >
                             <div
-                                className={` ${vipnagorgialla.className} text-[#00A3E0] text-5xl font-bold italic`}
+                                className={`${vipnagorgialla.className} text-[#00A3E0] text-4xl font-bold italic flex-shrink-0 flex items-center justify-center`}
+                                style={{ width: "180px", minWidth: "180px" }}
                             >
                                 {item.time}
                             </div>
-                            <div>
+                            <div
+                                className="flex-1 flex flex-col justify-center min-h-[120px]"
+                                style={{ minWidth: "0" }}
+                            >
                                 <div
-                                    className={`${vipnagorgialla.className} text-4xl italic font-bold text-[#2A2C3F] dark:text-[#EEE5E5]`}
+                                    className={`${vipnagorgialla.className} text-3xl italic font-bold text-[#2A2C3F] dark:text-[#EEE5E5] text-balance`}
                                 >
                                     {item.title}
                                 </div>
                                 {item.description && (
-                                    <div className="text-2xl text-[#938BA1] dark:text-[#938BA1]">
+                                    <div className="text-2xl text-[#938BA1] dark:text-[#938BA1] text-balance">
                                         {item.description}
                                     </div>
                                 )}
                                 {item.location && (
-                                    <div className="text-2xl text-[#938BA1] dark:text-[#938BA1]">
+                                    <div className="text-2xl text-[#938BA1] dark:text-[#938BA1] text-balance">
                                         {item.location}
                                     </div>
                                 )}
diff --git a/src/data/timetable.ts b/src/data/timetable.ts
index d91615e..a9c3441 100644
--- a/src/data/timetable.ts
+++ b/src/data/timetable.ts
@@ -8,26 +8,62 @@ export type ScheduleItem = {
 export const scheduleData: Record<string, ScheduleItem[]> = {
   "24. oktoober": [
     {
-      title: "League of Legends põhiturniir",
+      title: "Uksed avatakse",
+      location: "Registreerimine ja setup aulas",
+      time: "17:00",
+    },
+    {
+      title: "Põhiturniirid algavad",
       location: "Aula",
-      time: "-",
+      time: "20:00",
+    },
+    {
+      title: "Miniturniiride kick-off",
+      location: "Tudengimaja",
+      time: "18:00",
     },
     {
-      title: "Miniturniirid",
+      title: "Fighting games turniiride algus",
       location: "Tudengimaja",
-      time: "-",
+      time: "18:30",
     },
+    {
+      title: "Uksed suletakse",
+      location: "Aula ja Tudengimaja",
+      time: "*01:00",
+    },
+    
   ],
   "25. oktoober": [
     {
-      title: "Counter-Strike 2 põhiturniir",
+      title: "Uksed avatakse",
+      location: "Aula ja Tudengimaja",
+      time: "10:00",
+    },
+    {
+      title: "Miniturniirid algavad",
+      location: "Tudengimaja",
+      time: "11:00",
+    },
+    {
+      title: "Granblue turniir",
+      location: "Tudengimaja",
+      time: "11:30",
+    },
+    {
+      title: "Põhiturniirid algavad",
       location: "Aula",
-      time: "-",
+      time: "12:00",
     },
     {
-      title: "Miniturniirid",
+      title: " Gran Turismo turniir",
       location: "Tudengimaja",
-      time: "-",
+      time: "20:00",
+    },
+    {
+      title: "Uksed suletakse",
+      location: "Aula ja Tudengimaja",
+      time: "*01:00",
     },
   ],
 };