diff --git a/screens/Calendar.tsx b/screens/Calendar.tsx
index c39904e..bdf0d2a 100644
--- a/screens/Calendar.tsx
+++ b/screens/Calendar.tsx
@@ -114,9 +114,10 @@ const Calendar = () => {
               renderItem={({ item }) => (
               <View style={{ marginLeft: 5, marginBottom: 5, borderBottomWidth: 1, borderColor: '#ccc' }}>
                 <View style={{ flexDirection: 'row', alignItems: 'center', marginBottom: 3 }}>
-                  <ThemeText style={{ fontWeight: 'bold', marginRight: 5 }}>
-                    {format(item.date, 'dd.MM.yyyy')}
-                  </ThemeText>
+                  <ThemeText style={{ fontWeight: 'bold', marginRight: 5 }}>{format(item.date, 'dd.MM.yyyy')}</ThemeText>
+                  <ThemeText>{`${item.timeFrom}-${item.timeUntil}`}</ThemeText>
+                </View>
+                <View style={{ flexDirection: 'row', alignItems: 'center', marginBottom: 5 }}>
                   <ThemeText style={{ marginRight: 5 }}>{item.subject}</ThemeText>
                   <ThemeText style={{ marginRight: 5 }}>{item.type}</ThemeText>
                   {userInformation.usertype === 'teacher' && (
@@ -125,11 +126,8 @@ const Calendar = () => {
                   {userInformation.usertype === 'pupil' && (
                     <ThemeText style={{ marginRight: 5 }}>{item.teacher}</ThemeText>
                   )}
-                </View>
-                <View style={{ flexDirection: 'row', alignItems: 'center', marginBottom: 5 }}>
                   <ThemeText style={{ marginRight: 5 }}>{item.room}</ThemeText>
-                  <ThemeText style={{ marginRight: 5 }}>{`${item.hourFrom}-${item.hourUntil}`}</ThemeText>
-                  <ThemeText>{`${item.timeFrom}-${item.timeUntil}`}</ThemeText>
+                  <ThemeText style={{ marginRight: 5 }}>{`${item.hourFrom||'n'}-${item.hourUntil||'n'}`}</ThemeText>
                 </View>
               </View>
             )}