diff --git a/.idea/.name b/.idea/.name
new file mode 100644
index 00000000..9ffcbb8a
--- /dev/null
+++ b/.idea/.name
@@ -0,0 +1 @@
+Szkolny.eu
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 15ef006b..24f8c447 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -11,6 +11,7 @@
       <item index="1" class="java.lang.String" itemvalue="org.greenrobot.eventbus.Subscribe" />
     </list>
   </component>
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="NullableNotNullManager">
     <option name="myDefaultNullable" value="org.jetbrains.annotations.Nullable" />
     <option name="myDefaultNotNull" value="androidx.annotation.RecentlyNonNull" />
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/day/DayDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/day/DayDialog.kt
index 89af0ed3..c27fa7d0 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/day/DayDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/day/DayDialog.kt
@@ -92,7 +92,7 @@ class DayDialog(
                 onEventEditClick = {
                     EventManualDialog(
                             activity,
-                            profileId,
+                            it.profileId,
                             editingEvent = it,
                             onShowListener = onShowListener,
                             onDismissListener = onDismissListener
@@ -105,6 +105,7 @@ class DayDialog(
             if (b.eventsView.adapter == null) {
                 b.eventsView.adapter = adapter
                 b.eventsView.apply {
+                    isNestedScrollingEnabled = false
                     setHasFixedSize(true)
                     layoutManager = LinearLayoutManager(context)
                     addItemDecoration(SimpleDividerItemDecoration(context))
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventManualDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventManualDialog.kt
index fe529f5c..223bf1f8 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventManualDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventManualDialog.kt
@@ -461,7 +461,7 @@ class EventManualDialog(
                 b.teacherDropdown.deselect()
             }
             else {
-                defaultTime?.let {
+                val setTime: (Time) -> Unit = {
                     event.startTime = it
                     if (b.timeDropdown.select(it) == null)
                         b.timeDropdown.select(TextInputDropDown.Item(
@@ -470,23 +470,10 @@ class EventManualDialog(
                                 tag = it
                         ))
                 }
-
-                editingEvent?.startTime?.let {
-                    if (b.timeDropdown.select(it) == null)
-                        b.timeDropdown.select(TextInputDropDown.Item(
-                                it.value.toLong(),
-                                it.stringHM,
-                                tag = it
-                        ))
-                }
-
-                defaultLesson?.let {
-                    b.timeDropdown.select(it.displayStartTime?.value?.toLong())
-                }
-
-                defaultHour?.let {
-                    b.timeDropdown.select(it.value.toLong())
-                }
+                defaultTime?.let(setTime)
+                editingEvent?.startTime?.let(setTime)
+                defaultLesson?.displayStartTime?.let(setTime)
+                defaultHour?.let(setTime)
             }
             defaultLoaded = true
             b.timeDropdown.isEnabled = true
@@ -554,7 +541,7 @@ class EventManualDialog(
 
     private fun saveEvent() {
         val date = b.dateDropdown.selected?.tag.instanceOfOrNull<Date>()
-        val lesson = b.timeDropdown.selected?.tag.instanceOfOrNull<LessonFull>()
+        val startTime = b.timeDropdown.selected?.tag.instanceOfOrNull<Time>()
         val teamId = b.teamDropdown.selected?.id
         val type = b.typeDropdown.selected?.id
         val topic = b.topic.text?.toString()
@@ -592,7 +579,7 @@ class EventManualDialog(
                 profileId,
                 editingEvent?.id ?: id,
                 date,
-                lesson?.displayStartTime,
+                startTime,
                 topic,
                 customColor ?: -1,
                 type?.toInt() ?: Event.TYPE_DEFAULT,
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/timetable/LessonDetailsDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/timetable/LessonDetailsDialog.kt
index a5d645bd..137970ef 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/timetable/LessonDetailsDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/timetable/LessonDetailsDialog.kt
@@ -6,61 +6,84 @@ package pl.szczodrzynski.edziennik.ui.dialogs.timetable
 
 import android.content.Intent
 import android.view.View
+import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
+import androidx.lifecycle.Observer
+import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.data.db.modules.timetable.Lesson
 import pl.szczodrzynski.edziennik.data.db.modules.timetable.LessonFull
 import pl.szczodrzynski.edziennik.databinding.DialogLessonDetailsBinding
+import pl.szczodrzynski.edziennik.onClick
 import pl.szczodrzynski.edziennik.setText
+import pl.szczodrzynski.edziennik.ui.dialogs.event.EventListAdapter
 import pl.szczodrzynski.edziennik.ui.dialogs.event.EventManualDialog
 import pl.szczodrzynski.edziennik.ui.modules.timetable.v2.TimetableFragment
+import pl.szczodrzynski.edziennik.utils.SimpleDividerItemDecoration
 import pl.szczodrzynski.edziennik.utils.models.Date
 import pl.szczodrzynski.edziennik.utils.models.Week
+import kotlin.coroutines.CoroutineContext
 
 class LessonDetailsDialog(
         val activity: AppCompatActivity,
         val lesson: LessonFull,
         val onShowListener: ((tag: String) -> Unit)? = null,
         val onDismissListener: ((tag: String) -> Unit)? = null
-) {
+) : CoroutineScope {
     companion object {
         private const val TAG = "LessonDetailsDialog"
     }
 
+    private lateinit var app: App
     private lateinit var b: DialogLessonDetailsBinding
     private lateinit var dialog: AlertDialog
 
+    private val job = Job()
+    override val coroutineContext: CoroutineContext
+        get() = job + Dispatchers.Main
+
+    private lateinit var adapter: EventListAdapter
+
     init { run {
         if (activity.isFinishing)
             return@run
         onShowListener?.invoke(TAG)
+        app = activity.applicationContext as App
         b = DialogLessonDetailsBinding.inflate(activity.layoutInflater)
         dialog = MaterialAlertDialogBuilder(activity)
                 .setView(b.root)
                 .setPositiveButton(R.string.close) { dialog, _ ->
                     dialog.dismiss()
                 }
-                .setNeutralButton(R.string.add) { _, _ ->
-                    EventManualDialog(
-                            activity,
-                            lesson.profileId,
-                            lesson,
-                            onShowListener = onShowListener,
-                            onDismissListener = onDismissListener
-                    )
-                }
+                .setNeutralButton(R.string.add, null)
                 .setOnDismissListener {
                     onDismissListener?.invoke(TAG)
                 }
                 .show()
+
+        dialog.getButton(AlertDialog.BUTTON_NEUTRAL)?.onClick {
+            EventManualDialog(
+                    activity,
+                    lesson.profileId,
+                    defaultLesson = lesson,
+                    onShowListener = onShowListener,
+                    onDismissListener = onDismissListener
+            )
+        }
+
         update()
     }}
 
     private fun update() {
         b.lesson = lesson
         val lessonDate = lesson.displayDate ?: return
+        val lessonTime = lesson.displayStartTime ?: return
         b.lessonDate.text = Week.getFullDayName(lessonDate.weekDay) + ", " + lessonDate.formattedString
 
         if (lesson.type >= Lesson.TYPE_SHIFTED_SOURCE) {
@@ -138,5 +161,43 @@ class LessonDetailsDialog(
         if (lesson.type != Lesson.TYPE_CANCELLED && lesson.displayTeamId != null) {
             b.teamName = lesson.teamName
         }
+
+        adapter = EventListAdapter(
+                activity,
+                onItemClick = {
+                    Toast.makeText(activity, "Event clicked ${it.topic}", Toast.LENGTH_SHORT).show()
+                },
+                onEventEditClick = {
+                    EventManualDialog(
+                            activity,
+                            it.profileId,
+                            editingEvent = it,
+                            onShowListener = onShowListener,
+                            onDismissListener = onDismissListener
+                    )
+                }
+        )
+
+        app.db.eventDao().getAllByDateTime(lesson.profileId, lessonDate, lessonTime).observe(activity, Observer { events ->
+            adapter.items = events
+            if (b.eventsView.adapter == null) {
+                b.eventsView.adapter = adapter
+                b.eventsView.apply {
+                    isNestedScrollingEnabled = false
+                    setHasFixedSize(true)
+                    layoutManager = LinearLayoutManager(context)
+                    addItemDecoration(SimpleDividerItemDecoration(context))
+                }
+            }
+            adapter.notifyDataSetChanged()
+
+            if (events != null && events.isNotEmpty()) {
+                b.eventsView.visibility = View.VISIBLE
+                b.eventsNoData.visibility = View.GONE
+            } else {
+                b.eventsView.visibility = View.GONE
+                b.eventsNoData.visibility = View.VISIBLE
+            }
+        })
     }
 }
diff --git a/app/src/main/res/layout/dialog_day.xml b/app/src/main/res/layout/dialog_day.xml
index 0450559b..3bb0b9dd 100644
--- a/app/src/main/res/layout/dialog_day.xml
+++ b/app/src/main/res/layout/dialog_day.xml
@@ -8,25 +8,25 @@
     <data>
 
     </data>
-    <ScrollView
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent">
         <LinearLayout
-            android:orientation="vertical"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingTop="24dp"
+            android:orientation="vertical"
             android:paddingLeft="16dp"
+            android:paddingTop="24dp"
             android:paddingRight="16dp">
 
             <TextView
                 android:id="@+id/dayDate"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textIsSelectable="true"
-                android:textAppearance="@style/NavView.TextView.Title"
                 android:layout_marginLeft="8dp"
                 android:layout_marginRight="8dp"
+                android:textAppearance="@style/NavView.TextView.Title"
+                android:textIsSelectable="true"
                 tools:text="wtorek, 17 grudnia" />
 
             <include
@@ -34,10 +34,10 @@
                 layout="@layout/row_lesson_change_item"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="5dp"
-                android:layout_marginBottom="5dp"
                 android:layout_marginLeft="8dp"
+                android:layout_marginTop="5dp"
                 android:layout_marginRight="8dp"
+                android:layout_marginBottom="5dp"
                 android:visibility="gone"
                 tools:visibility="visible" />
 
@@ -78,7 +78,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="Możesz wpisać wydarzenie ręcznie, używając przycisku Dodaj."
+                    android:text="@string/dialog_no_events_hint"
                     android:gravity="center"
                     android:textStyle="italic"/>
 
@@ -90,9 +90,9 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
                 android:clipToPadding="false"
-                tools:visibility="gone"
+                tools:visibility="visible"
                 tools:listitem="@layout/event_list_item" />
 
         </LinearLayout>
-    </ScrollView>
+    </androidx.core.widget.NestedScrollView>
 </layout>
diff --git a/app/src/main/res/layout/dialog_lesson_details.xml b/app/src/main/res/layout/dialog_lesson_details.xml
index 616221b0..a282bf51 100644
--- a/app/src/main/res/layout/dialog_lesson_details.xml
+++ b/app/src/main/res/layout/dialog_lesson_details.xml
@@ -21,20 +21,24 @@
         <variable name="oldTeamName" type="String" />
         <variable name="teamName" type="String" />
     </data>
-    <ScrollView
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent">
         <LinearLayout
-            android:orientation="vertical"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:padding="24dp">
+            android:orientation="vertical"
+            android:paddingLeft="16dp"
+            android:paddingTop="24dp"
+            android:paddingRight="16dp">
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:baselineAligned="false">
+                android:layout_marginLeft="8dp"
+                android:layout_marginRight="8dp"
+                android:baselineAligned="false"
+                android:orientation="horizontal">
 
                 <LinearLayout
                     android:orientation="vertical"
@@ -110,7 +114,9 @@
                 android:id="@+id/shiftedLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginLeft="8dp"
                 android:layout_marginTop="8dp"
+                android:layout_marginRight="8dp"
                 android:baselineAligned="false"
                 android:gravity="center_vertical"
                 android:orientation="horizontal">
@@ -129,99 +135,185 @@
                     style="@style/Widget.MaterialComponents.Button.OutlinedButton"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="Przejdź" />
+                    android:text="@string/dialog_lesson_go_to_button" />
 
             </LinearLayout>
 
-            <TextView
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="8dp"
+                android:layout_marginTop="8dp"
+                android:layout_marginRight="8dp"
+                android:baselineAligned="false"
+                android:orientation="horizontal">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:layout_marginEnd="8dp"
+                    android:layout_marginRight="8dp"
+                    android:orientation="vertical">
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="@style/NavView.TextView.Helper"
+                        android:text="@string/dialog_lesson_details_teacher"
+                        android:visibility="@{teacherName != null || oldTeacherName != null ? View.VISIBLE : View.GONE}"/>
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="@style/NavView.TextView.Helper"
+                        android:text="@{oldTeacherName}"
+                        android:textIsSelectable="true"
+                        android:singleLine="true"
+                        android:visibility="@{oldTeacherName != null ? View.VISIBLE : View.GONE}"
+                        app:strikeThrough="@{true}"
+                        tools:text="Janósz Kowalski" />
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@{teacherName}"
+                        android:textIsSelectable="true"
+                        android:visibility="@{teacherName != null ? View.VISIBLE : View.GONE}"
+                        tools:text="Janósz Kowalski" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:orientation="vertical">
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="@style/NavView.TextView.Helper"
+                        android:text="@string/dialog_lesson_details_team"
+                        android:visibility="@{teamName != null || oldTeamName != null ? View.VISIBLE : View.GONE}"/>
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="@style/NavView.TextView.Helper"
+                        android:text="@{oldTeamName}"
+                        android:textIsSelectable="true"
+                        android:visibility="@{oldTeamName != null ? View.VISIBLE : View.GONE}"
+                        app:strikeThrough="@{true}"
+                        tools:text="013 informatyczna" />
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@{teamName}"
+                        android:textIsSelectable="true"
+                        android:visibility="@{teamName != null ? View.VISIBLE : View.GONE}"
+                        tools:text="013 informatyczna" />
+                </LinearLayout>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="8dp"
+                android:layout_marginRight="8dp"
+                android:baselineAligned="false"
+                android:orientation="horizontal">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:orientation="vertical">
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="8dp"
+                        android:textAppearance="@style/NavView.TextView.Helper"
+                        android:text="@string/dialog_lesson_details_classroom"
+                        android:visibility="@{classroom != null || oldClassroom != null ? View.VISIBLE : View.GONE}"/>
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="@style/NavView.TextView.Helper"
+                        android:text="@{oldClassroom}"
+                        android:textIsSelectable="true"
+                        android:visibility="@{oldClassroom != null ? View.VISIBLE : View.GONE}"
+                        app:strikeThrough="@{true}"
+                        tools:text="013 informatyczna" />
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@{classroom}"
+                        android:textIsSelectable="true"
+                        android:visibility="@{classroom != null ? View.VISIBLE : View.GONE}"
+                        tools:text="013 informatyczna" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:orientation="vertical">
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="8dp"
+                        android:textAppearance="@style/NavView.TextView.Helper"
+                        android:visibility="@{App.devMode ? View.VISIBLE : View.GONE}"
+                        android:text="@string/dialog_lesson_details_id" />
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="0dp"
+                        android:text="@{Long.toString(lesson.id)}"
+                        android:textIsSelectable="true"
+                        android:visibility="@{App.devMode ? View.VISIBLE : View.GONE}"
+                        tools:text="12345" />
+                </LinearLayout>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/eventsNoData"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="8dp"
+                android:layout_marginRight="8dp"
+                android:paddingTop="16dp"
+                android:paddingBottom="16dp"
+                android:orientation="vertical"
+                android:visibility="gone"
+                tools:visibility="visible">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:drawableTop="@drawable/ic_no_events"
+                    android:drawablePadding="16dp"
+                    android:fontFamily="sans-serif-light"
+                    android:text="@string/dialog_lesson_no_events"
+                    android:textSize="24sp" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/dialog_no_events_hint"
+                    android:gravity="center"
+                    android:textStyle="italic"/>
+
+            </LinearLayout>
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/eventsView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
-                android:textAppearance="@style/NavView.TextView.Helper"
-                android:text="@string/dialog_lesson_details_teacher"
-                android:visibility="@{teacherName != null || oldTeacherName != null ? View.VISIBLE : View.GONE}"/>
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textAppearance="@style/NavView.TextView.Helper"
-                android:text="@{oldTeacherName}"
-                android:textIsSelectable="true"
-                android:visibility="@{oldTeacherName != null ? View.VISIBLE : View.GONE}"
-                app:strikeThrough="@{true}"
-                tools:text="Janósz Kowalski" />
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@{teacherName}"
-                android:textIsSelectable="true"
-                android:visibility="@{teacherName != null ? View.VISIBLE : View.GONE}"
-                tools:text="Janósz Kowalski" />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:textAppearance="@style/NavView.TextView.Helper"
-                android:text="@string/dialog_lesson_details_classroom"
-                android:visibility="@{classroom != null || oldClassroom != null ? View.VISIBLE : View.GONE}"/>
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textAppearance="@style/NavView.TextView.Helper"
-                android:text="@{oldClassroom}"
-                android:textIsSelectable="true"
-                android:visibility="@{oldClassroom != null ? View.VISIBLE : View.GONE}"
-                app:strikeThrough="@{true}"
-                tools:text="013 informatyczna" />
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@{classroom}"
-                android:textIsSelectable="true"
-                android:visibility="@{classroom != null ? View.VISIBLE : View.GONE}"
-                tools:text="013 informatyczna" />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:textAppearance="@style/NavView.TextView.Helper"
-                android:text="@string/dialog_lesson_details_team"
-                android:visibility="@{teamName != null || oldTeamName != null ? View.VISIBLE : View.GONE}"/>
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textAppearance="@style/NavView.TextView.Helper"
-                android:text="@{oldTeamName}"
-                android:textIsSelectable="true"
-                android:visibility="@{oldTeamName != null ? View.VISIBLE : View.GONE}"
-                app:strikeThrough="@{true}"
-                tools:text="013 informatyczna" />
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@{teamName}"
-                android:textIsSelectable="true"
-                android:visibility="@{teamName != null ? View.VISIBLE : View.GONE}"
-                tools:text="013 informatyczna" />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:textAppearance="@style/NavView.TextView.Helper"
-                android:visibility="@{App.devMode ? View.VISIBLE : View.GONE}"
-                android:text="@string/dialog_lesson_details_id" />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="0dp"
-                android:text="@{Long.toString(lesson.id)}"
-                android:textIsSelectable="true"
-                android:visibility="@{App.devMode ? View.VISIBLE : View.GONE}"
-                tools:text="12345" />
+                android:clipToPadding="false"
+                tools:visibility="visible"
+                tools:listitem="@layout/event_list_item" />
 
         </LinearLayout>
-    </ScrollView>
+    </androidx.core.widget.NestedScrollView>
 </layout>
diff --git a/app/src/main/res/layout/event_list_item.xml b/app/src/main/res/layout/event_list_item.xml
index 0cdaa733..a4b70ba4 100644
--- a/app/src/main/res/layout/event_list_item.xml
+++ b/app/src/main/res/layout/event_list_item.xml
@@ -45,12 +45,13 @@
 
             <TextView
                 android:id="@+id/topic"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:textAppearance="@style/NavView.TextView.Medium"
                 android:maxLines="3"
-                tools:text="Rozdział II: Panowanie Piastów i Jagiellonów.Przeniesiony z 11 grudnia." />
+                android:ellipsize="end"
+                tools:text="Rozdział II: Panowanie Piastów i Jagiellonów.Przeniesiony z 11 grudnia. Nie wiem co się dzieje w tym roku nie będzie już religii w szkołach podstawowych w Polsce i Europie zachodniej Afryki" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/editButton"
@@ -71,6 +72,6 @@
             android:textAppearance="@style/NavView.TextView.Helper"
             android:singleLine="true"
             android:ellipsize="middle"
-            android:text="Udostępniono 10 grudnia przez Ktoś Z Twojej Klasy • 2B3T" />
+            tools:text="Udostępniono 10 grudnia przez Ktoś Z Twojej Klasy • 2B3T" />
     </LinearLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7030806e..80423430 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1076,4 +1076,7 @@
     <string name="settings_theme_snowfall_subtext">Dzwonią dzwonki sań</string>
     <string name="dialog_day_no_events">Brak wydarzeń tego dnia.</string>
     <string name="dialog_day_date_format">%s, %s</string>
+    <string name="dialog_lesson_go_to_button">Przejdź</string>
+    <string name="dialog_no_events_hint">Możesz wpisać wydarzenie ręcznie, używając przycisku Dodaj.</string>
+    <string name="dialog_lesson_no_events">Brak wydarzeń na tej lekcji.</string>
 </resources>