diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/adapters/HomeworkAdapter.java b/app/src/main/java/pl/szczodrzynski/edziennik/homework/HomeworkAdapter.java
similarity index 99%
rename from app/src/main/java/pl/szczodrzynski/edziennik/adapters/HomeworkAdapter.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/homework/HomeworkAdapter.java
index 884fdda1..e59a98ba 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/adapters/HomeworkAdapter.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/homework/HomeworkAdapter.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.adapters;
+package pl.szczodrzynski.edziennik.homework;
 
 import android.content.Context;
 import android.graphics.PorterDuff;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/homework/HomeworkDate.kt b/app/src/main/java/pl/szczodrzynski/edziennik/homework/HomeworkDate.kt
index 0aacdf94..53773502 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/homework/HomeworkDate.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/homework/HomeworkDate.kt
@@ -2,7 +2,7 @@ package pl.szczodrzynski.edziennik.homework
 
 class HomeworkDate {
     companion object {
-        val CURRENT = 0
-        val PAST = 1
+        const val CURRENT = 0
+        const val PAST = 1
     }
 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/homework/HomeworkFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/homework/HomeworkFragment.kt
index 891ddea2..9f7525c9 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/homework/HomeworkFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/homework/HomeworkFragment.kt
@@ -95,7 +95,7 @@ class HomeworkFragment : Fragment() {
         b.tabLayout.setupWithViewPager(b.viewPager)
 
         activity.navView.bottomBar.fabEnable = true
-        activity.navView.bottomBar.fabExtendedText = "Dodaj nowe"
+        activity.navView.bottomBar.fabExtendedText = getString(R.string.add)
         activity.navView.bottomBar.fabIcon = CommunityMaterial.Icon2.cmd_plus
         activity.navView.setFabOnClickListener(View.OnClickListener {
             EventManualDialog(activity).show(app, null, null, null, EventManualDialog.DIALOG_HOMEWORK)
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/homework/HomeworkListFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/homework/HomeworkListFragment.kt
index 7fd3f537..2e601755 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/homework/HomeworkListFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/homework/HomeworkListFragment.kt
@@ -7,11 +7,9 @@ import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.LinearLayoutManager
-import kotlinx.android.synthetic.main.activity_szkolny.*
 import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.MainActivity
 import pl.szczodrzynski.edziennik.R
-import pl.szczodrzynski.edziennik.adapters.HomeworkAdapter
 import pl.szczodrzynski.edziennik.databinding.HomeworkListBinding
 import pl.szczodrzynski.edziennik.datamodels.Event
 import pl.szczodrzynski.edziennik.getInt
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 9d105afe..e898c234 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -287,11 +287,7 @@
     <string name="help">Help</string>
     <string name="help_notification_web_push">Notification forwarding allows you to pair a PC web browser to receive notifications on your desktop. This includes new grades, events, homework etc.\n\nClick \"Notification forwarding\" to begin.</string>
     <string name="help_register_agreement">Registraton will run automatically on the first login.\n\nThere will be some data sent to the app server:\n- your school and class ID\n- your e-register username\n- your first and last name\n\nThe only data visible to others is your name (when sharing events). Any private data (like password, grades etc.) won\'t be sent anywhere. Learn more in the Privacy policy.</string>
-    <string name="homework_current_no_data">There is no current homework.</string>
-    <string name="homework_current_title">Current homework</string>
     <string name="homework_edit">Edit</string>
-    <string name="homework_past_no_data">No previous homework.</string>
-    <string name="homework_past_title">Past homework</string>
     <string name="i_agree">I agree</string>
     <string name="i_disagree">I disagree</string>
     <string name="incorrect_format">Incorrect format</string>
@@ -827,4 +823,32 @@
     <string name="yesterday">yesterday</string>
     <string name="you_are_offline_text">You\'re offline. Try enabling Wi-Fi or mobile data.</string>
     <string name="you_are_offline_title">Internet connection</string>
+    <string name="homework_tab_current">Current</string>
+    <string name="homework_tab_past">Past</string>
+    <string name="homework_no_data">There is no homework.</string>
+    <string name="sort_by_date">By date</string>
+    <string name="sort_by_subject">By subject</string>
+    <string name="sync_error_librus_disconnected">LIBRUS account has lost connection with the Synergia account. Login on portal.librus.pl or in the Librus mobile app and follow the instructions to fix the problem.</string>
+    <string name="compose_title">Compose</string>
+    <string name="drawer_add_new_profile_desc">Add a new profile</string>
+    <string name="drawer_manage_profiles_desc">Add or remove students\' profiles</string>
+    <string name="error_invalid_fragment">Wrong module given: %d Report it to the application developer</string>
+    <string name="menu_add_event">Add event</string>
+    <string name="menu_add_event_desc">Save own event or homework in the agenda</string>
+    <string name="menu_agenda_change_view">Change Agenda view</string>
+    <string name="menu_debug">Debugging</string>
+    <string name="menu_feedback">Help and FAQ</string>
+    <string name="menu_generate_block_timetable">Save the timetable as an image</string>
+    <string name="menu_generate_block_timetable_desc">Generates timetable for the whole week</string>
+    <string name="menu_grades_average_mode">End-of-year average calculation method</string>
+    <string name="menu_grades_averages">Grade averages</string>
+    <string name="menu_grades_averages_desc">Show semester and end-of-year averages</string>
+    <string name="menu_grades_color_mode">Grades color</string>
+    <string name="menu_grades_sort_mode">Sort grades</string>
+    <string name="menu_message">Message</string>
+    <string name="menu_set_student_number">Set your register number</string>
+    <string name="messages_compose_menu_attachment">Add an attachment</string>
+    <string name="messages_compose_menu_discard">Abort message</string>
+    <string name="messages_compose_menu_save_draft">Save draft</string>
+    <string name="messages_compose_menu_send">Send</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6b2a4514..cc848455 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -308,11 +308,7 @@
     <string name="help">Pomoc</string>
     <string name="help_notification_web_push">Przekazywanie powiadomień umożliwia sparowanie z przeglądarką internetową w celu wysyłania wszystkich powiadomień z aplikacji na komputer. Można do nich zaliczyć np. nowe oceny, wydarzenia, zadania domowe itp.\n\nKliknij \"Przekazywanie powiadomień\", aby rozpocząć.</string>
     <string name="help_register_agreement">Rejestracja odbędzie się automatycznie przy pierwszym logowaniu do e-dziennika.\n\nDo poprawnego działania funkcji zostaną przesłane:\n- Twój identyfikator szkoły i klasy\n- Twoja nazwa użytkownika do e-dziennika\n- Twoje imię i nazwisko\n\nJedyne dane widoczne dla innych osób z twojej klasy to Imię i Nazwisko podczas udostępniania wydarzeń. Nie zostaną wysłane żadne prywatne dane, takie jak hasła, oceny itp. Dowiedz się więcej w Polityce Prywatności.</string>
-    <string name="homework_current_no_data">Brak aktualnych zadań domowych.</string>
-    <string name="homework_current_title">Aktualne zadania</string>
     <string name="homework_edit">Edytuj</string>
-    <string name="homework_past_no_data">Brak poprzednich zadań domowych.</string>
-    <string name="homework_past_title">Poprzednie zadania</string>
     <string name="homework_subject_teacher_format" translatable="false">%s, %s</string>
     <string name="homework_team_date_format" translatable="false">%s %s</string>
     <string name="i_agree">Zgadzam się</string>