diff --git a/src/components/calendar/event-modal.tsx b/src/components/calendar/event-modal.tsx
index cb76062..798f5bc 100644
--- a/src/components/calendar/event-modal.tsx
+++ b/src/components/calendar/event-modal.tsx
@@ -152,18 +152,19 @@ export default function EventModal({
                 {type === "calendar" && (
                   <ModalItem
                     icon="calendar_today"
-                    label="Data"
+                    label="Date"
                     value={eventDate}
                   />
                 )}
-                <ModalItem icon="schedule" label="Hora" value={eventTime} />
-                {event.building && event.room && (
-                  <ModalItem
-                    icon="location_on"
-                    label="Local"
-                    value={eventLocation}
-                  />
-                )}
+                <ModalItem icon="schedule" label="Time" value={eventTime} />
+                {(event.building && event.room) ||
+                  (event.place && (
+                    <ModalItem
+                      icon="location_on"
+                      label="Place"
+                      value={eventLocation}
+                    />
+                  ))}
                 {type === "calendar" && event.link && (
                   <ModalItem
                     icon="explore"
diff --git a/src/components/events-calendar.tsx b/src/components/events-calendar.tsx
index 974afb4..54f01d6 100644
--- a/src/components/events-calendar.tsx
+++ b/src/components/events-calendar.tsx
@@ -15,7 +15,9 @@ export default function EventsCalendar() {
   // Converts an IEvent to an Event
   const formattedEvents = activeEvents.map((event): Event => {
     return {
-      title: event.title,
+      title: event.category.course
+        ? `[${event.category.course?.shortname}] ${event.title}`
+        : event.title,
       start: moment(event.start).toDate(),
       end: moment(event.end).toDate(),
       allDay: event.allDay,
diff --git a/src/lib/types.ts b/src/lib/types.ts
index 5dfc575..50de85c 100644
--- a/src/lib/types.ts
+++ b/src/lib/types.ts
@@ -85,7 +85,7 @@ export interface IEvent {
   category: IEventCategory;
   start: string;
   end: string;
-  place: string;
+  place?: string;
   link?: string;
   eventColor: string;
   textColor: string;
@@ -98,7 +98,7 @@ export interface IEventResponse {
   category: IEventCategory;
   start: string;
   end: string;
-  place: string;
+  place?: string;
   link?: string;
 }