diff --git a/.bettercodehub.yml b/.bettercodehub.yml
index d7be51695..349f7675a 100644
--- a/.bettercodehub.yml
+++ b/.bettercodehub.yml
@@ -1,3 +1,3 @@
-component_depth: 10
+component_depth: 8
 languages:
 - kotlin
diff --git a/.gitignore b/.gitignore
index d3fb6e4e9..5c98a4cff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,7 +63,6 @@ captures/
 .idea/dynamic.xml
 .idea/uiDesigner.xml
 .idea/runConfigurations.xml
-.idea/discord.xml
 
 # Keystore files
 *.jks
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index d66c3361f..15a4246be 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,6 +1,9 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
     <option name="LINE_SEPARATOR" value="&#10;" />
+    <AndroidXmlCodeStyleSettings>
+      <option name="ARRANGEMENT_SETTINGS_MIGRATED_TO_191" value="true" />
+    </AndroidXmlCodeStyleSettings>
     <JetCodeStyleSettings>
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
         <value>
diff --git a/.travis.yml b/.travis.yml
index 4bb842821..80628cc2e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ jdk: oraclejdk8
 env:
  global:
     - ANDROID_API_LEVEL=29
-    - ANDROID_BUILD_TOOLS_VERSION=29.0.3
+    - ANDROID_BUILD_TOOLS_VERSION=29.0.2
 
 cache:
   directories:
@@ -14,7 +14,7 @@ cache:
 branches:
   only:
     - develop
-    - 0.18.2
+    - 0.15.0
 
 android:
  licenses:
@@ -48,15 +48,20 @@ before_script:
 script:
   - ./gradlew dependencies --stacktrace --daemon
   - fossa --no-ansi || true
-  - ./gradlew -Pcoverage testPlayDebugUnitTest --stacktrace --daemon
-  - ./gradlew -Pcoverage createFdroidDebugCoverageReport --stacktrace --daemon
-  - ./gradlew -Pcoverage jacocoTestReport --stacktrace --daemon
+  #- ./gradlew lintPlayRelease -x fabricGenerateResourcesPlayRelease --stacktrace --daemon
+  - ./gradlew testPlayDebugUnitTest -x fabricGenerateResourcesPlay --stacktrace --daemon
+  - ./gradlew createFdroidDebugCoverageReport --stacktrace --daemon
+  - ./gradlew jacocoTestReport --stacktrace --daemon
+  - if [ -z ${SONAR_HOST+x} ]; then echo "sonar scan skipped"; else
+      git fetch --unshallow;
+      ./gradlew sonarqube -x test -x lint -x fabricGenerateResourcesPlayRelease -x fabricGenerateResourcesFdroidRelease -Dsonar.host.url=$SONAR_HOST -Dsonar.organization=$SONAR_ORG -Dsonar.login=$SONAR_KEY -Dsonar.branch.name=${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH} --stacktrace --daemon;
+    fi
   - |
     if [ $TRAVIS_TAG ]; then
       gpg --yes --batch --passphrase=$SERVICES_ENCRYPT_KEY ./app/src/release/google-services.json.gpg;
       gpg --yes --batch --passphrase=$ENCRYPT_KEY ./app/key.p12.gpg;
       gpg --yes --batch --passphrase=$ENCRYPT_KEY ./app/upload-key.jks.gpg;
-      ./gradlew publishPlayRelease -PenableFirebase --stacktrace;
+      ./gradlew publishPlayRelease -PenableCrashlytics --stacktrace;
     fi
 
 after_success:
diff --git a/app/build.gradle b/app/build.gradle
index e2aab017d..24306cd19 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,30 +1,30 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
-apply plugin: 'com.google.firebase.crashlytics'
+apply plugin: 'kotlin-android-extensions'
+apply plugin: 'io.fabric'
 apply plugin: 'com.github.triplet.play'
-apply plugin: 'com.mikepenz.aboutlibraries.plugin'
 apply from: 'jacoco.gradle'
 apply from: 'sonarqube.gradle'
 apply from: 'hooks.gradle'
 
 android {
     compileSdkVersion 29
-    buildToolsVersion '29.0.3'
+    buildToolsVersion '29.0.2'
 
     defaultConfig {
         applicationId "io.github.wulkanowy"
         testApplicationId "io.github.tests.wulkanowy"
-        minSdkVersion 17
+        minSdkVersion 16
         targetSdkVersion 29
-        versionCode 61
-        versionName "0.18.2"
+        versionCode 52
+        versionName "0.15.0"
         multiDexEnabled true
-        resValue "string", "app_name", "Wulkanowy"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
         manifestPlaceholders = [
-                firebase_enabled: project.hasProperty("enableFirebase")
+                fabric_api_key     : System.getenv("FABRIC_API_KEY") ?: "null",
+                crashlytics_enabled: project.hasProperty("enableCrashlytics")
         ]
         javaCompileOptions {
             annotationProcessorOptions {
@@ -51,17 +51,18 @@ android {
 
     buildTypes {
         release {
+            buildConfigField "boolean", "CRASHLYTICS_ENABLED", "true"
             minifyEnabled true
             shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             signingConfig signingConfigs.release
         }
         debug {
-            resValue "string", "app_name", "Wulkanowy DEV " + defaultConfig.versionCode
+            buildConfigField "boolean", "CRASHLYTICS_ENABLED", project.hasProperty("enableCrashlytics") ? "true" : "false"
             applicationIdSuffix ".dev"
             versionNameSuffix "-dev"
-            testCoverageEnabled = project.hasProperty('coverage')
-            ext.enableCrashlytics = project.hasProperty("enableFirebase")
+            testCoverageEnabled = true
+            ext.enableCrashlytics = project.hasProperty("enableCrashlytics")
         }
     }
 
@@ -73,14 +74,11 @@ android {
         }
 
         fdroid {
+            buildConfigField "boolean", "CRASHLYTICS_ENABLED", "false"
             dimension "platform"
         }
     }
 
-    viewBinding {
-        enabled = true
-    }
-
     lintOptions {
         disable 'HardwareIds'
     }
@@ -98,10 +96,10 @@ android {
         exclude 'META-INF/library_release.kotlin_module'
         exclude 'META-INF/library-core_release.kotlin_module'
     }
+}
 
-    aboutLibraries {
-        configPath = "app/src/main/res/raw"
-    }
+androidExtensions {
+    experimental = true
 }
 
 play {
@@ -112,10 +110,10 @@ play {
 }
 
 ext {
-    work_manager = "2.3.4"
-    room = "2.2.5"
-    dagger = "2.28"
-    chucker = "3.2.0"
+    work_manager = "2.3.0"
+    room = "2.2.3"
+    dagger = "2.25.4"
+    chucker = "2.0.4"
     mockk = "1.9.2"
 }
 
@@ -124,24 +122,24 @@ configurations.all {
 }
 
 dependencies {
-    implementation "io.github.wulkanowy:sdk:0.18.2"
+    implementation "io.github.wulkanowy:sdk:0.15.0"
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation "androidx.core:core-ktx:1.2.0"
+    implementation "androidx.core:core-ktx:1.2.0-rc01"
     implementation "androidx.activity:activity-ktx:1.1.0"
-    implementation "androidx.appcompat:appcompat:1.2.0-rc01"
+    implementation "androidx.appcompat:appcompat:1.1.0"
     implementation "androidx.appcompat:appcompat-resources:1.1.0"
-    implementation "androidx.fragment:fragment-ktx:1.2.4"
+    implementation "androidx.fragment:fragment-ktx:1.2.0"
     implementation "androidx.annotation:annotation:1.1.0"
     implementation "androidx.multidex:multidex:2.0.1"
 
-    implementation "androidx.preference:preference-ktx:1.1.1"
+    implementation "androidx.preference:preference-ktx:1.1.0"
     implementation "androidx.recyclerview:recyclerview:1.1.0"
     implementation "androidx.viewpager:viewpager:1.0.0"
-    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-rc01"
+    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha03"
     implementation "androidx.constraintlayout:constraintlayout:1.1.3"
     implementation "androidx.coordinatorlayout:coordinatorlayout:1.1.0"
-    implementation "com.google.android.material:material:1.1.0"
+    implementation "com.google.android.material:material:1.1.0-rc02"
     implementation "com.github.wulkanowy:material-chips-input:2.0.1"
     implementation "com.github.PhilJay:MPAndroidChart:v3.1.0"
     implementation "me.zhanghai.android.materialprogressbar:library:1.6.1"
@@ -150,8 +148,6 @@ dependencies {
     implementation "androidx.work:work-rxjava2:$work_manager"
     implementation "androidx.work:work-gcm:$work_manager"
 
-    implementation 'com.github.PaulinaSadowska:RxWorkManagerObservers:1.0.0'
-
     implementation "androidx.room:room-runtime:$room"
     implementation "androidx.room:room-rxjava2:$room"
     implementation "androidx.room:room-ktx:$room"
@@ -163,40 +159,37 @@ dependencies {
     implementation "com.squareup.inject:assisted-inject-annotations-dagger2:0.5.2"
     kapt "com.squareup.inject:assisted-inject-processor-dagger2:0.5.2"
 
+    implementation "eu.davidea:flexible-adapter:5.1.0"
+    implementation "eu.davidea:flexible-adapter-ui:1.0.0"
     implementation "com.aurelhubert:ahbottomnavigation:2.3.4"
     implementation "com.ncapdevi:frag-nav:3.3.0"
-    implementation "com.github.YarikSOffice:lingver:1.2.2"
+    implementation "com.github.YarikSOffice:lingver:1.1.0"
 
-    implementation "com.github.pwittchen:reactivenetwork-rx2:3.0.8"
+    implementation "com.github.pwittchen:reactivenetwork-rx2:3.0.6"
     implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
-    implementation "io.reactivex.rxjava2:rxjava:2.2.19"
+    implementation "io.reactivex.rxjava2:rxjava:2.2.17"
 
     implementation "com.google.code.gson:gson:2.8.6"
-    implementation "com.jakewharton.threetenabp:threetenabp:1.2.4"
+    implementation "com.jakewharton.threetenabp:threetenabp:1.2.2"
     implementation "com.jakewharton.timber:timber:4.7.1"
     implementation "at.favre.lib:slf4j-timber:1.0.1"
-    implementation "fr.bipi.treessence:treessence:0.3.2"
-    implementation "com.mikepenz:aboutlibraries-core:$about_libraries"
+    implementation "com.mikepenz:aboutlibraries-core:7.1.0"
     implementation 'com.wdullaer:materialdatetimepicker:4.2.3'
-    implementation "io.coil-kt:coil:0.11.0"
-    implementation "io.github.wulkanowy:AppKillerManager:3.0.0"
 
-    playImplementation 'com.google.firebase:firebase-analytics:17.4.2'
-    playImplementation 'com.google.firebase:firebase-inappmessaging-display-ktx:19.0.7'
-    playImplementation "com.google.firebase:firebase-inappmessaging-ktx:19.0.7"
-    playImplementation 'com.google.firebase:firebase-messaging:20.2.0'
-    playImplementation 'com.google.firebase:firebase-crashlytics:17.0.0'
-    playImplementation 'com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava'
+    implementation("io.coil-kt:coil:0.9.2")
 
-    releaseImplementation "com.github.ChuckerTeam.Chucker:library-no-op:$chucker"
+    playImplementation "com.google.firebase:firebase-core:17.2.2"
+    playImplementation "com.crashlytics.sdk.android:crashlytics:2.10.1"
 
-    debugImplementation "com.github.ChuckerTeam.Chucker:library:$chucker"
+    releaseImplementation "fr.o80.chucker:library-no-op:$chucker"
+
+    debugImplementation "fr.o80.chucker:library:$chucker"
     debugImplementation "com.amitshekhar.android:debug-db:1.0.6"
 
     testImplementation "junit:junit:4.13"
     testImplementation "io.mockk:mockk:$mockk"
-    testImplementation "org.threeten:threetenbp:1.4.4"
-    testImplementation "org.mockito:mockito-inline:3.3.3"
+    testImplementation "org.threeten:threetenbp:1.4.1"
+    testImplementation "org.mockito:mockito-inline:3.2.4"
 
     androidTestImplementation "androidx.test:core:1.2.0"
     androidTestImplementation "androidx.test:runner:1.2.0"
@@ -204,7 +197,7 @@ dependencies {
     androidTestImplementation "io.mockk:mockk-android:$mockk"
     androidTestImplementation "androidx.room:room-testing:$room"
     androidTestImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
-    androidTestImplementation "org.mockito:mockito-android:3.3.3"
+    androidTestImplementation "org.mockito:mockito-android:3.2.4"
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 1a8b8c329..77339fe9e 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -43,10 +43,3 @@
 
 #Config for Material Components
 -keep class com.google.android.material.tabs.** { *; }
-
-
-#Config for About Libraries
--keep class .R
--keep class **.R$* {
-    <fields>;
-}
diff --git a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/22.json b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/22.json
deleted file mode 100644
index 1eb8bc19c..000000000
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/22.json
+++ /dev/null
@@ -1,1658 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 22,
-    "identityHash": "798956844fdb3f64073921184e3acbfd",
-    "entities": [
-      {
-        "tableName": "Students",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `scrapper_base_url` TEXT NOT NULL, `mobile_base_url` TEXT NOT NULL, `login_type` TEXT NOT NULL, `login_mode` TEXT NOT NULL, `certificate_key` TEXT NOT NULL, `private_key` TEXT NOT NULL, `is_parent` INTEGER NOT NULL, `email` TEXT NOT NULL, `password` TEXT NOT NULL, `symbol` TEXT NOT NULL, `student_id` INTEGER NOT NULL, `user_login_id` INTEGER NOT NULL, `student_name` TEXT NOT NULL, `school_id` TEXT NOT NULL, `school_short` TEXT NOT NULL, `school_name` TEXT NOT NULL, `class_name` TEXT NOT NULL, `class_id` INTEGER NOT NULL, `is_current` INTEGER NOT NULL, `registration_date` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "scrapperBaseUrl",
-            "columnName": "scrapper_base_url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "mobileBaseUrl",
-            "columnName": "mobile_base_url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "loginType",
-            "columnName": "login_type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "loginMode",
-            "columnName": "login_mode",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "certificateKey",
-            "columnName": "certificate_key",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "privateKey",
-            "columnName": "private_key",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isParent",
-            "columnName": "is_parent",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "email",
-            "columnName": "email",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "password",
-            "columnName": "password",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "symbol",
-            "columnName": "symbol",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "userLoginId",
-            "columnName": "user_login_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentName",
-            "columnName": "student_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "schoolSymbol",
-            "columnName": "school_id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "schoolShortName",
-            "columnName": "school_short",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "schoolName",
-            "columnName": "school_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "className",
-            "columnName": "class_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "classId",
-            "columnName": "class_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isCurrent",
-            "columnName": "is_current",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "registrationDate",
-            "columnName": "registration_date",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [
-          {
-            "name": "index_Students_email_symbol_student_id_school_id_class_id",
-            "unique": true,
-            "columnNames": [
-              "email",
-              "symbol",
-              "student_id",
-              "school_id",
-              "class_id"
-            ],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Students_email_symbol_student_id_school_id_class_id` ON `${TABLE_NAME}` (`email`, `symbol`, `student_id`, `school_id`, `class_id`)"
-          }
-        ],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Semesters",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_current` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `diary_name` TEXT NOT NULL, `school_year` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `semester_name` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `unit_id` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "current",
-            "columnName": "is_current",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryName",
-            "columnName": "diary_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "schoolYear",
-            "columnName": "school_year",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterId",
-            "columnName": "semester_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterName",
-            "columnName": "semester_name",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "start",
-            "columnName": "start",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "end",
-            "columnName": "end",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "classId",
-            "columnName": "class_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "unitId",
-            "columnName": "unit_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [
-          {
-            "name": "index_Semesters_student_id_diary_id_semester_id",
-            "unique": true,
-            "columnNames": [
-              "student_id",
-              "diary_id",
-              "semester_id"
-            ],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Semesters_student_id_diary_id_semester_id` ON `${TABLE_NAME}` (`student_id`, `diary_id`, `semester_id`)"
-          }
-        ],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Exams",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `entry_date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `group` TEXT NOT NULL, `type` TEXT NOT NULL, `description` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "entryDate",
-            "columnName": "entry_date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "group",
-            "columnName": "group",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "description",
-            "columnName": "description",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacher",
-            "columnName": "teacher",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacherSymbol",
-            "columnName": "teacher_symbol",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Timetable",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `number` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `subjectOld` TEXT NOT NULL, `group` TEXT NOT NULL, `room` TEXT NOT NULL, `roomOld` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacherOld` TEXT NOT NULL, `info` TEXT NOT NULL, `student_plan` INTEGER NOT NULL, `changes` INTEGER NOT NULL, `canceled` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "number",
-            "columnName": "number",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "start",
-            "columnName": "start",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "end",
-            "columnName": "end",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subjectOld",
-            "columnName": "subjectOld",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "group",
-            "columnName": "group",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "room",
-            "columnName": "room",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "roomOld",
-            "columnName": "roomOld",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacher",
-            "columnName": "teacher",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacherOld",
-            "columnName": "teacherOld",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "info",
-            "columnName": "info",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isStudentPlan",
-            "columnName": "student_plan",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "changes",
-            "columnName": "changes",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "canceled",
-            "columnName": "canceled",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Attendance",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `time_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `number` INTEGER NOT NULL, `subject` TEXT NOT NULL, `name` TEXT NOT NULL, `presence` INTEGER NOT NULL, `absence` INTEGER NOT NULL, `exemption` INTEGER NOT NULL, `lateness` INTEGER NOT NULL, `excused` INTEGER NOT NULL, `deleted` INTEGER NOT NULL, `excusable` INTEGER NOT NULL, `excuse_status` TEXT)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "timeId",
-            "columnName": "time_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "number",
-            "columnName": "number",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "presence",
-            "columnName": "presence",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "absence",
-            "columnName": "absence",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "exemption",
-            "columnName": "exemption",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "lateness",
-            "columnName": "lateness",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "excused",
-            "columnName": "excused",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "deleted",
-            "columnName": "deleted",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "excusable",
-            "columnName": "excusable",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "excuseStatus",
-            "columnName": "excuse_status",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "AttendanceSummary",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `subject_id` INTEGER NOT NULL, `month` INTEGER NOT NULL, `presence` INTEGER NOT NULL, `absence` INTEGER NOT NULL, `absence_excused` INTEGER NOT NULL, `absence_for_school_reasons` INTEGER NOT NULL, `lateness` INTEGER NOT NULL, `lateness_excused` INTEGER NOT NULL, `exemption` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subjectId",
-            "columnName": "subject_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "month",
-            "columnName": "month",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "presence",
-            "columnName": "presence",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "absence",
-            "columnName": "absence",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "absenceExcused",
-            "columnName": "absence_excused",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "absenceForSchoolReasons",
-            "columnName": "absence_for_school_reasons",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "lateness",
-            "columnName": "lateness",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "latenessExcused",
-            "columnName": "lateness_excused",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "exemption",
-            "columnName": "exemption",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Grades",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `entry` TEXT NOT NULL, `value` REAL NOT NULL, `modifier` REAL NOT NULL, `comment` TEXT NOT NULL, `color` TEXT NOT NULL, `grade_symbol` TEXT NOT NULL, `description` TEXT NOT NULL, `weight` TEXT NOT NULL, `weightValue` REAL NOT NULL, `date` INTEGER NOT NULL, `teacher` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isRead",
-            "columnName": "is_read",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isNotified",
-            "columnName": "is_notified",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterId",
-            "columnName": "semester_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "entry",
-            "columnName": "entry",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "value",
-            "columnName": "value",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "modifier",
-            "columnName": "modifier",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "comment",
-            "columnName": "comment",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "color",
-            "columnName": "color",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "gradeSymbol",
-            "columnName": "grade_symbol",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "description",
-            "columnName": "description",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "weight",
-            "columnName": "weight",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "weightValue",
-            "columnName": "weightValue",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacher",
-            "columnName": "teacher",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "GradesSummary",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `position` INTEGER NOT NULL, `subject` TEXT NOT NULL, `predicted_grade` TEXT NOT NULL, `final_grade` TEXT NOT NULL, `proposed_points` TEXT NOT NULL, `final_points` TEXT NOT NULL, `points_sum` TEXT NOT NULL, `average` REAL NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterId",
-            "columnName": "semester_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "position",
-            "columnName": "position",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "predictedGrade",
-            "columnName": "predicted_grade",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "finalGrade",
-            "columnName": "final_grade",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "proposedPoints",
-            "columnName": "proposed_points",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "finalPoints",
-            "columnName": "final_points",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "pointsSum",
-            "columnName": "points_sum",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "average",
-            "columnName": "average",
-            "affinity": "REAL",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "GradesStatistics",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `grade` INTEGER NOT NULL, `amount` INTEGER NOT NULL, `is_semester` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterId",
-            "columnName": "semester_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "grade",
-            "columnName": "grade",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "amount",
-            "columnName": "amount",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semester",
-            "columnName": "is_semester",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "GradesPointsStatistics",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `others` REAL NOT NULL, `student` REAL NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterId",
-            "columnName": "semester_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "others",
-            "columnName": "others",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "student",
-            "columnName": "student",
-            "affinity": "REAL",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Messages",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `message_id` INTEGER NOT NULL, `sender_name` TEXT NOT NULL, `sender_id` INTEGER NOT NULL, `recipient_name` TEXT NOT NULL, `subject` TEXT NOT NULL, `content` TEXT NOT NULL, `date` INTEGER NOT NULL, `folder_id` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `unread_by` INTEGER NOT NULL, `read_by` INTEGER NOT NULL, `removed` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isNotified",
-            "columnName": "is_notified",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "realId",
-            "columnName": "real_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "messageId",
-            "columnName": "message_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "sender",
-            "columnName": "sender_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "senderId",
-            "columnName": "sender_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "recipient",
-            "columnName": "recipient_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "content",
-            "columnName": "content",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "folderId",
-            "columnName": "folder_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "unread",
-            "columnName": "unread",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "unreadBy",
-            "columnName": "unread_by",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "readBy",
-            "columnName": "read_by",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "removed",
-            "columnName": "removed",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Notes",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `teacher` TEXT NOT NULL, `category` TEXT NOT NULL, `content` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isRead",
-            "columnName": "is_read",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isNotified",
-            "columnName": "is_notified",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacher",
-            "columnName": "teacher",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "category",
-            "columnName": "category",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "content",
-            "columnName": "content",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Homework",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `entry_date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `content` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterId",
-            "columnName": "semester_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "entryDate",
-            "columnName": "entry_date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "content",
-            "columnName": "content",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacher",
-            "columnName": "teacher",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacherSymbol",
-            "columnName": "teacher_symbol",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Subjects",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `name` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "realId",
-            "columnName": "real_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "LuckyNumbers",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `lucky_number` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isNotified",
-            "columnName": "is_notified",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "luckyNumber",
-            "columnName": "lucky_number",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "CompletedLesson",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `number` INTEGER NOT NULL, `subject` TEXT NOT NULL, `topic` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `substitution` TEXT NOT NULL, `absence` TEXT NOT NULL, `resources` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "number",
-            "columnName": "number",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "topic",
-            "columnName": "topic",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacher",
-            "columnName": "teacher",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacherSymbol",
-            "columnName": "teacher_symbol",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "substitution",
-            "columnName": "substitution",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "absence",
-            "columnName": "absence",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "resources",
-            "columnName": "resources",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "ReportingUnits",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `short` TEXT NOT NULL, `sender_id` INTEGER NOT NULL, `sender_name` TEXT NOT NULL, `roles` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "realId",
-            "columnName": "real_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "shortName",
-            "columnName": "short",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "senderId",
-            "columnName": "sender_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "senderName",
-            "columnName": "sender_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "roles",
-            "columnName": "roles",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Recipients",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `real_id` TEXT NOT NULL, `name` TEXT NOT NULL, `real_name` TEXT NOT NULL, `login_id` INTEGER NOT NULL, `unit_id` INTEGER NOT NULL, `role` INTEGER NOT NULL, `hash` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "realId",
-            "columnName": "real_id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "realName",
-            "columnName": "real_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "loginId",
-            "columnName": "login_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "unitId",
-            "columnName": "unit_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "role",
-            "columnName": "role",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "hash",
-            "columnName": "hash",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "MobileDevices",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `device_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `date` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "deviceId",
-            "columnName": "device_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Teachers",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `name` TEXT NOT NULL, `short_name` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "classId",
-            "columnName": "class_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "shortName",
-            "columnName": "short_name",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "School",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `address` TEXT NOT NULL, `contact` TEXT NOT NULL, `headmaster` TEXT NOT NULL, `pedagogue` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "classId",
-            "columnName": "class_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "address",
-            "columnName": "address",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "contact",
-            "columnName": "contact",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "headmaster",
-            "columnName": "headmaster",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "pedagogue",
-            "columnName": "pedagogue",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      }
-    ],
-    "views": [],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '798956844fdb3f64073921184e3acbfd')"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/23.json b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/23.json
deleted file mode 100644
index f75a72acf..000000000
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/23.json
+++ /dev/null
@@ -1,1682 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 23,
-    "identityHash": "f2505bf0c76c3ae4567856536d790909",
-    "entities": [
-      {
-        "tableName": "Students",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `scrapper_base_url` TEXT NOT NULL, `mobile_base_url` TEXT NOT NULL, `login_type` TEXT NOT NULL, `login_mode` TEXT NOT NULL, `certificate_key` TEXT NOT NULL, `private_key` TEXT NOT NULL, `is_parent` INTEGER NOT NULL, `email` TEXT NOT NULL, `password` TEXT NOT NULL, `symbol` TEXT NOT NULL, `student_id` INTEGER NOT NULL, `user_login_id` INTEGER NOT NULL, `student_name` TEXT NOT NULL, `school_id` TEXT NOT NULL, `school_short` TEXT NOT NULL, `school_name` TEXT NOT NULL, `class_name` TEXT NOT NULL, `class_id` INTEGER NOT NULL, `is_current` INTEGER NOT NULL, `registration_date` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "scrapperBaseUrl",
-            "columnName": "scrapper_base_url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "mobileBaseUrl",
-            "columnName": "mobile_base_url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "loginType",
-            "columnName": "login_type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "loginMode",
-            "columnName": "login_mode",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "certificateKey",
-            "columnName": "certificate_key",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "privateKey",
-            "columnName": "private_key",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isParent",
-            "columnName": "is_parent",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "email",
-            "columnName": "email",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "password",
-            "columnName": "password",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "symbol",
-            "columnName": "symbol",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "userLoginId",
-            "columnName": "user_login_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentName",
-            "columnName": "student_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "schoolSymbol",
-            "columnName": "school_id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "schoolShortName",
-            "columnName": "school_short",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "schoolName",
-            "columnName": "school_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "className",
-            "columnName": "class_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "classId",
-            "columnName": "class_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isCurrent",
-            "columnName": "is_current",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "registrationDate",
-            "columnName": "registration_date",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [
-          {
-            "name": "index_Students_email_symbol_student_id_school_id_class_id",
-            "unique": true,
-            "columnNames": [
-              "email",
-              "symbol",
-              "student_id",
-              "school_id",
-              "class_id"
-            ],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Students_email_symbol_student_id_school_id_class_id` ON `${TABLE_NAME}` (`email`, `symbol`, `student_id`, `school_id`, `class_id`)"
-          }
-        ],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Semesters",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_current` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `diary_name` TEXT NOT NULL, `school_year` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `semester_name` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `unit_id` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "current",
-            "columnName": "is_current",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryName",
-            "columnName": "diary_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "schoolYear",
-            "columnName": "school_year",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterId",
-            "columnName": "semester_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterName",
-            "columnName": "semester_name",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "start",
-            "columnName": "start",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "end",
-            "columnName": "end",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "classId",
-            "columnName": "class_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "unitId",
-            "columnName": "unit_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [
-          {
-            "name": "index_Semesters_student_id_diary_id_semester_id",
-            "unique": true,
-            "columnNames": [
-              "student_id",
-              "diary_id",
-              "semester_id"
-            ],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Semesters_student_id_diary_id_semester_id` ON `${TABLE_NAME}` (`student_id`, `diary_id`, `semester_id`)"
-          }
-        ],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Exams",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `entry_date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `group` TEXT NOT NULL, `type` TEXT NOT NULL, `description` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "entryDate",
-            "columnName": "entry_date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "group",
-            "columnName": "group",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "description",
-            "columnName": "description",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacher",
-            "columnName": "teacher",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacherSymbol",
-            "columnName": "teacher_symbol",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Timetable",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `number` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `subjectOld` TEXT NOT NULL, `group` TEXT NOT NULL, `room` TEXT NOT NULL, `roomOld` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacherOld` TEXT NOT NULL, `info` TEXT NOT NULL, `student_plan` INTEGER NOT NULL, `changes` INTEGER NOT NULL, `canceled` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "number",
-            "columnName": "number",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "start",
-            "columnName": "start",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "end",
-            "columnName": "end",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subjectOld",
-            "columnName": "subjectOld",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "group",
-            "columnName": "group",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "room",
-            "columnName": "room",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "roomOld",
-            "columnName": "roomOld",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacher",
-            "columnName": "teacher",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacherOld",
-            "columnName": "teacherOld",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "info",
-            "columnName": "info",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isStudentPlan",
-            "columnName": "student_plan",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "changes",
-            "columnName": "changes",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "canceled",
-            "columnName": "canceled",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Attendance",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `time_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `number` INTEGER NOT NULL, `subject` TEXT NOT NULL, `name` TEXT NOT NULL, `presence` INTEGER NOT NULL, `absence` INTEGER NOT NULL, `exemption` INTEGER NOT NULL, `lateness` INTEGER NOT NULL, `excused` INTEGER NOT NULL, `deleted` INTEGER NOT NULL, `excusable` INTEGER NOT NULL, `excuse_status` TEXT)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "timeId",
-            "columnName": "time_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "number",
-            "columnName": "number",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "presence",
-            "columnName": "presence",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "absence",
-            "columnName": "absence",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "exemption",
-            "columnName": "exemption",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "lateness",
-            "columnName": "lateness",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "excused",
-            "columnName": "excused",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "deleted",
-            "columnName": "deleted",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "excusable",
-            "columnName": "excusable",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "excuseStatus",
-            "columnName": "excuse_status",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "AttendanceSummary",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `subject_id` INTEGER NOT NULL, `month` INTEGER NOT NULL, `presence` INTEGER NOT NULL, `absence` INTEGER NOT NULL, `absence_excused` INTEGER NOT NULL, `absence_for_school_reasons` INTEGER NOT NULL, `lateness` INTEGER NOT NULL, `lateness_excused` INTEGER NOT NULL, `exemption` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subjectId",
-            "columnName": "subject_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "month",
-            "columnName": "month",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "presence",
-            "columnName": "presence",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "absence",
-            "columnName": "absence",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "absenceExcused",
-            "columnName": "absence_excused",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "absenceForSchoolReasons",
-            "columnName": "absence_for_school_reasons",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "lateness",
-            "columnName": "lateness",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "latenessExcused",
-            "columnName": "lateness_excused",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "exemption",
-            "columnName": "exemption",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Grades",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `entry` TEXT NOT NULL, `value` REAL NOT NULL, `modifier` REAL NOT NULL, `comment` TEXT NOT NULL, `color` TEXT NOT NULL, `grade_symbol` TEXT NOT NULL, `description` TEXT NOT NULL, `weight` TEXT NOT NULL, `weightValue` REAL NOT NULL, `date` INTEGER NOT NULL, `teacher` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isRead",
-            "columnName": "is_read",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isNotified",
-            "columnName": "is_notified",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterId",
-            "columnName": "semester_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "entry",
-            "columnName": "entry",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "value",
-            "columnName": "value",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "modifier",
-            "columnName": "modifier",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "comment",
-            "columnName": "comment",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "color",
-            "columnName": "color",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "gradeSymbol",
-            "columnName": "grade_symbol",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "description",
-            "columnName": "description",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "weight",
-            "columnName": "weight",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "weightValue",
-            "columnName": "weightValue",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacher",
-            "columnName": "teacher",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "GradesSummary",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `position` INTEGER NOT NULL, `subject` TEXT NOT NULL, `predicted_grade` TEXT NOT NULL, `final_grade` TEXT NOT NULL, `proposed_points` TEXT NOT NULL, `final_points` TEXT NOT NULL, `points_sum` TEXT NOT NULL, `average` REAL NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterId",
-            "columnName": "semester_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "position",
-            "columnName": "position",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "predictedGrade",
-            "columnName": "predicted_grade",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "finalGrade",
-            "columnName": "final_grade",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "proposedPoints",
-            "columnName": "proposed_points",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "finalPoints",
-            "columnName": "final_points",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "pointsSum",
-            "columnName": "points_sum",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "average",
-            "columnName": "average",
-            "affinity": "REAL",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "GradesStatistics",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `grade` INTEGER NOT NULL, `amount` INTEGER NOT NULL, `is_semester` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterId",
-            "columnName": "semester_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "grade",
-            "columnName": "grade",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "amount",
-            "columnName": "amount",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semester",
-            "columnName": "is_semester",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "GradesPointsStatistics",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `others` REAL NOT NULL, `student` REAL NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterId",
-            "columnName": "semester_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "others",
-            "columnName": "others",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "student",
-            "columnName": "student",
-            "affinity": "REAL",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Messages",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `message_id` INTEGER NOT NULL, `sender_name` TEXT NOT NULL, `sender_id` INTEGER NOT NULL, `recipient_name` TEXT NOT NULL, `subject` TEXT NOT NULL, `content` TEXT NOT NULL, `date` INTEGER NOT NULL, `folder_id` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `unread_by` INTEGER NOT NULL, `read_by` INTEGER NOT NULL, `removed` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isNotified",
-            "columnName": "is_notified",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "realId",
-            "columnName": "real_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "messageId",
-            "columnName": "message_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "sender",
-            "columnName": "sender_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "senderId",
-            "columnName": "sender_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "recipient",
-            "columnName": "recipient_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "content",
-            "columnName": "content",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "folderId",
-            "columnName": "folder_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "unread",
-            "columnName": "unread",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "unreadBy",
-            "columnName": "unread_by",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "readBy",
-            "columnName": "read_by",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "removed",
-            "columnName": "removed",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Notes",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `category` TEXT NOT NULL, `category_type` INTEGER NOT NULL, `is_points_show` INTEGER NOT NULL, `points` INTEGER NOT NULL, `content` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isRead",
-            "columnName": "is_read",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isNotified",
-            "columnName": "is_notified",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacher",
-            "columnName": "teacher",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacherSymbol",
-            "columnName": "teacher_symbol",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "category",
-            "columnName": "category",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "categoryType",
-            "columnName": "category_type",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isPointsShow",
-            "columnName": "is_points_show",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "points",
-            "columnName": "points",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "content",
-            "columnName": "content",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Homework",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `entry_date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `content` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterId",
-            "columnName": "semester_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "entryDate",
-            "columnName": "entry_date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "content",
-            "columnName": "content",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacher",
-            "columnName": "teacher",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacherSymbol",
-            "columnName": "teacher_symbol",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Subjects",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `name` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "realId",
-            "columnName": "real_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "LuckyNumbers",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `lucky_number` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isNotified",
-            "columnName": "is_notified",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "luckyNumber",
-            "columnName": "lucky_number",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "CompletedLesson",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `number` INTEGER NOT NULL, `subject` TEXT NOT NULL, `topic` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `substitution` TEXT NOT NULL, `absence` TEXT NOT NULL, `resources` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "number",
-            "columnName": "number",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "topic",
-            "columnName": "topic",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacher",
-            "columnName": "teacher",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacherSymbol",
-            "columnName": "teacher_symbol",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "substitution",
-            "columnName": "substitution",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "absence",
-            "columnName": "absence",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "resources",
-            "columnName": "resources",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "ReportingUnits",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `short` TEXT NOT NULL, `sender_id` INTEGER NOT NULL, `sender_name` TEXT NOT NULL, `roles` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "realId",
-            "columnName": "real_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "shortName",
-            "columnName": "short",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "senderId",
-            "columnName": "sender_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "senderName",
-            "columnName": "sender_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "roles",
-            "columnName": "roles",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Recipients",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `real_id` TEXT NOT NULL, `name` TEXT NOT NULL, `real_name` TEXT NOT NULL, `login_id` INTEGER NOT NULL, `unit_id` INTEGER NOT NULL, `role` INTEGER NOT NULL, `hash` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "realId",
-            "columnName": "real_id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "realName",
-            "columnName": "real_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "loginId",
-            "columnName": "login_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "unitId",
-            "columnName": "unit_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "role",
-            "columnName": "role",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "hash",
-            "columnName": "hash",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "MobileDevices",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `device_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `date` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "deviceId",
-            "columnName": "device_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Teachers",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `name` TEXT NOT NULL, `short_name` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "classId",
-            "columnName": "class_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "shortName",
-            "columnName": "short_name",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "School",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `address` TEXT NOT NULL, `contact` TEXT NOT NULL, `headmaster` TEXT NOT NULL, `pedagogue` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "classId",
-            "columnName": "class_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "address",
-            "columnName": "address",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "contact",
-            "columnName": "contact",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "headmaster",
-            "columnName": "headmaster",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "pedagogue",
-            "columnName": "pedagogue",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      }
-    ],
-    "views": [],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'f2505bf0c76c3ae4567856536d790909')"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/24.json b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/24.json
deleted file mode 100644
index 17ae7d798..000000000
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/24.json
+++ /dev/null
@@ -1,1732 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 24,
-    "identityHash": "9bbf60310b56a855839164e2aae031f9",
-    "entities": [
-      {
-        "tableName": "Students",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `scrapper_base_url` TEXT NOT NULL, `mobile_base_url` TEXT NOT NULL, `login_type` TEXT NOT NULL, `login_mode` TEXT NOT NULL, `certificate_key` TEXT NOT NULL, `private_key` TEXT NOT NULL, `is_parent` INTEGER NOT NULL, `email` TEXT NOT NULL, `password` TEXT NOT NULL, `symbol` TEXT NOT NULL, `student_id` INTEGER NOT NULL, `user_login_id` INTEGER NOT NULL, `student_name` TEXT NOT NULL, `school_id` TEXT NOT NULL, `school_short` TEXT NOT NULL, `school_name` TEXT NOT NULL, `class_name` TEXT NOT NULL, `class_id` INTEGER NOT NULL, `is_current` INTEGER NOT NULL, `registration_date` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "scrapperBaseUrl",
-            "columnName": "scrapper_base_url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "mobileBaseUrl",
-            "columnName": "mobile_base_url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "loginType",
-            "columnName": "login_type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "loginMode",
-            "columnName": "login_mode",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "certificateKey",
-            "columnName": "certificate_key",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "privateKey",
-            "columnName": "private_key",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isParent",
-            "columnName": "is_parent",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "email",
-            "columnName": "email",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "password",
-            "columnName": "password",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "symbol",
-            "columnName": "symbol",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "userLoginId",
-            "columnName": "user_login_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentName",
-            "columnName": "student_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "schoolSymbol",
-            "columnName": "school_id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "schoolShortName",
-            "columnName": "school_short",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "schoolName",
-            "columnName": "school_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "className",
-            "columnName": "class_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "classId",
-            "columnName": "class_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isCurrent",
-            "columnName": "is_current",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "registrationDate",
-            "columnName": "registration_date",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [
-          {
-            "name": "index_Students_email_symbol_student_id_school_id_class_id",
-            "unique": true,
-            "columnNames": [
-              "email",
-              "symbol",
-              "student_id",
-              "school_id",
-              "class_id"
-            ],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Students_email_symbol_student_id_school_id_class_id` ON `${TABLE_NAME}` (`email`, `symbol`, `student_id`, `school_id`, `class_id`)"
-          }
-        ],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Semesters",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_current` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `diary_name` TEXT NOT NULL, `school_year` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `semester_name` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `unit_id` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "current",
-            "columnName": "is_current",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryName",
-            "columnName": "diary_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "schoolYear",
-            "columnName": "school_year",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterId",
-            "columnName": "semester_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterName",
-            "columnName": "semester_name",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "start",
-            "columnName": "start",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "end",
-            "columnName": "end",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "classId",
-            "columnName": "class_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "unitId",
-            "columnName": "unit_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [
-          {
-            "name": "index_Semesters_student_id_diary_id_semester_id",
-            "unique": true,
-            "columnNames": [
-              "student_id",
-              "diary_id",
-              "semester_id"
-            ],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Semesters_student_id_diary_id_semester_id` ON `${TABLE_NAME}` (`student_id`, `diary_id`, `semester_id`)"
-          }
-        ],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Exams",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `entry_date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `group` TEXT NOT NULL, `type` TEXT NOT NULL, `description` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "entryDate",
-            "columnName": "entry_date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "group",
-            "columnName": "group",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "description",
-            "columnName": "description",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacher",
-            "columnName": "teacher",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacherSymbol",
-            "columnName": "teacher_symbol",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Timetable",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `number` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `subjectOld` TEXT NOT NULL, `group` TEXT NOT NULL, `room` TEXT NOT NULL, `roomOld` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacherOld` TEXT NOT NULL, `info` TEXT NOT NULL, `student_plan` INTEGER NOT NULL, `changes` INTEGER NOT NULL, `canceled` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "number",
-            "columnName": "number",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "start",
-            "columnName": "start",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "end",
-            "columnName": "end",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subjectOld",
-            "columnName": "subjectOld",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "group",
-            "columnName": "group",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "room",
-            "columnName": "room",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "roomOld",
-            "columnName": "roomOld",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacher",
-            "columnName": "teacher",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacherOld",
-            "columnName": "teacherOld",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "info",
-            "columnName": "info",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isStudentPlan",
-            "columnName": "student_plan",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "changes",
-            "columnName": "changes",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "canceled",
-            "columnName": "canceled",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Attendance",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `time_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `number` INTEGER NOT NULL, `subject` TEXT NOT NULL, `name` TEXT NOT NULL, `presence` INTEGER NOT NULL, `absence` INTEGER NOT NULL, `exemption` INTEGER NOT NULL, `lateness` INTEGER NOT NULL, `excused` INTEGER NOT NULL, `deleted` INTEGER NOT NULL, `excusable` INTEGER NOT NULL, `excuse_status` TEXT)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "timeId",
-            "columnName": "time_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "number",
-            "columnName": "number",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "presence",
-            "columnName": "presence",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "absence",
-            "columnName": "absence",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "exemption",
-            "columnName": "exemption",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "lateness",
-            "columnName": "lateness",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "excused",
-            "columnName": "excused",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "deleted",
-            "columnName": "deleted",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "excusable",
-            "columnName": "excusable",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "excuseStatus",
-            "columnName": "excuse_status",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "AttendanceSummary",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `subject_id` INTEGER NOT NULL, `month` INTEGER NOT NULL, `presence` INTEGER NOT NULL, `absence` INTEGER NOT NULL, `absence_excused` INTEGER NOT NULL, `absence_for_school_reasons` INTEGER NOT NULL, `lateness` INTEGER NOT NULL, `lateness_excused` INTEGER NOT NULL, `exemption` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subjectId",
-            "columnName": "subject_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "month",
-            "columnName": "month",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "presence",
-            "columnName": "presence",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "absence",
-            "columnName": "absence",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "absenceExcused",
-            "columnName": "absence_excused",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "absenceForSchoolReasons",
-            "columnName": "absence_for_school_reasons",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "lateness",
-            "columnName": "lateness",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "latenessExcused",
-            "columnName": "lateness_excused",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "exemption",
-            "columnName": "exemption",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Grades",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `entry` TEXT NOT NULL, `value` REAL NOT NULL, `modifier` REAL NOT NULL, `comment` TEXT NOT NULL, `color` TEXT NOT NULL, `grade_symbol` TEXT NOT NULL, `description` TEXT NOT NULL, `weight` TEXT NOT NULL, `weightValue` REAL NOT NULL, `date` INTEGER NOT NULL, `teacher` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isRead",
-            "columnName": "is_read",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isNotified",
-            "columnName": "is_notified",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterId",
-            "columnName": "semester_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "entry",
-            "columnName": "entry",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "value",
-            "columnName": "value",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "modifier",
-            "columnName": "modifier",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "comment",
-            "columnName": "comment",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "color",
-            "columnName": "color",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "gradeSymbol",
-            "columnName": "grade_symbol",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "description",
-            "columnName": "description",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "weight",
-            "columnName": "weight",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "weightValue",
-            "columnName": "weightValue",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacher",
-            "columnName": "teacher",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "GradesSummary",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `position` INTEGER NOT NULL, `subject` TEXT NOT NULL, `predicted_grade` TEXT NOT NULL, `final_grade` TEXT NOT NULL, `proposed_points` TEXT NOT NULL, `final_points` TEXT NOT NULL, `points_sum` TEXT NOT NULL, `average` REAL NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterId",
-            "columnName": "semester_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "position",
-            "columnName": "position",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "predictedGrade",
-            "columnName": "predicted_grade",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "finalGrade",
-            "columnName": "final_grade",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "proposedPoints",
-            "columnName": "proposed_points",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "finalPoints",
-            "columnName": "final_points",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "pointsSum",
-            "columnName": "points_sum",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "average",
-            "columnName": "average",
-            "affinity": "REAL",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "GradesStatistics",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `grade` INTEGER NOT NULL, `amount` INTEGER NOT NULL, `is_semester` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterId",
-            "columnName": "semester_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "grade",
-            "columnName": "grade",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "amount",
-            "columnName": "amount",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semester",
-            "columnName": "is_semester",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "GradesPointsStatistics",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `others` REAL NOT NULL, `student` REAL NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterId",
-            "columnName": "semester_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "others",
-            "columnName": "others",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "student",
-            "columnName": "student",
-            "affinity": "REAL",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Messages",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `message_id` INTEGER NOT NULL, `sender_name` TEXT NOT NULL, `sender_id` INTEGER NOT NULL, `recipient_name` TEXT NOT NULL, `subject` TEXT NOT NULL, `content` TEXT NOT NULL, `date` INTEGER NOT NULL, `folder_id` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `unread_by` INTEGER NOT NULL, `read_by` INTEGER NOT NULL, `removed` INTEGER NOT NULL, `has_attachments` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isNotified",
-            "columnName": "is_notified",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "realId",
-            "columnName": "real_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "messageId",
-            "columnName": "message_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "sender",
-            "columnName": "sender_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "senderId",
-            "columnName": "sender_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "recipient",
-            "columnName": "recipient_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "content",
-            "columnName": "content",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "folderId",
-            "columnName": "folder_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "unread",
-            "columnName": "unread",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "unreadBy",
-            "columnName": "unread_by",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "readBy",
-            "columnName": "read_by",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "removed",
-            "columnName": "removed",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "hasAttachments",
-            "columnName": "has_attachments",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "MessageAttachments",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`real_id` INTEGER NOT NULL, `message_id` INTEGER NOT NULL, `one_drive_id` TEXT NOT NULL, `url` TEXT NOT NULL, `filename` TEXT NOT NULL, PRIMARY KEY(`real_id`))",
-        "fields": [
-          {
-            "fieldPath": "realId",
-            "columnName": "real_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "messageId",
-            "columnName": "message_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "oneDriveId",
-            "columnName": "one_drive_id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "filename",
-            "columnName": "filename",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "real_id"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Notes",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `category` TEXT NOT NULL, `category_type` INTEGER NOT NULL, `is_points_show` INTEGER NOT NULL, `points` INTEGER NOT NULL, `content` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isRead",
-            "columnName": "is_read",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isNotified",
-            "columnName": "is_notified",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacher",
-            "columnName": "teacher",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacherSymbol",
-            "columnName": "teacher_symbol",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "category",
-            "columnName": "category",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "categoryType",
-            "columnName": "category_type",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isPointsShow",
-            "columnName": "is_points_show",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "points",
-            "columnName": "points",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "content",
-            "columnName": "content",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Homework",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `entry_date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `content` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterId",
-            "columnName": "semester_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "entryDate",
-            "columnName": "entry_date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "content",
-            "columnName": "content",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacher",
-            "columnName": "teacher",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacherSymbol",
-            "columnName": "teacher_symbol",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Subjects",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `name` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "realId",
-            "columnName": "real_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "LuckyNumbers",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `lucky_number` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isNotified",
-            "columnName": "is_notified",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "luckyNumber",
-            "columnName": "lucky_number",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "CompletedLesson",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `number` INTEGER NOT NULL, `subject` TEXT NOT NULL, `topic` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `substitution` TEXT NOT NULL, `absence` TEXT NOT NULL, `resources` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "number",
-            "columnName": "number",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "topic",
-            "columnName": "topic",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacher",
-            "columnName": "teacher",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacherSymbol",
-            "columnName": "teacher_symbol",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "substitution",
-            "columnName": "substitution",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "absence",
-            "columnName": "absence",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "resources",
-            "columnName": "resources",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "ReportingUnits",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `short` TEXT NOT NULL, `sender_id` INTEGER NOT NULL, `sender_name` TEXT NOT NULL, `roles` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "realId",
-            "columnName": "real_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "shortName",
-            "columnName": "short",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "senderId",
-            "columnName": "sender_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "senderName",
-            "columnName": "sender_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "roles",
-            "columnName": "roles",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Recipients",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `real_id` TEXT NOT NULL, `name` TEXT NOT NULL, `real_name` TEXT NOT NULL, `login_id` INTEGER NOT NULL, `unit_id` INTEGER NOT NULL, `role` INTEGER NOT NULL, `hash` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "realId",
-            "columnName": "real_id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "realName",
-            "columnName": "real_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "loginId",
-            "columnName": "login_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "unitId",
-            "columnName": "unit_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "role",
-            "columnName": "role",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "hash",
-            "columnName": "hash",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "MobileDevices",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `device_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `date` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "deviceId",
-            "columnName": "device_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Teachers",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `name` TEXT NOT NULL, `short_name` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "classId",
-            "columnName": "class_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "shortName",
-            "columnName": "short_name",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "School",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `address` TEXT NOT NULL, `contact` TEXT NOT NULL, `headmaster` TEXT NOT NULL, `pedagogue` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "classId",
-            "columnName": "class_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "address",
-            "columnName": "address",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "contact",
-            "columnName": "contact",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "headmaster",
-            "columnName": "headmaster",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "pedagogue",
-            "columnName": "pedagogue",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      }
-    ],
-    "views": [],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '9bbf60310b56a855839164e2aae031f9')"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/25.json b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/25.json
deleted file mode 100644
index e99a11d4a..000000000
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/25.json
+++ /dev/null
@@ -1,1744 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 25,
-    "identityHash": "d101f5a26a024f62e6fee161e421b882",
-    "entities": [
-      {
-        "tableName": "Students",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `scrapper_base_url` TEXT NOT NULL, `mobile_base_url` TEXT NOT NULL, `login_type` TEXT NOT NULL, `login_mode` TEXT NOT NULL, `certificate_key` TEXT NOT NULL, `private_key` TEXT NOT NULL, `is_parent` INTEGER NOT NULL, `email` TEXT NOT NULL, `password` TEXT NOT NULL, `symbol` TEXT NOT NULL, `student_id` INTEGER NOT NULL, `user_login_id` INTEGER NOT NULL, `student_name` TEXT NOT NULL, `school_id` TEXT NOT NULL, `school_short` TEXT NOT NULL, `school_name` TEXT NOT NULL, `class_name` TEXT NOT NULL, `class_id` INTEGER NOT NULL, `is_current` INTEGER NOT NULL, `registration_date` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "scrapperBaseUrl",
-            "columnName": "scrapper_base_url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "mobileBaseUrl",
-            "columnName": "mobile_base_url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "loginType",
-            "columnName": "login_type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "loginMode",
-            "columnName": "login_mode",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "certificateKey",
-            "columnName": "certificate_key",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "privateKey",
-            "columnName": "private_key",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isParent",
-            "columnName": "is_parent",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "email",
-            "columnName": "email",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "password",
-            "columnName": "password",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "symbol",
-            "columnName": "symbol",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "userLoginId",
-            "columnName": "user_login_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentName",
-            "columnName": "student_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "schoolSymbol",
-            "columnName": "school_id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "schoolShortName",
-            "columnName": "school_short",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "schoolName",
-            "columnName": "school_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "className",
-            "columnName": "class_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "classId",
-            "columnName": "class_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isCurrent",
-            "columnName": "is_current",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "registrationDate",
-            "columnName": "registration_date",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [
-          {
-            "name": "index_Students_email_symbol_student_id_school_id_class_id",
-            "unique": true,
-            "columnNames": [
-              "email",
-              "symbol",
-              "student_id",
-              "school_id",
-              "class_id"
-            ],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Students_email_symbol_student_id_school_id_class_id` ON `${TABLE_NAME}` (`email`, `symbol`, `student_id`, `school_id`, `class_id`)"
-          }
-        ],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Semesters",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_current` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `diary_name` TEXT NOT NULL, `school_year` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `semester_name` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `unit_id` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "current",
-            "columnName": "is_current",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryName",
-            "columnName": "diary_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "schoolYear",
-            "columnName": "school_year",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterId",
-            "columnName": "semester_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterName",
-            "columnName": "semester_name",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "start",
-            "columnName": "start",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "end",
-            "columnName": "end",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "classId",
-            "columnName": "class_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "unitId",
-            "columnName": "unit_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [
-          {
-            "name": "index_Semesters_student_id_diary_id_semester_id",
-            "unique": true,
-            "columnNames": [
-              "student_id",
-              "diary_id",
-              "semester_id"
-            ],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Semesters_student_id_diary_id_semester_id` ON `${TABLE_NAME}` (`student_id`, `diary_id`, `semester_id`)"
-          }
-        ],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Exams",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `entry_date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `group` TEXT NOT NULL, `type` TEXT NOT NULL, `description` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "entryDate",
-            "columnName": "entry_date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "group",
-            "columnName": "group",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "description",
-            "columnName": "description",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacher",
-            "columnName": "teacher",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacherSymbol",
-            "columnName": "teacher_symbol",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Timetable",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `number` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `subjectOld` TEXT NOT NULL, `group` TEXT NOT NULL, `room` TEXT NOT NULL, `roomOld` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacherOld` TEXT NOT NULL, `info` TEXT NOT NULL, `student_plan` INTEGER NOT NULL, `changes` INTEGER NOT NULL, `canceled` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "number",
-            "columnName": "number",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "start",
-            "columnName": "start",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "end",
-            "columnName": "end",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subjectOld",
-            "columnName": "subjectOld",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "group",
-            "columnName": "group",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "room",
-            "columnName": "room",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "roomOld",
-            "columnName": "roomOld",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacher",
-            "columnName": "teacher",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacherOld",
-            "columnName": "teacherOld",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "info",
-            "columnName": "info",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isStudentPlan",
-            "columnName": "student_plan",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "changes",
-            "columnName": "changes",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "canceled",
-            "columnName": "canceled",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Attendance",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `time_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `number` INTEGER NOT NULL, `subject` TEXT NOT NULL, `name` TEXT NOT NULL, `presence` INTEGER NOT NULL, `absence` INTEGER NOT NULL, `exemption` INTEGER NOT NULL, `lateness` INTEGER NOT NULL, `excused` INTEGER NOT NULL, `deleted` INTEGER NOT NULL, `excusable` INTEGER NOT NULL, `excuse_status` TEXT)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "timeId",
-            "columnName": "time_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "number",
-            "columnName": "number",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "presence",
-            "columnName": "presence",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "absence",
-            "columnName": "absence",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "exemption",
-            "columnName": "exemption",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "lateness",
-            "columnName": "lateness",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "excused",
-            "columnName": "excused",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "deleted",
-            "columnName": "deleted",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "excusable",
-            "columnName": "excusable",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "excuseStatus",
-            "columnName": "excuse_status",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "AttendanceSummary",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `subject_id` INTEGER NOT NULL, `month` INTEGER NOT NULL, `presence` INTEGER NOT NULL, `absence` INTEGER NOT NULL, `absence_excused` INTEGER NOT NULL, `absence_for_school_reasons` INTEGER NOT NULL, `lateness` INTEGER NOT NULL, `lateness_excused` INTEGER NOT NULL, `exemption` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subjectId",
-            "columnName": "subject_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "month",
-            "columnName": "month",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "presence",
-            "columnName": "presence",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "absence",
-            "columnName": "absence",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "absenceExcused",
-            "columnName": "absence_excused",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "absenceForSchoolReasons",
-            "columnName": "absence_for_school_reasons",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "lateness",
-            "columnName": "lateness",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "latenessExcused",
-            "columnName": "lateness_excused",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "exemption",
-            "columnName": "exemption",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Grades",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `entry` TEXT NOT NULL, `value` REAL NOT NULL, `modifier` REAL NOT NULL, `comment` TEXT NOT NULL, `color` TEXT NOT NULL, `grade_symbol` TEXT NOT NULL, `description` TEXT NOT NULL, `weight` TEXT NOT NULL, `weightValue` REAL NOT NULL, `date` INTEGER NOT NULL, `teacher` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isRead",
-            "columnName": "is_read",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isNotified",
-            "columnName": "is_notified",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterId",
-            "columnName": "semester_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "entry",
-            "columnName": "entry",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "value",
-            "columnName": "value",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "modifier",
-            "columnName": "modifier",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "comment",
-            "columnName": "comment",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "color",
-            "columnName": "color",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "gradeSymbol",
-            "columnName": "grade_symbol",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "description",
-            "columnName": "description",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "weight",
-            "columnName": "weight",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "weightValue",
-            "columnName": "weightValue",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacher",
-            "columnName": "teacher",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "GradesSummary",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `position` INTEGER NOT NULL, `subject` TEXT NOT NULL, `predicted_grade` TEXT NOT NULL, `final_grade` TEXT NOT NULL, `proposed_points` TEXT NOT NULL, `final_points` TEXT NOT NULL, `points_sum` TEXT NOT NULL, `average` REAL NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterId",
-            "columnName": "semester_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "position",
-            "columnName": "position",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "predictedGrade",
-            "columnName": "predicted_grade",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "finalGrade",
-            "columnName": "final_grade",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "proposedPoints",
-            "columnName": "proposed_points",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "finalPoints",
-            "columnName": "final_points",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "pointsSum",
-            "columnName": "points_sum",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "average",
-            "columnName": "average",
-            "affinity": "REAL",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "GradesStatistics",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `grade` INTEGER NOT NULL, `amount` INTEGER NOT NULL, `is_semester` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterId",
-            "columnName": "semester_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "grade",
-            "columnName": "grade",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "amount",
-            "columnName": "amount",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semester",
-            "columnName": "is_semester",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "GradesPointsStatistics",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `others` REAL NOT NULL, `student` REAL NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterId",
-            "columnName": "semester_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "others",
-            "columnName": "others",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "student",
-            "columnName": "student",
-            "affinity": "REAL",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Messages",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `message_id` INTEGER NOT NULL, `sender_name` TEXT NOT NULL, `sender_id` INTEGER NOT NULL, `recipient_name` TEXT NOT NULL, `subject` TEXT NOT NULL, `content` TEXT NOT NULL, `date` INTEGER NOT NULL, `folder_id` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `unread_by` INTEGER NOT NULL, `read_by` INTEGER NOT NULL, `removed` INTEGER NOT NULL, `has_attachments` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isNotified",
-            "columnName": "is_notified",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "realId",
-            "columnName": "real_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "messageId",
-            "columnName": "message_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "sender",
-            "columnName": "sender_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "senderId",
-            "columnName": "sender_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "recipient",
-            "columnName": "recipient_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "content",
-            "columnName": "content",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "folderId",
-            "columnName": "folder_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "unread",
-            "columnName": "unread",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "unreadBy",
-            "columnName": "unread_by",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "readBy",
-            "columnName": "read_by",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "removed",
-            "columnName": "removed",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "hasAttachments",
-            "columnName": "has_attachments",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "MessageAttachments",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`real_id` INTEGER NOT NULL, `message_id` INTEGER NOT NULL, `one_drive_id` TEXT NOT NULL, `url` TEXT NOT NULL, `filename` TEXT NOT NULL, PRIMARY KEY(`real_id`))",
-        "fields": [
-          {
-            "fieldPath": "realId",
-            "columnName": "real_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "messageId",
-            "columnName": "message_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "oneDriveId",
-            "columnName": "one_drive_id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "filename",
-            "columnName": "filename",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "real_id"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Notes",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `category` TEXT NOT NULL, `category_type` INTEGER NOT NULL, `is_points_show` INTEGER NOT NULL, `points` INTEGER NOT NULL, `content` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isRead",
-            "columnName": "is_read",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isNotified",
-            "columnName": "is_notified",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacher",
-            "columnName": "teacher",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacherSymbol",
-            "columnName": "teacher_symbol",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "category",
-            "columnName": "category",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "categoryType",
-            "columnName": "category_type",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isPointsShow",
-            "columnName": "is_points_show",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "points",
-            "columnName": "points",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "content",
-            "columnName": "content",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Homework",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_done` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `entry_date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `content` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `attachments` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isDone",
-            "columnName": "is_done",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterId",
-            "columnName": "semester_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "entryDate",
-            "columnName": "entry_date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "content",
-            "columnName": "content",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacher",
-            "columnName": "teacher",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacherSymbol",
-            "columnName": "teacher_symbol",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "attachments",
-            "columnName": "attachments",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Subjects",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `name` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "realId",
-            "columnName": "real_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "LuckyNumbers",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `lucky_number` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isNotified",
-            "columnName": "is_notified",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "luckyNumber",
-            "columnName": "lucky_number",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "CompletedLesson",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `number` INTEGER NOT NULL, `subject` TEXT NOT NULL, `topic` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `substitution` TEXT NOT NULL, `absence` TEXT NOT NULL, `resources` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "number",
-            "columnName": "number",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "topic",
-            "columnName": "topic",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacher",
-            "columnName": "teacher",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacherSymbol",
-            "columnName": "teacher_symbol",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "substitution",
-            "columnName": "substitution",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "absence",
-            "columnName": "absence",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "resources",
-            "columnName": "resources",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "ReportingUnits",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `short` TEXT NOT NULL, `sender_id` INTEGER NOT NULL, `sender_name` TEXT NOT NULL, `roles` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "realId",
-            "columnName": "real_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "shortName",
-            "columnName": "short",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "senderId",
-            "columnName": "sender_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "senderName",
-            "columnName": "sender_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "roles",
-            "columnName": "roles",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Recipients",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `real_id` TEXT NOT NULL, `name` TEXT NOT NULL, `real_name` TEXT NOT NULL, `login_id` INTEGER NOT NULL, `unit_id` INTEGER NOT NULL, `role` INTEGER NOT NULL, `hash` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "realId",
-            "columnName": "real_id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "realName",
-            "columnName": "real_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "loginId",
-            "columnName": "login_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "unitId",
-            "columnName": "unit_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "role",
-            "columnName": "role",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "hash",
-            "columnName": "hash",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "MobileDevices",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `device_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `date` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "deviceId",
-            "columnName": "device_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Teachers",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `name` TEXT NOT NULL, `short_name` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "classId",
-            "columnName": "class_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "shortName",
-            "columnName": "short_name",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "School",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `address` TEXT NOT NULL, `contact` TEXT NOT NULL, `headmaster` TEXT NOT NULL, `pedagogue` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "classId",
-            "columnName": "class_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "address",
-            "columnName": "address",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "contact",
-            "columnName": "contact",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "headmaster",
-            "columnName": "headmaster",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "pedagogue",
-            "columnName": "pedagogue",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      }
-    ],
-    "views": [],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'd101f5a26a024f62e6fee161e421b882')"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/Migration13Test.kt b/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/Migration13Test.kt
index 6f9406f6d..8311f94b5 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/Migration13Test.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/Migration13Test.kt
@@ -8,6 +8,7 @@ import io.github.wulkanowy.data.db.entities.Semester
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
 import org.junit.Test
+import org.threeten.bp.LocalDate.now
 import org.threeten.bp.LocalDate.of
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue
@@ -103,45 +104,45 @@ class Migration13Test : AbstractMigrationTest() {
         val db = helper.runMigrationsAndValidate(dbName, 13, true, Migration13())
 
         val semesters1 = getSemesters(db, "SELECT * FROM Semesters WHERE student_id = 1 AND class_id = 5")
-        assertTrue { semesters1.single { it.second }.second }
+        assertTrue { semesters1.single { it.isCurrent }.isCurrent }
         semesters1[0].run {
-            assertFalse(second)
-            assertEquals(1, first.semesterId)
-            assertEquals(1, first.diaryId)
+            assertFalse(isCurrent)
+            assertEquals(1, semesterId)
+            assertEquals(1, diaryId)
         }
         semesters1[2].run {
-            assertFalse(second)
-            assertEquals(3, first.semesterId)
-            assertEquals(2, first.diaryId)
+            assertFalse(isCurrent)
+            assertEquals(3, semesterId)
+            assertEquals(2, diaryId)
         }
         semesters1[3].run {
-            assertTrue(second)
-            assertEquals(4, first.semesterId)
-            assertEquals(2, first.diaryId)
+            assertTrue(isCurrent)
+            assertEquals(4, semesterId)
+            assertEquals(2, diaryId)
         }
 
         getSemesters(db, "SELECT * FROM Semesters WHERE student_id = 2 AND class_id = 5").let {
-            assertTrue { it.single { it.second }.second }
-            assertEquals(1970, it[0].first.schoolYear)
-            assertEquals(of(1970, 1, 1), it[0].first.end)
-            assertEquals(of(1970, 1, 1), it[0].first.start)
-            assertFalse(it[0].second)
-            assertFalse(it[1].second)
-            assertFalse(it[2].second)
-            assertTrue(it[3].second)
+            assertTrue { it.single { it.isCurrent }.isCurrent }
+            assertEquals(1970, it[0].schoolYear)
+            assertEquals(of(1970, 1, 1), it[0].end)
+            assertEquals(of(1970, 1, 1), it[0].start)
+            assertFalse(it[0].isCurrent)
+            assertFalse(it[1].isCurrent)
+            assertFalse(it[2].isCurrent)
+            assertTrue(it[3].isCurrent)
         }
 
         getSemesters(db, "SELECT * FROM Semesters WHERE student_id = 2 AND class_id = 5").let {
-            assertTrue { it.single { it.second }.second }
-            assertFalse(it[0].second)
-            assertFalse(it[1].second)
-            assertFalse(it[2].second)
-            assertTrue(it[3].second)
+            assertTrue { it.single { it.isCurrent }.isCurrent }
+            assertFalse(it[0].isCurrent)
+            assertFalse(it[1].isCurrent)
+            assertFalse(it[2].isCurrent)
+            assertTrue(it[3].isCurrent)
         }
     }
 
-    private fun getSemesters(db: SupportSQLiteDatabase, query: String): List<Pair<Semester, Boolean>> {
-        val semesters = mutableListOf<Pair<Semester, Boolean>>()
+    private fun getSemesters(db: SupportSQLiteDatabase, query: String): List<Semester> {
+        val semesters = mutableListOf<Semester>()
 
         val cursor = db.query(query)
         if (cursor.moveToFirst()) {
@@ -152,12 +153,13 @@ class Migration13Test : AbstractMigrationTest() {
                     diaryName = cursor.getString(3),
                     semesterId = cursor.getInt(4),
                     semesterName = cursor.getInt(5),
+                    isCurrent = cursor.getInt(6) == 1,
                     classId = cursor.getInt(7),
                     unitId = cursor.getInt(8),
                     schoolYear = cursor.getInt(9),
                     start = Converters().timestampToDate(cursor.getLong(10))!!,
                     end = Converters().timestampToDate(cursor.getLong(11))!!
-                ) to (cursor.getInt(6) == 1))
+                ))
             } while (cursor.moveToNext())
         }
         return semesters.toList()
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/TestEntityCreator.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/TestEntityCreator.kt
deleted file mode 100644
index bbbfd83dd..000000000
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/TestEntityCreator.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package io.github.wulkanowy.data.repositories
-
-import io.github.wulkanowy.data.db.entities.Student
-import org.threeten.bp.LocalDateTime
-
-fun getStudent(): Student {
-    return Student(
-        email = "test",
-        password = "test123",
-        schoolSymbol = "23",
-        scrapperBaseUrl = "fakelog.cf",
-        loginType = "AUTO",
-        isCurrent = true,
-        studentName = "",
-        schoolShortName = "",
-        schoolName = "",
-        studentId = 0,
-        classId = 1,
-        symbol = "",
-        registrationDate = LocalDateTime.now(),
-        className = "",
-        loginMode = "API",
-        certificateKey = "",
-        privateKey = "",
-        mobileBaseUrl = "",
-        userLoginId = 0,
-        isParent = false
-    )
-}
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/attendance/AttendanceLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/attendance/AttendanceLocalTest.kt
index c7ede6ae5..5fd5b193a 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/attendance/AttendanceLocalTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/attendance/AttendanceLocalTest.kt
@@ -10,8 +10,8 @@ import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.threeten.bp.LocalDate
 import org.threeten.bp.LocalDate.now
-import org.threeten.bp.LocalDate.of
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -35,19 +35,19 @@ class AttendanceLocalTest {
     @Test
     fun saveAndReadTest() {
         attendanceLocal.saveAttendance(listOf(
-            Attendance(1, 2, 3, of(2018, 9, 10), 0, "", "", false, false, false, false, false, false, false, SentExcuseStatus.ACCEPTED.name),
-            Attendance(1, 2, 3, of(2018, 9, 14), 0, "", "", false, false, false, false, false, false, false, SentExcuseStatus.WAITING.name),
-            Attendance(1, 2, 3, of(2018, 9, 17), 0, "", "", false, false, false, false, false, false, false, SentExcuseStatus.ACCEPTED.name)
+            Attendance(1, 2, 3, LocalDate.of(2018, 9, 10), 0, "", "", false, false, false, false, false, false, false, SentExcuseStatus.ACCEPTED.name),
+            Attendance(1, 2, 3, LocalDate.of(2018, 9, 14), 0, "", "", false, false, false, false, false, false, false, SentExcuseStatus.WAITING.name),
+            Attendance(1, 2, 3, LocalDate.of(2018, 9, 17), 0, "", "", false, false, false, false, false, false, false, SentExcuseStatus.ACCEPTED.name)
         ))
 
         val attendance = attendanceLocal
-            .getAttendance(Semester(1, 2, "", 1, 3, 2019, now(), now(), 1, 1),
-                of(2018, 9, 10),
-                of(2018, 9, 14)
-            )
-            .blockingGet()
+            .getAttendance(Semester(1, 2, "", 1, 3, 2019, true, now(), now(), 1, 1),
+                        LocalDate.of(2018, 9, 10),
+                        LocalDate.of(2018, 9, 14)
+                )
+                .blockingGet()
         assertEquals(2, attendance.size)
-        assertEquals(attendance[0].date, of(2018, 9, 10))
-        assertEquals(attendance[1].date, of(2018, 9, 14))
+        assertEquals(attendance[0].date, LocalDate.of(2018, 9, 10))
+        assertEquals(attendance[1].date, LocalDate.of(2018, 9, 14))
     }
 }
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsLocalTest.kt
index 50badc468..356073e8e 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsLocalTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsLocalTest.kt
@@ -11,8 +11,6 @@ import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.threeten.bp.LocalDate
-import org.threeten.bp.LocalDate.now
-import org.threeten.bp.LocalDate.of
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -37,20 +35,20 @@ class CompletedLessonsLocalTest {
     @Test
     fun saveAndReadTest() {
         completedLessonsLocal.saveCompletedLessons(listOf(
-            getCompletedLesson(of(2018, 9, 10), 1),
-            getCompletedLesson(of(2018, 9, 14), 2),
-            getCompletedLesson(of(2018, 9, 17), 3)
+            getCompletedLesson(LocalDate.of(2018, 9, 10), 1),
+            getCompletedLesson(LocalDate.of(2018, 9, 14), 2),
+            getCompletedLesson(LocalDate.of(2018, 9, 17), 3)
         ))
 
         val completed = completedLessonsLocal
-            .getCompletedLessons(Semester(1, 2, "", 1, 3, 2019, now(), now(), 1, 1),
-                of(2018, 9, 10),
-                of(2018, 9, 14)
+            .getCompletedLessons(Semester(1, 2, "", 1, 3, 2019, true, LocalDate.now(), LocalDate.now(), 1, 1),
+                LocalDate.of(2018, 9, 10),
+                LocalDate.of(2018, 9, 14)
             )
             .blockingGet()
         assertEquals(2, completed.size)
-        assertEquals(completed[0].date, of(2018, 9, 10))
-        assertEquals(completed[1].date, of(2018, 9, 14))
+        assertEquals(completed[0].date, LocalDate.of(2018, 9, 10))
+        assertEquals(completed[1].date, LocalDate.of(2018, 9, 14))
     }
 
     private fun getCompletedLesson(date: LocalDate, number: Int): CompletedLesson {
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/exam/ExamLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/exam/ExamLocalTest.kt
index 98dfc88eb..fb76306d9 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/exam/ExamLocalTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/exam/ExamLocalTest.kt
@@ -10,8 +10,7 @@ import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.threeten.bp.LocalDate.now
-import org.threeten.bp.LocalDate.of
+import org.threeten.bp.LocalDate
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -35,19 +34,19 @@ class ExamLocalTest {
     @Test
     fun saveAndReadTest() {
         examLocal.saveExams(listOf(
-            Exam(1, 2, of(2018, 9, 10), now(), "", "", "", "", "", ""),
-            Exam(1, 2, of(2018, 9, 14), now(), "", "", "", "", "", ""),
-            Exam(1, 2, of(2018, 9, 17), now(), "", "", "", "", "", "")
+                Exam(1, 2, LocalDate.of(2018, 9, 10), LocalDate.now(), "", "", "", "", "", ""),
+                Exam(1, 2, LocalDate.of(2018, 9, 14), LocalDate.now(), "", "", "", "", "", ""),
+                Exam(1, 2, LocalDate.of(2018, 9, 17), LocalDate.now(), "", "", "", "", "", "")
         ))
 
         val exams = examLocal
-            .getExams(Semester(1, 2, "", 1, 3, 2019, now(), now(), 1, 1),
-                of(2018, 9, 10),
-                of(2018, 9, 14)
-            )
-            .blockingGet()
+            .getExams(Semester(1, 2, "", 1, 3, 2019, true, LocalDate.now(), LocalDate.now(), 1, 1),
+                        LocalDate.of(2018, 9, 10),
+                        LocalDate.of(2018, 9, 14)
+                )
+                .blockingGet()
         assertEquals(2, exams.size)
-        assertEquals(exams[0].date, of(2018, 9, 10))
-        assertEquals(exams[1].date, of(2018, 9, 14))
+        assertEquals(exams[0].date, LocalDate.of(2018, 9, 10))
+        assertEquals(exams[1].date, LocalDate.of(2018, 9, 14))
     }
 }
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeLocalTest.kt
index eb1a55480..954d0eea2 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeLocalTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeLocalTest.kt
@@ -24,7 +24,7 @@ class GradeLocalTest {
     fun createDb() {
         testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
             .build()
-        gradeLocal = GradeLocal(testDb.gradeDao, testDb.gradeSummaryDao)
+        gradeLocal = GradeLocal(testDb.gradeDao)
     }
 
     @After
@@ -40,10 +40,10 @@ class GradeLocalTest {
             createGradeLocal(3, 5.0, LocalDate.of(2019, 2, 28), "", 2)
         ))
 
-        val semester = Semester(1, 2, "", 2019, 2, 1, now(), now(), 1, 1)
+        val semester = Semester(1, 2, "", 2019, 2, 1, true, now(), now(), 1, 1)
 
         val grades = gradeLocal
-            .getGradesDetails(semester)
+            .getGrades(semester)
             .blockingGet()
 
         assertEquals(2, grades.size)
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeRepositoryTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeRepositoryTest.kt
index cdd514772..711e29118 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeRepositoryTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeRepositoryTest.kt
@@ -6,15 +6,18 @@ import androidx.test.core.app.ApplicationProvider.getApplicationContext
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.SdkSuppress
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
+import io.github.wulkanowy.data.SdkHelper
 import io.github.wulkanowy.data.db.AppDatabase
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.TestInternetObservingStrategy
 import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.sdk.pojo.Grade
 import io.mockk.MockKAnnotations
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
+import io.mockk.impl.annotations.SpyK
+import io.mockk.just
+import io.mockk.runs
 import io.reactivex.Single
 import org.junit.After
 import org.junit.Before
@@ -53,7 +56,7 @@ class GradeRepositoryTest {
     fun initApi() {
         MockKAnnotations.init(this)
         testDb = Room.inMemoryDatabaseBuilder(getApplicationContext(), AppDatabase::class.java).build()
-        gradeLocal = GradeLocal(testDb.gradeDao, testDb.gradeSummaryDao)
+        gradeLocal = GradeLocal(testDb.gradeDao)
         gradeRemote = GradeRemote(mockSdk)
 
         every { studentMock.registrationDate } returns LocalDateTime.of(2019, 2, 27, 12, 0)
@@ -76,10 +79,10 @@ class GradeRepositoryTest {
             createGradeApi(5, 4.0, of(2019, 2, 26), "przed zalogowanie w aplikacji"),
             createGradeApi(5, 4.0, of(2019, 2, 27), "Ocena z dnia logowania"),
             createGradeApi(5, 4.0, of(2019, 2, 28), "Ocena jeszcze nowsza")
-        ) to emptyList())
+        ))
 
         val grades = GradeRepository(settings, gradeLocal, gradeRemote)
-            .getGrades(studentMock, semesterMock, true).blockingGet().first.sortedByDescending { it.date }
+            .getGrades(studentMock, semesterMock, true).blockingGet().sortedByDescending { it.date }
 
         assertFalse { grades[0].isRead }
         assertFalse { grades[1].isRead }
@@ -100,10 +103,10 @@ class GradeRepositoryTest {
             createGradeApi(4, 3.0, of(2019, 2, 26), "starszą niż ostatnia lokalnie"),
             createGradeApi(3, 4.0, of(2019, 2, 27), "Ta jest z tego samego dnia co ostatnia lokalnie"),
             createGradeApi(2, 5.0, of(2019, 2, 28), "Ta jest już w ogóle nowa")
-        ) to emptyList())
+        ))
 
         val grades = GradeRepository(settings, gradeLocal, gradeRemote)
-            .getGrades(studentMock, semesterMock, true).blockingGet().first.sortedByDescending { it.date }
+            .getGrades(studentMock, semesterMock, true).blockingGet().sortedByDescending { it.date }
 
         assertFalse { grades[0].isRead }
         assertFalse { grades[1].isRead }
@@ -122,12 +125,12 @@ class GradeRepositoryTest {
         every { mockSdk.getGrades(1) } returns Single.just(listOf(
             createGradeApi(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
             createGradeApi(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
-        ) to emptyList())
+        ))
 
         val grades = GradeRepository(settings, gradeLocal, gradeRemote)
             .getGrades(studentMock, semesterMock, true).blockingGet()
 
-        assertEquals(2, grades.first.size)
+        assertEquals(2, grades.size)
     }
 
     @Test
@@ -141,12 +144,12 @@ class GradeRepositoryTest {
             createGradeApi(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
             createGradeApi(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
             createGradeApi(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
-        ) to emptyList())
+        ))
 
         val grades = GradeRepository(settings, gradeLocal, gradeRemote)
             .getGrades(studentMock, semesterMock, true).blockingGet()
 
-        assertEquals(3, grades.first.size)
+        assertEquals(3, grades.size)
     }
 
     @Test
@@ -157,12 +160,12 @@ class GradeRepositoryTest {
             createGradeApi(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
             createGradeApi(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
             createGradeApi(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
-        ) to emptyList())
+        ))
 
         val grades = GradeRepository(settings, gradeLocal, gradeRemote)
             .getGrades(studentMock, semesterMock, true).blockingGet()
 
-        assertEquals(3, grades.first.size)
+        assertEquals(3, grades.size)
     }
 
     @Test
@@ -172,11 +175,11 @@ class GradeRepositoryTest {
             createGradeLocal(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
         ))
 
-        every { mockSdk.getGrades(1) } returns Single.just(emptyList<Grade>() to emptyList())
+        every { mockSdk.getGrades(1) } returns Single.just(listOf())
 
         val grades = GradeRepository(settings, gradeLocal, gradeRemote)
             .getGrades(studentMock, semesterMock, true).blockingGet()
 
-        assertEquals(0, grades.first.size)
+        assertEquals(0, grades.size)
     }
 }
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsLocalTest.kt
index bd3635fea..f8aa58158 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsLocalTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsLocalTest.kt
@@ -11,7 +11,7 @@ import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.threeten.bp.LocalDate.now
+import org.threeten.bp.LocalDate
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -40,7 +40,10 @@ class GradeStatisticsLocalTest {
             getGradeStatistics("Fizyka", 1, 2)
         ))
 
-        val stats = gradeStatisticsLocal.getGradesStatistics(getSemester(), false, "Matematyka").blockingGet()
+        val stats = gradeStatisticsLocal.getGradesStatistics(
+            Semester(2, 2, "", 2019, 1, 2, true, LocalDate.now(), LocalDate.now(), 1, 1), false,
+            "Matematyka"
+        ).blockingGet()
         assertEquals(1, stats.size)
         assertEquals(stats[0].subject, "Matematyka")
     }
@@ -53,11 +56,12 @@ class GradeStatisticsLocalTest {
             getGradeStatistics("Fizyka", 1, 2)
         ))
 
-        val stats = gradeStatisticsLocal.getGradesStatistics(getSemester(), false, "Wszystkie").blockingGet()
-        assertEquals(3, stats.size)
+        val stats = gradeStatisticsLocal.getGradesStatistics(
+            Semester(2, 2, "", 2019, 1, 2, true, LocalDate.now(), LocalDate.now(), 1, 1), false,
+            "Wszystkie"
+        ).blockingGet()
+        assertEquals(1, stats.size)
         assertEquals(stats[0].subject, "Wszystkie")
-        assertEquals(stats[1].subject, "Matematyka")
-        assertEquals(stats[2].subject, "Chemia")
     }
 
     @Test
@@ -68,8 +72,11 @@ class GradeStatisticsLocalTest {
             getGradePointsStatistics("Fizyka", 1, 2)
         ))
 
-        val stats = gradeStatisticsLocal.getGradesPointsStatistics(getSemester(), "Matematyka").blockingGet()
-        with(stats[0]) {
+        val stats = gradeStatisticsLocal.getGradesPointsStatistics(
+            Semester(2, 2, "", 2019, 1, 2, true, LocalDate.now(), LocalDate.now(), 1, 1),
+            "Matematyka"
+        ).blockingGet()
+        with(stats) {
             assertEquals(subject, "Matematyka")
             assertEquals(others, 5.0)
             assertEquals(student, 5.0)
@@ -80,7 +87,10 @@ class GradeStatisticsLocalTest {
     fun saveAndRead_subjectEmpty() {
         gradeStatisticsLocal.saveGradesPointsStatistics(listOf())
 
-        val stats = gradeStatisticsLocal.getGradesPointsStatistics(getSemester(), "Matematyka").blockingGet()
+        val stats = gradeStatisticsLocal.getGradesPointsStatistics(
+            Semester(2, 2, "", 2019, 1, 2, true, LocalDate.now(), LocalDate.now(), 1, 1),
+            "Matematyka"
+        ).blockingGet()
         assertEquals(null, stats)
     }
 
@@ -88,14 +98,13 @@ class GradeStatisticsLocalTest {
     fun saveAndRead_allEmpty() {
         gradeStatisticsLocal.saveGradesPointsStatistics(listOf())
 
-        val stats = gradeStatisticsLocal.getGradesPointsStatistics(getSemester(), "Wszystkie").blockingGet()
+        val stats = gradeStatisticsLocal.getGradesPointsStatistics(
+            Semester(2, 2, "", 2019, 1, 2, true, LocalDate.now(), LocalDate.now(), 1, 1),
+            "Wszystkie"
+        ).blockingGet()
         assertEquals(null, stats)
     }
 
-    private fun getSemester(): Semester {
-        return Semester(2, 2, "", 2019, 1, 2, now(), now(), 1, 1)
-    }
-
     private fun getGradeStatistics(subject: String, studentId: Int, semesterId: Int): GradeStatistics {
         return GradeStatistics(studentId, semesterId, subject, 5, 5, false)
     }
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberLocalTest.kt
index 65ef1fcbf..77ddafb9c 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberLocalTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberLocalTest.kt
@@ -6,13 +6,11 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.github.wulkanowy.data.db.AppDatabase
 import io.github.wulkanowy.data.db.entities.LuckyNumber
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.threeten.bp.LocalDate
-import org.threeten.bp.LocalDateTime.now
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -38,7 +36,7 @@ class LuckyNumberLocalTest {
     fun saveAndReadTest() {
         luckyNumberLocal.saveLuckyNumber(LuckyNumber(1, LocalDate.of(2019, 1, 20), 14))
 
-        val luckyNumber = luckyNumberLocal.getLuckyNumber(Student("", "", "", "", "", "", false, "", "", "", 1, 1, "", "", "", "", "", 1, false, now()),
+        val luckyNumber = luckyNumberLocal.getLuckyNumber(Semester(1, 1, "", 1, 3, 2019, true, LocalDate.now(), LocalDate.now(), 1, 1),
             LocalDate.of(2019, 1, 20)
         ).blockingGet()
 
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/recipient/RecipientLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/recipient/RecipientLocalTest.kt
index 22578e41e..a394927bd 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/recipient/RecipientLocalTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/recipient/RecipientLocalTest.kt
@@ -42,7 +42,7 @@ class RecipientLocalTest {
         ))
 
         val recipients = recipientLocal.getRecipients(
-            Student("fakelog.cf", "AUTO", "", "", "", "", false, "", "", "", 1, 0, "", "", "", "", "", 1, true, LocalDateTime.now()),
+            Student("fakelog.cf", "AUTO", "", "", "", "", false, "", "", "", 1, 0, "", "", "", "", 1, true, LocalDateTime.now()),
             2,
             ReportingUnit(1, 4, "", 0, "", emptyList())
         ).blockingGet()
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/student/StudentLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/student/StudentLocalTest.kt
index 530bfb3f7..6ae404b2b 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/student/StudentLocalTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/student/StudentLocalTest.kt
@@ -5,11 +5,13 @@ import androidx.room.Room
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.github.wulkanowy.data.db.AppDatabase
-import io.github.wulkanowy.data.repositories.getStudent
+import io.github.wulkanowy.data.db.SharedPrefProvider
+import io.github.wulkanowy.data.db.entities.Student
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.threeten.bp.LocalDateTime.now
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -19,13 +21,14 @@ class StudentLocalTest {
 
     private lateinit var testDb: AppDatabase
 
-    private val student = getStudent()
+    private lateinit var sharedProvider: SharedPrefProvider
 
     @Before
     fun createDb() {
         val context = ApplicationProvider.getApplicationContext<Context>()
         testDb = Room.inMemoryDatabaseBuilder(context, AppDatabase::class.java)
             .build()
+        sharedProvider = SharedPrefProvider(context.getSharedPreferences("TEST", Context.MODE_PRIVATE))
         studentLocal = StudentLocal(testDb.studentDao, context)
     }
 
@@ -36,7 +39,8 @@ class StudentLocalTest {
 
     @Test
     fun saveAndReadTest() {
-        studentLocal.saveStudents(listOf(student)).blockingGet()
+        studentLocal.saveStudents(listOf(Student(email = "test", password = "test123", schoolSymbol = "23", scrapperBaseUrl = "fakelog.cf", loginType = "AUTO", isCurrent = true, studentName = "", schoolName = "", studentId = 0, classId = 1, symbol = "", registrationDate = now(), className = "", loginMode = "API", certificateKey = "", privateKey = "", mobileBaseUrl = "", userLoginId = 0, isParent = false)))
+            .blockingGet()
 
         val student = studentLocal.getCurrentStudent(true).blockingGet()
         assertEquals("23", student.schoolSymbol)
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TestTimetableEntityCreator.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TestTimetableEntityCreator.kt
index aa35fe790..77c061821 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TestTimetableEntityCreator.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TestTimetableEntityCreator.kt
@@ -21,7 +21,7 @@ fun createTimetableLocal(start: LocalDateTime, number: Int, room: String = "", s
         teacher = teacher,
         teacherOld = "",
         info = "",
-        isStudentPlan = true,
+        studentPlan = true,
         changes = changes,
         canceled = false
     )
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableLocalTest.kt
index a66e5843c..6406d7435 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableLocalTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableLocalTest.kt
@@ -41,7 +41,7 @@ class TimetableLocalTest {
         ))
 
         val exams = timetableDb.getTimetable(
-            Semester(1, 2, "", 1, 1, 2019, LocalDate.now(), LocalDate.now(), 1, 1),
+            Semester(1, 2, "", 1, 1, 2019, true, LocalDate.now(), LocalDate.now(), 1, 1),
             LocalDate.of(2018, 9, 10),
             LocalDate.of(2018, 9, 14)
         ).blockingGet()
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepositoryTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepositoryTest.kt
index 75f2f0b83..565425d43 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepositoryTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepositoryTest.kt
@@ -8,15 +8,11 @@ import androidx.test.filters.SdkSuppress
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.AppDatabase
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.TestInternetObservingStrategy
-import io.github.wulkanowy.data.repositories.getStudent
-import io.github.wulkanowy.services.alarm.TimetableNotificationSchedulerHelper
 import io.github.wulkanowy.sdk.Sdk
 import io.mockk.MockKAnnotations
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
-import io.mockk.mockk
 import io.reactivex.Single
 import org.junit.After
 import org.junit.Before
@@ -37,17 +33,9 @@ class TimetableRepositoryTest {
         .strategy(TestInternetObservingStrategy())
         .build()
 
-    @MockK
-    private lateinit var studentMock: Student
-
-    private val student = getStudent()
-
     @MockK
     private lateinit var semesterMock: Semester
 
-    @MockK
-    private lateinit var timetableNotificationSchedulerHelper: TimetableNotificationSchedulerHelper
-
     private lateinit var timetableRemote: TimetableRemote
 
     private lateinit var timetableLocal: TimetableLocal
@@ -61,17 +49,10 @@ class TimetableRepositoryTest {
         timetableLocal = TimetableLocal(testDb.timetableDao)
         timetableRemote = TimetableRemote(mockSdk)
 
-        every { timetableNotificationSchedulerHelper.scheduleNotifications(any(), any()) } returns mockk()
-        every { timetableNotificationSchedulerHelper.cancelScheduled(any(), any()) } returns mockk()
-
-        every { studentMock.studentId } returns 1
-        every { studentMock.studentName } returns "Jan Kowalski"
-
         every { semesterMock.studentId } returns 1
         every { semesterMock.diaryId } returns 2
         every { semesterMock.schoolYear } returns 2019
         every { semesterMock.semesterId } returns 1
-
         every { mockSdk.switchDiary(any(), any()) } returns mockSdk
     }
 
@@ -96,8 +77,8 @@ class TimetableRepositoryTest {
             createTimetableRemote(of(2019, 3, 5, 10, 30), 4, "", "W-F")
         ))
 
-        val lessons = TimetableRepository(settings, timetableLocal, timetableRemote, timetableNotificationSchedulerHelper)
-            .getTimetable(student, semesterMock, LocalDate.of(2019, 3, 5), LocalDate.of(2019, 3, 5), true)
+        val lessons = TimetableRepository(settings, timetableLocal, timetableRemote)
+            .getTimetable(semesterMock, LocalDate.of(2019, 3, 5), LocalDate.of(2019, 3, 5), true)
             .blockingGet()
 
         assertEquals(4, lessons.size)
@@ -142,8 +123,8 @@ class TimetableRepositoryTest {
             createTimetableRemote(of(2019, 12, 25, 10, 40), 4, "126", "Matematyka", "Paweł Czwartkowski", true)
         ))
 
-        val lessons = TimetableRepository(settings, timetableLocal, timetableRemote, timetableNotificationSchedulerHelper)
-            .getTimetable(student, semesterMock, LocalDate.of(2019, 12, 23), LocalDate.of(2019, 12, 25), true)
+        val lessons = TimetableRepository(settings, timetableLocal, timetableRemote)
+            .getTimetable(semesterMock, LocalDate.of(2019, 12, 23), LocalDate.of(2019, 12, 25), true)
             .blockingGet()
 
         assertEquals(12, lessons.size)
diff --git a/app/src/debug/res/values/preferences_defaults.xml b/app/src/debug/res/values/preferences_defaults.xml
deleted file mode 100644
index f5a12464f..000000000
--- a/app/src/debug/res/values/preferences_defaults.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
-
-    <bool name="pref_default_notification_debug">true</bool>
-</resources>
diff --git a/app/src/debug/res/values/strings.xml b/app/src/debug/res/values/strings.xml
new file mode 100644
index 000000000..c90641ddb
--- /dev/null
+++ b/app/src/debug/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">Wulkanowy DEV</string>
+</resources>
diff --git a/app/src/fdroid/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt b/app/src/fdroid/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt
index 6351997d0..be4c0ebeb 100644
--- a/app/src/fdroid/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt
+++ b/app/src/fdroid/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt
@@ -5,10 +5,13 @@ package io.github.wulkanowy.utils
 import android.content.Context
 import timber.log.Timber
 
-open class TimberTreeNoOp : Timber.Tree() {
-    override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {}
+fun initCrashlytics(context: Context, appInfo: AppInfo) {
+    // do nothing
 }
 
-class CrashlyticsTree : TimberTreeNoOp()
+class CrashlyticsTree : Timber.Tree() {
 
-class CrashlyticsExceptionTree : TimberTreeNoOp()
+    override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {
+        // do nothing
+    }
+}
diff --git a/app/src/fdroid/java/io/github/wulkanowy/utils/FirebaseAnalyticsHelper.kt b/app/src/fdroid/java/io/github/wulkanowy/utils/FirebaseAnalyticsHelper.kt
index f23645bc3..0b1274f15 100644
--- a/app/src/fdroid/java/io/github/wulkanowy/utils/FirebaseAnalyticsHelper.kt
+++ b/app/src/fdroid/java/io/github/wulkanowy/utils/FirebaseAnalyticsHelper.kt
@@ -1,18 +1,13 @@
 package io.github.wulkanowy.utils
 
-import android.app.Activity
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-@Suppress("UNUSED_PARAMETER")
 class FirebaseAnalyticsHelper @Inject constructor() {
 
+    @Suppress("UNUSED_PARAMETER")
     fun logEvent(name: String, vararg params: Pair<String, Any?>) {
         // do nothing
     }
-
-    fun setCurrentScreen(activity: Activity, name: String?) {
-        // do nothing
-    }
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 802cf1ad2..c644c8633 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -18,13 +18,11 @@
         android:supportsRtl="false"
         android:theme="@style/WulkanowyTheme"
         android:usesCleartextTraffic="true"
-        tools:ignore="GoogleAppIndexingWarning,UnusedAttribute"
-        tools:replace="android:supportsRtl,android:allowBackup">
+        tools:ignore="GoogleAppIndexingWarning,UnusedAttribute">
         <activity
             android:name=".ui.modules.splash.SplashActivity"
             android:screenOrientation="portrait"
-            android:theme="@style/WulkanowyTheme.SplashScreen"
-            tools:ignore="LockedOrientationActivity">
+            android:theme="@style/WulkanowyTheme.SplashScreen">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -40,14 +38,13 @@
             android:name=".ui.modules.main.MainActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/main_title"
-            android:theme="@style/WulkanowyTheme.NoActionBar"
-            android:windowSoftInputMode="adjustPan" />
+            android:theme="@style/WulkanowyTheme.NoActionBar" />
         <activity
             android:name=".ui.modules.message.send.SendMessageActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/send_message_title"
-            android:theme="@style/WulkanowyTheme.NoActionBar"
-            android:windowSoftInputMode="adjustResize" />
+            android:windowSoftInputMode="adjustResize"
+            android:theme="@style/WulkanowyTheme.NoActionBar" />
         <activity
             android:name=".ui.modules.timetablewidget.TimetableWidgetConfigureActivity"
             android:excludeFromRecents="true"
@@ -93,58 +90,17 @@
                 android:resource="@xml/provider_widget_lucky_number" />
         </receiver>
 
-        <receiver android:name=".services.alarm.TimetableNotificationReceiver" />
-
         <provider
             android:name="androidx.work.impl.WorkManagerInitializer"
             android:authorities="${applicationId}.workmanager-init"
             android:exported="false"
             tools:node="remove" />
 
-        <provider
-            android:name="androidx.core.content.FileProvider"
-            android:authorities="${applicationId}.fileprovider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/provider_paths" />
-        </provider>
-
-        <!-- workaround for https://github.com/firebase/firebase-android-sdk/issues/473 enabled:false -->
-        <!-- https://firebase.googleblog.com/2017/03/take-control-of-your-firebase-init-on.html -->
-        <provider
-            android:name="com.google.firebase.provider.FirebaseInitProvider"
-            android:authorities="${applicationId}.firebaseinitprovider"
-            android:enabled="${firebase_enabled}"
-            android:exported="false" />
-
         <meta-data
-            android:name="firebase_analytics_collection_enabled"
-            android:value="${firebase_enabled}" />
-
-        <meta-data
-            android:name="google_analytics_adid_collection_enabled"
-            android:value="${firebase_enabled}" />
-
+            android:name="io.fabric.ApiKey"
+            android:value="${fabric_api_key}" />
         <meta-data
             android:name="firebase_crashlytics_collection_enabled"
-            android:value="${firebase_enabled}" />
-
-        <meta-data
-            android:name="firebase_messaging_auto_init_enabled"
-            android:value="${firebase_enabled}" />
-
-        <meta-data
-            android:name="firebase_inapp_messaging_auto_data_collection_enabled"
-            android:value="${firebase_enabled}" />
-
-        <meta-data
-            android:name="com.google.firebase.messaging.default_notification_icon"
-            android:resource="@drawable/ic_stat_push" />
-
-        <meta-data
-            android:name="com.google.firebase.messaging.default_notification_channel_id"
-            android:value="push_channel" />
+            android:value="${crashlytics_enabled}" />
     </application>
 </manifest>
diff --git a/app/src/main/assets/contributors.json b/app/src/main/assets/creators.json
similarity index 82%
rename from app/src/main/assets/contributors.json
rename to app/src/main/assets/creators.json
index 40aff4c48..b99f51e21 100644
--- a/app/src/main/assets/contributors.json
+++ b/app/src/main/assets/creators.json
@@ -20,7 +20,7 @@
     "githubUsername": "doteq"
   },
   {
-    "displayName": "Paweł Krzyś",
+    "displayName": "Pavuloff",
     "githubUsername": "pavuloff"
   },
   {
@@ -30,9 +30,5 @@
   {
     "displayName": "Dinolek",
     "githubUsername": "Dinolek"
-  },
-  {
-    "displayName": "Mateusz Idziejczak",
-    "githubUsername": "PanTajemnic"
   }
 ]
diff --git a/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt b/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt
index 0e094f699..90b3581c8 100644
--- a/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt
+++ b/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt
@@ -1,7 +1,6 @@
 package io.github.wulkanowy
 
 import android.content.Context
-import android.util.Log.DEBUG
 import android.util.Log.INFO
 import android.util.Log.VERBOSE
 import androidx.multidex.MultiDex
@@ -10,15 +9,16 @@ import com.jakewharton.threetenabp.AndroidThreeTen
 import com.yariksoffice.lingver.Lingver
 import dagger.android.AndroidInjector
 import dagger.android.support.DaggerApplication
-import fr.bipi.tressence.file.FileLoggerTree
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.utils.Log
 import io.github.wulkanowy.di.DaggerAppComponent
 import io.github.wulkanowy.services.sync.SyncWorkerFactory
 import io.github.wulkanowy.ui.base.ThemeManager
 import io.github.wulkanowy.utils.ActivityLifecycleLogger
 import io.github.wulkanowy.utils.AppInfo
-import io.github.wulkanowy.utils.CrashlyticsExceptionTree
 import io.github.wulkanowy.utils.CrashlyticsTree
 import io.github.wulkanowy.utils.DebugLogTree
+import io.github.wulkanowy.utils.initCrashlytics
 import io.reactivex.exceptions.UndeliverableException
 import io.reactivex.plugins.RxJavaPlugins
 import timber.log.Timber
@@ -49,20 +49,14 @@ class WulkanowyApp : DaggerApplication(), Configuration.Provider {
         themeManager.applyDefaultTheme()
 
         initLogging()
+        initCrashlytics(this, appInfo)
     }
 
     private fun initLogging() {
         if (appInfo.isDebug) {
             Timber.plant(DebugLogTree())
-            Timber.plant(FileLoggerTree.Builder()
-                .withFileName("wulkanowy.%g.log")
-                .withDirName(applicationContext.filesDir.absolutePath)
-                .withFileLimit(10)
-                .withMinPriority(DEBUG)
-                .build()
-            )
+            FlexibleAdapter.enableLogs(Log.Level.DEBUG)
         } else {
-            Timber.plant(CrashlyticsExceptionTree())
             Timber.plant(CrashlyticsTree())
         }
         registerActivityLifecycleCallbacks(ActivityLifecycleLogger())
diff --git a/app/src/main/java/io/github/wulkanowy/data/RepositoryModule.kt b/app/src/main/java/io/github/wulkanowy/data/RepositoryModule.kt
index 9540372fc..48e51e3ce 100644
--- a/app/src/main/java/io/github/wulkanowy/data/RepositoryModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/RepositoryModule.kt
@@ -1,17 +1,15 @@
 package io.github.wulkanowy.data
 
-import android.app.AlarmManager
 import android.content.Context
 import android.content.SharedPreferences
 import android.content.res.AssetManager
 import android.content.res.Resources
-import androidx.core.content.getSystemService
 import androidx.preference.PreferenceManager
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.strategy.WalledGardenInternetObservingStrategy
-import com.chuckerteam.chucker.api.ChuckerCollector
-import com.chuckerteam.chucker.api.ChuckerInterceptor
-import com.chuckerteam.chucker.api.RetentionManager
+import com.readystatesoftware.chuck.api.ChuckCollector
+import com.readystatesoftware.chuck.api.ChuckInterceptor
+import com.readystatesoftware.chuck.api.RetentionManager
 import dagger.Module
 import dagger.Provides
 import io.github.wulkanowy.data.db.AppDatabase
@@ -34,25 +32,23 @@ internal class RepositoryModule {
 
     @Singleton
     @Provides
-    fun provideSdk(chuckerCollector: ChuckerCollector, context: Context): Sdk {
+    fun provideSdk(chuckCollector: ChuckCollector, context: Context): Sdk {
         return Sdk().apply {
             androidVersion = android.os.Build.VERSION.RELEASE
             buildTag = android.os.Build.MODEL
             setSimpleHttpLogger { Timber.d(it) }
 
             // for debug only
-            addInterceptor(ChuckerInterceptor(context, chuckerCollector), true)
+            addInterceptor(ChuckInterceptor(context, chuckCollector).maxContentLength(250000L), true)
         }
     }
 
     @Singleton
     @Provides
-    fun provideChuckerCollector(context: Context, prefRepository: PreferencesRepository): ChuckerCollector {
-        return ChuckerCollector(
-            context = context,
-            showNotification = prefRepository.isDebugNotificationEnable,
-            retentionPeriod = RetentionManager.Period.ONE_HOUR
-        )
+    fun provideChuckCollector(context: Context, prefRepository: PreferencesRepository): ChuckCollector {
+        return ChuckCollector(context)
+            .showNotification(prefRepository.isDebugNotificationEnable)
+            .retentionManager(RetentionManager(context, ChuckCollector.Period.ONE_HOUR))
     }
 
     @Singleton
@@ -99,10 +95,6 @@ internal class RepositoryModule {
     @Provides
     fun provideMessagesDao(database: AppDatabase) = database.messagesDao
 
-    @Singleton
-    @Provides
-    fun provideMessageAttachmentsDao(database: AppDatabase) = database.messageAttachmentDao
-
     @Singleton
     @Provides
     fun provideExamDao(database: AppDatabase) = database.examsDao
diff --git a/app/src/main/java/io/github/wulkanowy/data/SdkHelper.kt b/app/src/main/java/io/github/wulkanowy/data/SdkHelper.kt
new file mode 100644
index 000000000..901712594
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/SdkHelper.kt
@@ -0,0 +1,30 @@
+package io.github.wulkanowy.data
+
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.sdk.Sdk
+import javax.inject.Inject
+
+class SdkHelper @Inject constructor(private val sdk: Sdk) {
+
+    fun init(student: Student) {
+        sdk.apply {
+            email = student.email
+            password = student.password
+            symbol = student.symbol
+            schoolSymbol = student.schoolSymbol
+            studentId = student.studentId
+            classId = student.classId
+
+            if (Sdk.Mode.valueOf(student.loginMode) != Sdk.Mode.API) {
+                scrapperBaseUrl = student.scrapperBaseUrl
+                loginType = Sdk.ScrapperLoginType.valueOf(student.loginType)
+            }
+            loginId = student.userLoginId
+
+            mode = Sdk.Mode.valueOf(student.loginMode)
+            mobileBaseUrl = student.mobileBaseUrl
+            certKey = student.certificateKey
+            privateKey = student.privateKey
+        }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt b/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt
index 762c52f8f..b5293a53c 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt
@@ -17,7 +17,6 @@ import io.github.wulkanowy.data.db.dao.GradeStatisticsDao
 import io.github.wulkanowy.data.db.dao.GradeSummaryDao
 import io.github.wulkanowy.data.db.dao.HomeworkDao
 import io.github.wulkanowy.data.db.dao.LuckyNumberDao
-import io.github.wulkanowy.data.db.dao.MessageAttachmentDao
 import io.github.wulkanowy.data.db.dao.MessagesDao
 import io.github.wulkanowy.data.db.dao.MobileDeviceDao
 import io.github.wulkanowy.data.db.dao.NoteDao
@@ -40,7 +39,6 @@ import io.github.wulkanowy.data.db.entities.GradeSummary
 import io.github.wulkanowy.data.db.entities.Homework
 import io.github.wulkanowy.data.db.entities.LuckyNumber
 import io.github.wulkanowy.data.db.entities.Message
-import io.github.wulkanowy.data.db.entities.MessageAttachment
 import io.github.wulkanowy.data.db.entities.MobileDevice
 import io.github.wulkanowy.data.db.entities.Note
 import io.github.wulkanowy.data.db.entities.Recipient
@@ -64,10 +62,6 @@ import io.github.wulkanowy.data.db.migrations.Migration19
 import io.github.wulkanowy.data.db.migrations.Migration2
 import io.github.wulkanowy.data.db.migrations.Migration20
 import io.github.wulkanowy.data.db.migrations.Migration21
-import io.github.wulkanowy.data.db.migrations.Migration22
-import io.github.wulkanowy.data.db.migrations.Migration23
-import io.github.wulkanowy.data.db.migrations.Migration24
-import io.github.wulkanowy.data.db.migrations.Migration25
 import io.github.wulkanowy.data.db.migrations.Migration3
 import io.github.wulkanowy.data.db.migrations.Migration4
 import io.github.wulkanowy.data.db.migrations.Migration5
@@ -91,7 +85,6 @@ import javax.inject.Singleton
         GradeStatistics::class,
         GradePointsStatistics::class,
         Message::class,
-        MessageAttachment::class,
         Note::class,
         Homework::class,
         Subject::class,
@@ -110,7 +103,7 @@ import javax.inject.Singleton
 abstract class AppDatabase : RoomDatabase() {
 
     companion object {
-        const val VERSION_SCHEMA = 25
+        const val VERSION_SCHEMA = 21
 
         fun getMigrations(sharedPrefProvider: SharedPrefProvider): Array<Migration> {
             return arrayOf(
@@ -133,11 +126,7 @@ abstract class AppDatabase : RoomDatabase() {
                 Migration18(),
                 Migration19(sharedPrefProvider),
                 Migration20(),
-                Migration21(),
-                Migration22(),
-                Migration23(),
-                Migration24(),
-                Migration25()
+                Migration21()
             )
         }
 
@@ -173,8 +162,6 @@ abstract class AppDatabase : RoomDatabase() {
 
     abstract val messagesDao: MessagesDao
 
-    abstract val messageAttachmentDao: MessageAttachmentDao
-
     abstract val noteDao: NoteDao
 
     abstract val homeworkDao: HomeworkDao
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/Converters.kt b/app/src/main/java/io/github/wulkanowy/data/db/Converters.kt
index 294f73d3d..73a04d236 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/Converters.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/Converters.kt
@@ -48,14 +48,4 @@ class Converters {
     fun gsonToIntList(value: String): List<Int> {
         return Gson().fromJson(value, object : TypeToken<List<Int>>() {}.type)
     }
-
-    @TypeConverter
-    fun stringPairListToGson(list: List<Pair<String, String>>): String {
-        return Gson().toJson(list)
-    }
-
-    @TypeConverter
-    fun gsonToStringPairList(value: String): List<Pair<String, String>> {
-        return Gson().fromJson(value, object : TypeToken<List<Pair<String, String>>>() {}.type)
-    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/GradePointsStatisticsDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/GradePointsStatisticsDao.kt
index da1828666..376092865 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/GradePointsStatisticsDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/GradePointsStatisticsDao.kt
@@ -11,7 +11,7 @@ import javax.inject.Singleton
 interface GradePointsStatisticsDao : BaseDao<GradePointsStatistics> {
 
     @Query("SELECT * FROM GradesPointsStatistics WHERE student_id = :studentId AND semester_id = :semesterId AND subject = :subjectName")
-    fun loadSubject(semesterId: Int, studentId: Int, subjectName: String): Maybe<List<GradePointsStatistics>>
+    fun loadSubject(semesterId: Int, studentId: Int, subjectName: String): Maybe<GradePointsStatistics>
 
     @Query("SELECT * FROM GradesPointsStatistics WHERE student_id = :studentId AND semester_id = :semesterId")
     fun loadAll(semesterId: Int, studentId: Int): Maybe<List<GradePointsStatistics>>
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/MessageAttachmentDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/MessageAttachmentDao.kt
deleted file mode 100644
index 3c511a277..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/MessageAttachmentDao.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.github.wulkanowy.data.db.dao
-
-import androidx.room.Dao
-import androidx.room.Insert
-import androidx.room.OnConflictStrategy
-import io.github.wulkanowy.data.db.entities.MessageAttachment
-
-@Dao
-interface MessageAttachmentDao : BaseDao<MessageAttachment> {
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    fun insertAttachments(items: List<MessageAttachment>): List<Long>
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/MessagesDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/MessagesDao.kt
index 7a69e2707..6d14ad016 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/MessagesDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/MessagesDao.kt
@@ -2,22 +2,18 @@ package io.github.wulkanowy.data.db.dao
 
 import androidx.room.Dao
 import androidx.room.Query
-import androidx.room.Transaction
 import io.github.wulkanowy.data.db.entities.Message
-import io.github.wulkanowy.data.db.entities.MessageWithAttachment
 import io.reactivex.Maybe
-import io.reactivex.Single
 
 @Dao
 interface MessagesDao : BaseDao<Message> {
 
-    @Transaction
-    @Query("SELECT * FROM Messages WHERE student_id = :studentId AND message_id = :messageId")
-    fun loadMessageWithAttachment(studentId: Int, messageId: Int): Single<MessageWithAttachment>
-
     @Query("SELECT * FROM Messages WHERE student_id = :studentId AND folder_id = :folder AND removed = 0 ORDER BY date DESC")
     fun loadAll(studentId: Int, folder: Int): Maybe<List<Message>>
 
+    @Query("SELECT * FROM Messages WHERE id = :id")
+    fun load(id: Long): Maybe<Message>
+
     @Query("SELECT * FROM Messages WHERE student_id = :studentId AND removed = 1 ORDER BY date DESC")
     fun loadDeleted(studentId: Int): Maybe<List<Message>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/StudentDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/StudentDao.kt
index 901ddc73f..57bf25fb8 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/StudentDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/StudentDao.kt
@@ -22,9 +22,6 @@ interface StudentDao {
     @Query("SELECT * FROM Students WHERE is_current = 1")
     fun loadCurrent(): Maybe<Student>
 
-    @Query("SELECT * FROM Students WHERE id = :id")
-    fun loadById(id: Int): Maybe<Student>
-
     @Query("SELECT * FROM Students")
     fun loadAll(): Maybe<List<Student>>
 
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Homework.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Homework.kt
index cd7d153e9..a22df0961 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Homework.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Homework.kt
@@ -27,14 +27,10 @@ data class Homework(
     val teacher: String,
 
     @ColumnInfo(name = "teacher_symbol")
-    val teacherSymbol: String,
+    val teacherSymbol: String
 
-    val attachments: List<Pair<String, String>>
 ) : Serializable {
 
     @PrimaryKey(autoGenerate = true)
     var id: Long = 0
-
-    @ColumnInfo(name = "is_done")
-    var isDone: Boolean = false
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Message.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Message.kt
index 058298415..93e254c3b 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Message.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Message.kt
@@ -44,10 +44,7 @@ data class Message(
     @ColumnInfo(name = "read_by")
     val readBy: Int,
 
-    val removed: Boolean,
-
-    @ColumnInfo(name = "has_attachments")
-    val hasAttachments: Boolean
+    val removed: Boolean
 ) : Serializable {
 
     @PrimaryKey(autoGenerate = true)
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/MessageAttachment.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/MessageAttachment.kt
deleted file mode 100644
index d1886e910..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/MessageAttachment.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package io.github.wulkanowy.data.db.entities
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-import java.io.Serializable
-
-@Entity(tableName = "MessageAttachments")
-data class MessageAttachment(
-
-    @PrimaryKey
-    @ColumnInfo(name = "real_id")
-    val realId: Int,
-
-    @ColumnInfo(name = "message_id")
-    val messageId: Int,
-
-    @ColumnInfo(name = "one_drive_id")
-    val oneDriveId: String,
-
-    @ColumnInfo(name = "url")
-    val url: String,
-
-    @ColumnInfo(name = "filename")
-    val filename: String
-) : Serializable
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/MessageWithAttachment.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/MessageWithAttachment.kt
deleted file mode 100644
index 2e7af0f40..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/MessageWithAttachment.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package io.github.wulkanowy.data.db.entities
-
-import androidx.room.Embedded
-import androidx.room.Relation
-
-data class MessageWithAttachment(
-    @Embedded
-    val message: Message,
-
-    @Relation(parentColumn = "message_id", entityColumn = "message_id")
-    val attachments: List<MessageAttachment>
-)
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Note.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Note.kt
index 6f707a66a..5f3a92ab6 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Note.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Note.kt
@@ -16,19 +16,8 @@ data class Note(
 
     val teacher: String,
 
-    @ColumnInfo(name = "teacher_symbol")
-    val teacherSymbol: String,
-
     val category: String,
 
-    @ColumnInfo(name = "category_type")
-    val categoryType: Int,
-
-    @ColumnInfo(name = "is_points_show")
-    val isPointsShow: Boolean,
-
-    val points: Int,
-
     val content: String
 ) : Serializable {
 
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Semester.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Semester.kt
index 0641e0b6d..6c06be111 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Semester.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Semester.kt
@@ -27,6 +27,9 @@ data class Semester(
     @ColumnInfo(name = "semester_name")
     val semesterName: Int,
 
+    @ColumnInfo(name = "is_current")
+    val isCurrent: Boolean,
+
     val start: LocalDate,
 
     val end: LocalDate,
@@ -40,8 +43,4 @@ data class Semester(
 
     @PrimaryKey(autoGenerate = true)
     var id: Long = 0
-
-
-    @ColumnInfo(name = "is_current")
-    var current: Boolean = false
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Student.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Student.kt
index 905979f99..fe0283f87 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Student.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Student.kt
@@ -49,9 +49,6 @@ data class Student(
     @ColumnInfo(name = "school_id")
     val schoolSymbol: String,
 
-    @ColumnInfo(name ="school_short")
-    val schoolShortName: String,
-
     @ColumnInfo(name = "school_name")
     val schoolName: String,
 
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Timetable.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Timetable.kt
index cad3b7c69..313feb62c 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Timetable.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Timetable.kt
@@ -41,7 +41,7 @@ data class Timetable(
     val info: String,
 
     @ColumnInfo(name = "student_plan")
-    val isStudentPlan: Boolean,
+    val studentPlan: Boolean,
 
     val changes: Boolean,
 
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration22.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration22.kt
deleted file mode 100644
index cf50a6c3e..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration22.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-
-class Migration22 : Migration(21, 22) {
-
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("ALTER TABLE Students ADD COLUMN school_short TEXT NOT NULL DEFAULT ''")
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration23.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration23.kt
deleted file mode 100644
index 22de94c3f..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration23.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-
-class Migration23 : Migration(22, 23) {
-
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("ALTER TABLE Notes ADD COLUMN teacher_symbol TEXT NOT NULL DEFAULT ''")
-        database.execSQL("ALTER TABLE Notes ADD COLUMN category_type INTEGER NOT NULL DEFAULT 0")
-        database.execSQL("ALTER TABLE Notes ADD COLUMN is_points_show INTEGER NOT NULL DEFAULT 0")
-        database.execSQL("ALTER TABLE Notes ADD COLUMN points INTEGER NOT NULL DEFAULT 0")
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration24.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration24.kt
deleted file mode 100644
index 604ed4875..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration24.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-
-class Migration24 : Migration(23, 24) {
-
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("ALTER TABLE Messages ADD COLUMN has_attachments INTEGER NOT NULL DEFAULT 0")
-        database.execSQL("""
-            CREATE TABLE IF NOT EXISTS MessageAttachments (
-                real_id INTEGER NOT NULL,
-                message_id INTEGER NOT NULL,
-                one_drive_id TEXT NOT NULL,
-                url TEXT NOT NULL,
-                filename TEXT NOT NULL,
-                PRIMARY KEY(real_id)
-            )
-        """)
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration25.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration25.kt
deleted file mode 100644
index 4749bac73..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration25.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-
-class Migration25 : Migration(24, 25) {
-
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("ALTER TABLE Homework ADD COLUMN is_done INTEGER NOT NULL DEFAULT 0")
-        database.execSQL("ALTER TABLE Homework ADD COLUMN attachments TEXT NOT NULL DEFAULT \"[]\"")
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/pojos/AppCreator.kt b/app/src/main/java/io/github/wulkanowy/data/pojos/AppCreator.kt
new file mode 100644
index 000000000..d67aa2a7f
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/pojos/AppCreator.kt
@@ -0,0 +1,3 @@
+package io.github.wulkanowy.data.pojos
+
+class AppCreator(val displayName: String, val githubUsername: String)
diff --git a/app/src/main/java/io/github/wulkanowy/data/pojos/Contributor.kt b/app/src/main/java/io/github/wulkanowy/data/pojos/Contributor.kt
deleted file mode 100644
index e792bde46..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/pojos/Contributor.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package io.github.wulkanowy.data.pojos
-
-class Contributor(val displayName: String, val githubUsername: String)
diff --git a/app/src/main/java/io/github/wulkanowy/data/pojos/GradeStatisticsItem.kt b/app/src/main/java/io/github/wulkanowy/data/pojos/GradeStatisticsItem.kt
deleted file mode 100644
index 34b62abdb..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/pojos/GradeStatisticsItem.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package io.github.wulkanowy.data.pojos
-
-import io.github.wulkanowy.data.db.entities.GradePointsStatistics
-import io.github.wulkanowy.data.db.entities.GradeStatistics
-import io.github.wulkanowy.ui.modules.grade.statistics.ViewType
-
-data class GradeStatisticsItem(
-
-    val type: ViewType,
-
-    val partial: List<GradeStatistics>,
-
-    val points: GradePointsStatistics?
-)
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/appcreator/AppCreatorRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/appcreator/AppCreatorRepository.kt
index 6a0b2d32e..095b37166 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/appcreator/AppCreatorRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/appcreator/AppCreatorRepository.kt
@@ -2,18 +2,18 @@ package io.github.wulkanowy.data.repositories.appcreator
 
 import android.content.res.AssetManager
 import com.google.gson.Gson
-import io.github.wulkanowy.data.pojos.Contributor
+import io.github.wulkanowy.data.pojos.AppCreator
 import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class AppCreatorRepository @Inject constructor(private val assets: AssetManager) {
-    fun getAppCreators(): Single<List<Contributor>> {
-        return Single.fromCallable<List<Contributor>> {
+    fun getAppCreators(): Single<List<AppCreator>> {
+        return Single.fromCallable<List<AppCreator>> {
             Gson().fromJson(
-                assets.open("contributors.json").bufferedReader().use { it.readText() },
-                Array<Contributor>::class.java
+                assets.open("creators.json").bufferedReader().use { it.readText() },
+                Array<AppCreator>::class.java
             ).toList()
         }
     }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRemote.kt
index f64d920db..1828c2bdf 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRemote.kt
@@ -2,10 +2,8 @@ package io.github.wulkanowy.data.repositories.attendance
 
 import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.sdk.pojo.Absent
-import io.github.wulkanowy.utils.init
 import io.reactivex.Single
 import org.threeten.bp.LocalDate
 import org.threeten.bp.LocalDateTime
@@ -16,9 +14,8 @@ import javax.inject.Singleton
 @Singleton
 class AttendanceRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getAttendance(student: Student, semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<Attendance>> {
-        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
-            .getAttendance(startDate, endDate, semester.semesterId)
+    fun getAttendance(semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<Attendance>> {
+        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getAttendance(startDate, endDate, semester.semesterId)
             .map { attendance ->
                 attendance.map {
                     Attendance(
@@ -42,8 +39,8 @@ class AttendanceRemote @Inject constructor(private val sdk: Sdk) {
             }
     }
 
-    fun excuseAbsence(student: Student, semester: Semester, absenceList: List<Attendance>, reason: String?): Single<Boolean> {
-        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear).excuseForAbsence(absenceList.map { attendance ->
+    fun excuseAbsence(semester: Semester, absenceList: List<Attendance>, reason: String?): Single<Boolean> {
+        return sdk.switchDiary(semester.diaryId, semester.schoolYear).excuseForAbsence(absenceList.map { attendance ->
             Absent(
                 date = LocalDateTime.of(attendance.date, LocalTime.of(0, 0)),
                 timeId = attendance.timeId
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRepository.kt
index 68e7c5f12..fc3830c2e 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRepository.kt
@@ -4,8 +4,7 @@ import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.utils.sunday
+import io.github.wulkanowy.utils.friday
 import io.github.wulkanowy.utils.monday
 import io.github.wulkanowy.utils.uniqueSubtract
 import io.reactivex.Single
@@ -21,25 +20,29 @@ class AttendanceRepository @Inject constructor(
     private val remote: AttendanceRemote
 ) {
 
-    fun getAttendance(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean): Single<List<Attendance>> {
-        return local.getAttendance(semester, start.monday, end.sunday).filter { !forceRefresh }
-            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings).flatMap {
-                if (it) remote.getAttendance(student, semester, start.monday, end.sunday)
-                else Single.error(UnknownHostException())
-            }.flatMap { newAttendance ->
-                local.getAttendance(semester, start.monday, end.sunday)
-                    .toSingle(emptyList())
-                    .doOnSuccess { oldAttendance ->
-                        local.deleteAttendance(oldAttendance.uniqueSubtract(newAttendance))
-                        local.saveAttendance(newAttendance.uniqueSubtract(oldAttendance))
-                    }
-            }.flatMap {
-                local.getAttendance(semester, start.monday, end.sunday)
-                    .toSingle(emptyList())
-            }).map { list -> list.filter { it.date in start..end } }
+    fun getAttendance(semester: Semester, startDate: LocalDate, endDate: LocalDate, forceRefresh: Boolean)
+        : Single<List<Attendance>> {
+        return Single.fromCallable { startDate.monday to endDate.friday }
+            .flatMap { dates ->
+                local.getAttendance(semester, dates.first, dates.second).filter { !forceRefresh }
+                    .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings).flatMap {
+                        if (it) remote.getAttendance(semester, dates.first, dates.second)
+                        else Single.error(UnknownHostException())
+                    }.flatMap { newAttendance ->
+                        local.getAttendance(semester, dates.first, dates.second)
+                            .toSingle(emptyList())
+                            .doOnSuccess { oldAttendance ->
+                                local.deleteAttendance(oldAttendance.uniqueSubtract(newAttendance))
+                                local.saveAttendance(newAttendance.uniqueSubtract(oldAttendance))
+                            }
+                    }.flatMap {
+                        local.getAttendance(semester, dates.first, dates.second)
+                            .toSingle(emptyList())
+                    }).map { list -> list.filter { it.date in startDate..endDate } }
+            }
     }
 
-    fun excuseForAbsence(student: Student, semester: Semester, attendanceList: List<Attendance>, reason: String? = null): Single<Boolean> {
-        return remote.excuseAbsence(student, semester, attendanceList, reason)
+    fun excuseForAbsence(semester: Semester, attendanceList: List<Attendance>, reason: String? = null): Single<Boolean> {
+        return remote.excuseAbsence(semester, attendanceList, reason)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRemote.kt
index 8fef5c391..c167427f7 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRemote.kt
@@ -2,9 +2,7 @@ package io.github.wulkanowy.data.repositories.attendancesummary
 
 import io.github.wulkanowy.data.db.entities.AttendanceSummary
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.init
 import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -12,9 +10,8 @@ import javax.inject.Singleton
 @Singleton
 class AttendanceSummaryRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getAttendanceSummary(student: Student, semester: Semester, subjectId: Int): Single<List<AttendanceSummary>> {
-        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
-            .getAttendanceSummary(subjectId)
+    fun getAttendanceSummary(semester: Semester, subjectId: Int): Single<List<AttendanceSummary>> {
+        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getAttendanceSummary(subjectId)
             .map { attendance ->
                 attendance.map {
                     AttendanceSummary(
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRepository.kt
index 5f0b2b346..c65870508 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRepository.kt
@@ -4,7 +4,6 @@ import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.AttendanceSummary
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.utils.uniqueSubtract
 import io.reactivex.Single
 import java.net.UnknownHostException
@@ -18,11 +17,11 @@ class AttendanceSummaryRepository @Inject constructor(
     private val remote: AttendanceSummaryRemote
 ) {
 
-    fun getAttendanceSummary(student: Student, semester: Semester, subjectId: Int, forceRefresh: Boolean = false): Single<List<AttendanceSummary>> {
+    fun getAttendanceSummary(semester: Semester, subjectId: Int, forceRefresh: Boolean = false): Single<List<AttendanceSummary>> {
         return local.getAttendanceSummary(semester, subjectId).filter { !forceRefresh }
             .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
                 .flatMap {
-                    if (it) remote.getAttendanceSummary(student, semester, subjectId)
+                    if (it) remote.getAttendanceSummary(semester, subjectId)
                     else Single.error(UnknownHostException())
                 }.flatMap { new ->
                     local.getAttendanceSummary(semester, subjectId).toSingle(emptyList())
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRemote.kt
index bb115111e..ca680f209 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRemote.kt
@@ -2,9 +2,7 @@ package io.github.wulkanowy.data.repositories.completedlessons
 
 import io.github.wulkanowy.data.db.entities.CompletedLesson
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.init
 import io.reactivex.Single
 import org.threeten.bp.LocalDate
 import javax.inject.Inject
@@ -13,9 +11,8 @@ import javax.inject.Singleton
 @Singleton
 class CompletedLessonsRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getCompletedLessons(student: Student, semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<CompletedLesson>> {
-        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
-            .getCompletedLessons(startDate, endDate)
+    fun getCompletedLessons(semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<CompletedLesson>> {
+        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getCompletedLessons(startDate, endDate)
             .map { lessons ->
                 lessons.map {
                     it.absence
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRepository.kt
index 72cc93eb4..c22fabc39 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRepository.kt
@@ -4,8 +4,7 @@ import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.CompletedLesson
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.utils.sunday
+import io.github.wulkanowy.utils.friday
 import io.github.wulkanowy.utils.monday
 import io.github.wulkanowy.utils.uniqueSubtract
 import io.reactivex.Single
@@ -21,22 +20,25 @@ class CompletedLessonsRepository @Inject constructor(
     private val remote: CompletedLessonsRemote
 ) {
 
-    fun getCompletedLessons(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean = false): Single<List<CompletedLesson>> {
-        return local.getCompletedLessons(semester, start.monday, end.sunday).filter { !forceRefresh }
-            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                .flatMap {
-                    if (it) remote.getCompletedLessons(student, semester, start.monday, end.sunday)
-                    else Single.error(UnknownHostException())
-                }.flatMap { new ->
-                    local.getCompletedLessons(semester, start.monday, end.sunday)
-                        .toSingle(emptyList())
-                        .doOnSuccess { old ->
-                            local.deleteCompleteLessons(old.uniqueSubtract(new))
-                            local.saveCompletedLessons(new.uniqueSubtract(old))
-                        }
-                }.flatMap {
-                    local.getCompletedLessons(semester, start.monday, end.sunday)
-                        .toSingle(emptyList())
-                }).map { list -> list.filter { it.date in start..end } }
+    fun getCompletedLessons(semester: Semester, startDate: LocalDate, endDate: LocalDate, forceRefresh: Boolean = false): Single<List<CompletedLesson>> {
+        return Single.fromCallable { startDate.monday to endDate.friday }
+            .flatMap { dates ->
+                local.getCompletedLessons(semester, dates.first, dates.second).filter { !forceRefresh }
+                    .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                        .flatMap {
+                            if (it) remote.getCompletedLessons(semester, dates.first, dates.second)
+                            else Single.error(UnknownHostException())
+                        }.flatMap { new ->
+                            local.getCompletedLessons(semester, dates.first, dates.second)
+                                .toSingle(emptyList())
+                                .doOnSuccess { old ->
+                                    local.deleteCompleteLessons(old.uniqueSubtract(new))
+                                    local.saveCompletedLessons(new.uniqueSubtract(old))
+                                }
+                        }.flatMap {
+                            local.getCompletedLessons(semester, dates.first, dates.second)
+                                .toSingle(emptyList())
+                        }).map { list -> list.filter { it.date in startDate..endDate } }
+            }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRemote.kt
index fb105ceee..ea7ec9441 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRemote.kt
@@ -2,9 +2,7 @@ package io.github.wulkanowy.data.repositories.exam
 
 import io.github.wulkanowy.data.db.entities.Exam
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.init
 import io.reactivex.Single
 import org.threeten.bp.LocalDate
 import javax.inject.Inject
@@ -13,9 +11,8 @@ import javax.inject.Singleton
 @Singleton
 class ExamRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getExams(student: Student, semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<Exam>> {
-        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
-            .getExams(startDate, endDate, semester.semesterId)
+    fun getExams(semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<Exam>> {
+        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getExams(startDate, endDate, semester.semesterId)
             .map { exams ->
                 exams.map {
                     Exam(
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRepository.kt
index f29e4fdf8..be60eaecd 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRepository.kt
@@ -4,8 +4,7 @@ import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.Exam
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.utils.sunday
+import io.github.wulkanowy.utils.friday
 import io.github.wulkanowy.utils.monday
 import io.github.wulkanowy.utils.uniqueSubtract
 import io.reactivex.Single
@@ -21,22 +20,25 @@ class ExamRepository @Inject constructor(
     private val remote: ExamRemote
 ) {
 
-    fun getExams(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean = false): Single<List<Exam>> {
-        return local.getExams(semester, start.monday, end.sunday).filter { !forceRefresh }
-            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                .flatMap {
-                    if (it) remote.getExams(student, semester, start.monday, end.sunday)
-                    else Single.error(UnknownHostException())
-                }.flatMap { new ->
-                    local.getExams(semester, start.monday, end.sunday)
-                        .toSingle(emptyList())
-                        .doOnSuccess { old ->
-                            local.deleteExams(old.uniqueSubtract(new))
-                            local.saveExams(new.uniqueSubtract(old))
-                        }
-                }.flatMap {
-                    local.getExams(semester, start.monday, end.sunday)
-                        .toSingle(emptyList())
-                }).map { list -> list.filter { it.date in start..end } }
+    fun getExams(semester: Semester, startDate: LocalDate, endDate: LocalDate, forceRefresh: Boolean = false): Single<List<Exam>> {
+        return Single.fromCallable { startDate.monday to endDate.friday }
+            .flatMap { dates ->
+                local.getExams(semester, dates.first, dates.second).filter { !forceRefresh }
+                    .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                        .flatMap {
+                            if (it) remote.getExams(semester, dates.first, dates.second)
+                            else Single.error(UnknownHostException())
+                        }.flatMap { new ->
+                            local.getExams(semester, dates.first, dates.second)
+                                .toSingle(emptyList())
+                                .doOnSuccess { old ->
+                                    local.deleteExams(old.uniqueSubtract(new))
+                                    local.saveExams(new.uniqueSubtract(old))
+                                }
+                        }.flatMap {
+                            local.getExams(semester, dates.first, dates.second)
+                                .toSingle(emptyList())
+                        }).map { list -> list.filter { it.date in startDate..endDate } }
+            }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeLocal.kt
index 944ed34ae..4983a4740 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeLocal.kt
@@ -1,19 +1,14 @@
 package io.github.wulkanowy.data.repositories.grade
 
 import io.github.wulkanowy.data.db.dao.GradeDao
-import io.github.wulkanowy.data.db.dao.GradeSummaryDao
 import io.github.wulkanowy.data.db.entities.Grade
-import io.github.wulkanowy.data.db.entities.GradeSummary
 import io.github.wulkanowy.data.db.entities.Semester
 import io.reactivex.Maybe
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class GradeLocal @Inject constructor(
-    private val gradeDb: GradeDao,
-    private val gradeSummaryDb: GradeSummaryDao
-) {
+class GradeLocal @Inject constructor(private val gradeDb: GradeDao) {
 
     fun saveGrades(grades: List<Grade>) {
         gradeDb.insertAll(grades)
@@ -27,19 +22,7 @@ class GradeLocal @Inject constructor(
         gradeDb.updateAll(grades)
     }
 
-    fun getGradesDetails(semester: Semester): Maybe<List<Grade>> {
+    fun getGrades(semester: Semester): Maybe<List<Grade>> {
         return gradeDb.loadAll(semester.semesterId, semester.studentId).filter { it.isNotEmpty() }
     }
-
-    fun saveGradesSummary(gradesSummary: List<GradeSummary>) {
-        gradeSummaryDb.insertAll(gradesSummary)
-    }
-
-    fun deleteGradesSummary(gradesSummary: List<GradeSummary>) {
-        gradeSummaryDb.deleteAll(gradesSummary)
-    }
-
-    fun getGradesSummary(semester: Semester): Maybe<List<GradeSummary>> {
-        return gradeSummaryDb.loadAll(semester.semesterId, semester.studentId).filter { it.isNotEmpty() }
-    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRemote.kt
index abb2f98c9..d07ac6d1c 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRemote.kt
@@ -1,11 +1,8 @@
 package io.github.wulkanowy.data.repositories.grade
 
 import io.github.wulkanowy.data.db.entities.Grade
-import io.github.wulkanowy.data.db.entities.GradeSummary
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.init
 import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -13,11 +10,10 @@ import javax.inject.Singleton
 @Singleton
 class GradeRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getGrades(student: Student, semester: Semester): Single<Pair<List<Grade>, List<GradeSummary>>> {
-        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
-            .getGrades(semester.semesterId)
-            .map { (details, summary) ->
-                details.map {
+    fun getGrades(semester: Semester): Single<List<Grade>> {
+        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getGrades(semester.semesterId)
+            .map { grades ->
+                grades.map {
                     Grade(
                         studentId = semester.studentId,
                         semesterId = semester.semesterId,
@@ -34,19 +30,6 @@ class GradeRemote @Inject constructor(private val sdk: Sdk) {
                         date = it.date,
                         teacher = it.teacher
                     )
-                } to summary.map {
-                    GradeSummary(
-                        semesterId = semester.semesterId,
-                        studentId = semester.studentId,
-                        position = 0,
-                        subject = it.name,
-                        predictedGrade = it.predicted,
-                        finalGrade = it.final,
-                        pointsSum = it.pointsSum,
-                        proposedPoints = it.proposedPoints,
-                        finalPoints = it.finalPoints,
-                        average = it.average
-                    )
                 }
             }
     }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRepository.kt
index e28350a51..7f8e92a2e 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRepository.kt
@@ -3,7 +3,6 @@ package io.github.wulkanowy.data.repositories.grade
 import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.Grade
-import io.github.wulkanowy.data.db.entities.GradeSummary
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.utils.uniqueSubtract
@@ -20,47 +19,34 @@ class GradeRepository @Inject constructor(
     private val remote: GradeRemote
 ) {
 
-    fun getGrades(student: Student, semester: Semester, forceRefresh: Boolean = false, notify: Boolean = false): Single<Pair<List<Grade>, List<GradeSummary>>> {
-        return local.getGradesDetails(semester).flatMap { details ->
-            local.getGradesSummary(semester).map { summary -> details to summary }
-        }.filter { !forceRefresh }
-            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings).flatMap {
-                if (it) remote.getGrades(student, semester)
-                else Single.error(UnknownHostException())
-            }.flatMap { (newDetails, newSummary) ->
-                local.getGradesDetails(semester).toSingle(emptyList())
-                    .doOnSuccess { old ->
-                        val notifyBreakDate = old.maxBy { it.date }?.date ?: student.registrationDate.toLocalDate()
-                        local.deleteGrades(old.uniqueSubtract(newDetails))
-                        local.saveGrades(newDetails.uniqueSubtract(old)
-                            .onEach {
-                                if (it.date >= notifyBreakDate) it.apply {
-                                    isRead = false
-                                    if (notify) isNotified = false
-                                }
-                            })
-                    }.flatMap {
-                        local.getGradesSummary(semester).toSingle(emptyList())
-                            .doOnSuccess { old ->
-                                local.deleteGradesSummary(old.uniqueSubtract(newSummary))
-                                local.saveGradesSummary(newSummary.uniqueSubtract(old))
-                            }
-                    }
-            }.flatMap {
-                local.getGradesDetails(semester).toSingle(emptyList()).flatMap { details ->
-                    local.getGradesSummary(semester).toSingle(emptyList()).map { summary ->
-                        details to summary
-                    }
-                }
-            })
+    fun getGrades(student: Student, semester: Semester, forceRefresh: Boolean = false, notify: Boolean = false): Single<List<Grade>> {
+        return local.getGrades(semester).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) remote.getGrades(semester)
+                    else Single.error(UnknownHostException())
+                }.flatMap { new ->
+                    local.getGrades(semester).toSingle(emptyList())
+                        .doOnSuccess { old ->
+                            val notifyBreakDate = old.maxBy { it.date }?.date ?: student.registrationDate.toLocalDate()
+                            local.deleteGrades(old.uniqueSubtract(new))
+                            local.saveGrades(new.uniqueSubtract(old)
+                                .onEach {
+                                    if (it.date >= notifyBreakDate) it.apply {
+                                        isRead = false
+                                        if (notify) isNotified = false
+                                    }
+                                })
+                        }
+                }.flatMap { local.getGrades(semester).toSingle(emptyList()) })
     }
 
     fun getUnreadGrades(semester: Semester): Single<List<Grade>> {
-        return local.getGradesDetails(semester).map { it.filter { grade -> !grade.isRead } }.toSingle(emptyList())
+        return local.getGrades(semester).map { it.filter { grade -> !grade.isRead } }.toSingle(emptyList())
     }
 
     fun getNotNotifiedGrades(semester: Semester): Single<List<Grade>> {
-        return local.getGradesDetails(semester).map { it.filter { grade -> !grade.isNotified } }.toSingle(emptyList())
+        return local.getGrades(semester).map { it.filter { grade -> !grade.isNotified } }.toSingle(emptyList())
     }
 
     fun updateGrade(grade: Grade): Completable {
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryLocal.kt
new file mode 100644
index 000000000..e74641d3a
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryLocal.kt
@@ -0,0 +1,24 @@
+package io.github.wulkanowy.data.repositories.gradessummary
+
+import io.github.wulkanowy.data.db.dao.GradeSummaryDao
+import io.github.wulkanowy.data.db.entities.GradeSummary
+import io.github.wulkanowy.data.db.entities.Semester
+import io.reactivex.Maybe
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class GradeSummaryLocal @Inject constructor(private val gradeSummaryDb: GradeSummaryDao) {
+
+    fun saveGradesSummary(gradesSummary: List<GradeSummary>) {
+        gradeSummaryDb.insertAll(gradesSummary)
+    }
+
+    fun deleteGradesSummary(gradesSummary: List<GradeSummary>) {
+        gradeSummaryDb.deleteAll(gradesSummary)
+    }
+
+    fun getGradesSummary(semester: Semester): Maybe<List<GradeSummary>> {
+        return gradeSummaryDb.loadAll(semester.semesterId, semester.studentId).filter { it.isNotEmpty() }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryRemote.kt
new file mode 100644
index 000000000..2681fe058
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryRemote.kt
@@ -0,0 +1,32 @@
+package io.github.wulkanowy.data.repositories.gradessummary
+
+import io.github.wulkanowy.data.db.entities.GradeSummary
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.sdk.Sdk
+import io.reactivex.Single
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class GradeSummaryRemote @Inject constructor(private val sdk: Sdk) {
+
+    fun getGradeSummary(semester: Semester): Single<List<GradeSummary>> {
+        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getGradesSummary(semester.semesterId)
+            .map { gradesSummary ->
+                gradesSummary.map {
+                    GradeSummary(
+                        semesterId = semester.semesterId,
+                        studentId = semester.studentId,
+                        position = 0,
+                        subject = it.name,
+                        predictedGrade = it.predicted,
+                        finalGrade = it.final,
+                        pointsSum = it.pointsSum,
+                        proposedPoints = it.proposedPoints,
+                        finalPoints = it.finalPoints,
+                        average = it.average
+                    )
+                }
+            }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryRepository.kt
new file mode 100644
index 000000000..660a032c2
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryRepository.kt
@@ -0,0 +1,34 @@
+package io.github.wulkanowy.data.repositories.gradessummary
+
+import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
+import io.github.wulkanowy.data.db.entities.GradeSummary
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.utils.uniqueSubtract
+import io.reactivex.Single
+import java.net.UnknownHostException
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class GradeSummaryRepository @Inject constructor(
+    private val settings: InternetObservingSettings,
+    private val local: GradeSummaryLocal,
+    private val remote: GradeSummaryRemote
+) {
+
+    fun getGradesSummary(semester: Semester, forceRefresh: Boolean = false): Single<List<GradeSummary>> {
+        return local.getGradesSummary(semester).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) remote.getGradeSummary(semester)
+                    else Single.error(UnknownHostException())
+                }.flatMap { new ->
+                    local.getGradesSummary(semester).toSingle(emptyList())
+                        .doOnSuccess { old ->
+                            local.deleteGradesSummary(old.uniqueSubtract(new))
+                            local.saveGradesSummary(new.uniqueSubtract(old))
+                        }
+                }.flatMap { local.getGradesSummary(semester).toSingle(emptyList()) })
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsLocal.kt
index 7994bd758..279e2959d 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsLocal.kt
@@ -5,6 +5,7 @@ import io.github.wulkanowy.data.db.dao.GradeStatisticsDao
 import io.github.wulkanowy.data.db.entities.GradePointsStatistics
 import io.github.wulkanowy.data.db.entities.GradeStatistics
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.utils.roundToDecimalPlaces
 import io.reactivex.Maybe
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -29,17 +30,23 @@ class GradeStatisticsLocal @Inject constructor(
                 list.groupBy { it.grade }.map {
                     GradeStatistics(semester.studentId, semester.semesterId, subjectName, it.key,
                         it.value.fold(0) { acc, e -> acc + e.amount }, false)
-                } + list
+                }
             }
             else -> gradeStatisticsDb.loadSubject(semester.semesterId, semester.studentId, subjectName, isSemester)
         }.filter { it.isNotEmpty() }
     }
 
-    fun getGradesPointsStatistics(semester: Semester, subjectName: String): Maybe<List<GradePointsStatistics>> {
+    fun getGradesPointsStatistics(semester: Semester, subjectName: String): Maybe<GradePointsStatistics> {
         return when (subjectName) {
-            "Wszystkie" -> gradePointsStatisticsDb.loadAll(semester.semesterId, semester.studentId)
+            "Wszystkie" -> gradePointsStatisticsDb.loadAll(semester.semesterId, semester.studentId).flatMap { list ->
+                if (list.isEmpty()) return@flatMap Maybe.empty<GradePointsStatistics>()
+                Maybe.just(GradePointsStatistics(semester.studentId, semester.semesterId, subjectName,
+                    (list.fold(.0) { acc, e -> acc + e.others } / list.size).roundToDecimalPlaces(2),
+                    (list.fold(.0) { acc, e -> acc + e.student } / list.size).roundToDecimalPlaces(2)
+                ))
+            }
             else -> gradePointsStatisticsDb.loadSubject(semester.semesterId, semester.studentId, subjectName)
-        }.filter { it.isNotEmpty() }
+        }
     }
 
     fun saveGradesStatistics(gradesStatistics: List<GradeStatistics>) {
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRemote.kt
index 99e0cb987..f10f30369 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRemote.kt
@@ -3,9 +3,7 @@ package io.github.wulkanowy.data.repositories.gradestatistics
 import io.github.wulkanowy.data.db.entities.GradePointsStatistics
 import io.github.wulkanowy.data.db.entities.GradeStatistics
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.init
 import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -13,8 +11,8 @@ import javax.inject.Singleton
 @Singleton
 class GradeStatisticsRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getGradeStatistics(student: Student, semester: Semester, isSemester: Boolean): Single<List<GradeStatistics>> {
-        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear).let {
+    fun getGradeStatistics(semester: Semester, isSemester: Boolean): Single<List<GradeStatistics>> {
+        return sdk.switchDiary(semester.diaryId, semester.schoolYear).let {
             if (isSemester) it.getGradesAnnualStatistics(semester.semesterId)
             else it.getGradesPartialStatistics(semester.semesterId)
         }.map { gradeStatistics ->
@@ -31,9 +29,8 @@ class GradeStatisticsRemote @Inject constructor(private val sdk: Sdk) {
         }
     }
 
-    fun getGradePointsStatistics(student: Student, semester: Semester): Single<List<GradePointsStatistics>> {
-        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
-            .getGradesPointsStatistics(semester.semesterId)
+    fun getGradePointsStatistics(semester: Semester): Single<List<GradePointsStatistics>> {
+        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getGradesPointsStatistics(semester.semesterId)
             .map { gradePointsStatistics ->
                 gradePointsStatistics.map {
                     GradePointsStatistics(
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRepository.kt
index 8d96d2f57..9335d1d21 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRepository.kt
@@ -5,10 +5,8 @@ import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.Inter
 import io.github.wulkanowy.data.db.entities.GradePointsStatistics
 import io.github.wulkanowy.data.db.entities.GradeStatistics
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.pojos.GradeStatisticsItem
-import io.github.wulkanowy.ui.modules.grade.statistics.ViewType
 import io.github.wulkanowy.utils.uniqueSubtract
+import io.reactivex.Maybe
 import io.reactivex.Single
 import java.net.UnknownHostException
 import javax.inject.Inject
@@ -21,11 +19,11 @@ class GradeStatisticsRepository @Inject constructor(
     private val remote: GradeStatisticsRemote
 ) {
 
-    fun getGradesStatistics(student: Student, semester: Semester, subjectName: String, isSemester: Boolean, forceRefresh: Boolean = false): Single<List<GradeStatisticsItem>> {
-        return local.getGradesStatistics(semester, isSemester, subjectName).map { it.mapToStatisticItems() }.filter { !forceRefresh }
+    fun getGradesStatistics(semester: Semester, subjectName: String, isSemester: Boolean, forceRefresh: Boolean = false): Single<List<GradeStatistics>> {
+        return local.getGradesStatistics(semester, isSemester, subjectName).filter { !forceRefresh }
             .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
                 .flatMap {
-                    if (it) remote.getGradeStatistics(student, semester, isSemester)
+                    if (it) remote.getGradeStatistics(semester, isSemester)
                     else Single.error(UnknownHostException())
                 }.flatMap { new ->
                     local.getGradesStatistics(semester, isSemester).toSingle(emptyList())
@@ -33,43 +31,21 @@ class GradeStatisticsRepository @Inject constructor(
                             local.deleteGradesStatistics(old.uniqueSubtract(new))
                             local.saveGradesStatistics(new.uniqueSubtract(old))
                         }
-                }.flatMap { local.getGradesStatistics(semester, isSemester, subjectName).map { it.mapToStatisticItems() }.toSingle(emptyList()) })
+                }.flatMap { local.getGradesStatistics(semester, isSemester, subjectName).toSingle(emptyList()) })
     }
 
-    fun getGradesPointsStatistics(student: Student, semester: Semester, subjectName: String, forceRefresh: Boolean): Single<List<GradeStatisticsItem>> {
-        return local.getGradesPointsStatistics(semester, subjectName).map { it.mapToStatisticsItem() }.filter { !forceRefresh }
+    fun getGradesPointsStatistics(semester: Semester, subjectName: String, forceRefresh: Boolean): Maybe<GradePointsStatistics> {
+        return local.getGradesPointsStatistics(semester, subjectName).filter { !forceRefresh }
             .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                .flatMap {
-                    if (it) remote.getGradePointsStatistics(student, semester)
-                    else Single.error(UnknownHostException())
+                .flatMapMaybe {
+                    if (it) remote.getGradePointsStatistics(semester).toMaybe()
+                    else Maybe.error(UnknownHostException())
                 }.flatMap { new ->
-                    local.getGradesPointsStatistics(semester).toSingle(emptyList())
+                    local.getGradesPointsStatistics(semester).defaultIfEmpty(emptyList())
                         .doOnSuccess { old ->
                             local.deleteGradesPointsStatistics(old.uniqueSubtract(new))
                             local.saveGradesPointsStatistics(new.uniqueSubtract(old))
                         }
-                }.flatMap { local.getGradesPointsStatistics(semester, subjectName).map { it.mapToStatisticsItem() }.toSingle(emptyList()) })
-    }
-
-    private fun List<GradeStatistics>.mapToStatisticItems(): List<GradeStatisticsItem> {
-        return groupBy { it.subject }.map {
-            GradeStatisticsItem(
-                type = ViewType.PARTIAL,
-                partial = it.value
-                    .sortedByDescending { item -> item.grade }
-                    .filter { item -> item.amount != 0 },
-                points = null
-            )
-        }
-    }
-
-    private fun List<GradePointsStatistics>.mapToStatisticsItem(): List<GradeStatisticsItem> {
-        return map {
-            GradeStatisticsItem(
-                type = ViewType.POINTS,
-                partial = emptyList(),
-                points = it
-            )
-        }
+                }.flatMap { local.getGradesPointsStatistics(semester, subjectName) })
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkLocal.kt
index fdae45182..671ecafd7 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkLocal.kt
@@ -19,10 +19,6 @@ class HomeworkLocal @Inject constructor(private val homeworkDb: HomeworkDao) {
         homeworkDb.deleteAll(homework)
     }
 
-    fun updateHomework(homework: List<Homework>) {
-        homeworkDb.updateAll(homework)
-    }
-
     fun getHomework(semester: Semester, startDate: LocalDate, endDate: LocalDate): Maybe<List<Homework>> {
         return homeworkDb.loadAll(semester.semesterId, semester.studentId, startDate, endDate)
             .filter { it.isNotEmpty() }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRemote.kt
index 20ffee99c..189499dbe 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRemote.kt
@@ -2,9 +2,7 @@ package io.github.wulkanowy.data.repositories.homework
 
 import io.github.wulkanowy.data.db.entities.Homework
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.init
 import io.reactivex.Single
 import org.threeten.bp.LocalDate
 import javax.inject.Inject
@@ -13,9 +11,8 @@ import javax.inject.Singleton
 @Singleton
 class HomeworkRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getHomework(student: Student, semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<Homework>> {
-        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
-            .getHomework(startDate, endDate)
+    fun getHomework(semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<Homework>> {
+        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getHomework(startDate, endDate)
             .map { homework ->
                 homework.map {
                     Homework(
@@ -26,8 +23,7 @@ class HomeworkRemote @Inject constructor(private val sdk: Sdk) {
                         subject = it.subject,
                         content = it.content,
                         teacher = it.teacher,
-                        teacherSymbol = it.teacherSymbol,
-                        attachments = it.attachments.map { attachment -> attachment.url to attachment.name }
+                        teacherSymbol = it.teacherSymbol
                     )
                 }
             }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRepository.kt
index 7e8fd5c30..3f924944d 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRepository.kt
@@ -4,11 +4,9 @@ import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.Homework
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.utils.sunday
+import io.github.wulkanowy.utils.friday
 import io.github.wulkanowy.utils.monday
 import io.github.wulkanowy.utils.uniqueSubtract
-import io.reactivex.Completable
 import io.reactivex.Single
 import org.threeten.bp.LocalDate
 import java.net.UnknownHostException
@@ -22,12 +20,12 @@ class HomeworkRepository @Inject constructor(
     private val remote: HomeworkRemote
 ) {
 
-    fun getHomework(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean = false): Single<List<Homework>> {
-        return Single.fromCallable { start.monday to end.sunday }.flatMap { (monday, friday) ->
+    fun getHomework(semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean = false): Single<List<Homework>> {
+        return Single.fromCallable { start.monday to end.friday }.flatMap { (monday, friday) ->
             local.getHomework(semester, monday, friday).filter { !forceRefresh }
                 .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
                     .flatMap {
-                        if (it) remote.getHomework(student, semester, monday, friday)
+                        if (it) remote.getHomework(semester, monday, friday)
                         else Single.error(UnknownHostException())
                     }.flatMap { new ->
                         local.getHomework(semester, monday, friday).toSingle(emptyList())
@@ -38,12 +36,4 @@ class HomeworkRepository @Inject constructor(
                     }.flatMap { local.getHomework(semester, monday, friday).toSingle(emptyList()) })
         }
     }
-
-    fun toggleDone(homework: Homework): Completable {
-        return Completable.fromCallable {
-            local.updateHomework(listOf(homework.apply {
-                isDone = !isDone
-            }))
-        }
-    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/logger/LoggerRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/logger/LoggerRepository.kt
deleted file mode 100644
index be6ad2f48..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/logger/LoggerRepository.kt
+++ /dev/null
@@ -1,39 +0,0 @@
-package io.github.wulkanowy.data.repositories.logger
-
-import android.content.Context
-import io.reactivex.Single
-import java.io.File
-import java.io.FileNotFoundException
-import javax.inject.Inject
-
-class LoggerRepository @Inject constructor(private val context: Context) {
-
-    fun getLastLogLines(): Single<List<String>> {
-        return getLastModified()
-            .map { it.readText() }
-            .map { it.split("\n") }
-    }
-
-    fun getLogFiles(): Single<List<File>> {
-        return Single.fromCallable {
-            File(context.filesDir.absolutePath).listFiles(File::isFile)?.filter {
-                it.name.endsWith(".log")
-            }
-        }
-    }
-
-    private fun getLastModified(): Single<File> {
-        return Single.fromCallable {
-            var lastModifiedTime = Long.MIN_VALUE
-            var chosenFile: File? = null
-            File(context.filesDir.absolutePath).listFiles(File::isFile)?.forEach { file ->
-                if (file.lastModified() > lastModifiedTime) {
-                    lastModifiedTime = file.lastModified()
-                    chosenFile = file
-                }
-            }
-            if (chosenFile == null) throw FileNotFoundException("Log file not found")
-            chosenFile
-        }
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberLocal.kt
index 0f4f79c84..b461ca22a 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberLocal.kt
@@ -2,7 +2,7 @@ package io.github.wulkanowy.data.repositories.luckynumber
 
 import io.github.wulkanowy.data.db.dao.LuckyNumberDao
 import io.github.wulkanowy.data.db.entities.LuckyNumber
-import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.db.entities.Semester
 import io.reactivex.Maybe
 import org.threeten.bp.LocalDate
 import javax.inject.Inject
@@ -23,7 +23,7 @@ class LuckyNumberLocal @Inject constructor(private val luckyNumberDb: LuckyNumbe
         luckyNumberDb.deleteAll(listOf(luckyNumber))
     }
 
-    fun getLuckyNumber(student: Student, date: LocalDate): Maybe<LuckyNumber> {
-        return luckyNumberDb.load(student.studentId, date)
+    fun getLuckyNumber(semester: Semester, date: LocalDate): Maybe<LuckyNumber> {
+        return luckyNumberDb.load(semester.studentId, date)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRemote.kt
index 0c71897a6..75454143f 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRemote.kt
@@ -1,9 +1,8 @@
 package io.github.wulkanowy.data.repositories.luckynumber
 
 import io.github.wulkanowy.data.db.entities.LuckyNumber
-import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.init
 import io.reactivex.Maybe
 import org.threeten.bp.LocalDate
 import javax.inject.Inject
@@ -12,13 +11,14 @@ import javax.inject.Singleton
 @Singleton
 class LuckyNumberRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getLuckyNumber(student: Student): Maybe<LuckyNumber> {
-        return sdk.init(student).getLuckyNumber(student.schoolShortName).map {
-            LuckyNumber(
-                studentId = student.studentId,
-                date = LocalDate.now(),
-                luckyNumber = it
-            )
-        }
+    fun getLuckyNumber(semester: Semester): Maybe<LuckyNumber> {
+        return sdk.getLuckyNumber()
+            .map {
+                LuckyNumber(
+                    studentId = semester.studentId,
+                    date = LocalDate.now(),
+                    luckyNumber = it
+                )
+            }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRepository.kt
index 374b9a294..4036521f7 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRepository.kt
@@ -3,7 +3,7 @@ package io.github.wulkanowy.data.repositories.luckynumber
 import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.LuckyNumber
-import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.db.entities.Semester
 import io.reactivex.Completable
 import io.reactivex.Maybe
 import org.threeten.bp.LocalDate
@@ -18,14 +18,14 @@ class LuckyNumberRepository @Inject constructor(
     private val remote: LuckyNumberRemote
 ) {
 
-    fun getLuckyNumber(student: Student, forceRefresh: Boolean = false, notify: Boolean = false): Maybe<LuckyNumber> {
-        return local.getLuckyNumber(student, LocalDate.now()).filter { !forceRefresh }
+    fun getLuckyNumber(semester: Semester, forceRefresh: Boolean = false, notify: Boolean = false): Maybe<LuckyNumber> {
+        return local.getLuckyNumber(semester, LocalDate.now()).filter { !forceRefresh }
             .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
                 .flatMapMaybe {
-                    if (it) remote.getLuckyNumber(student)
+                    if (it) remote.getLuckyNumber(semester)
                     else Maybe.error(UnknownHostException())
                 }.flatMap { new ->
-                    local.getLuckyNumber(student, LocalDate.now())
+                    local.getLuckyNumber(semester, LocalDate.now())
                         .doOnSuccess { old ->
                             if (new != old) {
                                 local.deleteLuckyNumber(old)
@@ -39,13 +39,13 @@ class LuckyNumberRepository @Inject constructor(
                                 if (notify) isNotified = false
                             })
                         }
-                }.flatMap({ local.getLuckyNumber(student, LocalDate.now()) }, { Maybe.error(it) },
-                    { local.getLuckyNumber(student, LocalDate.now()) })
+                }.flatMap({ local.getLuckyNumber(semester, LocalDate.now()) }, { Maybe.error(it) },
+                    { local.getLuckyNumber(semester, LocalDate.now()) })
             )
     }
 
-    fun getNotNotifiedLuckyNumber(student: Student): Maybe<LuckyNumber> {
-        return local.getLuckyNumber(student, LocalDate.now()).filter { !it.isNotified }
+    fun getNotNotifiedLuckyNumber(semester: Semester): Maybe<LuckyNumber> {
+        return local.getLuckyNumber(semester, LocalDate.now()).filter { !it.isNotified }
     }
 
     fun updateLuckyNumber(luckyNumber: LuckyNumber): Completable {
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageLocal.kt
index 53cf0a983..ce08d13ec 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageLocal.kt
@@ -1,22 +1,15 @@
 package io.github.wulkanowy.data.repositories.message
 
-import io.github.wulkanowy.data.db.dao.MessageAttachmentDao
 import io.github.wulkanowy.data.db.dao.MessagesDao
 import io.github.wulkanowy.data.db.entities.Message
-import io.github.wulkanowy.data.db.entities.MessageAttachment
-import io.github.wulkanowy.data.db.entities.MessageWithAttachment
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.message.MessageFolder.TRASHED
 import io.reactivex.Maybe
-import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class MessageLocal @Inject constructor(
-    private val messagesDb: MessagesDao,
-    private val messageAttachmentDao: MessageAttachmentDao
-) {
+class MessageLocal @Inject constructor(private val messagesDb: MessagesDao) {
 
     fun saveMessages(messages: List<Message>) {
         messagesDb.insertAll(messages)
@@ -30,12 +23,8 @@ class MessageLocal @Inject constructor(
         messagesDb.deleteAll(messages)
     }
 
-    fun getMessageWithAttachment(student: Student, message: Message): Single<MessageWithAttachment> {
-        return messagesDb.loadMessageWithAttachment(student.id.toInt(), message.messageId)
-    }
-
-    fun saveMessageAttachments(attachments: List<MessageAttachment>) {
-        messageAttachmentDao.insertAttachments(attachments)
+    fun getMessage(id: Long): Maybe<Message> {
+        return messagesDb.load(id)
     }
 
     fun getMessages(student: Student, folder: MessageFolder): Maybe<List<Message>> {
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRemote.kt
index 1808c048b..d27eb904d 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRemote.kt
@@ -1,14 +1,12 @@
 package io.github.wulkanowy.data.repositories.message
 
 import io.github.wulkanowy.data.db.entities.Message
-import io.github.wulkanowy.data.db.entities.MessageAttachment
 import io.github.wulkanowy.data.db.entities.Recipient
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.sdk.pojo.Folder
 import io.github.wulkanowy.sdk.pojo.SentMessage
-import io.github.wulkanowy.utils.init
 import io.reactivex.Single
 import org.threeten.bp.LocalDateTime.now
 import javax.inject.Inject
@@ -19,7 +17,7 @@ import io.github.wulkanowy.sdk.pojo.Recipient as SdkRecipient
 class MessageRemote @Inject constructor(private val sdk: Sdk) {
 
     fun getMessages(student: Student, semester: Semester, folder: MessageFolder): Single<List<Message>> {
-        return sdk.init(student).getMessages(Folder.valueOf(folder.name), semester.start.atStartOfDay(), semester.end.atStartOfDay()).map { messages ->
+        return sdk.getMessages(Folder.valueOf(folder.name), semester.start.atStartOfDay(), semester.end.atStartOfDay()).map { messages ->
             messages.map {
                 Message(
                     studentId = student.id.toInt(),
@@ -35,29 +33,18 @@ class MessageRemote @Inject constructor(private val sdk: Sdk) {
                     unread = it.unread ?: false,
                     unreadBy = it.unreadBy ?: 0,
                     readBy = it.readBy ?: 0,
-                    removed = it.removed,
-                    hasAttachments = it.hasAttachments
+                    removed = it.removed
                 )
             }
         }
     }
 
-    fun getMessagesContentDetails(student: Student, message: Message, markAsRead: Boolean = false): Single<Pair<String, List<MessageAttachment>>> {
-        return sdk.init(student).getMessageDetails(message.messageId, message.folderId, markAsRead, message.realId).map { details ->
-            details.content to details.attachments.map {
-                MessageAttachment(
-                    realId = it.id,
-                    messageId = it.messageId,
-                    oneDriveId = it.oneDriveId,
-                    url = it.url,
-                    filename = it.filename
-                )
-            }
-        }
+    fun getMessagesContent(message: Message, markAsRead: Boolean = false): Single<String> {
+        return sdk.getMessageContent(message.messageId, message.folderId, markAsRead, message.realId)
     }
 
-    fun sendMessage(student: Student, subject: String, content: String, recipients: List<Recipient>): Single<SentMessage> {
-        return sdk.init(student).sendMessage(
+    fun sendMessage(subject: String, content: String, recipients: List<Recipient>): Single<SentMessage> {
+        return sdk.sendMessage(
             subject = subject,
             content = content,
             recipients = recipients.map {
@@ -74,7 +61,7 @@ class MessageRemote @Inject constructor(private val sdk: Sdk) {
         )
     }
 
-    fun deleteMessage(student: Student, message: Message): Single<Boolean> {
-        return sdk.init(student).deleteMessages(listOf(Pair(message.realId, message.folderId)))
+    fun deleteMessage(message: Message): Single<Boolean> {
+        return sdk.deleteMessages(listOf(Pair(message.realId, message.folderId)))
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRepository.kt
index 2d2c0430c..0dfdd72fe 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRepository.kt
@@ -2,8 +2,8 @@ package io.github.wulkanowy.data.repositories.message
 
 import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
+import io.github.wulkanowy.data.SdkHelper
 import io.github.wulkanowy.data.db.entities.Message
-import io.github.wulkanowy.data.db.entities.MessageWithAttachment
 import io.github.wulkanowy.data.db.entities.Recipient
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
@@ -11,8 +11,8 @@ import io.github.wulkanowy.data.repositories.message.MessageFolder.RECEIVED
 import io.github.wulkanowy.sdk.pojo.SentMessage
 import io.github.wulkanowy.utils.uniqueSubtract
 import io.reactivex.Completable
+import io.reactivex.Maybe
 import io.reactivex.Single
-import timber.log.Timber
 import java.net.UnknownHostException
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -21,53 +21,54 @@ import javax.inject.Singleton
 class MessageRepository @Inject constructor(
     private val settings: InternetObservingSettings,
     private val local: MessageLocal,
-    private val remote: MessageRemote
+    private val remote: MessageRemote,
+    private val sdkHelper: SdkHelper
 ) {
 
     fun getMessages(student: Student, semester: Semester, folder: MessageFolder, forceRefresh: Boolean = false, notify: Boolean = false): Single<List<Message>> {
-        return local.getMessages(student, folder).filter { !forceRefresh }
-            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                .flatMap {
-                    if (it) remote.getMessages(student, semester, folder)
-                    else Single.error(UnknownHostException())
-                }.flatMap { new ->
-                    local.getMessages(student, folder).toSingle(emptyList())
-                        .doOnSuccess { old ->
-                            local.deleteMessages(old.uniqueSubtract(new))
-                            local.saveMessages(new.uniqueSubtract(old)
-                                .onEach {
-                                    it.isNotified = !notify
-                                })
-                        }
-                }.flatMap { local.getMessages(student, folder).toSingle(emptyList()) }
-            )
+        return Single.just(sdkHelper.init(student))
+            .flatMap { _ ->
+                local.getMessages(student, folder).filter { !forceRefresh }
+                    .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                        .flatMap {
+                            if (it) remote.getMessages(student, semester, folder)
+                            else Single.error(UnknownHostException())
+                        }.flatMap { new ->
+                            local.getMessages(student, folder).toSingle(emptyList())
+                                .doOnSuccess { old ->
+                                    local.deleteMessages(old.uniqueSubtract(new))
+                                    local.saveMessages(new.uniqueSubtract(old)
+                                        .onEach {
+                                            it.isNotified = !notify
+                                        })
+                                }
+                        }.flatMap { local.getMessages(student, folder).toSingle(emptyList()) }
+                    )
+            }
     }
 
-    fun getMessage(student: Student, message: Message, markAsRead: Boolean = false): Single<MessageWithAttachment> {
-        return local.getMessageWithAttachment(student, message)
-            .filter {
-                it.message.content.isNotEmpty().also { status ->
-                    Timber.d("Message content in db empty: ${!status}")
-                } && !it.message.unread
+    fun getMessage(student: Student, messageDbId: Long, markAsRead: Boolean = false): Single<Message> {
+        return Single.just(sdkHelper.init(student))
+            .flatMap { _ ->
+                local.getMessage(messageDbId)
+                    .filter { it.content.isNotEmpty() }
+                    .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                        .flatMap {
+                            if (it) local.getMessage(messageDbId).toSingle()
+                            else Single.error(UnknownHostException())
+                        }
+                        .flatMap { dbMessage ->
+                            remote.getMessagesContent(dbMessage, markAsRead).doOnSuccess {
+                                local.updateMessages(listOf(dbMessage.copy(unread = false).apply {
+                                    id = dbMessage.id
+                                    content = content.ifBlank { it }
+                                }))
+                            }
+                        }.flatMap {
+                            local.getMessage(messageDbId).toSingle()
+                        }
+                    )
             }
-            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                .flatMap {
-                    if (it) local.getMessageWithAttachment(student, message)
-                    else Single.error(UnknownHostException())
-                }
-                .flatMap { dbMessage ->
-                    remote.getMessagesContentDetails(student, dbMessage.message, markAsRead).doOnSuccess { (downloadedMessage, attachments) ->
-                        local.updateMessages(listOf(dbMessage.message.copy(unread = !markAsRead).apply {
-                            id = dbMessage.message.id
-                            content = content.ifBlank { downloadedMessage }
-                        }))
-                        local.saveMessageAttachments(attachments)
-                        Timber.d("Message ${message.messageId} with blank content: ${dbMessage.message.content.isBlank()}, marked as read")
-                    }
-                }.flatMap {
-                    local.getMessageWithAttachment(student, message)
-                }
-            )
     }
 
     fun getNotNotifiedMessages(student: Student): Single<List<Message>> {
@@ -76,24 +77,29 @@ class MessageRepository @Inject constructor(
             .toSingle(emptyList())
     }
 
+    fun updateMessage(message: Message): Completable {
+        return Completable.fromCallable { local.updateMessages(listOf(message)) }
+    }
+
     fun updateMessages(messages: List<Message>): Completable {
         return Completable.fromCallable { local.updateMessages(messages) }
     }
 
-    fun sendMessage(student: Student, subject: String, content: String, recipients: List<Recipient>): Single<SentMessage> {
+    fun sendMessage(subject: String, content: String, recipients: List<Recipient>): Single<SentMessage> {
         return ReactiveNetwork.checkInternetConnectivity(settings)
             .flatMap {
-                if (it) remote.sendMessage(student, subject, content, recipients)
+                if (it) remote.sendMessage(subject, content, recipients)
                 else Single.error(UnknownHostException())
             }
     }
 
-    fun deleteMessage(student: Student, message: Message): Single<Boolean> {
+    fun deleteMessage(message: Message): Maybe<Boolean> {
         return ReactiveNetwork.checkInternetConnectivity(settings)
             .flatMap {
-                if (it) remote.deleteMessage(student, message)
+                if (it) remote.deleteMessage(message)
                 else Single.error(UnknownHostException())
             }
+            .filter { it }
             .doOnSuccess {
                 if (!message.removed) local.updateMessages(listOf(message.copy(removed = true).apply {
                     id = message.id
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRemote.kt
index 800f95971..c43c3f21e 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRemote.kt
@@ -2,10 +2,8 @@ package io.github.wulkanowy.data.repositories.mobiledevice
 
 import io.github.wulkanowy.data.db.entities.MobileDevice
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.pojos.MobileDeviceToken
 import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.init
 import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -13,14 +11,13 @@ import javax.inject.Singleton
 @Singleton
 class MobileDeviceRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getDevices(student: Student, semester: Semester): Single<List<MobileDevice>> {
-        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
-            .getRegisteredDevices()
+    fun getDevices(semester: Semester): Single<List<MobileDevice>> {
+        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getRegisteredDevices()
             .map { devices ->
                 devices.map {
                     MobileDevice(
                         studentId = semester.studentId,
-                        date = it.createDate,
+                        date = it.date,
                         deviceId = it.id,
                         name = it.name
                     )
@@ -28,14 +25,12 @@ class MobileDeviceRemote @Inject constructor(private val sdk: Sdk) {
             }
     }
 
-    fun unregisterDevice(student: Student, semester: Semester, device: MobileDevice): Single<Boolean> {
-        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
-            .unregisterDevice(device.deviceId)
+    fun unregisterDevice(semester: Semester, device: MobileDevice): Single<Boolean> {
+        return sdk.switchDiary(semester.diaryId, semester.schoolYear).unregisterDevice(device.deviceId)
     }
 
-    fun getToken(student: Student, semester: Semester): Single<MobileDeviceToken> {
-        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
-            .getToken()
+    fun getToken(semester: Semester): Single<MobileDeviceToken> {
+        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getToken()
             .map {
                 MobileDeviceToken(
                     token = it.token,
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRepository.kt
index 545846e85..ac450ff46 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRepository.kt
@@ -4,7 +4,6 @@ import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.MobileDevice
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.pojos.MobileDeviceToken
 import io.github.wulkanowy.utils.uniqueSubtract
 import io.reactivex.Single
@@ -19,11 +18,11 @@ class MobileDeviceRepository @Inject constructor(
     private val remote: MobileDeviceRemote
 ) {
 
-    fun getDevices(student: Student, semester: Semester, forceRefresh: Boolean = false): Single<List<MobileDevice>> {
+    fun getDevices(semester: Semester, forceRefresh: Boolean = false): Single<List<MobileDevice>> {
         return local.getDevices(semester).filter { !forceRefresh }
             .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
                 .flatMap {
-                    if (it) remote.getDevices(student, semester)
+                    if (it) remote.getDevices(semester)
                     else Single.error(UnknownHostException())
                 }.flatMap { new ->
                     local.getDevices(semester).toSingle(emptyList())
@@ -35,18 +34,18 @@ class MobileDeviceRepository @Inject constructor(
             ).flatMap { local.getDevices(semester).toSingle(emptyList()) }
     }
 
-    fun unregisterDevice(student: Student, semester: Semester, device: MobileDevice): Single<Boolean> {
+    fun unregisterDevice(semester: Semester, device: MobileDevice): Single<Boolean> {
         return ReactiveNetwork.checkInternetConnectivity(settings)
             .flatMap {
-                if (it) remote.unregisterDevice(student, semester, device)
+                if (it) remote.unregisterDevice(semester, device)
                 else Single.error(UnknownHostException())
             }
     }
 
-    fun getToken(student: Student, semester: Semester): Single<MobileDeviceToken> {
+    fun getToken(semester: Semester): Single<MobileDeviceToken> {
         return ReactiveNetwork.checkInternetConnectivity(settings)
             .flatMap {
-                if (it) remote.getToken(student, semester)
+                if (it) remote.getToken(semester)
                 else Single.error(UnknownHostException())
             }
     }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRemote.kt
index 2c62b608d..503575b69 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRemote.kt
@@ -2,9 +2,7 @@ package io.github.wulkanowy.data.repositories.note
 
 import io.github.wulkanowy.data.db.entities.Note
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.init
 import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -12,20 +10,15 @@ import javax.inject.Singleton
 @Singleton
 class NoteRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getNotes(student: Student, semester: Semester): Single<List<Note>> {
-        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
-            .getNotes(semester.semesterId)
+    fun getNotes(semester: Semester): Single<List<Note>> {
+        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getNotes(semester.semesterId)
             .map { notes ->
                 notes.map {
                     Note(
                         studentId = semester.studentId,
                         date = it.date,
                         teacher = it.teacher,
-                        teacherSymbol = it.teacherSymbol,
                         category = it.category,
-                        categoryType = it.categoryType.id,
-                        isPointsShow = it.showPoints,
-                        points = it.points,
                         content = it.content
                     )
                 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRepository.kt
index e155e2bad..52cb2d0f5 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRepository.kt
@@ -23,7 +23,7 @@ class NoteRepository @Inject constructor(
         return local.getNotes(student).filter { !forceRefresh }
             .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
                 .flatMap {
-                    if (it) remote.getNotes(student, semester)
+                    if (it) remote.getNotes(semester)
                     else Single.error(UnknownHostException())
                 }.flatMap { new ->
                     local.getNotes(student).toSingle(emptyList())
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/preferences/PreferencesRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/preferences/PreferencesRepository.kt
index 6b13563a4..523caf6c9 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/preferences/PreferencesRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/preferences/PreferencesRepository.kt
@@ -26,9 +26,6 @@ class PreferencesRepository @Inject constructor(
     val isGradeExpandable: Boolean
         get() = !getBoolean(R.string.pref_key_expand_grade, R.bool.pref_default_expand_grade)
 
-    val showAllSubjectsOnStatisticsList: Boolean
-        get() = getBoolean(R.string.pref_key_grade_statistics_list, R.bool.pref_default_grade_statistics_list)
-
     val appThemeKey = context.getString(R.string.pref_key_app_theme)
     val appTheme: String
         get() = getString(appThemeKey, R.string.pref_default_app_theme)
@@ -55,10 +52,6 @@ class PreferencesRepository @Inject constructor(
     val isNotificationsEnable: Boolean
         get() = getBoolean(R.string.pref_key_notifications_enable, R.bool.pref_default_notifications_enable)
 
-    val isUpcomingLessonsNotificationsEnableKey = context.getString(R.string.pref_key_notifications_upcoming_lessons_enable)
-    val isUpcomingLessonsNotificationsEnable: Boolean
-        get() = getBoolean(isUpcomingLessonsNotificationsEnableKey, R.bool.pref_default_notification_upcoming_lessons_enable)
-
     val isDebugNotificationEnableKey = context.getString(R.string.pref_key_notification_debug)
     val isDebugNotificationEnable: Boolean
         get() = getBoolean(isDebugNotificationEnableKey, R.bool.pref_default_notification_debug)
@@ -75,9 +68,6 @@ class PreferencesRepository @Inject constructor(
     val showWholeClassPlan: String
         get() = getString(R.string.pref_key_timetable_show_whole_class, R.string.pref_default_timetable_show_whole_class)
 
-    val showTimetableTimers: Boolean
-        get() = getBoolean(R.string.pref_key_timetable_show_timers, R.bool.pref_default_timetable_show_timers)
-
     private fun getString(id: Int, default: Int) = getString(context.getString(id), default)
 
     private fun getString(id: String, default: Int) = sharedPref.getString(id, context.getString(default)) ?: context.getString(default)
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientRemote.kt
index e5b16a156..f070ea765 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientRemote.kt
@@ -3,9 +3,7 @@ package io.github.wulkanowy.data.repositories.recipient
 import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.db.entities.Recipient
 import io.github.wulkanowy.data.db.entities.ReportingUnit
-import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.init
 import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -14,15 +12,15 @@ import io.github.wulkanowy.sdk.pojo.Recipient as SdkRecipient
 @Singleton
 class RecipientRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getRecipients(student: Student, role: Int, unit: ReportingUnit): Single<List<Recipient>> {
-        return sdk.init(student).getRecipients(unit.realId, role)
+    fun getRecipients(role: Int, unit: ReportingUnit): Single<List<Recipient>> {
+        return sdk.getRecipients(unit.realId, role)
             .map { recipients ->
                 recipients.map { it.toRecipient() }
             }
     }
 
-    fun getMessageRecipients(student: Student, message: Message): Single<List<Recipient>> {
-        return sdk.init(student).getMessageRecipients(message.messageId, message.senderId)
+    fun getMessageRecipients(message: Message): Single<List<Recipient>> {
+        return sdk.getMessageRecipients(message.messageId, message.senderId)
             .map { recipients ->
                 recipients.map { it.toRecipient() }
             }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientRepository.kt
index 6f8a72af2..d29369b94 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientRepository.kt
@@ -2,6 +2,7 @@ package io.github.wulkanowy.data.repositories.recipient
 
 import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
+import io.github.wulkanowy.data.SdkHelper
 import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.db.entities.Recipient
 import io.github.wulkanowy.data.db.entities.ReportingUnit
@@ -16,31 +17,36 @@ import javax.inject.Singleton
 class RecipientRepository @Inject constructor(
     private val settings: InternetObservingSettings,
     private val local: RecipientLocal,
-    private val remote: RecipientRemote
+    private val remote: RecipientRemote,
+    private val sdkHelper: SdkHelper
 ) {
 
     fun getRecipients(student: Student, role: Int, unit: ReportingUnit, forceRefresh: Boolean = false): Single<List<Recipient>> {
-        return local.getRecipients(student, role, unit).filter { !forceRefresh }
-            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                .flatMap {
-                    if (it) remote.getRecipients(student, role, unit)
-                    else Single.error(UnknownHostException())
-                }.flatMap { new ->
-                    local.getRecipients(student, role, unit).toSingle(emptyList())
-                        .doOnSuccess { old ->
-                            local.deleteRecipients(old.uniqueSubtract(new))
-                            local.saveRecipients(new.uniqueSubtract(old))
+        return Single.just(sdkHelper.init(student))
+            .flatMap { _ ->
+                local.getRecipients(student, role, unit).filter { !forceRefresh }
+                    .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                        .flatMap {
+                            if (it) remote.getRecipients(role, unit)
+                            else Single.error(UnknownHostException())
+                        }.flatMap { new ->
+                            local.getRecipients(student, role, unit).toSingle(emptyList())
+                                .doOnSuccess { old ->
+                                    local.deleteRecipients(old.uniqueSubtract(new))
+                                    local.saveRecipients(new.uniqueSubtract(old))
+                                }
+                        }.flatMap {
+                            local.getRecipients(student, role, unit).toSingle(emptyList())
                         }
-                }.flatMap {
-                    local.getRecipients(student, role, unit).toSingle(emptyList())
-                }
-            )
+                    )
+            }
     }
 
     fun getMessageRecipients(student: Student, message: Message): Single<List<Recipient>> {
-        return ReactiveNetwork.checkInternetConnectivity(settings)
+        return Single.just(sdkHelper.init(student))
+            .flatMap { ReactiveNetwork.checkInternetConnectivity(settings) }
             .flatMap {
-                if (it) remote.getMessageRecipients(student, message)
+                if (it) remote.getMessageRecipients(message)
                 else Single.error(UnknownHostException())
             }
     }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/recover/RecoverRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/recover/RecoverRemote.kt
deleted file mode 100644
index f27891250..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/recover/RecoverRemote.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package io.github.wulkanowy.data.repositories.recover
-
-import io.github.wulkanowy.sdk.Sdk
-import io.reactivex.Single
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class RecoverRemote @Inject constructor(private val sdk: Sdk) {
-
-    fun getReCaptchaSiteKey(host: String, symbol: String): Single<Pair<String, String>> {
-        return sdk.getPasswordResetCaptchaCode(host, symbol)
-    }
-
-    fun sendRecoverRequest(url: String, symbol: String, email: String, reCaptchaResponse: String): Single<String> {
-        return sdk.sendPasswordResetRequest(url, symbol, email, reCaptchaResponse)
-    }
-}
-
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/recover/RecoverRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/recover/RecoverRepository.kt
deleted file mode 100644
index 86d4ba1b3..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/recover/RecoverRepository.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package io.github.wulkanowy.data.repositories.recover
-
-import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
-import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
-import io.reactivex.Single
-import java.net.UnknownHostException
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class RecoverRepository @Inject constructor(private val settings: InternetObservingSettings, private val remote: RecoverRemote) {
-
-    fun getReCaptchaSiteKey(host: String, symbol: String): Single<Pair<String, String>> {
-        return ReactiveNetwork.checkInternetConnectivity(settings).flatMap {
-            if (it) remote.getReCaptchaSiteKey(host, symbol)
-            else Single.error(UnknownHostException())
-        }
-    }
-
-    fun sendRecoverRequest(url: String, symbol: String, email: String, reCaptchaResponse: String): Single<String> {
-        return ReactiveNetwork.checkInternetConnectivity(settings).flatMap {
-            if (it) remote.sendRecoverRequest(url, symbol, email, reCaptchaResponse)
-            else Single.error(UnknownHostException())
-        }
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRemote.kt
index 1fd8b08e3..5dbabc545 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRemote.kt
@@ -1,9 +1,7 @@
 package io.github.wulkanowy.data.repositories.reportingunit
 
 import io.github.wulkanowy.data.db.entities.ReportingUnit
-import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.init
 import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -11,8 +9,8 @@ import javax.inject.Singleton
 @Singleton
 class ReportingUnitRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getReportingUnits(student: Student): Single<List<ReportingUnit>> {
-        return sdk.init(student).getReportingUnits().map {
+    fun getReportingUnits(): Single<List<ReportingUnit>> {
+        return sdk.getReportingUnits().map {
             it.map { unit ->
                 ReportingUnit(
                     studentId = sdk.studentId,
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRepository.kt
index ee5440984..4c8370e68 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRepository.kt
@@ -2,6 +2,7 @@ package io.github.wulkanowy.data.repositories.reportingunit
 
 import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
+import io.github.wulkanowy.data.SdkHelper
 import io.github.wulkanowy.data.db.entities.ReportingUnit
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.utils.uniqueSubtract
@@ -15,34 +16,41 @@ import javax.inject.Singleton
 class ReportingUnitRepository @Inject constructor(
     private val settings: InternetObservingSettings,
     private val local: ReportingUnitLocal,
-    private val remote: ReportingUnitRemote
+    private val remote: ReportingUnitRemote,
+    private val sdkHelper: SdkHelper
 ) {
 
     fun getReportingUnits(student: Student, forceRefresh: Boolean = false): Single<List<ReportingUnit>> {
-        return local.getReportingUnits(student).filter { !forceRefresh }
-            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                .flatMap {
-                    if (it) remote.getReportingUnits(student)
-                    else Single.error(UnknownHostException())
-                }.flatMap { new ->
-                    local.getReportingUnits(student).toSingle(emptyList())
-                        .doOnSuccess { old ->
-                            local.deleteReportingUnits(old.uniqueSubtract(new))
-                            local.saveReportingUnits(new.uniqueSubtract(old))
-                        }
-                }.flatMap { local.getReportingUnits(student).toSingle(emptyList()) }
-            )
+        return Single.just(sdkHelper.init(student))
+            .flatMap { _ ->
+                local.getReportingUnits(student).filter { !forceRefresh }
+                    .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                        .flatMap {
+                            if (it) remote.getReportingUnits()
+                            else Single.error(UnknownHostException())
+                        }.flatMap { new ->
+                            local.getReportingUnits(student).toSingle(emptyList())
+                                .doOnSuccess { old ->
+                                    local.deleteReportingUnits(old.uniqueSubtract(new))
+                                    local.saveReportingUnits(new.uniqueSubtract(old))
+                                }
+                        }.flatMap { local.getReportingUnits(student).toSingle(emptyList()) }
+                    )
+            }
     }
 
     fun getReportingUnit(student: Student, unitId: Int): Maybe<ReportingUnit> {
-        return local.getReportingUnit(student, unitId)
-            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                .flatMap {
-                    if (it) getReportingUnits(student, true)
-                    else Single.error(UnknownHostException())
-                }.flatMapMaybe {
-                    local.getReportingUnit(student, unitId)
-                }
-            )
+        return Maybe.just(sdkHelper.init(student))
+            .flatMap { _ ->
+                local.getReportingUnit(student, unitId)
+                    .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                        .flatMap {
+                            if (it) getReportingUnits(student, true)
+                            else Single.error(UnknownHostException())
+                        }.flatMapMaybe {
+                            local.getReportingUnit(student, unitId)
+                        }
+                    )
+            }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolRemote.kt
index 6a95a446b..4d5c92a9e 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolRemote.kt
@@ -2,17 +2,14 @@ package io.github.wulkanowy.data.repositories.school
 
 import io.github.wulkanowy.data.db.entities.School
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.init
 import io.reactivex.Single
 import javax.inject.Inject
 
 class SchoolRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getSchoolInfo(student: Student, semester: Semester): Single<School> {
-        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
-            .getSchool()
+    fun getSchoolInfo(semester: Semester): Single<School> {
+        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getSchool()
             .map {
                 School(
                     studentId = semester.studentId,
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolRepository.kt
index 1715a28d5..a352324d2 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolRepository.kt
@@ -4,7 +4,6 @@ import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.School
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
 import io.reactivex.Maybe
 import io.reactivex.Single
 import java.net.UnknownHostException
@@ -18,11 +17,11 @@ class SchoolRepository @Inject constructor(
     private val remote: SchoolRemote
 ) {
 
-    fun getSchoolInfo(student: Student, semester: Semester, forceRefresh: Boolean = false): Maybe<School> {
+    fun getSchoolInfo(semester: Semester, forceRefresh: Boolean = false): Maybe<School> {
         return local.getSchool(semester).filter { !forceRefresh }
             .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
                 .flatMap {
-                    if (it) remote.getSchoolInfo(student, semester)
+                    if (it) remote.getSchoolInfo(semester)
                     else Single.error(UnknownHostException())
                 }.flatMapMaybe { new ->
                     local.getSchool(semester)
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterLocal.kt
index 3d98785cd..b9750e7d5 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterLocal.kt
@@ -19,6 +19,6 @@ class SemesterLocal @Inject constructor(private val semesterDb: SemesterDao) {
     }
 
     fun getSemesters(student: Student): Maybe<List<Semester>> {
-        return semesterDb.loadAll(student.studentId, student.classId).filter { it.isNotEmpty() }
+        return semesterDb.loadAll(student.studentId, student.classId).filter { !it.isEmpty() }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRemote.kt
index 90f0e1d71..55d13a765 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRemote.kt
@@ -3,7 +3,6 @@ package io.github.wulkanowy.data.repositories.semester
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.init
 import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -12,7 +11,7 @@ import javax.inject.Singleton
 class SemesterRemote @Inject constructor(private val sdk: Sdk) {
 
     fun getSemesters(student: Student): Single<List<Semester>> {
-        return sdk.init(student).getSemesters().map { semesters ->
+        return sdk.getSemesters().map { semesters ->
             semesters.map {
                 Semester(
                     studentId = student.studentId,
@@ -21,6 +20,7 @@ class SemesterRemote @Inject constructor(private val sdk: Sdk) {
                     schoolYear = it.schoolYear,
                     semesterId = it.semesterId,
                     semesterName = it.semesterNumber,
+                    isCurrent = it.current,
                     start = it.start,
                     end = it.end,
                     classId = it.classId,
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRepository.kt
index 68946beef..6377cb78e 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRepository.kt
@@ -2,13 +2,13 @@ package io.github.wulkanowy.data.repositories.semester
 
 import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
+import io.github.wulkanowy.data.SdkHelper
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.getCurrentOrLast
-import io.github.wulkanowy.utils.isCurrent
 import io.github.wulkanowy.utils.uniqueSubtract
+import io.reactivex.Maybe
 import io.reactivex.Single
+import timber.log.Timber
 import java.net.UnknownHostException
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -17,31 +17,32 @@ import javax.inject.Singleton
 class SemesterRepository @Inject constructor(
     private val remote: SemesterRemote,
     private val local: SemesterLocal,
-    private val settings: InternetObservingSettings
+    private val settings: InternetObservingSettings,
+    private val sdkHelper: SdkHelper
 ) {
 
-    fun getSemesters(student: Student, forceRefresh: Boolean = false, refreshOnNoCurrent: Boolean = false): Single<List<Semester>> {
-        return local.getSemesters(student).filter { !forceRefresh }.filter { semesters ->
-            when {
-                Sdk.Mode.valueOf(student.loginMode) != Sdk.Mode.API -> semesters.firstOrNull { it.isCurrent }?.diaryId != 0
-                refreshOnNoCurrent -> semesters.any { semester -> semester.isCurrent }
-                else -> true
-            }
-        }.switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-            .flatMap {
-                if (it) remote.getSemesters(student)
-                else Single.error(UnknownHostException())
-            }.flatMap { new ->
-                if (new.isEmpty()) throw IllegalArgumentException("Empty semester list!")
-
-                local.getSemesters(student).toSingle(emptyList()).doOnSuccess { old ->
-                    local.deleteSemesters(old.uniqueSubtract(new))
-                    local.saveSemesters(new.uniqueSubtract(old))
-                }
-            }.flatMap { local.getSemesters(student).toSingle(emptyList()) })
+    fun getSemesters(student: Student, forceRefresh: Boolean = false): Single<List<Semester>> {
+        return Maybe.just(sdkHelper.init(student))
+            .flatMap { local.getSemesters(student).filter { !forceRefresh } }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) remote.getSemesters(student) else Single.error(UnknownHostException())
+                }.flatMap { new ->
+                    val currentSemesters = new.filter { it.isCurrent }
+                    if (currentSemesters.size == 1) {
+                        local.getSemesters(student).toSingle(emptyList())
+                            .doOnSuccess { old ->
+                                local.deleteSemesters(old.uniqueSubtract(new))
+                                local.saveSemesters(new.uniqueSubtract(old))
+                            }
+                    } else {
+                        Timber.i("Current semesters list:\n${new.joinToString(separator = "\n")}")
+                        throw IllegalArgumentException("Current semester can be only one.")
+                    }
+                }.flatMap { local.getSemesters(student).toSingle(emptyList()) })
     }
 
     fun getCurrentSemester(student: Student, forceRefresh: Boolean = false): Single<Semester> {
-        return getSemesters(student, forceRefresh).map { it.getCurrentOrLast() }
+        return getSemesters(student, forceRefresh).map { item -> item.single { it.isCurrent } }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentLocal.kt
index 06b9bb4ac..a3576ca22 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentLocal.kt
@@ -29,18 +29,10 @@ class StudentLocal @Inject constructor(
 
     fun getStudents(decryptPass: Boolean): Maybe<List<Student>> {
         return studentDb.loadAll()
-            .map { list -> list.map { it.apply { if (decryptPass && Sdk.Mode.valueOf(loginMode) != Sdk.Mode.API) password = decrypt(password) } } }
+            .map { list -> list.map { it.apply { if (decryptPass) password = decrypt(password) } } }
             .filter { it.isNotEmpty() }
     }
 
-    fun getStudentById(id: Int): Maybe<Student> {
-        return studentDb.loadById(id).map {
-            it.apply {
-                if (Sdk.Mode.valueOf(loginMode) != Sdk.Mode.API) password = decrypt(password)
-            }
-        }
-    }
-
     fun getCurrentStudent(decryptPass: Boolean): Maybe<Student> {
         return studentDb.loadCurrent().map {
             it.apply {
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRemote.kt
index 15c336505..944313082 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRemote.kt
@@ -22,7 +22,6 @@ class StudentRemote @Inject constructor(private val sdk: Sdk) {
                 userLoginId = student.userLoginId,
                 studentName = student.studentName,
                 schoolSymbol = student.schoolSymbol,
-                schoolShortName = student.schoolShortName,
                 schoolName = student.schoolName,
                 className = student.className,
                 classId = student.classId,
@@ -39,7 +38,7 @@ class StudentRemote @Inject constructor(private val sdk: Sdk) {
     }
 
     fun getStudentsMobileApi(token: String, pin: String, symbol: String): Single<List<Student>> {
-        return sdk.getStudentsFromMobileApi(token, pin, symbol, "").map { mapStudents(it, "", "") }
+        return sdk.getStudentsFromMobileApi(token, pin, symbol).map { mapStudents(it, "", "") }
     }
 
     fun getStudentsScrapper(email: String, password: String, scrapperBaseUrl: String, symbol: String): Single<List<Student>> {
@@ -47,6 +46,6 @@ class StudentRemote @Inject constructor(private val sdk: Sdk) {
     }
 
     fun getStudentsHybrid(email: String, password: String, scrapperBaseUrl: String, symbol: String): Single<List<Student>> {
-        return sdk.getStudentsHybrid(email, password, scrapperBaseUrl, "", symbol).map { mapStudents(it, email, password) }
+        return sdk.getStudentsHybrid(email, password, scrapperBaseUrl, symbol).map { mapStudents(it, email, password) }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRepository.kt
index bebd1eb9c..e06e654a9 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRepository.kt
@@ -29,7 +29,7 @@ class StudentRepository @Inject constructor(
         }
     }
 
-    fun getStudentsScrapper(email: String, password: String, endpoint: String, symbol: String): Single<List<Student>> {
+    fun getStudentsScrapper(email: String, password: String, endpoint: String, symbol: String = ""): Single<List<Student>> {
         return ReactiveNetwork.checkInternetConnectivity(settings).flatMap {
             if (it) remote.getStudentsScrapper(email, password, endpoint, symbol)
             else Single.error(UnknownHostException("No internet connection"))
@@ -47,12 +47,6 @@ class StudentRepository @Inject constructor(
         return local.getStudents(decryptPass).toSingle(emptyList())
     }
 
-    fun getStudentById(id: Int): Single<Student> {
-        return local.getStudentById(id)
-            .switchIfEmpty(Maybe.error(NoCurrentStudentException()))
-            .toSingle()
-    }
-
     fun getCurrentStudent(decryptPass: Boolean = true): Single<Student> {
         return local.getCurrentStudent(decryptPass)
             .switchIfEmpty(Maybe.error(NoCurrentStudentException()))
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectLocal.kt
index f8c13e6c2..63e334019 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectLocal.kt
@@ -12,7 +12,7 @@ class SubjectLocal @Inject constructor(private val subjectDao: SubjectDao) {
 
     fun getSubjects(semester: Semester): Maybe<List<Subject>> {
         return subjectDao.loadAll(semester.diaryId, semester.studentId)
-            .filter { it.isNotEmpty() }
+            .filter { !it.isEmpty() }
     }
 
     fun saveSubjects(subjects: List<Subject>) {
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRemote.kt
index d30232f82..32dbb2f2e 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRemote.kt
@@ -1,10 +1,8 @@
 package io.github.wulkanowy.data.repositories.subject
 
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.db.entities.Subject
 import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.init
 import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -12,9 +10,8 @@ import javax.inject.Singleton
 @Singleton
 class SubjectRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getSubjects(student: Student, semester: Semester): Single<List<Subject>> {
-        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
-            .getSubjects()
+    fun getSubjects(semester: Semester): Single<List<Subject>> {
+        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getSubjects()
             .map { subjects ->
                 subjects.map {
                     Subject(
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRepository.kt
index 649904da1..0c5f386b6 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRepository.kt
@@ -3,7 +3,6 @@ package io.github.wulkanowy.data.repositories.subject
 import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.db.entities.Subject
 import io.github.wulkanowy.utils.uniqueSubtract
 import io.reactivex.Single
@@ -18,11 +17,11 @@ class SubjectRepository @Inject constructor(
     private val remote: SubjectRemote
 ) {
 
-    fun getSubjects(student: Student, semester: Semester, forceRefresh: Boolean = false): Single<List<Subject>> {
+    fun getSubjects(semester: Semester, forceRefresh: Boolean = false): Single<List<Subject>> {
         return local.getSubjects(semester).filter { !forceRefresh }
             .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
                 .flatMap {
-                    if (it) remote.getSubjects(student, semester)
+                    if (it) remote.getSubjects(semester)
                     else Single.error(UnknownHostException())
                 }.flatMap { new ->
                     local.getSubjects(semester)
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherRemote.kt
index 01552f748..d4401bfb2 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherRemote.kt
@@ -1,10 +1,8 @@
 package io.github.wulkanowy.data.repositories.teacher
 
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.db.entities.Teacher
 import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.init
 import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -12,9 +10,8 @@ import javax.inject.Singleton
 @Singleton
 class TeacherRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getTeachers(student: Student, semester: Semester): Single<List<Teacher>> {
-        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
-            .getTeachers(semester.semesterId)
+    fun getTeachers(semester: Semester): Single<List<Teacher>> {
+        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getTeachers(semester.semesterId)
             .map { teachers ->
                 teachers.map {
                     Teacher(
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherRepository.kt
index 3c10be73f..19e7a32b8 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherRepository.kt
@@ -3,7 +3,6 @@ package io.github.wulkanowy.data.repositories.teacher
 import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.db.entities.Teacher
 import io.github.wulkanowy.utils.uniqueSubtract
 import io.reactivex.Single
@@ -18,11 +17,11 @@ class TeacherRepository @Inject constructor(
     private val remote: TeacherRemote
 ) {
 
-    fun getTeachers(student: Student, semester: Semester, forceRefresh: Boolean = false): Single<List<Teacher>> {
+    fun getTeachers(semester: Semester, forceRefresh: Boolean = false): Single<List<Teacher>> {
         return local.getTeachers(semester).filter { !forceRefresh }
             .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
                 .flatMap {
-                    if (it) remote.getTeachers(student, semester)
+                    if (it) remote.getTeachers(semester)
                     else Single.error(UnknownHostException())
                 }.flatMap { new ->
                     local.getTeachers(semester).toSingle(emptyList())
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRemote.kt
index 22cb947db..26e7836ad 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRemote.kt
@@ -1,10 +1,8 @@
 package io.github.wulkanowy.data.repositories.timetable
 
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.db.entities.Timetable
 import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.init
 import io.reactivex.Single
 import org.threeten.bp.LocalDate
 import javax.inject.Inject
@@ -13,9 +11,8 @@ import javax.inject.Singleton
 @Singleton
 class TimetableRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getTimetable(student: Student, semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<Timetable>> {
-        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
-            .getTimetable(startDate, endDate)
+    fun getTimetable(semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<Timetable>> {
+        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getTimetable(startDate, endDate)
             .map { lessons ->
                 lessons.map {
                     Timetable(
@@ -33,7 +30,7 @@ class TimetableRemote @Inject constructor(private val sdk: Sdk) {
                         teacher = it.teacher,
                         teacherOld = it.teacherOld,
                         info = it.info,
-                        isStudentPlan = it.studentPlan,
+                        studentPlan = it.studentPlan,
                         changes = it.changes,
                         canceled = it.canceled
                     )
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepository.kt
index 4a7a0eb24..20e183c25 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepository.kt
@@ -3,10 +3,8 @@ package io.github.wulkanowy.data.repositories.timetable
 import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.db.entities.Timetable
-import io.github.wulkanowy.services.alarm.TimetableNotificationSchedulerHelper
-import io.github.wulkanowy.utils.sunday
+import io.github.wulkanowy.utils.friday
 import io.github.wulkanowy.utils.monday
 import io.github.wulkanowy.utils.uniqueSubtract
 import io.reactivex.Single
@@ -19,22 +17,21 @@ import javax.inject.Singleton
 class TimetableRepository @Inject constructor(
     private val settings: InternetObservingSettings,
     private val local: TimetableLocal,
-    private val remote: TimetableRemote,
-    private val schedulerHelper: TimetableNotificationSchedulerHelper
+    private val remote: TimetableRemote
 ) {
 
-    fun getTimetable(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean = false): Single<List<Timetable>> {
-        return Single.fromCallable { start.monday to end.sunday }.flatMap { (monday, sunday) ->
-            local.getTimetable(semester, monday, sunday).filter { !forceRefresh }
+    fun getTimetable(semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean = false): Single<List<Timetable>> {
+        return Single.fromCallable { start.monday to end.friday }.flatMap { (monday, friday) ->
+            local.getTimetable(semester, monday, friday).filter { !forceRefresh }
                 .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings).flatMap {
-                    if (it) remote.getTimetable(student, semester, monday, sunday)
+                    if (it) remote.getTimetable(semester, monday, friday)
                     else Single.error(UnknownHostException())
                 }.flatMap { new ->
-                    local.getTimetable(semester, monday, sunday)
+                    local.getTimetable(semester, monday, friday)
                         .toSingle(emptyList())
                         .doOnSuccess { old ->
-                            local.deleteTimetable(old.uniqueSubtract(new).also { schedulerHelper.cancelScheduled(it) })
-                            local.saveTimetable(new.uniqueSubtract(old).also { schedulerHelper.scheduleNotifications(it, student) }.map { item ->
+                            local.deleteTimetable(old.uniqueSubtract(new))
+                            local.saveTimetable(new.uniqueSubtract(old).map { item ->
                                 item.also { new ->
                                     old.singleOrNull { new.start == it.start }?.let { old ->
                                         return@map new.copy(
@@ -46,8 +43,8 @@ class TimetableRepository @Inject constructor(
                             })
                         }
                 }.flatMap {
-                    local.getTimetable(semester, monday, sunday).toSingle(emptyList())
-                }).map { list -> list.filter { it.date in start..end }.also { schedulerHelper.scheduleNotifications(it, student) } }
+                    local.getTimetable(semester, monday, friday).toSingle(emptyList())
+                }).map { list -> list.filter { it.date in start..end } }
         }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/di/AppModule.kt b/app/src/main/java/io/github/wulkanowy/di/AppModule.kt
index db5ff59b3..4f5683850 100644
--- a/app/src/main/java/io/github/wulkanowy/di/AppModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/di/AppModule.kt
@@ -5,6 +5,8 @@ import android.content.Context
 import com.yariksoffice.lingver.Lingver
 import dagger.Module
 import dagger.Provides
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.WulkanowyApp
 import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.SchedulersProvider
@@ -21,6 +23,9 @@ internal class AppModule {
     @Provides
     fun provideSchedulersProvider() = SchedulersProvider()
 
+    @Provides
+    fun provideFlexibleAdapter() = FlexibleAdapter<AbstractFlexibleItem<*>>(null, null, true)
+
     @Singleton
     @Provides
     fun provideAppWidgetManager(context: Context): AppWidgetManager = AppWidgetManager.getInstance(context)
diff --git a/app/src/main/java/io/github/wulkanowy/di/BindingModule.kt b/app/src/main/java/io/github/wulkanowy/di/BindingModule.kt
index 1b462964d..98061e609 100644
--- a/app/src/main/java/io/github/wulkanowy/di/BindingModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/di/BindingModule.kt
@@ -3,8 +3,6 @@ package io.github.wulkanowy.di
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
 import io.github.wulkanowy.di.scopes.PerActivity
-import io.github.wulkanowy.ui.base.ErrorDialog
-import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver
 import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.ui.modules.login.LoginModule
 import io.github.wulkanowy.ui.modules.luckynumberwidget.LuckyNumberWidgetConfigureActivity
@@ -20,9 +18,6 @@ import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider
 @Module
 internal abstract class BindingModule {
 
-    @ContributesAndroidInjector
-    abstract fun bindErrorDialog(): ErrorDialog
-
     @PerActivity
     @ContributesAndroidInjector
     abstract fun bindSplashActivity(): SplashActivity
@@ -49,7 +44,4 @@ internal abstract class BindingModule {
 
     @ContributesAndroidInjector
     abstract fun bindLuckyNumberWidgetProvider(): LuckyNumberWidgetProvider
-
-    @ContributesAndroidInjector
-    abstract fun bindTimetableNotificationReceiver(): TimetableNotificationReceiver
 }
diff --git a/app/src/main/java/io/github/wulkanowy/services/ServicesModule.kt b/app/src/main/java/io/github/wulkanowy/services/ServicesModule.kt
index b87f0e683..78bdbd8c0 100644
--- a/app/src/main/java/io/github/wulkanowy/services/ServicesModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/ServicesModule.kt
@@ -1,9 +1,7 @@
 package io.github.wulkanowy.services
 
-import android.app.AlarmManager
 import android.content.Context
 import androidx.core.app.NotificationManagerCompat
-import androidx.core.content.getSystemService
 import androidx.work.WorkManager
 import com.squareup.inject.assisted.dagger2.AssistedModule
 import dagger.Binds
@@ -11,19 +9,12 @@ import dagger.Module
 import dagger.Provides
 import dagger.android.ContributesAndroidInjector
 import dagger.multibindings.IntoSet
-import io.github.wulkanowy.services.sync.channels.Channel
-import io.github.wulkanowy.services.sync.channels.DebugChannel
-import io.github.wulkanowy.services.sync.channels.LuckyNumberChannel
-import io.github.wulkanowy.services.sync.channels.NewGradesChannel
-import io.github.wulkanowy.services.sync.channels.NewMessagesChannel
-import io.github.wulkanowy.services.sync.channels.NewNotesChannel
-import io.github.wulkanowy.services.sync.channels.UpcomingLessonsChannel
-import io.github.wulkanowy.services.sync.channels.PushChannel
 import io.github.wulkanowy.services.sync.works.AttendanceSummaryWork
 import io.github.wulkanowy.services.sync.works.AttendanceWork
 import io.github.wulkanowy.services.sync.works.CompletedLessonWork
 import io.github.wulkanowy.services.sync.works.ExamWork
 import io.github.wulkanowy.services.sync.works.GradeStatisticsWork
+import io.github.wulkanowy.services.sync.works.GradeSummaryWork
 import io.github.wulkanowy.services.sync.works.GradeWork
 import io.github.wulkanowy.services.sync.works.HomeworkWork
 import io.github.wulkanowy.services.sync.works.LuckyNumberWork
@@ -38,10 +29,11 @@ import javax.inject.Singleton
 
 @Suppress("unused")
 @AssistedModule
-@Module(includes = [AssistedInject_ServicesModule::class])
+@Module(includes = [AssistedInject_ServicesModule::class, ServicesModule.Static::class])
 abstract class ServicesModule {
 
-    companion object {
+    @Module
+    object Static {
 
         @Provides
         fun provideWorkManager(context: Context) = WorkManager.getInstance(context)
@@ -49,10 +41,6 @@ abstract class ServicesModule {
         @Singleton
         @Provides
         fun provideNotificationManager(context: Context) = NotificationManagerCompat.from(context)
-
-        @Singleton
-        @Provides
-        fun provideAlarmManager(context: Context): AlarmManager = context.getSystemService()!!
     }
 
     @ContributesAndroidInjector
@@ -70,6 +58,10 @@ abstract class ServicesModule {
     @IntoSet
     abstract fun provideAttendanceWork(work: AttendanceWork): Work
 
+    @Binds
+    @IntoSet
+    abstract fun provideGradeSummaryWork(work: GradeSummaryWork): Work
+
     @Binds
     @IntoSet
     abstract fun provideExamWork(work: ExamWork): Work
@@ -109,32 +101,4 @@ abstract class ServicesModule {
     @Binds
     @IntoSet
     abstract fun provideGradeStatistics(work: GradeStatisticsWork): Work
-
-    @Binds
-    @IntoSet
-    abstract fun provideDebugChannel(channel: DebugChannel): Channel
-
-    @Binds
-    @IntoSet
-    abstract fun provideLuckyNumberChannel(channel: LuckyNumberChannel): Channel
-
-    @Binds
-    @IntoSet
-    abstract fun provideNewGradesChannel(channel: NewGradesChannel): Channel
-
-    @Binds
-    @IntoSet
-    abstract fun provideNewMessageChannel(channel: NewMessagesChannel): Channel
-
-    @Binds
-    @IntoSet
-    abstract fun provideNewNotesChannel(channel: NewNotesChannel): Channel
-
-    @Binds
-    @IntoSet
-    abstract fun providePushChannel(channel: PushChannel): Channel
-
-    @Binds
-    @IntoSet
-    abstract fun provideUpcomingLessonsChannel(channel: UpcomingLessonsChannel): Channel
 }
diff --git a/app/src/main/java/io/github/wulkanowy/services/alarm/TimetableNotificationReceiver.kt b/app/src/main/java/io/github/wulkanowy/services/alarm/TimetableNotificationReceiver.kt
deleted file mode 100644
index 0130f4673..000000000
--- a/app/src/main/java/io/github/wulkanowy/services/alarm/TimetableNotificationReceiver.kt
+++ /dev/null
@@ -1,117 +0,0 @@
-package io.github.wulkanowy.services.alarm
-
-import android.annotation.SuppressLint
-import android.app.PendingIntent
-import android.app.PendingIntent.FLAG_UPDATE_CURRENT
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import android.os.Build
-import android.os.Build.VERSION_CODES.N
-import androidx.core.app.NotificationCompat
-import androidx.core.app.NotificationManagerCompat
-import dagger.android.AndroidInjection
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.repositories.student.StudentRepository
-import io.github.wulkanowy.services.sync.channels.UpcomingLessonsChannel.Companion.CHANNEL_ID
-import io.github.wulkanowy.ui.modules.main.MainActivity
-import io.github.wulkanowy.ui.modules.main.MainView
-import io.github.wulkanowy.utils.SchedulersProvider
-import io.github.wulkanowy.utils.getCompatColor
-import io.github.wulkanowy.utils.toLocalDateTime
-import timber.log.Timber
-import javax.inject.Inject
-
-class TimetableNotificationReceiver : BroadcastReceiver() {
-
-    @Inject
-    lateinit var studentRepository: StudentRepository
-
-    @Inject
-    lateinit var schedulers: SchedulersProvider
-
-    companion object {
-        const val NOTIFICATION_TYPE_CURRENT = 1
-        const val NOTIFICATION_TYPE_UPCOMING = 2
-        const val NOTIFICATION_TYPE_LAST_LESSON_CANCELLATION = 3
-
-        const val NOTIFICATION_ID = "id"
-
-        const val STUDENT_NAME = "student_name"
-        const val STUDENT_ID = "student_id"
-        const val LESSON_TYPE = "type"
-        const val LESSON_TITLE = "title"
-        const val LESSON_ROOM = "room"
-        const val LESSON_NEXT_TITLE = "next_title"
-        const val LESSON_NEXT_ROOM = "next_room"
-        const val LESSON_START = "start_timestamp"
-        const val LESSON_END = "end_timestamp"
-    }
-
-    @SuppressLint("CheckResult")
-    override fun onReceive(context: Context, intent: Intent) {
-        Timber.d("Receiving intent... ${intent.toUri(0)}")
-        AndroidInjection.inject(this, context)
-
-        studentRepository.getCurrentStudent(false)
-            .subscribeOn(schedulers.backgroundThread)
-            .observeOn(schedulers.mainThread)
-            .subscribe({
-                val studentId = intent.getIntExtra(STUDENT_ID, 0)
-                if (it.studentId == studentId) prepareNotification(context, intent)
-                else Timber.d("Notification studentId($studentId) differs from current(${it.studentId})")
-            }, { Timber.e(it) })
-    }
-
-    private fun prepareNotification(context: Context, intent: Intent) {
-        val type = intent.getIntExtra(LESSON_TYPE, 0)
-        val notificationId = intent.getIntExtra(NOTIFICATION_ID, MainView.Section.TIMETABLE.id)
-
-        if (type == NOTIFICATION_TYPE_LAST_LESSON_CANCELLATION) {
-            return NotificationManagerCompat.from(context).cancel(notificationId)
-        }
-
-        val studentId = intent.getIntExtra(STUDENT_ID, 0)
-        val studentName = intent.getStringExtra(STUDENT_NAME)
-
-        val subject = intent.getStringExtra(LESSON_TITLE)
-        val room = intent.getStringExtra(LESSON_ROOM)
-
-        val start = intent.getLongExtra(LESSON_START, 0)
-        val end = intent.getLongExtra(LESSON_END, 0)
-
-        val nextSubject = intent.getStringExtra(LESSON_NEXT_TITLE)
-        val nextRoom = intent.getStringExtra(LESSON_NEXT_ROOM)
-
-        Timber.d("TimetableNotification receive: type: $type, subject: $subject, start: ${start.toLocalDateTime()}, student: $studentId")
-
-        showNotification(context, notificationId, studentName,
-            if (type == NOTIFICATION_TYPE_CURRENT) end else start, end - start,
-            context.getString(if (type == NOTIFICATION_TYPE_CURRENT) R.string.timetable_now else R.string.timetable_next, "($room) $subject".removePrefix("()")),
-            nextSubject?.let { context.getString(R.string.timetable_later, "($nextRoom) $nextSubject".removePrefix("()")) }
-        )
-    }
-
-    private fun showNotification(context: Context, notificationId: Int, studentName: String?, countDown: Long, timeout: Long, title: String, next: String?) {
-        NotificationManagerCompat.from(context).notify(notificationId, NotificationCompat.Builder(context, CHANNEL_ID)
-            .setContentTitle(title)
-            .setContentText(next)
-            .setAutoCancel(false)
-            .setOngoing(true)
-            .setWhen(countDown)
-            .apply {
-                if (Build.VERSION.SDK_INT >= N) setUsesChronometer(true)
-            }
-            .setTimeoutAfter(timeout)
-            .setSmallIcon(R.drawable.ic_stat_timetable)
-            .setColor(context.getCompatColor(R.color.colorPrimary))
-            .setStyle(NotificationCompat.InboxStyle().also {
-                it.setSummaryText(studentName)
-                it.addLine(next)
-            })
-            .setContentIntent(PendingIntent.getActivity(context, MainView.Section.TIMETABLE.id,
-                MainActivity.getStartIntent(context, MainView.Section.TIMETABLE, true), FLAG_UPDATE_CURRENT))
-            .build()
-        )
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/services/alarm/TimetableNotificationSchedulerHelper.kt b/app/src/main/java/io/github/wulkanowy/services/alarm/TimetableNotificationSchedulerHelper.kt
deleted file mode 100644
index 54b245ddb..000000000
--- a/app/src/main/java/io/github/wulkanowy/services/alarm/TimetableNotificationSchedulerHelper.kt
+++ /dev/null
@@ -1,109 +0,0 @@
-package io.github.wulkanowy.services.alarm
-
-import android.app.AlarmManager
-import android.app.AlarmManager.RTC_WAKEUP
-import android.app.PendingIntent
-import android.app.PendingIntent.FLAG_UPDATE_CURRENT
-import android.content.Context
-import android.content.Intent
-import androidx.core.app.AlarmManagerCompat
-import androidx.core.app.NotificationManagerCompat
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.db.entities.Timetable
-import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
-import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver.Companion.LESSON_END
-import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver.Companion.LESSON_NEXT_ROOM
-import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver.Companion.LESSON_NEXT_TITLE
-import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver.Companion.LESSON_ROOM
-import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver.Companion.LESSON_START
-import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver.Companion.LESSON_TITLE
-import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver.Companion.LESSON_TYPE
-import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver.Companion.NOTIFICATION_ID
-import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver.Companion.NOTIFICATION_TYPE_CURRENT
-import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver.Companion.NOTIFICATION_TYPE_LAST_LESSON_CANCELLATION
-import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver.Companion.NOTIFICATION_TYPE_UPCOMING
-import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver.Companion.STUDENT_ID
-import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver.Companion.STUDENT_NAME
-import io.github.wulkanowy.ui.modules.main.MainView
-import io.github.wulkanowy.utils.toTimestamp
-import org.threeten.bp.LocalDateTime
-import org.threeten.bp.LocalDateTime.now
-import timber.log.Timber
-import javax.inject.Inject
-
-class TimetableNotificationSchedulerHelper @Inject constructor(
-    private val context: Context,
-    private val alarmManager: AlarmManager,
-    private val preferencesRepository: PreferencesRepository
-) {
-
-    private fun getRequestCode(time: LocalDateTime, studentId: Int) = (time.toTimestamp() * studentId).toInt()
-
-    private fun getUpcomingLessonTime(index: Int, day: List<Timetable>, lesson: Timetable): LocalDateTime {
-        return day.getOrNull(index - 1)?.end ?: lesson.start.minusMinutes(30)
-    }
-
-    fun cancelScheduled(lessons: List<Timetable>, studentId: Int = 1) {
-        lessons.sortedBy { it.start }.forEachIndexed { index, lesson ->
-            val upcomingTime = getUpcomingLessonTime(index, lessons, lesson)
-            cancelScheduledTo(upcomingTime..lesson.start, getRequestCode(upcomingTime, studentId))
-            cancelScheduledTo(lesson.start..lesson.end, getRequestCode(lesson.start, studentId))
-
-            Timber.d("TimetableNotification canceled: type 1 & 2, subject: ${lesson.subject}, start: ${lesson.start}, student: $studentId")
-        }
-    }
-
-    private fun cancelScheduledTo(range: ClosedRange<LocalDateTime>, requestCode: Int) {
-        if (now() in range) cancelNotification()
-        alarmManager.cancel(PendingIntent.getBroadcast(context, requestCode, Intent(), FLAG_UPDATE_CURRENT))
-    }
-
-    fun cancelNotification() = NotificationManagerCompat.from(context).cancel(MainView.Section.TIMETABLE.id)
-
-    fun scheduleNotifications(lessons: List<Timetable>, student: Student) {
-        if (!preferencesRepository.isUpcomingLessonsNotificationsEnable) return cancelScheduled(lessons, student.studentId)
-
-        lessons.groupBy { it.date }
-            .map { it.value.sortedBy { lesson -> lesson.start } }
-            .map { it.filter { lesson -> !lesson.canceled && lesson.isStudentPlan } }
-            .map { day ->
-                day.forEachIndexed { index, lesson ->
-                    val intent = createIntent(student, lesson, day.getOrNull(index + 1))
-
-                    if (lesson.start > now()) {
-                        scheduleBroadcast(intent, student.studentId, NOTIFICATION_TYPE_UPCOMING, getUpcomingLessonTime(index, day, lesson))
-                    }
-
-                    if (lesson.end > now()) {
-                        scheduleBroadcast(intent, student.studentId, NOTIFICATION_TYPE_CURRENT, lesson.start)
-                        if (day.lastIndex == index) {
-                            scheduleBroadcast(intent, student.studentId, NOTIFICATION_TYPE_LAST_LESSON_CANCELLATION, lesson.end)
-                        }
-                    }
-                }
-            }
-    }
-
-    private fun createIntent(student: Student, lesson: Timetable, nextLesson: Timetable?): Intent {
-        return Intent(context, TimetableNotificationReceiver::class.java).apply {
-            putExtra(STUDENT_ID, student.studentId)
-            putExtra(STUDENT_NAME, student.studentName)
-            putExtra(LESSON_ROOM, lesson.room)
-            putExtra(LESSON_START, lesson.start.toTimestamp())
-            putExtra(LESSON_END, lesson.end.toTimestamp())
-            putExtra(LESSON_TITLE, lesson.subject)
-            putExtra(LESSON_NEXT_TITLE, nextLesson?.subject)
-            putExtra(LESSON_NEXT_ROOM, nextLesson?.room)
-        }
-    }
-
-    private fun scheduleBroadcast(intent: Intent, studentId: Int, notificationType: Int, time: LocalDateTime) {
-        AlarmManagerCompat.setExactAndAllowWhileIdle(alarmManager, RTC_WAKEUP, time.toTimestamp(),
-            PendingIntent.getBroadcast(context, getRequestCode(time, studentId), intent.also {
-                it.putExtra(NOTIFICATION_ID, MainView.Section.TIMETABLE.id)
-                it.putExtra(LESSON_TYPE, notificationType)
-            }, FLAG_UPDATE_CURRENT)
-        )
-        Timber.d("TimetableNotification scheduled: type: $notificationType, subject: ${intent.getStringExtra(LESSON_TITLE)}, start: $time, student: $studentId")
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/SyncManager.kt b/app/src/main/java/io/github/wulkanowy/services/sync/SyncManager.kt
index 965ed0ad9..6b0469773 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/SyncManager.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/SyncManager.kt
@@ -2,27 +2,21 @@ package io.github.wulkanowy.services.sync
 
 import android.os.Build.VERSION.SDK_INT
 import android.os.Build.VERSION_CODES.O
-import androidx.core.app.NotificationManagerCompat
 import androidx.work.BackoffPolicy.EXPONENTIAL
 import androidx.work.Constraints
-import androidx.work.Data
 import androidx.work.ExistingPeriodicWorkPolicy.KEEP
 import androidx.work.ExistingPeriodicWorkPolicy.REPLACE
-import androidx.work.ExistingWorkPolicy
 import androidx.work.NetworkType.CONNECTED
 import androidx.work.NetworkType.UNMETERED
-import androidx.work.OneTimeWorkRequestBuilder
 import androidx.work.PeriodicWorkRequestBuilder
-import androidx.work.WorkInfo
 import androidx.work.WorkManager
-import com.paulinasadowska.rxworkmanagerobservers.extensions.getWorkInfoByIdObservable
 import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.db.SharedPrefProvider.Companion.APP_VERSION_CODE_KEY
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
-import io.github.wulkanowy.services.sync.channels.Channel
+import io.github.wulkanowy.services.sync.channels.DebugChannel
+import io.github.wulkanowy.services.sync.channels.NewEntriesChannel
 import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.isHolidays
-import io.reactivex.Observable
 import org.threeten.bp.LocalDate.now
 import timber.log.Timber
 import java.util.concurrent.TimeUnit.MINUTES
@@ -33,28 +27,28 @@ import javax.inject.Singleton
 class SyncManager @Inject constructor(
     private val workManager: WorkManager,
     private val preferencesRepository: PreferencesRepository,
-    channels: Set<@JvmSuppressWildcards Channel>,
-    notificationManager: NotificationManagerCompat,
     sharedPrefProvider: SharedPrefProvider,
+    newEntriesChannel: NewEntriesChannel,
+    debugChannel: DebugChannel,
     appInfo: AppInfo
 ) {
 
     init {
         if (now().isHolidays) stopSyncWorker()
 
-        if (SDK_INT >= O) {
-            channels.forEach { it.create() }
-            notificationManager.deleteNotificationChannel("new_entries_channel")
+        if (SDK_INT > O) {
+            newEntriesChannel.create()
+            if (appInfo.isDebug) debugChannel.create()
         }
 
         if (sharedPrefProvider.getLong(APP_VERSION_CODE_KEY, -1L) != appInfo.versionCode.toLong()) {
-            startPeriodicSyncWorker(true)
+            startSyncWorker(true)
             sharedPrefProvider.putLong(APP_VERSION_CODE_KEY, appInfo.versionCode.toLong(), true)
         }
         Timber.i("SyncManager was initialized")
     }
 
-    fun startPeriodicSyncWorker(restart: Boolean = false) {
+    fun startSyncWorker(restart: Boolean = false) {
         if (preferencesRepository.isServiceEnabled && !now().isHolidays) {
             workManager.enqueueUniquePeriodicWork(SyncWorker::class.java.simpleName, if (restart) REPLACE else KEEP,
                 PeriodicWorkRequestBuilder<SyncWorker>(preferencesRepository.servicesInterval, MINUTES)
@@ -67,19 +61,6 @@ class SyncManager @Inject constructor(
         }
     }
 
-    fun startOneTimeSyncWorker(): Observable<WorkInfo> {
-        val work = OneTimeWorkRequestBuilder<SyncWorker>()
-            .setInputData(
-                Data.Builder()
-                    .putBoolean("one_time", true)
-                    .build()
-            )
-            .build()
-
-        workManager.enqueueUniqueWork("${SyncWorker::class.java.simpleName}_one_time", ExistingWorkPolicy.REPLACE, work)
-        return workManager.getWorkInfoByIdObservable(work.id)
-    }
-
     fun stopSyncWorker() {
         workManager.cancelUniqueWork(SyncWorker::class.java.simpleName)
     }
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/SyncWorker.kt b/app/src/main/java/io/github/wulkanowy/services/sync/SyncWorker.kt
index 126d856aa..68702d9a9 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/SyncWorker.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/SyncWorker.kt
@@ -5,7 +5,6 @@ import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationCompat.BigTextStyle
 import androidx.core.app.NotificationCompat.PRIORITY_DEFAULT
 import androidx.core.app.NotificationManagerCompat
-import androidx.work.Data
 import androidx.work.ListenableWorker
 import androidx.work.RxWorker
 import androidx.work.WorkerParameters
@@ -16,7 +15,6 @@ import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.sdk.exception.FeatureDisabledException
-import io.github.wulkanowy.sdk.exception.FeatureNotAvailableException
 import io.github.wulkanowy.services.sync.channels.DebugChannel
 import io.github.wulkanowy.services.sync.works.Work
 import io.github.wulkanowy.utils.getCompatColor
@@ -45,10 +43,6 @@ class SyncWorker @AssistedInject constructor(
                     .flatMapCompletable { semester ->
                         Completable.mergeDelayError(works.map { work ->
                             work.create(student, semester)
-                                .onErrorResumeNext {
-                                    if (it is FeatureDisabledException || it is FeatureNotAvailableException) Completable.complete()
-                                    else Completable.error(it)
-                                }
                                 .doOnSubscribe { Timber.i("${work::class.java.simpleName} is starting") }
                                 .doOnError { Timber.i("${work::class.java.simpleName} result: An exception occurred") }
                                 .doOnComplete { Timber.i("${work::class.java.simpleName} result: Success") }
@@ -58,15 +52,8 @@ class SyncWorker @AssistedInject constructor(
             .toSingleDefault(Result.success())
             .onErrorReturn {
                 Timber.e(it, "There was an error during synchronization")
-                when {
-                    inputData.getBoolean("one_time", false) -> {
-                        Result.failure(Data.Builder()
-                            .putString("error", it.toString())
-                            .build()
-                        )
-                    }
-                    else -> Result.retry()
-                }
+                if (it is FeatureDisabledException) Result.success()
+                else Result.retry()
             }
             .doOnSuccess {
                 if (preferencesRepository.isDebugNotificationEnable) notify(it)
@@ -77,7 +64,7 @@ class SyncWorker @AssistedInject constructor(
     private fun notify(result: Result) {
         notificationManager.notify(Random.nextInt(Int.MAX_VALUE), NotificationCompat.Builder(applicationContext, DebugChannel.CHANNEL_ID)
             .setContentTitle("Debug notification")
-            .setSmallIcon(R.drawable.ic_stat_push)
+            .setSmallIcon(R.drawable.ic_more_settings)
             .setAutoCancel(true)
             .setColor(applicationContext.getCompatColor(R.color.colorPrimary))
             .setStyle(BigTextStyle().bigText("${SyncWorker::class.java.simpleName} result: $result"))
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/channels/Channel.kt b/app/src/main/java/io/github/wulkanowy/services/sync/channels/Channel.kt
deleted file mode 100644
index f47c2220c..000000000
--- a/app/src/main/java/io/github/wulkanowy/services/sync/channels/Channel.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package io.github.wulkanowy.services.sync.channels
-
-interface Channel {
-
-    fun create()
-}
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/channels/DebugChannel.kt b/app/src/main/java/io/github/wulkanowy/services/sync/channels/DebugChannel.kt
index a67350550..166d3efc4 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/channels/DebugChannel.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/channels/DebugChannel.kt
@@ -7,22 +7,19 @@ import android.app.NotificationManager.IMPORTANCE_DEFAULT
 import android.content.Context
 import androidx.core.app.NotificationManagerCompat
 import io.github.wulkanowy.R
-import io.github.wulkanowy.utils.AppInfo
 import javax.inject.Inject
 
 @TargetApi(26)
 class DebugChannel @Inject constructor(
     private val notificationManager: NotificationManagerCompat,
-    private val context: Context,
-    private val appInfo: AppInfo
-) : Channel {
+    private val context: Context
+) {
 
     companion object {
         const val CHANNEL_ID = "debug_channel"
     }
 
-    override fun create() {
-        if (!appInfo.isDebug) return
+    fun create() {
         notificationManager.createNotificationChannel(
             NotificationChannel(CHANNEL_ID, context.getString(R.string.channel_debug), IMPORTANCE_DEFAULT)
                 .apply {
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/channels/LuckyNumberChannel.kt b/app/src/main/java/io/github/wulkanowy/services/sync/channels/LuckyNumberChannel.kt
deleted file mode 100644
index ae228edd7..000000000
--- a/app/src/main/java/io/github/wulkanowy/services/sync/channels/LuckyNumberChannel.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-package io.github.wulkanowy.services.sync.channels
-
-import android.annotation.TargetApi
-import android.app.Notification
-import android.app.NotificationChannel
-import android.app.NotificationManager
-import android.content.Context
-import androidx.core.app.NotificationManagerCompat
-import io.github.wulkanowy.R
-import javax.inject.Inject
-
-@TargetApi(26)
-class LuckyNumberChannel @Inject constructor(
-    private val notificationManager: NotificationManagerCompat,
-    private val context: Context
-) : Channel {
-
-    companion object {
-        const val CHANNEL_ID = "lucky_number_channel"
-    }
-
-    override fun create() {
-        notificationManager.createNotificationChannel(
-            NotificationChannel(CHANNEL_ID, context.getString(R.string.channel_lucky_number), NotificationManager.IMPORTANCE_HIGH)
-                .apply {
-                    enableLights(true)
-                    enableVibration(true)
-                    lockscreenVisibility = Notification.VISIBILITY_PUBLIC
-                })
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewNotesChannel.kt b/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewEntriesChannel.kt
similarity index 65%
rename from app/src/main/java/io/github/wulkanowy/services/sync/channels/NewNotesChannel.kt
rename to app/src/main/java/io/github/wulkanowy/services/sync/channels/NewEntriesChannel.kt
index d80d43dc5..71624510b 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewNotesChannel.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewEntriesChannel.kt
@@ -1,31 +1,31 @@
 package io.github.wulkanowy.services.sync.channels
 
 import android.annotation.TargetApi
-import android.app.Notification
+import android.app.Notification.VISIBILITY_PUBLIC
 import android.app.NotificationChannel
-import android.app.NotificationManager
+import android.app.NotificationManager.IMPORTANCE_HIGH
 import android.content.Context
 import androidx.core.app.NotificationManagerCompat
 import io.github.wulkanowy.R
 import javax.inject.Inject
 
 @TargetApi(26)
-class NewNotesChannel @Inject constructor(
+class NewEntriesChannel @Inject constructor(
     private val notificationManager: NotificationManagerCompat,
     private val context: Context
-) : Channel {
+) {
 
     companion object {
-        const val CHANNEL_ID = "new_notes_channel"
+        const val CHANNEL_ID = "new_entries_channel"
     }
 
-    override fun create() {
+    fun create() {
         notificationManager.createNotificationChannel(
-            NotificationChannel(CHANNEL_ID, context.getString(R.string.channel_new_notes), NotificationManager.IMPORTANCE_HIGH)
+            NotificationChannel(CHANNEL_ID, context.getString(R.string.channel_new_entries), IMPORTANCE_HIGH)
                 .apply {
                     enableLights(true)
                     enableVibration(true)
-                    lockscreenVisibility = Notification.VISIBILITY_PUBLIC
+                    lockscreenVisibility = VISIBILITY_PUBLIC
                 })
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewGradesChannel.kt b/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewGradesChannel.kt
deleted file mode 100644
index 7d6f275d9..000000000
--- a/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewGradesChannel.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-package io.github.wulkanowy.services.sync.channels
-
-import android.annotation.TargetApi
-import android.app.Notification
-import android.app.NotificationChannel
-import android.app.NotificationManager
-import android.content.Context
-import androidx.core.app.NotificationManagerCompat
-import io.github.wulkanowy.R
-import javax.inject.Inject
-
-@TargetApi(26)
-class NewGradesChannel @Inject constructor(
-    private val notificationManager: NotificationManagerCompat,
-    private val context: Context
-) : Channel {
-
-    companion object {
-        const val CHANNEL_ID = "new_grade_channel"
-    }
-
-    override fun create() {
-        notificationManager.createNotificationChannel(
-            NotificationChannel(CHANNEL_ID, context.getString(R.string.channel_new_grades), NotificationManager.IMPORTANCE_HIGH)
-                .apply {
-                    enableLights(true)
-                    enableVibration(true)
-                    lockscreenVisibility = Notification.VISIBILITY_PUBLIC
-                })
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewMessagesChannel.kt b/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewMessagesChannel.kt
deleted file mode 100644
index 49f39c6be..000000000
--- a/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewMessagesChannel.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-package io.github.wulkanowy.services.sync.channels
-
-import android.annotation.TargetApi
-import android.app.Notification
-import android.app.NotificationChannel
-import android.app.NotificationManager
-import android.content.Context
-import androidx.core.app.NotificationManagerCompat
-import io.github.wulkanowy.R
-import javax.inject.Inject
-
-@TargetApi(26)
-class NewMessagesChannel @Inject constructor(
-    private val notificationManager: NotificationManagerCompat,
-    private val context: Context
-) : Channel {
-
-    companion object {
-        const val CHANNEL_ID = "new_message_channel"
-    }
-
-    override fun create() {
-        notificationManager.createNotificationChannel(
-            NotificationChannel(CHANNEL_ID, context.getString(R.string.channel_new_message), NotificationManager.IMPORTANCE_HIGH)
-                .apply {
-                    enableLights(true)
-                    enableVibration(true)
-                    lockscreenVisibility = Notification.VISIBILITY_PUBLIC
-                })
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/channels/PushChannel.kt b/app/src/main/java/io/github/wulkanowy/services/sync/channels/PushChannel.kt
deleted file mode 100644
index a0e24ab45..000000000
--- a/app/src/main/java/io/github/wulkanowy/services/sync/channels/PushChannel.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package io.github.wulkanowy.services.sync.channels
-
-import android.annotation.TargetApi
-import android.app.Notification
-import android.app.NotificationChannel
-import android.app.NotificationManager
-import android.content.Context
-import androidx.core.app.NotificationManagerCompat
-import io.github.wulkanowy.R
-import javax.inject.Inject
-
-@TargetApi(26)
-class PushChannel @Inject constructor(
-    private val notificationManager: NotificationManagerCompat,
-    private val context: Context
-) : Channel {
-
-    companion object {
-        const val CHANNEL_ID = "push_channel"
-    }
-
-    override fun create() {
-        notificationManager.createNotificationChannel(
-            NotificationChannel(CHANNEL_ID, context.getString(R.string.channel_push), NotificationManager.IMPORTANCE_HIGH)
-                .apply {
-                    enableLights(true)
-                    enableVibration(true)
-                    lockscreenVisibility = Notification.VISIBILITY_PUBLIC
-                }
-        )
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/channels/UpcomingLessonsChannel.kt b/app/src/main/java/io/github/wulkanowy/services/sync/channels/UpcomingLessonsChannel.kt
deleted file mode 100644
index a292c8b53..000000000
--- a/app/src/main/java/io/github/wulkanowy/services/sync/channels/UpcomingLessonsChannel.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-package io.github.wulkanowy.services.sync.channels
-
-import android.annotation.TargetApi
-import android.app.Notification.VISIBILITY_PUBLIC
-import android.app.NotificationChannel
-import android.app.NotificationManager.IMPORTANCE_DEFAULT
-import android.content.Context
-import androidx.core.app.NotificationManagerCompat
-import io.github.wulkanowy.R
-import javax.inject.Inject
-
-@TargetApi(26)
-class UpcomingLessonsChannel @Inject constructor(
-    private val notificationManager: NotificationManagerCompat,
-    private val context: Context
-) : Channel {
-
-    companion object {
-        const val CHANNEL_ID = "lesson_channel"
-    }
-
-    override fun create() {
-        notificationManager.createNotificationChannel(
-            NotificationChannel(CHANNEL_ID, context.getString(R.string.channel_upcoming_lessons), IMPORTANCE_DEFAULT).apply {
-                lockscreenVisibility = VISIBILITY_PUBLIC
-                setShowBadge(false)
-                enableVibration(false)
-            }
-        )
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/AttendanceSummaryWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/AttendanceSummaryWork.kt
index 5f7d7efa2..01978c5b6 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/AttendanceSummaryWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/AttendanceSummaryWork.kt
@@ -11,7 +11,7 @@ class AttendanceSummaryWork @Inject constructor(
 ) : Work {
 
     override fun create(student: Student, semester: Semester): Completable {
-        return attendanceSummaryRepository.getAttendanceSummary(student, semester, -1, true).ignoreElement()
+        return attendanceSummaryRepository.getAttendanceSummary(semester, -1, true).ignoreElement()
     }
 }
 
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/AttendanceWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/AttendanceWork.kt
index 063b74825..e4b55b0ea 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/AttendanceWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/AttendanceWork.kt
@@ -3,7 +3,7 @@ package io.github.wulkanowy.services.sync.works
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.attendance.AttendanceRepository
-import io.github.wulkanowy.utils.sunday
+import io.github.wulkanowy.utils.friday
 import io.github.wulkanowy.utils.monday
 import io.reactivex.Completable
 import org.threeten.bp.LocalDate.now
@@ -12,7 +12,7 @@ import javax.inject.Inject
 class AttendanceWork @Inject constructor(private val attendanceRepository: AttendanceRepository) : Work {
 
     override fun create(student: Student, semester: Semester): Completable {
-        return attendanceRepository.getAttendance(student, semester, now().monday, now().sunday, true)
+        return attendanceRepository.getAttendance(semester, now().monday, now().friday, true)
             .ignoreElement()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/CompletedLessonWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/CompletedLessonWork.kt
index 26f79a0d5..29642ad6f 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/CompletedLessonWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/CompletedLessonWork.kt
@@ -3,7 +3,7 @@ package io.github.wulkanowy.services.sync.works
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.completedlessons.CompletedLessonsRepository
-import io.github.wulkanowy.utils.sunday
+import io.github.wulkanowy.utils.friday
 import io.github.wulkanowy.utils.monday
 import io.reactivex.Completable
 import org.threeten.bp.LocalDate.now
@@ -14,7 +14,7 @@ class CompletedLessonWork @Inject constructor(
 ) : Work {
 
     override fun create(student: Student, semester: Semester): Completable {
-        return completedLessonsRepository.getCompletedLessons(student, semester, now().monday, now().sunday, true)
+        return completedLessonsRepository.getCompletedLessons(semester, now().monday, now().friday, true)
             .ignoreElement()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/ExamWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/ExamWork.kt
index 1ef97f59c..8744fcc79 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/ExamWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/ExamWork.kt
@@ -3,7 +3,7 @@ package io.github.wulkanowy.services.sync.works
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.exam.ExamRepository
-import io.github.wulkanowy.utils.sunday
+import io.github.wulkanowy.utils.friday
 import io.github.wulkanowy.utils.monday
 import io.reactivex.Completable
 import org.threeten.bp.LocalDate.now
@@ -12,6 +12,6 @@ import javax.inject.Inject
 class ExamWork @Inject constructor(private val examRepository: ExamRepository) : Work {
 
     override fun create(student: Student, semester: Semester): Completable {
-        return examRepository.getExams(student, semester, now().monday, now().sunday, true).ignoreElement()
+        return examRepository.getExams(semester, now().monday, now().friday, true).ignoreElement()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeStatisticsWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeStatisticsWork.kt
index 327c71740..1de39a95f 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeStatisticsWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeStatisticsWork.kt
@@ -9,7 +9,7 @@ import javax.inject.Inject
 class GradeStatisticsWork @Inject constructor(private val gradeStatisticsRepository: GradeStatisticsRepository) : Work {
 
     override fun create(student: Student, semester: Semester): Completable {
-        return gradeStatisticsRepository.getGradesStatistics(student, semester, "Wszystkie", false, true)
+        return gradeStatisticsRepository.getGradesStatistics(semester, "Wszystkie", false, true)
             .ignoreElement()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeSummaryWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeSummaryWork.kt
new file mode 100644
index 000000000..6de0bc5b0
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeSummaryWork.kt
@@ -0,0 +1,14 @@
+package io.github.wulkanowy.services.sync.works
+
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.repositories.gradessummary.GradeSummaryRepository
+import io.reactivex.Completable
+import javax.inject.Inject
+
+class GradeSummaryWork @Inject constructor(private val gradeSummaryRepository: GradeSummaryRepository) : Work {
+
+    override fun create(student: Student, semester: Semester): Completable {
+        return gradeSummaryRepository.getGradesSummary(semester, true).ignoreElement()
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeWork.kt
index 6e90826ad..cd863568b 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeWork.kt
@@ -13,7 +13,7 @@ import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.grade.GradeRepository
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
-import io.github.wulkanowy.services.sync.channels.NewGradesChannel
+import io.github.wulkanowy.services.sync.channels.NewEntriesChannel
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.getCompatColor
@@ -38,7 +38,7 @@ class GradeWork @Inject constructor(
     }
 
     private fun notify(grades: List<Grade>) {
-        notificationManager.notify(Random.nextInt(Int.MAX_VALUE), NotificationCompat.Builder(context, NewGradesChannel.CHANNEL_ID)
+        notificationManager.notify(Random.nextInt(Int.MAX_VALUE), NotificationCompat.Builder(context, NewEntriesChannel.CHANNEL_ID)
             .setContentTitle(context.resources.getQuantityString(R.plurals.grade_new_items, grades.size, grades.size))
             .setContentText(context.resources.getQuantityString(R.plurals.grade_notify_new_items, grades.size, grades.size))
             .setSmallIcon(R.drawable.ic_stat_grade)
@@ -58,3 +58,4 @@ class GradeWork @Inject constructor(
         )
     }
 }
+
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/HomeworkWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/HomeworkWork.kt
index 186d57b03..32b356c68 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/HomeworkWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/HomeworkWork.kt
@@ -3,7 +3,7 @@ package io.github.wulkanowy.services.sync.works
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.homework.HomeworkRepository
-import io.github.wulkanowy.utils.sunday
+import io.github.wulkanowy.utils.friday
 import io.github.wulkanowy.utils.monday
 import io.reactivex.Completable
 import org.threeten.bp.LocalDate.now
@@ -12,6 +12,6 @@ import javax.inject.Inject
 class HomeworkWork @Inject constructor(private val homeworkRepository: HomeworkRepository) : Work {
 
     override fun create(student: Student, semester: Semester): Completable {
-        return homeworkRepository.getHomework(student, semester, now().monday, now().sunday, true).ignoreElement()
+        return homeworkRepository.getHomework(semester, now().monday, now().friday, true).ignoreElement()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/LuckyNumberWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/LuckyNumberWork.kt
index f19af4df6..1e366d58c 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/LuckyNumberWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/LuckyNumberWork.kt
@@ -13,7 +13,7 @@ import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.luckynumber.LuckyNumberRepository
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
-import io.github.wulkanowy.services.sync.channels.LuckyNumberChannel
+import io.github.wulkanowy.services.sync.channels.NewEntriesChannel
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.getCompatColor
@@ -29,8 +29,8 @@ class LuckyNumberWork @Inject constructor(
 ) : Work {
 
     override fun create(student: Student, semester: Semester): Completable {
-        return luckyNumberRepository.getLuckyNumber(student, true, preferencesRepository.isNotificationsEnable)
-            .flatMap { luckyNumberRepository.getNotNotifiedLuckyNumber(student) }
+        return luckyNumberRepository.getLuckyNumber(semester, true, preferencesRepository.isNotificationsEnable)
+            .flatMap { luckyNumberRepository.getNotNotifiedLuckyNumber(semester) }
             .flatMapCompletable {
                 notify(it)
                 luckyNumberRepository.updateLuckyNumber(it.apply { isNotified = true })
@@ -38,7 +38,7 @@ class LuckyNumberWork @Inject constructor(
     }
 
     private fun notify(luckyNumber: LuckyNumber) {
-        notificationManager.notify(Random.nextInt(Int.MAX_VALUE), NotificationCompat.Builder(context, LuckyNumberChannel.CHANNEL_ID)
+        notificationManager.notify(Random.nextInt(Int.MAX_VALUE), NotificationCompat.Builder(context, NewEntriesChannel.CHANNEL_ID)
             .setContentTitle(context.getString(R.string.lucky_number_notify_new_item_title))
             .setContentText(context.getString(R.string.lucky_number_notify_new_item, luckyNumber.luckyNumber))
             .setSmallIcon(R.drawable.ic_stat_luckynumber)
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/MessageWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/MessageWork.kt
index b8773dbca..d0890626f 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/MessageWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/MessageWork.kt
@@ -14,7 +14,7 @@ import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.message.MessageFolder.RECEIVED
 import io.github.wulkanowy.data.repositories.message.MessageRepository
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
-import io.github.wulkanowy.services.sync.channels.NewMessagesChannel
+import io.github.wulkanowy.services.sync.channels.NewEntriesChannel
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.getCompatColor
@@ -39,7 +39,7 @@ class MessageWork @Inject constructor(
     }
 
     private fun notify(messages: List<Message>) {
-        notificationManager.notify(Random.nextInt(Int.MAX_VALUE), NotificationCompat.Builder(context, NewMessagesChannel.CHANNEL_ID)
+        notificationManager.notify(Random.nextInt(Int.MAX_VALUE), NotificationCompat.Builder(context, NewEntriesChannel.CHANNEL_ID)
             .setContentTitle(context.resources.getQuantityString(R.plurals.message_new_items, messages.size, messages.size))
             .setContentText(context.resources.getQuantityString(R.plurals.message_notify_new_items, messages.size, messages.size))
             .setSmallIcon(R.drawable.ic_stat_message)
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/NoteWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/NoteWork.kt
index 4fc92ffcc..235ef201e 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/NoteWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/NoteWork.kt
@@ -13,7 +13,7 @@ import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.note.NoteRepository
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
-import io.github.wulkanowy.services.sync.channels.NewNotesChannel
+import io.github.wulkanowy.services.sync.channels.NewEntriesChannel
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.getCompatColor
@@ -38,7 +38,7 @@ class NoteWork @Inject constructor(
     }
 
     private fun notify(notes: List<Note>) {
-        notificationManager.notify(Random.nextInt(Int.MAX_VALUE), NotificationCompat.Builder(context, NewNotesChannel.CHANNEL_ID)
+        notificationManager.notify(Random.nextInt(Int.MAX_VALUE), NotificationCompat.Builder(context, NewEntriesChannel.CHANNEL_ID)
             .setContentTitle(context.resources.getQuantityString(R.plurals.note_new_items, notes.size, notes.size))
             .setContentText(context.resources.getQuantityString(R.plurals.note_notify_new_items, notes.size, notes.size))
             .setSmallIcon(R.drawable.ic_stat_note)
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/TeacherWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/TeacherWork.kt
index 5a7a41d8d..18178d2d1 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/TeacherWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/TeacherWork.kt
@@ -9,6 +9,6 @@ import javax.inject.Inject
 class TeacherWork @Inject constructor(private val teacherRepository: TeacherRepository) : Work {
 
     override fun create(student: Student, semester: Semester): Completable {
-        return teacherRepository.getTeachers(student, semester, true).ignoreElement()
+        return teacherRepository.getTeachers(semester, true).ignoreElement()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/TimetableWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/TimetableWork.kt
index d79d24033..743ae0e83 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/TimetableWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/TimetableWork.kt
@@ -3,7 +3,7 @@ package io.github.wulkanowy.services.sync.works
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.timetable.TimetableRepository
-import io.github.wulkanowy.utils.sunday
+import io.github.wulkanowy.utils.friday
 import io.github.wulkanowy.utils.monday
 import io.reactivex.Completable
 import org.threeten.bp.LocalDate.now
@@ -12,7 +12,7 @@ import javax.inject.Inject
 class TimetableWork @Inject constructor(private val timetableRepository: TimetableRepository) : Work {
 
     override fun create(student: Student, semester: Semester): Completable {
-        return timetableRepository.getTimetable(student, semester, now().monday, now().sunday, true)
+        return timetableRepository.getTimetable(semester, now().monday, now().friday, true)
             .ignoreElement()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/services/widgets/TimetableWidgetService.kt b/app/src/main/java/io/github/wulkanowy/services/widgets/TimetableWidgetService.kt
index e5ccf963c..7c7e67101 100644
--- a/app/src/main/java/io/github/wulkanowy/services/widgets/TimetableWidgetService.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/widgets/TimetableWidgetService.kt
@@ -4,7 +4,6 @@ import android.content.Intent
 import android.widget.RemoteViewsService
 import dagger.android.AndroidInjection
 import io.github.wulkanowy.data.db.SharedPrefProvider
-import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.data.repositories.timetable.TimetableRepository
@@ -23,9 +22,6 @@ class TimetableWidgetService : RemoteViewsService() {
     @Inject
     lateinit var semesterRepo: SemesterRepository
 
-    @Inject
-    lateinit var prefRepository: PreferencesRepository
-
     @Inject
     lateinit var sharedPref: SharedPrefProvider
 
@@ -34,6 +30,6 @@ class TimetableWidgetService : RemoteViewsService() {
 
     override fun onGetViewFactory(intent: Intent?): RemoteViewsFactory {
         AndroidInjection.inject(this)
-        return TimetableWidgetFactory(timetableRepo, studentRepo, semesterRepo, prefRepository, sharedPref, schedulers, applicationContext, intent)
+        return TimetableWidgetFactory(timetableRepo, studentRepo, semesterRepo, sharedPref, schedulers, applicationContext, intent)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/BaseActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/base/BaseActivity.kt
index f20fb22f3..ee74832fd 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/BaseActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/BaseActivity.kt
@@ -11,7 +11,6 @@ import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
-import androidx.viewbinding.ViewBinding
 import com.google.android.material.snackbar.Snackbar
 import com.google.android.material.snackbar.Snackbar.LENGTH_LONG
 import dagger.android.AndroidInjection
@@ -21,13 +20,10 @@ import io.github.wulkanowy.R
 import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.utils.FragmentLifecycleLogger
 import io.github.wulkanowy.utils.getThemeAttrColor
-import io.github.wulkanowy.utils.lifecycleAwareVariable
 import javax.inject.Inject
 
-abstract class BaseActivity<T : BasePresenter<out BaseView>, VB : ViewBinding> :
-    AppCompatActivity(), BaseView, HasAndroidInjector {
-
-    protected var binding: VB by lifecycleAwareVariable()
+abstract class BaseActivity<T : BasePresenter<out BaseView>> : AppCompatActivity(), BaseView,
+    HasAndroidInjector {
 
     @Inject
     lateinit var androidInjector: DispatchingAndroidInjector<Any>
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/BaseDialogFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/base/BaseDialogFragment.kt
index 0279dccf4..fdc463714 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/BaseDialogFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/BaseDialogFragment.kt
@@ -1,13 +1,9 @@
 package io.github.wulkanowy.ui.base
 
 import android.widget.Toast
-import androidx.viewbinding.ViewBinding
 import dagger.android.support.DaggerAppCompatDialogFragment
-import io.github.wulkanowy.utils.lifecycleAwareVariable
 
-abstract class BaseDialogFragment<VB : ViewBinding> : DaggerAppCompatDialogFragment(), BaseView {
-
-    protected var binding: VB by lifecycleAwareVariable()
+abstract class BaseDialogFragment : DaggerAppCompatDialogFragment(), BaseView {
 
     override fun showError(text: String, error: Throwable) {
         showMessage(text)
@@ -18,11 +14,11 @@ abstract class BaseDialogFragment<VB : ViewBinding> : DaggerAppCompatDialogFragm
     }
 
     override fun showExpiredDialog() {
-        (activity as? BaseActivity<*, *>)?.showExpiredDialog()
+        (activity as? BaseActivity<*>)?.showExpiredDialog()
     }
 
     override fun openClearLoginView() {
-        (activity as? BaseActivity<*, *>)?.openClearLoginView()
+        (activity as? BaseActivity<*>)?.openClearLoginView()
     }
 
     override fun showErrorDetailsDialog(error: Throwable) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/BaseExpandableAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/base/BaseExpandableAdapter.kt
deleted file mode 100644
index eee4625c9..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/base/BaseExpandableAdapter.kt
+++ /dev/null
@@ -1,58 +0,0 @@
-package io.github.wulkanowy.ui.base
-
-import android.util.DisplayMetrics
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.LinearSmoothScroller
-import androidx.recyclerview.widget.RecyclerView
-import kotlin.math.max
-import kotlin.math.min
-
-abstract class BaseExpandableAdapter<T : RecyclerView.ViewHolder> : RecyclerView.Adapter<T>() {
-
-    companion object {
-        private const val MILLISECONDS_PER_INCH = 100f
-        private const val AUTO_SCROLL_DELAY = 150L
-    }
-
-    private var recyclerView: RecyclerView? = null
-
-    override fun onAttachedToRecyclerView(recyclerView: RecyclerView) {
-        super.onAttachedToRecyclerView(recyclerView)
-        this.recyclerView = recyclerView
-    }
-
-    override fun onDetachedFromRecyclerView(recyclerView: RecyclerView) {
-        super.onDetachedFromRecyclerView(recyclerView)
-        this.recyclerView = null
-    }
-
-    // original: https://github.com/davideas/FlexibleAdapter/blob/5.1.0/flexible-adapter/src/main/java/eu/davidea/flexibleadapter/FlexibleAdapter.java#L4984-L5011
-    protected fun scrollToHeaderWithSubItems(position: Int, subItemsCount: Int) {
-        val layoutManager = recyclerView!!.layoutManager as LinearLayoutManager
-        val firstVisibleItem = layoutManager.findFirstCompletelyVisibleItemPosition()
-        val lastVisibleItem = layoutManager.findLastCompletelyVisibleItemPosition()
-        val itemsToShow = position + subItemsCount - lastVisibleItem
-        if (itemsToShow > 0) {
-            val scrollMax: Int = position - firstVisibleItem
-            val scrollMin = max(0, position + subItemsCount - lastVisibleItem)
-            val scrollBy = min(scrollMax, scrollMin)
-            val scrollTo = firstVisibleItem + scrollBy
-            scrollToPosition(scrollTo)
-        } else if (position < firstVisibleItem) {
-            scrollToPosition(position)
-        }
-    }
-
-    private fun scrollToPosition(position: Int) {
-        recyclerView?.run {
-            postDelayed({
-                layoutManager?.startSmoothScroll(object : LinearSmoothScroller(context) {
-                    override fun getVerticalSnapPreference() = SNAP_TO_START
-                    override fun calculateSpeedPerPixel(displayMetrics: DisplayMetrics) = MILLISECONDS_PER_INCH / displayMetrics.densityDpi
-                }.apply {
-                    targetPosition = position
-                })
-            }, AUTO_SCROLL_DELAY)
-        }
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/BaseFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/base/BaseFragment.kt
index 83f787654..2f5878d0d 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/BaseFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/BaseFragment.kt
@@ -1,18 +1,12 @@
 package io.github.wulkanowy.ui.base
 
 import android.view.View
-import androidx.annotation.LayoutRes
-import androidx.viewbinding.ViewBinding
 import com.google.android.material.snackbar.Snackbar
 import com.google.android.material.snackbar.Snackbar.LENGTH_LONG
 import dagger.android.support.DaggerFragment
 import io.github.wulkanowy.R
-import io.github.wulkanowy.utils.lifecycleAwareVariable
 
-abstract class BaseFragment<VB : ViewBinding>(@LayoutRes layoutId: Int) : DaggerFragment(layoutId),
-    BaseView {
-
-    protected var binding: VB by lifecycleAwareVariable()
+abstract class BaseFragment : DaggerFragment(), BaseView {
 
     protected var messageContainer: View? = null
 
@@ -22,7 +16,7 @@ abstract class BaseFragment<VB : ViewBinding>(@LayoutRes layoutId: Int) : Dagger
                 .setAction(R.string.all_details) { if (isAdded) showErrorDetailsDialog(error) }
                 .show()
         } else {
-            (activity as? BaseActivity<*, *>)?.showError(text, error)
+            (activity as? BaseActivity<*>)?.showError(text, error)
         }
     }
 
@@ -34,15 +28,15 @@ abstract class BaseFragment<VB : ViewBinding>(@LayoutRes layoutId: Int) : Dagger
         if (messageContainer != null) {
             Snackbar.make(messageContainer!!, text, LENGTH_LONG).show()
         } else {
-            (activity as? BaseActivity<*, *>)?.showMessage(text)
+            (activity as? BaseActivity<*>)?.showMessage(text)
         }
     }
 
     override fun showExpiredDialog() {
-        (activity as? BaseActivity<*, *>)?.showExpiredDialog()
+        (activity as? BaseActivity<*>)?.showExpiredDialog()
     }
 
     override fun openClearLoginView() {
-        (activity as? BaseActivity<*, *>)?.openClearLoginView()
+        (activity as? BaseActivity<*>)?.openClearLoginView()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/ErrorDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/base/ErrorDialog.kt
index 896e4ff1c..3255ea683 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/ErrorDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/ErrorDialog.kt
@@ -6,35 +6,19 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.HorizontalScrollView
 import android.widget.Toast
 import android.widget.Toast.LENGTH_LONG
-import androidx.appcompat.app.AlertDialog
 import androidx.core.content.getSystemService
+import androidx.fragment.app.DialogFragment
 import io.github.wulkanowy.R
-import io.github.wulkanowy.databinding.DialogErrorBinding
-import io.github.wulkanowy.sdk.exception.FeatureDisabledException
-import io.github.wulkanowy.sdk.exception.FeatureNotAvailableException
-import io.github.wulkanowy.sdk.exception.ServiceUnavailableException
-import io.github.wulkanowy.utils.AppInfo
-import io.github.wulkanowy.utils.getString
-import io.github.wulkanowy.utils.openAppInMarket
-import io.github.wulkanowy.utils.openEmailClient
-import io.github.wulkanowy.utils.openInternetBrowser
-import java.io.InterruptedIOException
+import kotlinx.android.synthetic.main.dialog_error.*
 import java.io.PrintWriter
 import java.io.StringWriter
-import java.net.SocketTimeoutException
-import java.net.UnknownHostException
-import javax.inject.Inject
 
-class ErrorDialog : BaseDialogFragment<DialogErrorBinding>() {
+class ErrorDialog : DialogFragment() {
 
     private lateinit var error: Throwable
 
-    @Inject
-    lateinit var appInfo: AppInfo
-
     companion object {
         private const val ARGUMENT_KEY = "Data"
 
@@ -54,7 +38,7 @@ class ErrorDialog : BaseDialogFragment<DialogErrorBinding>() {
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return DialogErrorBinding.inflate(inflater).apply { binding = this }.root
+        return inflater.inflate(R.layout.dialog_error, container, false)
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
@@ -64,56 +48,14 @@ class ErrorDialog : BaseDialogFragment<DialogErrorBinding>() {
             error.printStackTrace(PrintWriter(this))
         }
 
-        with(binding) {
-            errorDialogContent.text = stringWriter.toString()
-            with(errorDialogHorizontalScroll) {
-                post { fullScroll(HorizontalScrollView.FOCUS_LEFT) }
-            }
-            errorDialogCopy.setOnClickListener {
-                val clip = ClipData.newPlainText("wulkanowy", stringWriter.toString())
-                activity?.getSystemService<ClipboardManager>()?.setPrimaryClip(clip)
+        errorDialogContent.text = stringWriter.toString()
+        errorDialogCopy.setOnClickListener {
+            val clip = ClipData.newPlainText("wulkanowy", stringWriter.toString())
+            activity?.getSystemService<ClipboardManager>()?.setPrimaryClip(clip)
 
-                Toast.makeText(context, R.string.all_copied, LENGTH_LONG).show()
-            }
-            errorDialogCancel.setOnClickListener { dismiss() }
-            errorDialogReport.setOnClickListener {
-                openConfirmDialog { openEmailClient(stringWriter.toString()) }
-            }
-            errorDialogMessage.text = resources.getString(error)
-            errorDialogReport.isEnabled = when (error) {
-                is UnknownHostException,
-                is InterruptedIOException,
-                is SocketTimeoutException,
-                is ServiceUnavailableException,
-                is FeatureDisabledException,
-                is FeatureNotAvailableException -> false
-                else -> true
-            }
+            Toast.makeText(context, R.string.all_copied, LENGTH_LONG).show()
         }
-    }
-
-    private fun openConfirmDialog(callback: () -> Unit) {
-        AlertDialog.Builder(requireContext())
-            .setTitle(R.string.dialog_error_check_update)
-            .setMessage(R.string.dialog_error_check_update_message)
-            .setNeutralButton(R.string.about_feedback) { _, _ -> callback() }
-            .setPositiveButton(R.string.dialog_error_check_update) { _, _ ->
-                requireContext().openAppInMarket(::showMessage)
-            }
-            .show()
-    }
-
-    private fun openEmailClient(content: String) {
-        requireContext().openEmailClient(
-            chooserTitle = getString(R.string.about_feedback),
-            email = "wulkanowyinc@gmail.com",
-            subject = "Zgłoszenie błędu",
-            body = requireContext().getString(R.string.about_feedback_template,
-                "${appInfo.systemManufacturer} ${appInfo.systemModel}", appInfo.systemVersion.toString(), appInfo.versionName
-            ) + "\n" + content,
-            onActivityNotFound = {
-                requireContext().openInternetBrowser("https://github.com/wulkanowy/wulkanowy/issues", ::showMessage)
-            }
-        )
+        errorDialogCancel.setOnClickListener { dismiss() }
     }
 }
+
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/ErrorHandler.kt b/app/src/main/java/io/github/wulkanowy/ui/base/ErrorHandler.kt
index f746b36f8..ba10af6bf 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/ErrorHandler.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/ErrorHandler.kt
@@ -1,15 +1,21 @@
 package io.github.wulkanowy.ui.base
 
 import android.content.res.Resources
-import com.chuckerteam.chucker.api.ChuckerCollector
+import com.readystatesoftware.chuck.api.ChuckCollector
+import io.github.wulkanowy.R
 import io.github.wulkanowy.data.exceptions.NoCurrentStudentException
 import io.github.wulkanowy.sdk.exception.BadCredentialsException
-import io.github.wulkanowy.utils.getString
+import io.github.wulkanowy.sdk.exception.FeatureDisabledException
+import io.github.wulkanowy.sdk.exception.FeatureNotAvailableException
+import io.github.wulkanowy.sdk.exception.NotLoggedInException
+import io.github.wulkanowy.sdk.exception.ServiceUnavailableException
 import io.github.wulkanowy.utils.security.ScramblerException
 import timber.log.Timber
+import java.net.SocketTimeoutException
+import java.net.UnknownHostException
 import javax.inject.Inject
 
-open class ErrorHandler @Inject constructor(protected val resources: Resources, private val chuckerCollector: ChuckerCollector) {
+open class ErrorHandler @Inject constructor(protected val resources: Resources, private val chuckCollector: ChuckCollector) {
 
     var showErrorMessage: (String, Throwable) -> Unit = { _, _ -> }
 
@@ -18,16 +24,24 @@ open class ErrorHandler @Inject constructor(protected val resources: Resources,
     var onNoCurrentStudent: () -> Unit = {}
 
     fun dispatch(error: Throwable) {
-        chuckerCollector.onError(error.javaClass.simpleName, error)
+        chuckCollector.onError(error.javaClass.simpleName, error)
         Timber.e(error, "An exception occurred while the Wulkanowy was running")
         proceed(error)
     }
 
     protected open fun proceed(error: Throwable) {
-        when (error) {
-            is ScramblerException, is BadCredentialsException -> onSessionExpired()
-            is NoCurrentStudentException -> onNoCurrentStudent()
-            else -> showErrorMessage(resources.getString(error), error)
+        resources.run {
+            when (error) {
+                is UnknownHostException -> showErrorMessage(getString(R.string.error_no_internet), error)
+                is SocketTimeoutException -> showErrorMessage(getString(R.string.error_timeout), error)
+                is NotLoggedInException -> showErrorMessage(getString(R.string.error_login_failed), error)
+                is ServiceUnavailableException -> showErrorMessage(getString(R.string.error_service_unavailable), error)
+                is FeatureDisabledException -> showErrorMessage(getString(R.string.error_feature_disabled), error)
+                is ScramblerException, is BadCredentialsException -> onSessionExpired()
+                is NoCurrentStudentException -> onNoCurrentStudent()
+                is FeatureNotAvailableException -> showErrorMessage(getString(R.string.error_feature_not_available), error)
+                else -> showErrorMessage(getString(R.string.error_unknown), error)
+            }
         }
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/WidgetConfigureAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/base/WidgetConfigureAdapter.kt
deleted file mode 100644
index cefe6ed75..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/base/WidgetConfigureAdapter.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-package io.github.wulkanowy.ui.base
-
-import android.annotation.SuppressLint
-import android.graphics.PorterDuff
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.databinding.ItemAccountBinding
-import io.github.wulkanowy.utils.getThemeAttrColor
-import javax.inject.Inject
-
-class WidgetConfigureAdapter @Inject constructor() : RecyclerView.Adapter<WidgetConfigureAdapter.ItemViewHolder>() {
-
-    var items = emptyList<Pair<Student, Boolean>>()
-
-    var onClickListener: (Student) -> Unit = {}
-
-    override fun getItemCount() = items.size
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        ItemAccountBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-    )
-
-    @SuppressLint("SetTextI18n")
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        val (student, isCurrent) = items[position]
-
-        with(holder.binding) {
-            accountItemName.text = "${student.studentName} ${student.className}"
-            accountItemSchool.text = student.schoolName
-
-            with(accountItemImage) {
-                val colorImage = if (isCurrent) context.getThemeAttrColor(R.attr.colorPrimary)
-                else context.getThemeAttrColor(R.attr.colorOnSurface, 153)
-
-                setColorFilter(colorImage, PorterDuff.Mode.SRC_IN)
-            }
-
-            root.setOnClickListener { onClickListener(student) }
-        }
-    }
-
-    class ItemViewHolder(val binding: ItemAccountBinding) : RecyclerView.ViewHolder(binding.root)
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutAdapter.kt
deleted file mode 100644
index 35dec3b4f..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutAdapter.kt
+++ /dev/null
@@ -1,72 +0,0 @@
-package io.github.wulkanowy.ui.modules.about
-
-import android.graphics.drawable.Drawable
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.core.content.res.ResourcesCompat
-import androidx.recyclerview.widget.RecyclerView
-import io.github.wulkanowy.databinding.ItemAboutBinding
-import io.github.wulkanowy.databinding.ScrollableHeaderAboutBinding
-import javax.inject.Inject
-
-class AboutAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
-
-    private enum class ViewType(val id: Int) {
-        ITEM_HEADER(1),
-        ITEM_ELEMENT(2)
-    }
-
-    var items = emptyList<Triple<String, String, Drawable?>>()
-
-    var onClickListener: (name: String) -> Unit = {}
-
-    override fun getItemCount() = items.size + 1
-
-    override fun getItemViewType(position: Int) = when (position) {
-        0 -> ViewType.ITEM_HEADER.id
-        else -> ViewType.ITEM_ELEMENT.id
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        val inflater = LayoutInflater.from(parent.context)
-
-        return when (viewType) {
-            ViewType.ITEM_HEADER.id -> HeaderViewHolder(ScrollableHeaderAboutBinding.inflate(inflater, parent, false))
-            ViewType.ITEM_ELEMENT.id -> ItemViewHolder(ItemAboutBinding.inflate(inflater, parent, false))
-            else -> throw IllegalStateException()
-        }
-    }
-
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        when (holder) {
-            is HeaderViewHolder -> bindHeaderViewHolder(holder.binding)
-            is ItemViewHolder -> bindItemViewHolder(holder.binding, position - 1)
-        }
-    }
-
-    private fun bindHeaderViewHolder(binding: ScrollableHeaderAboutBinding) {
-        with(binding.aboutScrollableHeaderIcon) {
-            setImageDrawable(ResourcesCompat.getDrawableForDensity(
-                context.resources, context.applicationInfo.icon, 640, null)
-            )
-        }
-    }
-
-    private fun bindItemViewHolder(binding: ItemAboutBinding, position: Int) {
-        val (title, summary, image) = items[position]
-
-        with(binding) {
-            aboutItemImage.setImageDrawable(image)
-            aboutItemTitle.text = title
-            aboutItemSummary.text = summary
-
-            root.setOnClickListener { onClickListener(title) }
-        }
-    }
-
-    private class HeaderViewHolder(val binding: ScrollableHeaderAboutBinding) :
-        RecyclerView.ViewHolder(binding.root)
-
-    private class ItemViewHolder(val binding: ItemAboutBinding) :
-        RecyclerView.ViewHolder(binding.root)
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutFragment.kt
index d85d01e9e..d9430a47a 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutFragment.kt
@@ -1,32 +1,39 @@
 package io.github.wulkanowy.ui.modules.about
 
+import android.content.Intent
+import android.content.Intent.ACTION_SENDTO
+import android.content.Intent.EXTRA_EMAIL
+import android.content.Intent.EXTRA_SUBJECT
+import android.content.Intent.EXTRA_TEXT
 import android.graphics.drawable.Drawable
+import android.net.Uri
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
-import androidx.recyclerview.widget.LinearLayoutManager
+import android.view.ViewGroup
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.R
-import io.github.wulkanowy.databinding.FragmentAboutBinding
 import io.github.wulkanowy.ui.base.BaseFragment
-import io.github.wulkanowy.ui.modules.about.contributor.ContributorFragment
+import io.github.wulkanowy.ui.modules.about.creator.CreatorFragment
 import io.github.wulkanowy.ui.modules.about.license.LicenseFragment
-import io.github.wulkanowy.ui.modules.about.logviewer.LogViewerFragment
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.getCompatDrawable
-import io.github.wulkanowy.utils.openAppInMarket
-import io.github.wulkanowy.utils.openEmailClient
 import io.github.wulkanowy.utils.openInternetBrowser
+import io.github.wulkanowy.utils.setOnItemClickListener
+import kotlinx.android.synthetic.main.fragment_about.*
 import javax.inject.Inject
 
-class AboutFragment : BaseFragment<FragmentAboutBinding>(R.layout.fragment_about), AboutView,
-    MainView.TitledView {
+class AboutFragment : BaseFragment(), AboutView, MainView.TitledView {
 
     @Inject
     lateinit var presenter: AboutPresenter
 
     @Inject
-    lateinit var aboutAdapter: AboutAdapter
+    lateinit var aboutAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
 
     @Inject
     lateinit var appInfo: AppInfo
@@ -38,7 +45,7 @@ class AboutFragment : BaseFragment<FragmentAboutBinding>(R.layout.fragment_about
 
     override val creatorsRes: Triple<String, String, Drawable?>?
         get() = context?.run {
-            Triple(getString(R.string.about_contributor), getString(R.string.about_contributor_summary), getCompatDrawable(R.drawable.ic_about_creator))
+            Triple(getString(R.string.about_creator), getString(R.string.about_creator_summary), getCompatDrawable(R.drawable.ic_about_creator))
         }
 
     override val feedbackRes: Triple<String, String, Drawable?>?
@@ -77,36 +84,32 @@ class AboutFragment : BaseFragment<FragmentAboutBinding>(R.layout.fragment_about
         fun newInstance() = AboutFragment()
     }
 
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_about, container, false)
+    }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        binding = FragmentAboutBinding.bind(view)
         presenter.onAttachView(this)
     }
 
     override fun initView() {
-        aboutAdapter.onClickListener = presenter::onItemSelected
+        aboutAdapter.setOnItemClickListener(presenter::onItemSelected)
 
-        with(binding.aboutRecycler) {
-            layoutManager = LinearLayoutManager(context)
+        with(aboutRecycler) {
+            layoutManager = SmoothScrollLinearLayoutManager(context)
             adapter = aboutAdapter
         }
     }
 
-    override fun updateData(data: List<Triple<String, String, Drawable?>>) {
+    override fun updateData(header: AboutScrollableHeader, items: List<AboutItem>) {
         with(aboutAdapter) {
-            items = data
-            notifyDataSetChanged()
+            removeAllScrollableHeaders()
+            addScrollableHeader(header)
+            updateDataSet(items)
         }
     }
 
-    override fun openAppInMarket() {
-        context?.openAppInMarket(::showMessage)
-    }
-
-    override fun openLogViewer() {
-        (activity as? MainActivity)?.pushView(LogViewerFragment.newInstance())
-    }
-
     override fun openDiscordInvite() {
         context?.openInternetBrowser("https://discord.gg/vccAQBr", ::showMessage)
     }
@@ -116,17 +119,26 @@ class AboutFragment : BaseFragment<FragmentAboutBinding>(R.layout.fragment_about
     }
 
     override fun openEmailClient() {
-        requireContext().openEmailClient(
-            chooserTitle = getString(R.string.about_feedback),
-            email = "wulkanowyinc@gmail.com",
-            subject = "Zgłoszenie błędu",
-            body = getString(R.string.about_feedback_template,
-                "${appInfo.systemManufacturer} ${appInfo.systemModel}", appInfo.systemVersion.toString(), appInfo.versionName
-            ),
-            onActivityNotFound = {
-                requireContext().openInternetBrowser("https://github.com/wulkanowy/wulkanowy/issues", ::showMessage)
+        val intent = Intent(ACTION_SENDTO)
+            .apply {
+                data = Uri.parse("mailto:")
+                putExtra(EXTRA_EMAIL, arrayOf("wulkanowyinc@gmail.com"))
+                putExtra(EXTRA_SUBJECT, "Zgłoszenie błędu")
+                putExtra(EXTRA_TEXT, "Tu umieść treść zgłoszenia\n\n${"-".repeat(40)}\n " +
+                    """
+                        Build: ${appInfo.versionCode}
+                        SDK: ${appInfo.systemVersion}
+                        Device: ${appInfo.systemManufacturer} ${appInfo.systemModel}
+                    """.trimIndent())
             }
-        )
+
+        context?.let {
+            if (intent.resolveActivity(it.packageManager) != null) {
+                startActivity(Intent.createChooser(intent, getString(R.string.about_feedback)))
+            } else {
+                it.openInternetBrowser("https://github.com/wulkanowy/wulkanowy/issues", ::showMessage)
+            }
+        }
     }
 
     override fun openFaqPage() {
@@ -138,7 +150,7 @@ class AboutFragment : BaseFragment<FragmentAboutBinding>(R.layout.fragment_about
     }
 
     override fun openCreators() {
-        (activity as? MainActivity)?.pushView(ContributorFragment.newInstance())
+        (activity as? MainActivity)?.pushView(CreatorFragment.newInstance())
     }
 
     override fun openPrivacyPolicy() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutItem.kt
new file mode 100644
index 000000000..29f1cd8c8
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutItem.kt
@@ -0,0 +1,56 @@
+package io.github.wulkanowy.ui.modules.about
+
+import android.graphics.drawable.Drawable
+import android.view.View
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.FlexibleViewHolder
+import io.github.wulkanowy.R
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.item_about.*
+
+class AboutItem(
+    val title: String,
+    private val summary: String,
+    private val image: Drawable?
+) : AbstractFlexibleItem<AboutItem.ViewHolder>() {
+
+    override fun getLayoutRes() = R.layout.item_about
+
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>) = ViewHolder(view, adapter)
+
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>) {
+        with(holder) {
+            aboutItemImage.setImageDrawable(image)
+            aboutItemTitle.text = title
+            aboutItemSummary.text = summary
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as AboutItem
+
+        if (title != other.title) return false
+        if (summary != other.summary) return false
+        if (image != other.image) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = title.hashCode()
+        result = 31 * result + summary.hashCode()
+        result = 31 * result + (image?.hashCode() ?: 0)
+        return result
+    }
+
+    class ViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>) : FlexibleViewHolder(view, adapter),
+        LayoutContainer {
+
+        override val containerView: View? get() = contentView
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutPresenter.kt
index ee892adfc..662939832 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutPresenter.kt
@@ -1,9 +1,9 @@
 package io.github.wulkanowy.ui.modules.about
 
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
-import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 import io.github.wulkanowy.utils.SchedulersProvider
 import timber.log.Timber
@@ -13,7 +13,6 @@ class AboutPresenter @Inject constructor(
     schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
-    private val appInfo: AppInfo,
     private val analytics: FirebaseAnalyticsHelper
 ) : BasePresenter<AboutView>(errorHandler, studentRepository, schedulers) {
 
@@ -24,15 +23,10 @@ class AboutPresenter @Inject constructor(
         loadData()
     }
 
-    fun onItemSelected(name: String) {
+    fun onItemSelected(item: AbstractFlexibleItem<*>) {
+        if (item !is AboutItem) return
         view?.run {
-            when (name) {
-                versionRes?.first -> {
-                    Timber.i("Opening log viewer")
-                    if (appInfo.isDebug) openLogViewer()
-                    else openAppInMarket()
-                    analytics.logEvent("about_open", "name" to "log_viewer")
-                }
+            when (item.title) {
                 feedbackRes?.first -> {
                     Timber.i("Opening email client")
                     openEmailClient()
@@ -74,16 +68,15 @@ class AboutPresenter @Inject constructor(
 
     private fun loadData() {
         view?.run {
-            updateData(listOfNotNull(
-                versionRes,
-                creatorsRes,
-                feedbackRes,
-                faqRes,
-                discordRes,
-                homepageRes,
-                licensesRes,
-                privacyRes
-            ))
+            updateData(AboutScrollableHeader(), listOfNotNull(
+                versionRes?.let { (title, summary, image) -> AboutItem(title, summary, image) },
+                creatorsRes?.let { (title, summary, image) -> AboutItem(title, summary, image) },
+                feedbackRes?.let { (title, summary, image) -> AboutItem(title, summary, image) },
+                faqRes?.let { (title, summary, image) -> AboutItem(title, summary, image) },
+                discordRes?.let { (title, summary, image) -> AboutItem(title, summary, image) },
+                homepageRes?.let { (title, summary, image) -> AboutItem(title, summary, image) },
+                licensesRes?.let { (title, summary, image) -> AboutItem(title, summary, image) },
+                privacyRes?.let { (title, summary, image) -> AboutItem(title, summary, image) }))
         }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutScrollableHeader.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutScrollableHeader.kt
new file mode 100644
index 000000000..07bb41249
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutScrollableHeader.kt
@@ -0,0 +1,41 @@
+package io.github.wulkanowy.ui.modules.about
+
+import android.view.View
+import androidx.core.content.res.ResourcesCompat
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.FlexibleViewHolder
+import io.github.wulkanowy.R
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.scrollable_header_about.*
+
+class AboutScrollableHeader : AbstractFlexibleItem<AboutScrollableHeader.ViewHolder>() {
+
+    override fun getLayoutRes() = R.layout.scrollable_header_about
+
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>) = ViewHolder(view, adapter)
+
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>) {
+        with(holder) {
+            val context = contentView.context
+            val drawable = ResourcesCompat.getDrawableForDensity(context.resources, context.applicationInfo.icon, 640, null)
+
+            aboutScrollableHeaderIcon.setImageDrawable(drawable)
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+        return true
+    }
+
+    override fun hashCode() = javaClass.hashCode()
+
+    class ViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>) : FlexibleViewHolder(view, adapter),
+        LayoutContainer {
+
+        override val containerView: View? get() = contentView
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutView.kt
index 4c4b002f9..228225ec6 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutView.kt
@@ -23,11 +23,7 @@ interface AboutView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<Triple<String, String, Drawable?>>)
-
-    fun openAppInMarket()
-
-    fun openLogViewer()
+    fun updateData(header: AboutScrollableHeader, items: List<AboutItem>)
 
     fun openDiscordInvite()
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorAdapter.kt
deleted file mode 100644
index 215cd27db..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorAdapter.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-package io.github.wulkanowy.ui.modules.about.contributor
-
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import coil.api.load
-import coil.transform.RoundedCornersTransformation
-import io.github.wulkanowy.data.pojos.Contributor
-import io.github.wulkanowy.databinding.ItemContributorBinding
-import javax.inject.Inject
-
-class ContributorAdapter @Inject constructor() :
-    RecyclerView.Adapter<ContributorAdapter.ItemViewHolder>() {
-
-    var items = emptyList<Contributor>()
-
-    var onClickListener: (Contributor) -> Unit = {}
-
-    override fun getItemCount() = items.size
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        ItemContributorBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-    )
-
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        val item = items[position]
-
-        with(holder.binding) {
-            creatorItemName.text = item.displayName
-            creatorItemAvatar.load("https://github.com/${item.githubUsername}.png") {
-                transformations(RoundedCornersTransformation(8f))
-                crossfade(true)
-            }
-
-            root.setOnClickListener { onClickListener(item) }
-        }
-    }
-
-    class ItemViewHolder(val binding: ItemContributorBinding) :
-        RecyclerView.ViewHolder(binding.root)
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorFragment.kt
deleted file mode 100644
index 42eebd347..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorFragment.kt
+++ /dev/null
@@ -1,71 +0,0 @@
-package io.github.wulkanowy.ui.modules.about.contributor
-
-import android.os.Bundle
-import android.view.View
-import android.view.View.GONE
-import android.view.View.VISIBLE
-import androidx.recyclerview.widget.LinearLayoutManager
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.pojos.Contributor
-import io.github.wulkanowy.databinding.FragmentContributorBinding
-import io.github.wulkanowy.ui.base.BaseFragment
-import io.github.wulkanowy.ui.modules.main.MainView
-import io.github.wulkanowy.ui.widgets.DividerItemDecoration
-import io.github.wulkanowy.utils.openInternetBrowser
-import javax.inject.Inject
-
-class ContributorFragment : BaseFragment<FragmentContributorBinding>(R.layout.fragment_contributor),
-    ContributorView, MainView.TitledView {
-
-    @Inject
-    lateinit var presenter: ContributorPresenter
-
-    @Inject
-    lateinit var creatorsAdapter: ContributorAdapter
-
-    override val titleStringId get() = R.string.contributors_title
-
-    companion object {
-        fun newInstance() = ContributorFragment()
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding = FragmentContributorBinding.bind(view)
-        presenter.onAttachView(this)
-    }
-
-    override fun initView() {
-        with(binding.creatorRecycler) {
-            layoutManager = LinearLayoutManager(context)
-            adapter = creatorsAdapter
-            addItemDecoration(DividerItemDecoration(context))
-        }
-        creatorsAdapter.onClickListener = presenter::onItemSelected
-        binding.creatorSeeMore.setOnClickListener { presenter.onSeeMoreClick() }
-    }
-
-    override fun updateData(data: List<Contributor>) {
-        with(creatorsAdapter) {
-            items = data
-            notifyDataSetChanged()
-        }
-    }
-
-    override fun openUserGithubPage(username: String) {
-        context?.openInternetBrowser("https://github.com/${username}", ::showMessage)
-    }
-
-    override fun openGithubContributorsPage() {
-        context?.openInternetBrowser("https://github.com/wulkanowy/wulkanowy/graphs/contributors", ::showMessage)
-    }
-
-    override fun showProgress(show: Boolean) {
-        binding.creatorProgress.visibility = if (show) VISIBLE else GONE
-    }
-
-    override fun onDestroyView() {
-        presenter.onDetachView()
-        super.onDestroyView()
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/creator/CreatorFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/creator/CreatorFragment.kt
new file mode 100644
index 000000000..299657ba6
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/creator/CreatorFragment.kt
@@ -0,0 +1,76 @@
+package io.github.wulkanowy.ui.modules.about.creator
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.View.GONE
+import android.view.View.VISIBLE
+import android.view.ViewGroup
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.common.FlexibleItemDecoration
+import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import io.github.wulkanowy.R
+import io.github.wulkanowy.ui.base.BaseFragment
+import io.github.wulkanowy.ui.modules.main.MainView
+import io.github.wulkanowy.utils.openInternetBrowser
+import io.github.wulkanowy.utils.setOnItemClickListener
+import kotlinx.android.synthetic.main.fragment_creator.*
+import javax.inject.Inject
+
+class CreatorFragment : BaseFragment(), CreatorView, MainView.TitledView {
+
+    @Inject
+    lateinit var presenter: CreatorPresenter
+
+    @Inject
+    lateinit var creatorsAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
+
+    override val titleStringId get() = R.string.creators_title
+
+    companion object {
+        fun newInstance() = CreatorFragment()
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_creator, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        presenter.onAttachView(this)
+    }
+
+    override fun initView() {
+        with(creatorRecycler) {
+            layoutManager = SmoothScrollLinearLayoutManager(context)
+            adapter = creatorsAdapter
+            addItemDecoration(FlexibleItemDecoration(context)
+                .withDefaultDivider()
+                .withDrawDividerOnLastItem(false))
+        }
+        creatorsAdapter.setOnItemClickListener(presenter::onItemSelected)
+        creatorSeeMore.setOnClickListener { presenter.onSeeMoreClick() }
+    }
+
+    override fun updateData(data: List<CreatorItem>) {
+        creatorsAdapter.updateDataSet(data)
+    }
+
+    override fun openUserGithubPage(username: String) {
+        context?.openInternetBrowser("https://github.com/${username}", ::showMessage)
+    }
+
+    override fun openGithubContributorsPage() {
+        context?.openInternetBrowser("https://github.com/wulkanowy/wulkanowy/graphs/contributors", ::showMessage)
+    }
+
+    override fun showProgress(show: Boolean) {
+        creatorProgress.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun onDestroyView() {
+        presenter.onDetachView()
+        super.onDestroyView()
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/creator/CreatorItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/creator/CreatorItem.kt
new file mode 100644
index 000000000..909919bbc
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/creator/CreatorItem.kt
@@ -0,0 +1,50 @@
+package io.github.wulkanowy.ui.modules.about.creator
+
+import android.view.View
+import coil.api.load
+import coil.transform.RoundedCornersTransformation
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.FlexibleViewHolder
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.pojos.AppCreator
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.item_creator.*
+
+class CreatorItem(val creator: AppCreator) : AbstractFlexibleItem<CreatorItem.ViewHolder>() {
+
+    override fun getLayoutRes() = R.layout.item_creator
+
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>) = ViewHolder(view, adapter)
+
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>) {
+        with(holder) {
+            creatorItemName.text = creator.displayName
+
+            creatorItemAvatar.load("https://github.com/${creator.githubUsername}.png") {
+                transformations(RoundedCornersTransformation(8f))
+                crossfade(true)
+            }
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as CreatorItem
+
+        if (creator != other.creator) return false
+
+        return true
+    }
+
+    override fun hashCode() = creator.hashCode()
+
+    class ViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>) : FlexibleViewHolder(view, adapter),
+        LayoutContainer {
+
+        override val containerView: View? get() = contentView
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/creator/CreatorPresenter.kt
similarity index 63%
rename from app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorPresenter.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/about/creator/CreatorPresenter.kt
index 416a59ce5..bc8034ab5 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/creator/CreatorPresenter.kt
@@ -1,28 +1,31 @@
-package io.github.wulkanowy.ui.modules.about.contributor
+package io.github.wulkanowy.ui.modules.about.creator
 
-import io.github.wulkanowy.data.pojos.Contributor
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import io.github.wulkanowy.data.pojos.AppCreator
 import io.github.wulkanowy.data.repositories.appcreator.AppCreatorRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.SchedulersProvider
+import io.reactivex.Single
 import javax.inject.Inject
 
-class ContributorPresenter @Inject constructor(
+class CreatorPresenter @Inject constructor(
     schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val appCreatorRepository: AppCreatorRepository
-) : BasePresenter<ContributorView>(errorHandler, studentRepository, schedulers) {
+) : BasePresenter<CreatorView>(errorHandler, studentRepository, schedulers) {
 
-    override fun onAttachView(view: ContributorView) {
+    override fun onAttachView(view: CreatorView) {
         super.onAttachView(view)
         view.initView()
         loadData()
     }
 
-    fun onItemSelected(contributor: Contributor) {
-        view?.openUserGithubPage(contributor.githubUsername)
+    fun onItemSelected(item: AbstractFlexibleItem<*>) {
+        if (item !is CreatorItem) return
+        view?.openUserGithubPage(item.creator.githubUsername)
     }
 
     fun onSeeMoreClick() {
@@ -31,6 +34,7 @@ class ContributorPresenter @Inject constructor(
 
     private fun loadData() {
         disposable.add(appCreatorRepository.getAppCreators()
+            .map { it.map { creator -> CreatorItem(creator) } }
             .subscribeOn(schedulers.backgroundThread)
             .observeOn(schedulers.mainThread)
             .doFinally { view?.showProgress(false) }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/creator/CreatorView.kt
similarity index 50%
rename from app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorView.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/about/creator/CreatorView.kt
index 8007e4e3f..2a6a43039 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/creator/CreatorView.kt
@@ -1,13 +1,12 @@
-package io.github.wulkanowy.ui.modules.about.contributor
+package io.github.wulkanowy.ui.modules.about.creator
 
-import io.github.wulkanowy.data.pojos.Contributor
 import io.github.wulkanowy.ui.base.BaseView
 
-interface ContributorView : BaseView {
+interface CreatorView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<Contributor>)
+    fun updateData(data: List<CreatorItem>)
 
     fun openUserGithubPage(username: String)
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseAdapter.kt
deleted file mode 100644
index 07025c09f..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseAdapter.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-package io.github.wulkanowy.ui.modules.about.license
-
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import com.mikepenz.aboutlibraries.entity.Library
-import io.github.wulkanowy.databinding.ItemLicenseBinding
-import javax.inject.Inject
-
-class LicenseAdapter @Inject constructor() : RecyclerView.Adapter<LicenseAdapter.ItemViewHolder>() {
-
-    var items = emptyList<Library>()
-
-    var onClickListener: (Library) -> Unit = {}
-
-    override fun getItemCount() = items.size
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        ItemLicenseBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-    )
-
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        val item = items[position]
-
-        with(holder.binding) {
-            licenseItemName.text = item.libraryName
-            licenseItemSummary.text = item.license?.licenseName?.takeIf { it.isNotBlank() } ?: item.libraryVersion
-
-            root.setOnClickListener { onClickListener(item) }
-        }
-    }
-
-    class ItemViewHolder(val binding: ItemLicenseBinding) : RecyclerView.ViewHolder(binding.root)
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseFragment.kt
index f6c3b5698..2681680b1 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseFragment.kt
@@ -1,29 +1,33 @@
 package io.github.wulkanowy.ui.modules.about.license
 
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
+import android.view.ViewGroup
 import androidx.appcompat.app.AlertDialog
 import androidx.core.text.parseAsHtml
-import androidx.recyclerview.widget.LinearLayoutManager
 import com.mikepenz.aboutlibraries.Libs
 import com.mikepenz.aboutlibraries.entity.Library
 import dagger.Lazy
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.R
-import io.github.wulkanowy.databinding.FragmentLicenseBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainView
+import io.github.wulkanowy.utils.setOnItemClickListener
+import kotlinx.android.synthetic.main.fragment_license.*
 import javax.inject.Inject
 
-class LicenseFragment : BaseFragment<FragmentLicenseBinding>(R.layout.fragment_license),
-    LicenseView, MainView.TitledView {
+class LicenseFragment : BaseFragment(), LicenseView, MainView.TitledView {
 
     @Inject
     lateinit var presenter: LicensePresenter
 
     @Inject
-    lateinit var licenseAdapter: LicenseAdapter
+    lateinit var licenseAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
 
     @Inject
     lateinit var libs: Lazy<Libs>
@@ -39,26 +43,25 @@ class LicenseFragment : BaseFragment<FragmentLicenseBinding>(R.layout.fragment_l
         fun newInstance() = LicenseFragment()
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding = FragmentLicenseBinding.bind(view)
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_license, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
         presenter.onAttachView(this)
     }
 
     override fun initView() {
-        licenseAdapter.onClickListener = presenter::onItemSelected
-
-        with(binding.licenseRecycler) {
-            layoutManager = LinearLayoutManager(context)
+        with(licenseRecycler) {
+            layoutManager = SmoothScrollLinearLayoutManager(context)
             adapter = licenseAdapter
         }
+        licenseAdapter.setOnItemClickListener(presenter::onItemSelected)
     }
 
-    override fun updateData(data: List<Library>) {
-        with(licenseAdapter) {
-            items = data
-            notifyDataSetChanged()
-        }
+    override fun updateData(data: List<LicenseItem>) {
+        licenseAdapter.updateDataSet(data)
     }
 
     override fun openLicense(licenseHtml: String) {
@@ -73,7 +76,7 @@ class LicenseFragment : BaseFragment<FragmentLicenseBinding>(R.layout.fragment_l
     }
 
     override fun showProgress(show: Boolean) {
-        binding.licenseProgress.visibility = if (show) VISIBLE else GONE
+        licenseProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun onDestroyView() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseItem.kt
new file mode 100644
index 000000000..98c86e75a
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseItem.kt
@@ -0,0 +1,44 @@
+package io.github.wulkanowy.ui.modules.about.license
+
+import android.view.View
+import com.mikepenz.aboutlibraries.entity.Library
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.FlexibleViewHolder
+import io.github.wulkanowy.R
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.item_license.*
+
+class LicenseItem(val library: Library) : AbstractFlexibleItem<LicenseItem.ViewHolder>() {
+
+    override fun getLayoutRes() = R.layout.item_license
+
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>) = ViewHolder(view, adapter)
+
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>) {
+        with(holder) {
+            licenseItemName.text = library.libraryName
+            licenseItemSummary.text = library.license?.licenseName
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as LicenseItem
+
+        if (library != other.library) return false
+
+        return true
+    }
+
+    override fun hashCode() = library.hashCode()
+
+    class ViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>) : FlexibleViewHolder(view, adapter),
+        LayoutContainer {
+
+        override val containerView: View? get() = contentView
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicensePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicensePresenter.kt
index d0f6d69e0..b5b8fcd13 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicensePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicensePresenter.kt
@@ -1,6 +1,6 @@
 package io.github.wulkanowy.ui.modules.about.license
 
-import com.mikepenz.aboutlibraries.entity.Library
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
@@ -20,12 +20,18 @@ class LicensePresenter @Inject constructor(
         loadData()
     }
 
-    fun onItemSelected(library: Library) {
-        view?.run { library.license?.licenseDescription?.let { openLicense(it) } }
+    fun onItemSelected(item: AbstractFlexibleItem<*>) {
+        if (item !is LicenseItem) return
+        view?.run { item.library.license?.licenseDescription?.let { openLicense(it) } }
     }
 
     private fun loadData() {
-        disposable.add(Single.fromCallable { view?.appLibraries.orEmpty() }
+        disposable.add(Single.fromCallable { view?.appLibraries }
+            .map {
+                val exclude = listOf("Android-Iconics", "CircleImageView", "FastAdapter", "Jsoup", "okio", "Retrofit")
+                it.filter { library -> !exclude.contains(library.libraryName) }
+            }
+            .map { it.map { library -> LicenseItem(library) } }
             .subscribeOn(schedulers.backgroundThread)
             .observeOn(schedulers.mainThread)
             .doOnEvent { _, _ -> view?.showProgress(false) }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseView.kt
index 0680dbb73..3939d3e80 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseView.kt
@@ -9,7 +9,7 @@ interface LicenseView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<Library>)
+    fun updateData(data: List<LicenseItem>)
 
     fun openLicense(licenseHtml: String)
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/logviewer/LogViewerAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/logviewer/LogViewerAdapter.kt
deleted file mode 100644
index 45c304aae..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/logviewer/LogViewerAdapter.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package io.github.wulkanowy.ui.modules.about.logviewer
-
-import android.view.ViewGroup
-import android.widget.TextView
-import androidx.recyclerview.widget.RecyclerView
-
-class LogViewerAdapter : RecyclerView.Adapter<LogViewerAdapter.ViewHolder>() {
-
-    var lines = emptyList<String>()
-
-    class ViewHolder(val textView: TextView) : RecyclerView.ViewHolder(textView)
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        return ViewHolder(TextView(parent.context))
-    }
-
-    override fun getItemCount() = lines.size
-
-    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        holder.textView.text = lines[position]
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/logviewer/LogViewerFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/logviewer/LogViewerFragment.kt
deleted file mode 100644
index 08f91aff1..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/logviewer/LogViewerFragment.kt
+++ /dev/null
@@ -1,94 +0,0 @@
-package io.github.wulkanowy.ui.modules.about.logviewer
-
-import android.content.Intent
-import android.content.Intent.EXTRA_EMAIL
-import android.content.Intent.EXTRA_STREAM
-import android.content.Intent.FLAG_GRANT_READ_URI_PERMISSION
-import android.net.Uri
-import android.os.Build.VERSION.SDK_INT
-import android.os.Build.VERSION_CODES.LOLLIPOP
-import android.os.Bundle
-import android.view.Menu
-import android.view.MenuInflater
-import android.view.MenuItem
-import android.view.View
-import androidx.core.content.FileProvider
-import androidx.recyclerview.widget.LinearLayoutManager
-import io.github.wulkanowy.BuildConfig.APPLICATION_ID
-import io.github.wulkanowy.R
-import io.github.wulkanowy.databinding.FragmentLogviewerBinding
-import io.github.wulkanowy.ui.base.BaseFragment
-import io.github.wulkanowy.ui.modules.main.MainView
-import java.io.File
-import javax.inject.Inject
-
-class LogViewerFragment : BaseFragment<FragmentLogviewerBinding>(R.layout.fragment_logviewer),
-    LogViewerView, MainView.TitledView {
-
-    @Inject
-    lateinit var presenter: LogViewerPresenter
-
-    private val logAdapter = LogViewerAdapter()
-
-    override val titleStringId: Int
-        get() = R.string.logviewer_title
-
-    companion object {
-        fun newInstance() = LogViewerFragment()
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setHasOptionsMenu(true)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding = FragmentLogviewerBinding.bind(view)
-        messageContainer = binding.logViewerRecycler
-        presenter.onAttachView(this)
-    }
-
-    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-        inflater.inflate(R.menu.action_menu_logviewer, menu)
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        return if (item.itemId == R.id.logViewerMenuShare) presenter.onShareLogsSelected()
-        else false
-    }
-
-    override fun initView() {
-        with(binding.logViewerRecycler) {
-            layoutManager = LinearLayoutManager(context)
-            adapter = logAdapter
-        }
-
-        binding.logViewRefreshButton.setOnClickListener { presenter.onRefreshClick() }
-    }
-
-    override fun setLines(lines: List<String>) {
-        logAdapter.lines = lines
-        logAdapter.notifyDataSetChanged()
-        binding.logViewerRecycler.scrollToPosition(lines.size - 1)
-    }
-
-    override fun shareLogs(files: List<File>) {
-        val intent = Intent(Intent.ACTION_SEND_MULTIPLE).apply {
-            type = "text/plain"
-            putExtra(EXTRA_EMAIL, arrayOf("wulkanowyinc@gmail.com"))
-            addFlags(FLAG_GRANT_READ_URI_PERMISSION)
-            putParcelableArrayListExtra(EXTRA_STREAM, ArrayList(files.map {
-                if (SDK_INT < LOLLIPOP) Uri.fromFile(it)
-                else FileProvider.getUriForFile(requireContext(), "$APPLICATION_ID.fileprovider", it)
-            }))
-        }
-
-        startActivity(Intent.createChooser(intent, getString(R.string.logviewer_share)))
-    }
-
-    override fun onDestroyView() {
-        presenter.onDetachView()
-        super.onDestroyView()
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/logviewer/LogViewerPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/logviewer/LogViewerPresenter.kt
deleted file mode 100644
index 4485cb3eb..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/logviewer/LogViewerPresenter.kt
+++ /dev/null
@@ -1,54 +0,0 @@
-package io.github.wulkanowy.ui.modules.about.logviewer
-
-import io.github.wulkanowy.data.repositories.logger.LoggerRepository
-import io.github.wulkanowy.data.repositories.student.StudentRepository
-import io.github.wulkanowy.ui.base.BasePresenter
-import io.github.wulkanowy.ui.base.ErrorHandler
-import io.github.wulkanowy.utils.SchedulersProvider
-import timber.log.Timber
-import javax.inject.Inject
-
-class LogViewerPresenter @Inject constructor(
-    schedulers: SchedulersProvider,
-    errorHandler: ErrorHandler,
-    studentRepository: StudentRepository,
-    private val loggerRepository: LoggerRepository
-) : BasePresenter<LogViewerView>(errorHandler, studentRepository, schedulers) {
-
-    override fun onAttachView(view: LogViewerView) {
-        super.onAttachView(view)
-        view.initView()
-        loadLogFile()
-    }
-
-    fun onShareLogsSelected(): Boolean {
-        disposable.add(loggerRepository.getLogFiles()
-            .subscribeOn(schedulers.backgroundThread)
-            .observeOn(schedulers.mainThread)
-            .subscribe({
-                Timber.i("Loading logs files result: ${it.joinToString { it.name }}")
-                view?.shareLogs(it)
-            }, {
-                Timber.i("Loading logs files result: An exception occurred")
-                errorHandler.dispatch(it)
-            }))
-        return true
-    }
-
-    fun onRefreshClick() {
-        loadLogFile()
-    }
-
-    private fun loadLogFile() {
-        disposable.add(loggerRepository.getLastLogLines()
-            .subscribeOn(schedulers.backgroundThread)
-            .observeOn(schedulers.mainThread)
-            .subscribe({
-                Timber.i("Loading last log file result: load ${it.size} lines")
-                view?.setLines(it)
-            }, {
-                Timber.i("Loading last log file result: An exception occurred")
-                errorHandler.dispatch(it)
-            }))
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/logviewer/LogViewerView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/logviewer/LogViewerView.kt
deleted file mode 100644
index bd98c24fd..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/logviewer/LogViewerView.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.github.wulkanowy.ui.modules.about.logviewer
-
-import io.github.wulkanowy.ui.base.BaseView
-import java.io.File
-
-interface LogViewerView : BaseView {
-
-    fun initView()
-
-    fun setLines(lines: List<String>)
-
-    fun shareLogs(files: List<File>)
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountAdapter.kt
deleted file mode 100644
index 7df0ca378..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountAdapter.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-package io.github.wulkanowy.ui.modules.account
-
-import android.annotation.SuppressLint
-import android.graphics.PorterDuff
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.databinding.ItemAccountBinding
-import io.github.wulkanowy.utils.getThemeAttrColor
-import javax.inject.Inject
-
-class AccountAdapter @Inject constructor() : RecyclerView.Adapter<AccountAdapter.ItemViewHolder>() {
-
-    var items = emptyList<Student>()
-
-    var onClickListener: (Student) -> Unit = {}
-
-    override fun getItemCount() = items.size
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        ItemAccountBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-    )
-
-    @SuppressLint("SetTextI18n")
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        val student = items[position]
-
-        with(holder.binding) {
-            accountItemName.text = "${student.studentName} ${student.className}"
-            accountItemSchool.text = student.schoolName
-
-            with(accountItemImage) {
-                val colorImage = if (student.isCurrent) context.getThemeAttrColor(R.attr.colorPrimary)
-                else context.getThemeAttrColor(R.attr.colorOnSurface, 153)
-
-                setColorFilter(colorImage, PorterDuff.Mode.SRC_IN)
-            }
-
-            root.setOnClickListener { onClickListener(student) }
-        }
-    }
-
-    class ItemViewHolder(val binding: ItemAccountBinding) : RecyclerView.ViewHolder(binding.root)
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountDialog.kt
index ce811e0b0..cfff31c98 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountDialog.kt
@@ -7,21 +7,23 @@ import android.view.ViewGroup
 import android.widget.Toast
 import android.widget.Toast.LENGTH_LONG
 import androidx.appcompat.app.AlertDialog
-import androidx.recyclerview.widget.LinearLayoutManager
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.databinding.DialogAccountBinding
 import io.github.wulkanowy.ui.base.BaseDialogFragment
 import io.github.wulkanowy.ui.modules.login.LoginActivity
+import io.github.wulkanowy.utils.setOnItemClickListener
+import kotlinx.android.synthetic.main.dialog_account.*
 import javax.inject.Inject
 
-class AccountDialog : BaseDialogFragment<DialogAccountBinding>(), AccountView {
+class AccountDialog : BaseDialogFragment(), AccountView {
 
     @Inject
     lateinit var presenter: AccountPresenter
 
     @Inject
-    lateinit var accountAdapter: AccountAdapter
+    lateinit var accountAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
 
     companion object {
         fun newInstance() = AccountDialog()
@@ -33,7 +35,7 @@ class AccountDialog : BaseDialogFragment<DialogAccountBinding>(), AccountView {
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return DialogAccountBinding.inflate(inflater).apply { binding = this }.root
+        return inflater.inflate(R.layout.dialog_account, container, false)
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
@@ -42,23 +44,18 @@ class AccountDialog : BaseDialogFragment<DialogAccountBinding>(), AccountView {
     }
 
     override fun initView() {
-        accountAdapter.onClickListener = presenter::onItemSelected
+        accountAdapter.setOnItemClickListener { presenter.onItemSelected(it) }
 
-        with(binding) {
-            accountDialogAdd.setOnClickListener { presenter.onAddSelected() }
-            accountDialogRemove.setOnClickListener { presenter.onRemoveSelected() }
-            accountDialogRecycler.apply {
-                layoutManager = LinearLayoutManager(context)
-                adapter = accountAdapter
-            }
+        accountDialogAdd.setOnClickListener { presenter.onAddSelected() }
+        accountDialogRemove.setOnClickListener { presenter.onRemoveSelected() }
+        accountDialogRecycler.apply {
+            layoutManager = SmoothScrollLinearLayoutManager(context)
+            adapter = accountAdapter
         }
     }
 
-    override fun updateData(data: List<Student>) {
-        with(accountAdapter) {
-            items = data
-            notifyDataSetChanged()
-        }
+    override fun updateData(data: List<AccountItem>) {
+        accountAdapter.updateDataSet(data)
     }
 
     override fun showError(text: String, error: Throwable) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountItem.kt
new file mode 100644
index 000000000..d3a3ee6a3
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountItem.kt
@@ -0,0 +1,59 @@
+package io.github.wulkanowy.ui.modules.account
+
+import android.annotation.SuppressLint
+import android.graphics.PorterDuff
+import android.view.View
+import androidx.core.graphics.ColorUtils
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.FlexibleViewHolder
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.utils.getThemeAttrColor
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.item_account.*
+
+class AccountItem(val student: Student) : AbstractFlexibleItem<AccountItem.ViewHolder>() {
+
+    override fun getLayoutRes() = R.layout.item_account
+
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>) = ViewHolder(view, adapter)
+
+    @SuppressLint("SetTextI18n")
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
+        val context = holder.contentView.context
+
+        val colorImage = if (student.isCurrent) context.getThemeAttrColor(R.attr.colorPrimary)
+        else ColorUtils.setAlphaComponent(context.getThemeAttrColor(R.attr.colorOnSurface), 153)
+
+        with(holder) {
+            accountItemName.text = "${student.studentName} ${student.className}"
+            accountItemSchool.text = student.schoolName
+            accountItemImage.setColorFilter(colorImage, PorterDuff.Mode.SRC_IN)
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as AccountItem
+
+        if (student != other.student) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = student.hashCode()
+        result = 31 * result + student.id.toInt()
+        return result
+    }
+
+    class ViewHolder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter),
+        LayoutContainer {
+
+        override val containerView: View? get() = contentView
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountPresenter.kt
index 3416a043f..e9b4b81ee 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountPresenter.kt
@@ -1,6 +1,6 @@
 package io.github.wulkanowy.ui.modules.account
 
-import io.github.wulkanowy.data.db.entities.Student
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.services.sync.SyncManager
 import io.github.wulkanowy.ui.base.BasePresenter
@@ -63,29 +63,32 @@ class AccountPresenter @Inject constructor(
             }))
     }
 
-    fun onItemSelected(student: Student) {
-        Timber.i("Select student item ${student.id}")
-        if (student.isCurrent) {
-            view?.dismissView()
-        } else {
-            Timber.i("Attempt to change a student")
-            disposable.add(studentRepository.switchStudent(student)
-                .subscribeOn(schedulers.backgroundThread)
-                .observeOn(schedulers.mainThread)
-                .doFinally { view?.dismissView() }
-                .subscribe({
-                    Timber.i("Change a student result: Success")
-                    view?.recreateMainView()
-                }, {
-                    Timber.i("Change a student result: An exception occurred")
-                    errorHandler.dispatch(it)
-                }))
+    fun onItemSelected(item: AbstractFlexibleItem<*>) {
+        if (item is AccountItem) {
+            Timber.i("Select student item ${item.student.id}")
+            if (item.student.isCurrent) {
+                view?.dismissView()
+            } else {
+                Timber.i("Attempt to change a student")
+                disposable.add(studentRepository.switchStudent(item.student)
+                    .subscribeOn(schedulers.backgroundThread)
+                    .observeOn(schedulers.mainThread)
+                    .doFinally { view?.dismissView() }
+                    .subscribe({
+                        Timber.i("Change a student result: Success")
+                        view?.recreateMainView()
+                    }, {
+                        Timber.i("Change a student result: An exception occurred")
+                        errorHandler.dispatch(it)
+                    }))
+            }
         }
     }
 
     private fun loadData() {
         Timber.i("Loading account data started")
         disposable.add(studentRepository.getSavedStudents(false)
+            .map { it.map { item -> AccountItem(item) } }
             .subscribeOn(schedulers.backgroundThread)
             .observeOn(schedulers.mainThread)
             .subscribe({
@@ -97,3 +100,4 @@ class AccountPresenter @Inject constructor(
             }))
     }
 }
+
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountView.kt
index abb9e1d27..ede5023ba 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountView.kt
@@ -1,13 +1,12 @@
 package io.github.wulkanowy.ui.modules.account
 
-import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.ui.base.BaseView
 
 interface AccountView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<Student>)
+    fun updateData(data: List<AccountItem>)
 
     fun dismissView()
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceAdapter.kt
index a63d5045a..75f998404 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceAdapter.kt
@@ -1,80 +1,12 @@
 package io.github.wulkanowy.ui.modules.attendance
 
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.core.view.isVisible
-import androidx.recyclerview.widget.RecyclerView
-import io.github.wulkanowy.R
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.IFlexible
 import io.github.wulkanowy.data.db.entities.Attendance
-import io.github.wulkanowy.data.repositories.attendance.SentExcuseStatus
-import io.github.wulkanowy.databinding.ItemAttendanceBinding
-import javax.inject.Inject
 
-class AttendanceAdapter @Inject constructor() :
-    RecyclerView.Adapter<AttendanceAdapter.ItemViewHolder>() {
-
-    var items = emptyList<Attendance>()
+class AttendanceAdapter<T : IFlexible<*>> : FlexibleAdapter<T>(null, null, true) {
 
     var excuseActionMode: Boolean = false
 
-    var onClickListener: (Attendance) -> Unit = {}
-
     var onExcuseCheckboxSelect: (attendanceItem: Attendance, checked: Boolean) -> Unit = { _, _ -> }
-
-    override fun getItemCount() = items.size
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        ItemAttendanceBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-    )
-
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        val item = items[position]
-
-        with(holder.binding) {
-            attendanceItemNumber.text = item.number.toString()
-            attendanceItemSubject.text = item.subject
-            attendanceItemDescription.text = item.name
-            attendanceItemAlert.visibility = item.run { if (absence && !excused) View.VISIBLE else View.INVISIBLE }
-            attendanceItemNumber.visibility = View.GONE
-            attendanceItemExcuseInfo.visibility = View.GONE
-            attendanceItemExcuseCheckbox.visibility = View.GONE
-            attendanceItemExcuseCheckbox.isChecked = false
-            attendanceItemExcuseCheckbox.setOnCheckedChangeListener { _, checked ->
-                onExcuseCheckboxSelect(item, checked)
-            }
-
-            when (if (item.excuseStatus != null) SentExcuseStatus.valueOf(item.excuseStatus) else null) {
-                SentExcuseStatus.WAITING -> {
-                    attendanceItemExcuseInfo.setImageResource(R.drawable.ic_excuse_waiting)
-                    attendanceItemExcuseInfo.visibility = View.VISIBLE
-                    attendanceItemAlert.visibility = View.INVISIBLE
-                }
-                SentExcuseStatus.DENIED -> {
-                    attendanceItemExcuseInfo.setImageResource(R.drawable.ic_excuse_denied)
-                    attendanceItemExcuseInfo.visibility = View.VISIBLE
-                }
-                else -> {
-                    if (item.excusable && excuseActionMode) {
-                        attendanceItemNumber.visibility = View.GONE
-                        attendanceItemExcuseCheckbox.visibility = View.VISIBLE
-                    } else {
-                        attendanceItemNumber.visibility = View.VISIBLE
-                        attendanceItemExcuseCheckbox.visibility = View.GONE
-                    }
-                }
-            }
-            root.setOnClickListener {
-                onClickListener(item)
-
-                with(attendanceItemExcuseCheckbox) {
-                    if (excuseActionMode && isVisible) {
-                        isChecked = !isChecked
-                    }
-                }
-            }
-        }
-    }
-
-    class ItemViewHolder(val binding: ItemAttendanceBinding) : RecyclerView.ViewHolder(binding.root)
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceDialog.kt
index 97b76e812..611dd999e 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceDialog.kt
@@ -5,15 +5,13 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.DialogFragment
+import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Attendance
-import io.github.wulkanowy.databinding.DialogAttendanceBinding
-import io.github.wulkanowy.utils.lifecycleAwareVariable
 import io.github.wulkanowy.utils.toFormattedString
+import kotlinx.android.synthetic.main.dialog_attendance.*
 
 class AttendanceDialog : DialogFragment() {
 
-    private var binding: DialogAttendanceBinding by lifecycleAwareVariable()
-
     private lateinit var attendance: Attendance
 
     companion object {
@@ -35,18 +33,16 @@ class AttendanceDialog : DialogFragment() {
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return DialogAttendanceBinding.inflate(inflater).apply { binding = this }.root
+        return inflater.inflate(R.layout.dialog_attendance, container, false)
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
-        with(binding) {
-            attendanceDialogSubject.text = attendance.subject
-            attendanceDialogDescription.text = attendance.name
-            attendanceDialogDate.text = attendance.date.toFormattedString()
-            attendanceDialogNumber.text = attendance.number.toString()
-            attendanceDialogClose.setOnClickListener { dismiss() }
-        }
+        attendanceDialogSubject.text = attendance.subject
+        attendanceDialogDescription.text = attendance.name
+        attendanceDialogDate.text = attendance.date.toFormattedString()
+        attendanceDialogNumber.text = attendance.number.toString()
+        attendanceDialogClose.setOnClickListener { dismiss() }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt
index 6599243dd..9969b1c78 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt
@@ -10,32 +10,35 @@ import android.view.View
 import android.view.View.GONE
 import android.view.View.INVISIBLE
 import android.view.View.VISIBLE
+import android.view.ViewGroup
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.view.ActionMode
-import androidx.recyclerview.widget.LinearLayoutManager
 import com.wdullaer.materialdatetimepicker.date.DatePickerDialog
+import eu.davidea.flexibleadapter.common.FlexibleItemDecoration
+import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Attendance
-import io.github.wulkanowy.databinding.DialogExcuseBinding
-import io.github.wulkanowy.databinding.FragmentAttendanceBinding
 import io.github.wulkanowy.ui.base.BaseFragment
-import io.github.wulkanowy.ui.widgets.DividerItemDecoration
 import io.github.wulkanowy.ui.modules.attendance.summary.AttendanceSummaryFragment
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.SchooldaysRangeLimiter
 import io.github.wulkanowy.utils.dpToPx
+import io.github.wulkanowy.utils.setOnItemClickListener
+import kotlinx.android.synthetic.main.dialog_excuse.*
+import kotlinx.android.synthetic.main.fragment_attendance.*
 import org.threeten.bp.LocalDate
 import javax.inject.Inject
 
-class AttendanceFragment : BaseFragment<FragmentAttendanceBinding>(R.layout.fragment_attendance), AttendanceView, MainView.MainChildView,
+class AttendanceFragment : BaseFragment(), AttendanceView, MainView.MainChildView,
     MainView.TitledView {
 
     @Inject
     lateinit var presenter: AttendancePresenter
 
     @Inject
-    lateinit var attendanceAdapter: AttendanceAdapter
+    lateinit var attendanceAdapter: AttendanceAdapter<AbstractFlexibleItem<*>>
 
     override val excuseSuccessString: String
         get() = getString(R.string.attendance_excuse_success)
@@ -51,7 +54,7 @@ class AttendanceFragment : BaseFragment<FragmentAttendanceBinding>(R.layout.frag
 
     override val titleStringId get() = R.string.attendance_title
 
-    override val isViewEmpty get() = attendanceAdapter.items.isEmpty()
+    override val isViewEmpty get() = attendanceAdapter.isEmpty
 
     override val currentStackSize get() = (activity as? MainActivity)?.currentStackSize
 
@@ -88,38 +91,39 @@ class AttendanceFragment : BaseFragment<FragmentAttendanceBinding>(R.layout.frag
         setHasOptionsMenu(true)
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding = FragmentAttendanceBinding.bind(view)
-        messageContainer = binding.attendanceRecycler
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_attendance, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        messageContainer = attendanceRecycler
         presenter.onAttachView(this, savedInstanceState?.getLong(SAVED_DATE_KEY))
     }
 
     override fun initView() {
-        with(attendanceAdapter) {
-            onClickListener = presenter::onAttendanceItemSelected
-            onExcuseCheckboxSelect = presenter::onExcuseCheckboxSelect
-        }
+        attendanceAdapter.setOnItemClickListener(presenter::onAttendanceItemSelected)
+        attendanceAdapter.onExcuseCheckboxSelect = presenter::onExcuseCheckboxSelect
 
-        with(binding.attendanceRecycler) {
-            layoutManager = LinearLayoutManager(context)
+        with(attendanceRecycler) {
+            layoutManager = SmoothScrollLinearLayoutManager(context)
             adapter = attendanceAdapter
-            addItemDecoration(DividerItemDecoration(context))
+            addItemDecoration(FlexibleItemDecoration(context)
+                .withDefaultDivider()
+                .withDrawDividerOnLastItem(false))
         }
 
-        with(binding) {
-            attendanceSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
-            attendanceErrorRetry.setOnClickListener { presenter.onRetry() }
-            attendanceErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+        attendanceSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
+        attendanceErrorRetry.setOnClickListener { presenter.onRetry() }
+        attendanceErrorDetails.setOnClickListener { presenter.onDetailsClick() }
 
-            attendancePreviousButton.setOnClickListener { presenter.onPreviousDay() }
-            attendanceNavDate.setOnClickListener { presenter.onPickDate() }
-            attendanceNextButton.setOnClickListener { presenter.onNextDay() }
+        attendancePreviousButton.setOnClickListener { presenter.onPreviousDay() }
+        attendanceNavDate.setOnClickListener { presenter.onPickDate() }
+        attendanceNextButton.setOnClickListener { presenter.onNextDay() }
 
-            attendanceExcuseButton.setOnClickListener { presenter.onExcuseButtonClick() }
+        attendanceExcuseButton.setOnClickListener { presenter.onExcuseButtonClick() }
 
-            attendanceNavContainer.setElevationCompat(requireContext().dpToPx(8f))
-        }
+        attendanceNavContainer.setElevationCompat(requireContext().dpToPx(8f))
     }
 
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
@@ -131,26 +135,20 @@ class AttendanceFragment : BaseFragment<FragmentAttendanceBinding>(R.layout.frag
         else false
     }
 
-    override fun updateData(data: List<Attendance>) {
-        with(attendanceAdapter) {
-            items = data
-            notifyDataSetChanged()
-        }
+    override fun updateData(data: List<AttendanceItem>) {
+        attendanceAdapter.updateDataSet(data, true)
     }
 
     override fun updateNavigationDay(date: String) {
-        binding.attendanceNavDate.text = date
+        attendanceNavDate.text = date
     }
 
     override fun clearData() {
-        with(attendanceAdapter) {
-            items = emptyList()
-            notifyDataSetChanged()
-        }
+        attendanceAdapter.clear()
     }
 
     override fun resetView() {
-        binding.attendanceRecycler.smoothScrollToPosition(0)
+        attendanceRecycler.smoothScrollToPosition(0)
     }
 
     override fun onFragmentReselected() {
@@ -166,43 +164,43 @@ class AttendanceFragment : BaseFragment<FragmentAttendanceBinding>(R.layout.frag
     }
 
     override fun showEmpty(show: Boolean) {
-        binding.attendanceEmpty.visibility = if (show) VISIBLE else GONE
+        attendanceEmpty.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showErrorView(show: Boolean) {
-        binding.attendanceError.visibility = if (show) VISIBLE else GONE
+        attendanceError.visibility = if (show) VISIBLE else GONE
     }
 
     override fun setErrorDetails(message: String) {
-        binding.attendanceErrorMessage.text = message
+        attendanceErrorMessage.text = message
     }
 
     override fun showProgress(show: Boolean) {
-        binding.attendanceProgress.visibility = if (show) VISIBLE else GONE
+        attendanceProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun enableSwipe(enable: Boolean) {
-        binding.attendanceSwipe.isEnabled = enable
+        attendanceSwipe.isEnabled = enable
     }
 
     override fun showContent(show: Boolean) {
-        binding. attendanceRecycler.visibility = if (show) VISIBLE else GONE
+        attendanceRecycler.visibility = if (show) VISIBLE else GONE
     }
 
     override fun hideRefresh() {
-        binding.attendanceSwipe.isRefreshing = false
+        attendanceSwipe.isRefreshing = false
     }
 
     override fun showPreButton(show: Boolean) {
-        binding.attendancePreviousButton.visibility = if (show) VISIBLE else INVISIBLE
+        attendancePreviousButton.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun showNextButton(show: Boolean) {
-        binding. attendanceNextButton.visibility = if (show) VISIBLE else INVISIBLE
+        attendanceNextButton.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun showExcuseButton(show: Boolean) {
-        binding.attendanceExcuseButton.visibility = if (show) VISIBLE else GONE
+        attendanceExcuseButton.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showAttendanceDialog(lesson: Attendance) {
@@ -225,15 +223,14 @@ class AttendanceFragment : BaseFragment<FragmentAttendanceBinding>(R.layout.frag
     }
 
     override fun showExcuseDialog() {
-        val dialogBinding = DialogExcuseBinding.inflate(LayoutInflater.from(context))
         AlertDialog.Builder(requireContext())
             .setTitle(R.string.attendance_excuse_title)
-            .setView(dialogBinding.root)
+            .setView(R.layout.dialog_excuse)
             .setNegativeButton(android.R.string.cancel) { _, _ -> }
             .create()
             .apply {
                 setButton(BUTTON_POSITIVE, getString(R.string.attendance_excuse_dialog_submit)) { _, _ ->
-                    presenter.onExcuseDialogSubmit(dialogBinding.excuseReason.text?.toString().orEmpty())
+                    presenter.onExcuseDialogSubmit(excuseReason.text?.toString().orEmpty())
                 }
             }.show()
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceItem.kt
new file mode 100644
index 000000000..7355aec2e
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceItem.kt
@@ -0,0 +1,97 @@
+package io.github.wulkanowy.ui.modules.attendance
+
+import android.view.View
+import android.view.View.GONE
+import android.view.View.INVISIBLE
+import android.view.View.VISIBLE
+import androidx.core.view.isVisible
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.FlexibleViewHolder
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Attendance
+import io.github.wulkanowy.data.repositories.attendance.SentExcuseStatus
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.item_attendance.*
+
+class AttendanceItem(val attendance: Attendance) :
+    AbstractFlexibleItem<AttendanceItem.ViewHolder>() {
+
+    override fun getLayoutRes() = R.layout.item_attendance
+
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): ViewHolder {
+        return ViewHolder(view, adapter)
+    }
+
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
+        holder.apply {
+            attendanceItemNumber.text = attendance.number.toString()
+            attendanceItemSubject.text = attendance.subject
+            attendanceItemDescription.text = attendance.name
+            attendanceItemAlert.visibility = attendance.run { if (absence && !excused) VISIBLE else INVISIBLE }
+            attendanceItemNumber.visibility = GONE
+            attendanceItemExcuseInfo.visibility = GONE
+            attendanceItemExcuseCheckbox.visibility = GONE
+            attendanceItemExcuseCheckbox.isChecked = false
+            attendanceItemExcuseCheckbox.setOnCheckedChangeListener { _, checked ->
+                (adapter as AttendanceAdapter).onExcuseCheckboxSelect(attendance, checked)
+            }
+
+            when (if (attendance.excuseStatus != null) SentExcuseStatus.valueOf(attendance.excuseStatus) else null) {
+                SentExcuseStatus.WAITING -> {
+                    attendanceItemExcuseInfo.setImageResource(R.drawable.ic_excuse_waiting)
+                    attendanceItemExcuseInfo.visibility = VISIBLE
+                    attendanceItemAlert.visibility = INVISIBLE
+                }
+                SentExcuseStatus.DENIED -> {
+                    attendanceItemExcuseInfo.setImageResource(R.drawable.ic_excuse_denied)
+                    attendanceItemExcuseInfo.visibility = VISIBLE
+                }
+                else -> {
+                    if (attendance.excusable && (adapter as AttendanceAdapter).excuseActionMode) {
+                        attendanceItemNumber.visibility = GONE
+                        attendanceItemExcuseCheckbox.visibility = VISIBLE
+                    } else {
+                        attendanceItemNumber.visibility = VISIBLE
+                        attendanceItemExcuseCheckbox.visibility = GONE
+                    }
+                }
+            }
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as AttendanceItem
+
+        if (attendance != other.attendance) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = attendance.hashCode()
+        result = 31 * result + attendance.id.toInt()
+        return result
+    }
+
+    class ViewHolder(view: View, val adapter: FlexibleAdapter<*>) :
+        FlexibleViewHolder(view, adapter),
+        LayoutContainer {
+
+        override val containerView: View
+            get() = contentView
+
+        override fun onClick(view: View?) {
+            super.onClick(view)
+            attendanceItemExcuseCheckbox.apply {
+                if ((adapter as AttendanceAdapter).excuseActionMode && isVisible) {
+                    isChecked = !isChecked
+                }
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceModule.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceModule.kt
new file mode 100644
index 000000000..eb35fea1b
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceModule.kt
@@ -0,0 +1,12 @@
+package io.github.wulkanowy.ui.modules.attendance
+
+import dagger.Module
+import dagger.Provides
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+
+@Module
+class AttendanceModule {
+
+    @Provides
+    fun provideAttendanceFlexibleAdapter() = AttendanceAdapter<AbstractFlexibleItem<*>>()
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt
index 437e06c92..679d5367d 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt
@@ -1,6 +1,7 @@
 package io.github.wulkanowy.ui.modules.attendance
 
 import android.annotation.SuppressLint
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.data.repositories.attendance.AttendanceRepository
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
@@ -110,11 +111,11 @@ class AttendancePresenter @Inject constructor(
         view?.finishActionMode()
     }
 
-    fun onAttendanceItemSelected(attendance: Attendance) {
+    fun onAttendanceItemSelected(item: AbstractFlexibleItem<*>?) {
         view?.apply {
-            if (!excuseActionMode) {
-                Timber.i("Select attendance item ${attendance.id}")
-                showAttendanceDialog(attendance)
+            if (item is AttendanceItem && !excuseActionMode) {
+                Timber.i("Select attendance item ${item.attendance.id}")
+                showAttendanceDialog(item.attendance)
             }
         }
     }
@@ -187,16 +188,15 @@ class AttendancePresenter @Inject constructor(
         disposable.apply {
             clear()
             add(studentRepository.getCurrentStudent()
-                .flatMap { student ->
-                    semesterRepository.getCurrentSemester(student).flatMap { semester ->
-                        attendanceRepository.getAttendance(student, semester, date, date, forceRefresh)
-                    }
-                }
+                .delay(200, MILLISECONDS)
+                .flatMap { semesterRepository.getCurrentSemester(it) }
+                .flatMap { attendanceRepository.getAttendance(it, date, date, forceRefresh) }
                 .map { list ->
                     if (prefRepository.isShowPresent) list
                     else list.filter { !it.presence }
                 }
-                .map { items -> items.sortedBy { it.number } }
+                .map { items -> items.map { AttendanceItem(it) } }
+                .map { items -> items.sortedBy { it.attendance.number } }
                 .subscribeOn(schedulers.backgroundThread)
                 .observeOn(schedulers.mainThread)
                 .doFinally {
@@ -213,14 +213,9 @@ class AttendancePresenter @Inject constructor(
                         showEmpty(it.isEmpty())
                         showErrorView(false)
                         showContent(it.isNotEmpty())
-                        showExcuseButton(it.any { item -> item.excusable })
+                        showExcuseButton(it.any { item -> item.attendance.excusable })
                     }
-                    analytics.logEvent(
-                        "load_data",
-                        "type" to "attendance",
-                        "items" to it.size,
-                        "force_refresh" to forceRefresh
-                    )
+                    analytics.logEvent("load_attendance", "items" to it.size, "force_refresh" to forceRefresh)
                 }) {
                     Timber.i("Loading attendance result: An exception occurred")
                     errorHandler.dispatch(it)
@@ -233,11 +228,9 @@ class AttendancePresenter @Inject constructor(
         Timber.i("Excusing absence started")
         disposable.apply {
             add(studentRepository.getCurrentStudent()
-                .flatMap { student ->
-                    semesterRepository.getCurrentSemester(student).flatMap { semester ->
-                        attendanceRepository.excuseForAbsence(student, semester, toExcuseList, reason)
-                    }
-                }
+                .delay(200, MILLISECONDS)
+                .flatMap { semesterRepository.getCurrentSemester(it) }
+                .flatMap { attendanceRepository.excuseForAbsence(it, toExcuseList, reason) }
                 .subscribeOn(schedulers.backgroundThread)
                 .observeOn(schedulers.mainThread)
                 .doOnSubscribe {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceView.kt
index 484070a2e..03e95053f 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceView.kt
@@ -18,7 +18,7 @@ interface AttendanceView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<Attendance>)
+    fun updateData(data: List<AttendanceItem>)
 
     fun updateNavigationDay(date: String)
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryAdapter.kt
deleted file mode 100644
index 236c3da16..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryAdapter.kt
+++ /dev/null
@@ -1,101 +0,0 @@
-package io.github.wulkanowy.ui.modules.attendance.summary
-
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.AttendanceSummary
-import io.github.wulkanowy.databinding.ItemAttendanceSummaryBinding
-import io.github.wulkanowy.databinding.ScrollableHeaderAttendanceSummaryBinding
-import io.github.wulkanowy.utils.calculatePercentage
-import io.github.wulkanowy.utils.getFormattedName
-import org.threeten.bp.Month
-import java.util.Locale
-import javax.inject.Inject
-
-class AttendanceSummaryAdapter @Inject constructor() :
-    RecyclerView.Adapter<RecyclerView.ViewHolder>() {
-
-    private enum class ViewType(val id: Int) {
-        HEADER(1),
-        ITEM(2)
-    }
-
-    var items = emptyList<AttendanceSummary>()
-
-    override fun getItemCount() = if (items.isNotEmpty()) items.size + 2 else 0
-
-    override fun getItemViewType(position: Int) = when (position) {
-        0 -> ViewType.HEADER.id
-        else -> ViewType.ITEM.id
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        val inflater = LayoutInflater.from(parent.context)
-
-        return when (viewType) {
-            ViewType.HEADER.id -> HeaderViewHolder(ScrollableHeaderAttendanceSummaryBinding.inflate(inflater, parent, false))
-            ViewType.ITEM.id -> ItemViewHolder(ItemAttendanceSummaryBinding.inflate(inflater, parent, false))
-            else -> throw IllegalStateException()
-        }
-    }
-
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        when (holder) {
-            is HeaderViewHolder -> bindHeaderViewHolder(holder.binding)
-            is ItemViewHolder -> bindItemViewHolder(holder.binding, position - 2)
-        }
-    }
-
-    private fun bindHeaderViewHolder(binding: ScrollableHeaderAttendanceSummaryBinding) {
-        binding.attendanceSummaryScrollableHeaderPercentage.text = formatPercentage(items.calculatePercentage())
-    }
-
-    private fun bindItemViewHolder(binding: ItemAttendanceSummaryBinding, position: Int) {
-        val item = if (position == -1) getTotalItem() else items[position]
-
-        with(binding) {
-            attendanceSummaryMonth.text = when (position) {
-                -1 -> root.context.getString(R.string.attendance_summary_total)
-                else -> item.month.getFormattedName()
-            }
-            attendanceSummaryPercentage.text = when (position) {
-                -1 -> formatPercentage(items.calculatePercentage())
-                else -> formatPercentage(item.calculatePercentage())
-            }
-
-            attendanceSummaryPresent.text = item.presence.toString()
-            attendanceSummaryAbsenceUnexcused.text = item.absence.toString()
-            attendanceSummaryAbsenceExcused.text = item.absenceExcused.toString()
-            attendanceSummaryAbsenceSchool.text = item.absenceForSchoolReasons.toString()
-            attendanceSummaryExemption.text = item.exemption.toString()
-            attendanceSummaryLatenessUnexcused.text = item.lateness.toString()
-            attendanceSummaryLatenessExcused.text = item.latenessExcused.toString()
-        }
-    }
-
-    private fun getTotalItem() = AttendanceSummary(
-        month = Month.APRIL,
-        presence = items.sumBy { it.presence },
-        absence = items.sumBy { it.absence },
-        absenceExcused = items.sumBy { it.absenceExcused },
-        absenceForSchoolReasons = items.sumBy { it.absenceForSchoolReasons },
-        exemption = items.sumBy { it.exemption },
-        lateness = items.sumBy { it.lateness },
-        latenessExcused = items.sumBy { it.latenessExcused },
-        diaryId = -1,
-        studentId = -1,
-        subjectId = -1
-    )
-
-    private fun formatPercentage(percentage: Double): String {
-        return if (percentage == 0.0) "0%"
-        else "${String.format(Locale.FRANCE, "%.2f", percentage)}%"
-    }
-
-    class HeaderViewHolder(val binding: ScrollableHeaderAttendanceSummaryBinding) :
-        RecyclerView.ViewHolder(binding.root)
-
-    class ItemViewHolder(val binding: ItemAttendanceSummaryBinding) :
-        RecyclerView.ViewHolder(binding.root)
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryFragment.kt
index 1b9fe08ef..fc3601847 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryFragment.kt
@@ -1,31 +1,32 @@
 package io.github.wulkanowy.ui.modules.attendance.summary
 
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
 import android.view.View.INVISIBLE
 import android.view.View.VISIBLE
+import android.view.ViewGroup
 import android.widget.ArrayAdapter
 import android.widget.TextView
-import androidx.recyclerview.widget.LinearLayoutManager
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.AttendanceSummary
-import io.github.wulkanowy.databinding.FragmentAttendanceSummaryBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.setOnItemSelectedListener
+import kotlinx.android.synthetic.main.fragment_attendance_summary.*
 import javax.inject.Inject
 
-class AttendanceSummaryFragment :
-    BaseFragment<FragmentAttendanceSummaryBinding>(R.layout.fragment_attendance_summary),
-    AttendanceSummaryView, MainView.TitledView {
+class AttendanceSummaryFragment : BaseFragment(), AttendanceSummaryView, MainView.TitledView {
 
     @Inject
     lateinit var presenter: AttendanceSummaryPresenter
 
     @Inject
-    lateinit var attendanceSummaryAdapter: AttendanceSummaryAdapter
+    lateinit var attendanceSummaryAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
 
     private lateinit var subjectsAdapter: ArrayAdapter<String>
 
@@ -37,36 +38,37 @@ class AttendanceSummaryFragment :
 
     override val titleStringId get() = R.string.attendance_title
 
-    override val isViewEmpty get() = attendanceSummaryAdapter.items.isEmpty()
+    override val isViewEmpty get() = attendanceSummaryAdapter.isEmpty
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding = FragmentAttendanceSummaryBinding.bind(view)
-        messageContainer = binding.attendanceSummaryRecycler
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_attendance_summary, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        messageContainer = attendanceSummaryRecycler
         presenter.onAttachView(this, savedInstanceState?.getInt(SAVED_SUBJECT_KEY))
     }
 
     override fun initView() {
-        with(binding.attendanceSummaryRecycler) {
-            layoutManager = LinearLayoutManager(context)
+        with(attendanceSummaryRecycler) {
+            layoutManager = SmoothScrollLinearLayoutManager(context)
             adapter = attendanceSummaryAdapter
         }
 
-        with(binding) {
-            attendanceSummarySwipe.setOnRefreshListener(presenter::onSwipeRefresh)
-            attendanceSummaryErrorRetry.setOnClickListener { presenter.onRetry() }
-            attendanceSummaryErrorDetails.setOnClickListener { presenter.onDetailsClick() }
-        }
+        attendanceSummarySwipe.setOnRefreshListener(presenter::onSwipeRefresh)
+        attendanceSummaryErrorRetry.setOnClickListener { presenter.onRetry() }
+        attendanceSummaryErrorDetails.setOnClickListener { presenter.onDetailsClick() }
 
         subjectsAdapter = ArrayAdapter(requireContext(), android.R.layout.simple_spinner_item, mutableListOf())
         subjectsAdapter.setDropDownViewResource(R.layout.item_attendance_summary_subject)
 
-        with(binding.attendanceSummarySubjects) {
+        with(attendanceSummarySubjects) {
             adapter = subjectsAdapter
             setOnItemSelectedListener<TextView> { presenter.onSubjectSelected(it?.text?.toString()) }
         }
 
-        binding.attendanceSummarySubjectsContainer.setElevationCompat(requireContext().dpToPx(1f))
+        attendanceSummarySubjectsContainer.setElevationCompat(requireContext().dpToPx(1f))
     }
 
     override fun updateSubjects(data: ArrayList<String>) {
@@ -77,50 +79,48 @@ class AttendanceSummaryFragment :
         }
     }
 
-    override fun updateDataSet(data: List<AttendanceSummary>) {
+    override fun updateDataSet(data: List<AttendanceSummaryItem>, header: AttendanceSummaryScrollableHeader) {
         with(attendanceSummaryAdapter) {
-            items = data
-            notifyDataSetChanged()
+            updateDataSet(data, true)
+            removeAllScrollableHeaders()
+            addScrollableHeader(header)
         }
     }
 
     override fun clearView() {
-        with(attendanceSummaryAdapter) {
-            items = emptyList()
-            notifyDataSetChanged()
-        }
+        attendanceSummaryAdapter.clear()
     }
 
     override fun showEmpty(show: Boolean) {
-        binding.attendanceSummaryEmpty.visibility = if (show) VISIBLE else GONE
+        attendanceSummaryEmpty.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showErrorView(show: Boolean) {
-        binding.attendanceSummaryError.visibility = if (show) VISIBLE else GONE
+        attendanceSummaryError.visibility = if (show) VISIBLE else GONE
     }
 
     override fun setErrorDetails(message: String) {
-        binding.attendanceSummaryErrorMessage.text = message
+        attendanceSummaryErrorMessage.text = message
     }
 
     override fun showProgress(show: Boolean) {
-        binding.attendanceSummaryProgress.visibility = if (show) VISIBLE else GONE
+        attendanceSummaryProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun enableSwipe(enable: Boolean) {
-        binding.attendanceSummarySwipe.isEnabled = enable
+        attendanceSummarySwipe.isEnabled = enable
     }
 
     override fun showContent(show: Boolean) {
-        binding.attendanceSummaryRecycler.visibility = if (show) VISIBLE else GONE
+        attendanceSummaryRecycler.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showSubjects(show: Boolean) {
-        binding.attendanceSummarySubjectsContainer.visibility = if (show) VISIBLE else INVISIBLE
+        attendanceSummarySubjectsContainer.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun hideRefresh() {
-        binding.attendanceSummarySwipe.isRefreshing = false
+        attendanceSummarySwipe.isRefreshing = false
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
@@ -129,7 +129,7 @@ class AttendanceSummaryFragment :
     }
 
     override fun onDestroyView() {
-        presenter.onDetachView()
         super.onDestroyView()
+        presenter.onDetachView()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryItem.kt
new file mode 100644
index 000000000..265d6ce44
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryItem.kt
@@ -0,0 +1,80 @@
+package io.github.wulkanowy.ui.modules.attendance.summary
+
+import android.view.View
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.FlexibleViewHolder
+import io.github.wulkanowy.R
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.item_attendance_summary.*
+
+class AttendanceSummaryItem(
+    private val month: String,
+    private val percentage: String,
+    private val present: String,
+    private val absence: String,
+    private val excusedAbsence: String,
+    private val schoolAbsence: String,
+    private val exemption: String,
+    private val lateness: String,
+    private val excusedLateness: String
+) : AbstractFlexibleItem<AttendanceSummaryItem.ViewHolder>() {
+
+    override fun getLayoutRes() = R.layout.item_attendance_summary
+
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): ViewHolder {
+        return ViewHolder(view, adapter)
+    }
+
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
+        holder.apply {
+            attendanceSummaryMonth.text = month
+            attendanceSummaryPercentage.text = percentage
+            attendanceSummaryPresent.text = present
+            attendanceSummaryAbsenceUnexcused.text = absence
+            attendanceSummaryAbsenceExcused.text = excusedAbsence
+            attendanceSummaryAbsenceSchool.text = schoolAbsence
+            attendanceSummaryExemption.text = exemption
+            attendanceSummaryLatenessUnexcused.text = lateness
+            attendanceSummaryLatenessExcused.text = excusedLateness
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as AttendanceSummaryItem
+
+        if (month != other.month) return false
+        if (percentage != other.percentage) return false
+        if (present != other.present) return false
+        if (absence != other.absence) return false
+        if (excusedAbsence != other.excusedAbsence) return false
+        if (schoolAbsence != other.schoolAbsence) return false
+        if (exemption != other.exemption) return false
+        if (lateness != other.lateness) return false
+        if (excusedLateness != other.excusedLateness) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = month.hashCode()
+        result = 31 * result + percentage.hashCode()
+        result = 31 * result + present.hashCode()
+        result = 31 * result + absence.hashCode()
+        result = 31 * result + excusedAbsence.hashCode()
+        result = 31 * result + schoolAbsence.hashCode()
+        result = 31 * result + exemption.hashCode()
+        result = 31 * result + lateness.hashCode()
+        result = 31 * result + excusedLateness.hashCode()
+        return result
+    }
+
+    class ViewHolder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter), LayoutContainer {
+        override val containerView: View
+            get() = contentView
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryPresenter.kt
index 33e18c2e7..3ce85d815 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryPresenter.kt
@@ -1,5 +1,6 @@
 package io.github.wulkanowy.ui.modules.attendance.summary
 
+import io.github.wulkanowy.data.db.entities.AttendanceSummary
 import io.github.wulkanowy.data.db.entities.Subject
 import io.github.wulkanowy.data.repositories.attendancesummary.AttendanceSummaryRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
@@ -9,8 +10,12 @@ import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 import io.github.wulkanowy.utils.SchedulersProvider
-import org.threeten.bp.Month
+import io.github.wulkanowy.utils.calculatePercentage
+import io.github.wulkanowy.utils.getFormattedName
 import timber.log.Timber
+import java.lang.String.format
+import java.util.Locale.FRANCE
+import java.util.concurrent.TimeUnit.MILLISECONDS
 import javax.inject.Inject
 
 class AttendanceSummaryPresenter @Inject constructor(
@@ -77,12 +82,10 @@ class AttendanceSummaryPresenter @Inject constructor(
         disposable.apply {
             clear()
             add(studentRepository.getCurrentStudent()
-                .flatMap { student ->
-                    semesterRepository.getCurrentSemester(student).flatMap {
-                        attendanceSummaryRepository.getAttendanceSummary(student, it, subjectId, forceRefresh)
-                    }
-                }
-                .map { items -> items.sortedByDescending { if (it.month.value <= Month.JUNE.value) it.month.value + 12 else it.month.value } }
+                .delay(200, MILLISECONDS)
+                .flatMap { semesterRepository.getCurrentSemester(it) }
+                .flatMap { attendanceSummaryRepository.getAttendanceSummary(it, subjectId, forceRefresh) }
+                .map { createAttendanceSummaryItems(it) to AttendanceSummaryScrollableHeader(formatPercentage(it.calculatePercentage())) }
                 .subscribeOn(schedulers.backgroundThread)
                 .observeOn(schedulers.mainThread)
                 .doFinally {
@@ -95,17 +98,11 @@ class AttendanceSummaryPresenter @Inject constructor(
                 .subscribe({
                     Timber.i("Loading attendance summary result: Success")
                     view?.apply {
-                        showEmpty(it.isEmpty())
-                        showContent(it.isNotEmpty())
-                        updateDataSet(it)
+                        showEmpty(it.first.isEmpty())
+                        showContent(it.first.isNotEmpty())
+                        updateDataSet(it.first, it.second)
                     }
-                    analytics.logEvent(
-                        "load_data",
-                        "type" to "attendance_summary",
-                        "items" to it.size,
-                        "force_refresh" to forceRefresh,
-                        "item_id" to subjectId
-                    )
+                    analytics.logEvent("load_attendance_summary", "items" to it.first.size, "force_refresh" to forceRefresh, "item_id" to subjectId)
                 }) {
                     Timber.i("Loading attendance summary result: An exception occurred")
                     errorHandler.dispatch(it)
@@ -128,11 +125,8 @@ class AttendanceSummaryPresenter @Inject constructor(
     private fun loadSubjects() {
         Timber.i("Loading attendance summary subjects started")
         disposable.add(studentRepository.getCurrentStudent()
-            .flatMap { student ->
-                semesterRepository.getCurrentSemester(student).flatMap { semester ->
-                    subjectRepository.getSubjects(student, semester)
-                }
-            }
+            .flatMap { semesterRepository.getCurrentSemester(it) }
+            .flatMap { subjectRepository.getSubjects(it) }
             .doOnSuccess { subjects = it }
             .map { ArrayList(it.map { subject -> subject.name }) }
             .subscribeOn(schedulers.backgroundThread)
@@ -149,4 +143,25 @@ class AttendanceSummaryPresenter @Inject constructor(
             })
         )
     }
+
+    private fun createAttendanceSummaryItems(attendanceSummary: List<AttendanceSummary>): List<AttendanceSummaryItem> {
+        return attendanceSummary.sortedByDescending { it.id }.map {
+            AttendanceSummaryItem(
+                month = it.month.getFormattedName(),
+                percentage = formatPercentage(it.calculatePercentage()),
+                present = it.presence.toString(),
+                absence = it.absence.toString(),
+                excusedAbsence = it.absenceExcused.toString(),
+                schoolAbsence = it.absenceForSchoolReasons.toString(),
+                exemption = it.exemption.toString(),
+                lateness = it.lateness.toString(),
+                excusedLateness = it.latenessExcused.toString()
+            )
+        }
+    }
+
+    private fun formatPercentage(percentage: Double): String {
+        return if (percentage == 0.0) "0%"
+        else "${format(FRANCE, "%.2f", percentage)}%"
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryScrollableHeader.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryScrollableHeader.kt
new file mode 100644
index 000000000..c258f71d2
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryScrollableHeader.kt
@@ -0,0 +1,46 @@
+package io.github.wulkanowy.ui.modules.attendance.summary
+
+import android.view.View
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.FlexibleViewHolder
+import io.github.wulkanowy.R
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.scrollable_header_attendance_summary.*
+
+class AttendanceSummaryScrollableHeader(private val percentage: String) :
+    AbstractFlexibleItem<AttendanceSummaryScrollableHeader.ViewHolder>() {
+
+    override fun getLayoutRes() = R.layout.scrollable_header_attendance_summary
+
+    override fun createViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?): ViewHolder {
+        return ViewHolder(view, adapter)
+    }
+
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>?, holder: ViewHolder?, position: Int, payloads: MutableList<Any>?) {
+        holder?.apply { attendanceSummaryScrollableHeaderPercentage.text = percentage }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as AttendanceSummaryScrollableHeader
+
+        if (percentage != other.percentage) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        return percentage.hashCode()
+    }
+
+    class ViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?) : FlexibleViewHolder(view, adapter),
+        LayoutContainer {
+
+        override val containerView: View?
+            get() = contentView
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryView.kt
index dd4053c72..b86f6590d 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryView.kt
@@ -1,6 +1,5 @@
 package io.github.wulkanowy.ui.modules.attendance.summary
 
-import io.github.wulkanowy.data.db.entities.AttendanceSummary
 import io.github.wulkanowy.ui.base.BaseView
 
 interface AttendanceSummaryView : BaseView {
@@ -23,7 +22,7 @@ interface AttendanceSummaryView : BaseView {
 
     fun setErrorDetails(message: String)
 
-    fun updateDataSet(data: List<AttendanceSummary>)
+    fun updateDataSet(data: List<AttendanceSummaryItem>, header: AttendanceSummaryScrollableHeader)
 
     fun updateSubjects(data: ArrayList<String>)
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamAdapter.kt
deleted file mode 100644
index 85061997c..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamAdapter.kt
+++ /dev/null
@@ -1,65 +0,0 @@
-package io.github.wulkanowy.ui.modules.exam
-
-import android.annotation.SuppressLint
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import io.github.wulkanowy.data.db.entities.Exam
-import io.github.wulkanowy.databinding.HeaderExamBinding
-import io.github.wulkanowy.databinding.ItemExamBinding
-import io.github.wulkanowy.utils.toFormattedString
-import io.github.wulkanowy.utils.weekDayName
-import org.threeten.bp.LocalDate
-import javax.inject.Inject
-
-class ExamAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
-
-    var items = emptyList<ExamItem<*>>()
-
-    var onClickListener: (Exam) -> Unit = {}
-
-    override fun getItemCount() = items.size
-
-    override fun getItemViewType(position: Int) = items[position].viewType.id
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        val inflater = LayoutInflater.from(parent.context)
-
-        return when (viewType) {
-            ExamItem.ViewType.HEADER.id -> HeaderViewHolder(HeaderExamBinding.inflate(inflater, parent, false))
-            ExamItem.ViewType.ITEM.id -> ItemViewHolder(ItemExamBinding.inflate(inflater, parent, false))
-            else -> throw IllegalStateException()
-        }
-    }
-
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        when (holder) {
-            is HeaderViewHolder -> bindHeaderViewHolder(holder.binding, items[position].value as LocalDate)
-            is ItemViewHolder -> bindItemViewHolder(holder.binding, items[position].value as Exam)
-        }
-    }
-
-    @SuppressLint("DefaultLocale")
-    private fun bindHeaderViewHolder(binding: HeaderExamBinding, date: LocalDate) {
-        with(binding) {
-            examHeaderDay.text = date.weekDayName.capitalize()
-            examHeaderDate.text = date.toFormattedString()
-        }
-    }
-
-    private fun bindItemViewHolder(binding: ItemExamBinding, exam: Exam) {
-        with(binding) {
-            examItemSubject.text = exam.subject
-            examItemTeacher.text = exam.teacher
-            examItemType.text = exam.type
-
-            root.setOnClickListener { onClickListener(exam) }
-        }
-    }
-
-    private class HeaderViewHolder(val binding: HeaderExamBinding) :
-        RecyclerView.ViewHolder(binding.root)
-
-    private class ItemViewHolder(val binding: ItemExamBinding) :
-        RecyclerView.ViewHolder(binding.root)
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamDialog.kt
index c1a6f1f0d..ed5092c96 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamDialog.kt
@@ -5,15 +5,13 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.DialogFragment
+import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Exam
-import io.github.wulkanowy.databinding.DialogExamBinding
-import io.github.wulkanowy.utils.lifecycleAwareVariable
 import io.github.wulkanowy.utils.toFormattedString
+import kotlinx.android.synthetic.main.dialog_exam.*
 
 class ExamDialog : DialogFragment() {
 
-    private var binding: DialogExamBinding by lifecycleAwareVariable()
-
     private lateinit var exam: Exam
 
     companion object {
@@ -35,20 +33,18 @@ class ExamDialog : DialogFragment() {
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return DialogExamBinding.inflate(inflater).apply { binding = this }.root
+        return inflater.inflate(R.layout.dialog_exam, container, false)
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
-        with(binding) {
-            examDialogSubjectValue.text = exam.subject
-            examDialogTypeValue.text = exam.type
-            examDialogTeacherValue.text = exam.teacher
-            examDialogDateValue.text = exam.entryDate.toFormattedString()
-            examDialogDescriptionValue.text = exam.description
+        examDialogSubjectValue.text = exam.subject
+        examDialogTypeValue.text = exam.type
+        examDialogTeacherValue.text = exam.teacher
+        examDialogDateValue.text = exam.entryDate.toFormattedString()
+        examDialogDescriptionValue.text = exam.description
 
-            examDialogClose.setOnClickListener { dismiss() }
-        }
+        examDialogClose.setOnClickListener { dismiss() }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamFragment.kt
index eeab30c15..b880f4650 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamFragment.kt
@@ -1,29 +1,33 @@
 package io.github.wulkanowy.ui.modules.exam
 
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
 import android.view.View.INVISIBLE
 import android.view.View.VISIBLE
-import androidx.recyclerview.widget.LinearLayoutManager
+import android.view.ViewGroup
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.common.FlexibleItemDecoration
+import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Exam
-import io.github.wulkanowy.databinding.FragmentExamBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
-import io.github.wulkanowy.ui.widgets.DividerItemDecoration
 import io.github.wulkanowy.utils.dpToPx
+import io.github.wulkanowy.utils.setOnItemClickListener
+import kotlinx.android.synthetic.main.fragment_exam.*
 import javax.inject.Inject
 
-class ExamFragment : BaseFragment<FragmentExamBinding>(R.layout.fragment_exam), ExamView,
-    MainView.MainChildView, MainView.TitledView {
+class ExamFragment : BaseFragment(), ExamView, MainView.MainChildView, MainView.TitledView {
 
     @Inject
     lateinit var presenter: ExamPresenter
 
     @Inject
-    lateinit var examAdapter: ExamAdapter
+    lateinit var examAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
 
     companion object {
         private const val SAVED_DATE_KEY = "CURRENT_DATE"
@@ -33,60 +37,57 @@ class ExamFragment : BaseFragment<FragmentExamBinding>(R.layout.fragment_exam),
 
     override val titleStringId get() = R.string.exam_title
 
-    override val isViewEmpty get() = examAdapter.items.isEmpty()
+    override val isViewEmpty get() = examAdapter.isEmpty
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding = FragmentExamBinding.bind(view)
-        messageContainer = binding.examRecycler
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_exam, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        messageContainer = examRecycler
         presenter.onAttachView(this, savedInstanceState?.getLong(SAVED_DATE_KEY))
     }
 
     override fun initView() {
-        examAdapter.onClickListener = presenter::onExamItemSelected
+        examAdapter.setOnItemClickListener(presenter::onExamItemSelected)
 
-        with(binding.examRecycler) {
-            layoutManager = LinearLayoutManager(context)
+        with(examRecycler) {
+            layoutManager = SmoothScrollLinearLayoutManager(context)
             adapter = examAdapter
-            addItemDecoration(DividerItemDecoration(context))
+            addItemDecoration(FlexibleItemDecoration(context)
+                .withDefaultDivider(R.layout.item_exam)
+                .withDrawDividerOnLastItem(false))
         }
 
-        with(binding) {
-            examSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
-            examErrorRetry.setOnClickListener { presenter.onRetry() }
-            examErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+        examSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
+        examErrorRetry.setOnClickListener { presenter.onRetry() }
+        examErrorDetails.setOnClickListener { presenter.onDetailsClick() }
 
-            examPreviousButton.setOnClickListener { presenter.onPreviousWeek() }
-            examNextButton.setOnClickListener { presenter.onNextWeek() }
+        examPreviousButton.setOnClickListener { presenter.onPreviousWeek() }
+        examNextButton.setOnClickListener { presenter.onNextWeek() }
 
-            examNavContainer.setElevationCompat(requireContext().dpToPx(8f))
-        }
+        examNavContainer.setElevationCompat(requireContext().dpToPx(8f))
     }
 
     override fun hideRefresh() {
-        binding.examSwipe.isRefreshing = false
+        examSwipe.isRefreshing = false
     }
 
-    override fun updateData(data: List<ExamItem<*>>) {
-        with(examAdapter) {
-            items = data
-            notifyDataSetChanged()
-        }
+    override fun updateData(data: List<ExamItem>) {
+        examAdapter.updateDataSet(data, true)
     }
 
     override fun updateNavigationWeek(date: String) {
-        binding.examNavDate.text = date
+        examNavDate.text = date
     }
 
     override fun clearData() {
-        with(examAdapter) {
-            items = emptyList()
-            notifyDataSetChanged()
-        }
+        examAdapter.clear()
     }
 
     override fun resetView() {
-        binding.examRecycler.scrollToPosition(0)
+        examRecycler.scrollToPosition(0)
     }
 
     override fun onFragmentReselected() {
@@ -94,35 +95,35 @@ class ExamFragment : BaseFragment<FragmentExamBinding>(R.layout.fragment_exam),
     }
 
     override fun showEmpty(show: Boolean) {
-        binding.examEmpty.visibility = if (show) VISIBLE else GONE
+        examEmpty.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showErrorView(show: Boolean) {
-        binding.examError.visibility = if (show) VISIBLE else GONE
+        examError.visibility = if (show) VISIBLE else GONE
     }
 
     override fun setErrorDetails(message: String) {
-        binding.examErrorMessage.text = message
+        examErrorMessage.text = message
     }
 
     override fun showProgress(show: Boolean) {
-        binding.examProgress.visibility = if (show) VISIBLE else GONE
+        examProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun enableSwipe(enable: Boolean) {
-        binding.examSwipe.isEnabled = enable
+        examSwipe.isEnabled = enable
     }
 
     override fun showContent(show: Boolean) {
-        binding.examRecycler.visibility = if (show) VISIBLE else GONE
+        examRecycler.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showPreButton(show: Boolean) {
-        binding.examPreviousButton.visibility = if (show) VISIBLE else INVISIBLE
+        examPreviousButton.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun showNextButton(show: Boolean) {
-        binding.examNextButton.visibility = if (show) VISIBLE else INVISIBLE
+        examNextButton.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun showExamDialog(exam: Exam) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamHeader.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamHeader.kt
new file mode 100644
index 000000000..0a5b862c3
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamHeader.kt
@@ -0,0 +1,52 @@
+package io.github.wulkanowy.ui.modules.exam
+
+import android.view.View
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractHeaderItem
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.ExpandableViewHolder
+import io.github.wulkanowy.R
+import io.github.wulkanowy.utils.toFormattedString
+import io.github.wulkanowy.utils.weekDayName
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.header_exam.*
+import org.threeten.bp.LocalDate
+
+class ExamHeader(private val date: LocalDate) : AbstractHeaderItem<ExamHeader.ViewHolder>() {
+
+    override fun getLayoutRes() = R.layout.header_exam
+
+    override fun createViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?): ViewHolder {
+        return ViewHolder(view, adapter)
+    }
+
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>?, holder: ViewHolder,
+                                position: Int, payloads: MutableList<Any>?) {
+        holder.run {
+            examHeaderDay.text = date.weekDayName.capitalize()
+            examHeaderDate.text = date.toFormattedString()
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as ExamHeader
+
+        if (date != other.date) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        return date.hashCode()
+    }
+
+    class ViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?) : ExpandableViewHolder(view, adapter),
+            LayoutContainer {
+
+        override val containerView: View
+            get() = contentView
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamItem.kt
index 579e37203..8971b4df3 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamItem.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamItem.kt
@@ -1,9 +1,50 @@
 package io.github.wulkanowy.ui.modules.exam
 
-data class ExamItem<out T>(val value: T, val viewType: ViewType) {
+import android.view.View
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractSectionableItem
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.FlexibleViewHolder
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Exam
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.item_exam.*
 
-    enum class ViewType(val id: Int) {
-        HEADER(1),
-        ITEM(2)
+class ExamItem(header: ExamHeader, val exam: Exam) : AbstractSectionableItem<ExamItem.ViewHolder, ExamHeader>(header) {
+
+    override fun getLayoutRes() = R.layout.item_exam
+
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): ViewHolder {
+        return ViewHolder(view, adapter)
+    }
+
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
+        holder.run {
+            examItemSubject.text = exam.subject
+            examItemTeacher.text = exam.teacher
+            examItemType.text = exam.type
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as ExamItem
+
+        if (exam != other.exam) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = exam.hashCode()
+        result = 31 * result + exam.id.toInt()
+        return result
+    }
+
+    class ViewHolder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter), LayoutContainer {
+        override val containerView: View
+            get() = contentView
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamPresenter.kt
index 1140cb020..35cf5b945 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamPresenter.kt
@@ -1,5 +1,6 @@
 package io.github.wulkanowy.ui.modules.exam
 
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.db.entities.Exam
 import io.github.wulkanowy.data.repositories.exam.ExamRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
@@ -8,7 +9,7 @@ import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 import io.github.wulkanowy.utils.SchedulersProvider
-import io.github.wulkanowy.utils.sunday
+import io.github.wulkanowy.utils.friday
 import io.github.wulkanowy.utils.getLastSchoolDayIfHoliday
 import io.github.wulkanowy.utils.isHolidays
 import io.github.wulkanowy.utils.monday
@@ -18,6 +19,7 @@ import org.threeten.bp.LocalDate
 import org.threeten.bp.LocalDate.now
 import org.threeten.bp.LocalDate.ofEpochDay
 import timber.log.Timber
+import java.util.concurrent.TimeUnit.MILLISECONDS
 import javax.inject.Inject
 
 class ExamPresenter @Inject constructor(
@@ -73,9 +75,11 @@ class ExamPresenter @Inject constructor(
         view?.showErrorDetailsDialog(lastError)
     }
 
-    fun onExamItemSelected(exam: Exam) {
-        Timber.i("Select exam item ${exam.id}")
-        view?.showExamDialog(exam)
+    fun onExamItemSelected(item: AbstractFlexibleItem<*>?) {
+        if (item is ExamItem) {
+            Timber.i("Select exam item ${item.exam.id}")
+            view?.showExamDialog(item.exam)
+        }
     }
 
     fun onViewReselected() {
@@ -108,11 +112,10 @@ class ExamPresenter @Inject constructor(
         disposable.apply {
             clear()
             add(studentRepository.getCurrentStudent()
-                .flatMap { student ->
-                    semesterRepository.getCurrentSemester(student).flatMap { semester ->
-                        examRepository.getExams(student, semester, currentDate.monday, currentDate.sunday, forceRefresh)
-                    }
-                }
+                .delay(200, MILLISECONDS)
+                .flatMap { semesterRepository.getCurrentSemester(it) }
+                .flatMap { examRepository.getExams(it, currentDate.monday, currentDate.friday, forceRefresh) }
+                .map { it.groupBy { exam -> exam.date }.toSortedMap() }
                 .map { createExamItems(it) }
                 .subscribeOn(schedulers.backgroundThread)
                 .observeOn(schedulers.mainThread)
@@ -131,12 +134,7 @@ class ExamPresenter @Inject constructor(
                         showErrorView(false)
                         showContent(it.isNotEmpty())
                     }
-                    analytics.logEvent(
-                        "load_data",
-                        "type" to "exam",
-                        "items" to it.size,
-                        "force_refresh" to forceRefresh
-                    )
+                    analytics.logEvent("load_exam", "items" to it.size, "force_refresh" to forceRefresh)
                 }) {
                     Timber.i("Loading exam result: An exception occurred")
                     errorHandler.dispatch(it)
@@ -155,12 +153,12 @@ class ExamPresenter @Inject constructor(
         }
     }
 
-    private fun createExamItems(items: List<Exam>): List<ExamItem<*>> {
-        return items.groupBy { it.date }.toSortedMap().map { (date, exams) ->
-            listOf(ExamItem(date, ExamItem.ViewType.HEADER)) + exams.reversed().map { exam ->
-                ExamItem(exam, ExamItem.ViewType.ITEM)
+    private fun createExamItems(items: Map<LocalDate, List<Exam>>): List<ExamItem> {
+        return items.flatMap {
+            ExamHeader(it.key).let { header ->
+                it.value.reversed().map { item -> ExamItem(header, item) }
             }
-        }.flatten()
+        }
     }
 
     private fun reloadView() {
@@ -181,7 +179,7 @@ class ExamPresenter @Inject constructor(
             showPreButton(!currentDate.minusDays(7).isHolidays)
             showNextButton(!currentDate.plusDays(7).isHolidays)
             updateNavigationWeek("${currentDate.monday.toFormattedString("dd.MM")} - " +
-                currentDate.sunday.toFormattedString("dd.MM"))
+                currentDate.friday.toFormattedString("dd.MM"))
         }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamView.kt
index 00429bae6..5f4a74306 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamView.kt
@@ -9,7 +9,7 @@ interface ExamView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<ExamItem<*>>)
+    fun updateData(data: List<ExamItem>)
 
     fun updateNavigationWeek(date: String)
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProvider.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProvider.kt
index 9582a5db3..37bba4d43 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProvider.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProvider.kt
@@ -1,101 +1,73 @@
 package io.github.wulkanowy.ui.modules.grade
 
-import io.github.wulkanowy.data.db.entities.Grade
-import io.github.wulkanowy.data.db.entities.GradeSummary
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.grade.GradeRepository
+import io.github.wulkanowy.data.repositories.gradessummary.GradeSummaryRepository
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
-import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.calcAverage
 import io.github.wulkanowy.utils.changeModifier
+import io.reactivex.Maybe
 import io.reactivex.Single
 import javax.inject.Inject
 
 class GradeAverageProvider @Inject constructor(
-    private val semesterRepository: SemesterRepository,
+    private val preferencesRepository: PreferencesRepository,
     private val gradeRepository: GradeRepository,
-    private val preferencesRepository: PreferencesRepository
+    private val gradeSummaryRepository: GradeSummaryRepository
 ) {
 
     private val plusModifier = preferencesRepository.gradePlusModifier
 
     private val minusModifier = preferencesRepository.gradeMinusModifier
 
-    fun getGradesDetailsWithAverage(student: Student, semesterId: Int, forceRefresh: Boolean = false): Single<List<GradeDetailsWithAverage>> {
-        return semesterRepository.getSemesters(student).flatMap { semesters ->
-            when (preferencesRepository.gradeAverageMode) {
-                "only_one_semester" -> getSemesterDetailsWithAverage(student, semesters.single { it.semesterId == semesterId }, forceRefresh)
-                "all_year" -> calculateWholeYearAverage(student, semesters, semesterId, forceRefresh)
-                else -> throw IllegalArgumentException("Incorrect grade average mode: ${preferencesRepository.gradeAverageMode} ")
-            }
+    fun getGradeAverage(student: Student, semesters: List<Semester>, selectedSemesterId: Int, forceRefresh: Boolean): Single<List<Triple<String, Double, String>>> {
+        return when (preferencesRepository.gradeAverageMode) {
+            "all_year" -> getAllYearAverage(student, semesters, selectedSemesterId, forceRefresh)
+            "only_one_semester" -> getOnlyOneSemesterAverage(student, semesters, selectedSemesterId, forceRefresh)
+            else -> throw IllegalArgumentException("Incorrect grade average mode: ${preferencesRepository.gradeAverageMode} ")
         }
     }
 
-    private fun calculateWholeYearAverage(student: Student, semesters: List<Semester>, semesterId: Int, forceRefresh: Boolean): Single<List<GradeDetailsWithAverage>> {
+    private fun getAllYearAverage(student: Student, semesters: List<Semester>, semesterId: Int, forceRefresh: Boolean): Single<List<Triple<String, Double, String>>> {
         val selectedSemester = semesters.single { it.semesterId == semesterId }
         val firstSemester = semesters.single { it.diaryId == selectedSemester.diaryId && it.semesterName == 1 }
 
-        return getSemesterDetailsWithAverage(student, selectedSemester, forceRefresh).flatMap { selectedDetails ->
-            val isAnyAverage = selectedDetails.any { it.average != .0 }
-
-            if (selectedSemester != firstSemester) {
-                getSemesterDetailsWithAverage(student, firstSemester, forceRefresh).map { secondDetails ->
-                    selectedDetails.map { selected ->
-                        val second = secondDetails.singleOrNull { it.subject == selected.subject }
-                        selected.copy(
-                            average = if (!isAnyAverage || preferencesRepository.gradeAverageForceCalc) {
-                                (selected.grades + second?.grades.orEmpty()).calcAverage()
-                            } else (selected.average + (second?.average ?: selected.average)) / 2
-                        )
+        return getAverageFromGradeSummary(selectedSemester, forceRefresh)
+            .switchIfEmpty(gradeRepository.getGrades(student, selectedSemester, forceRefresh)
+                .flatMap { firstGrades ->
+                    if (selectedSemester == firstSemester) Single.just(firstGrades)
+                    else {
+                        gradeRepository.getGrades(student, firstSemester)
+                            .map { secondGrades -> secondGrades + firstGrades }
                     }
-                }
-            } else Single.just(selectedDetails)
-        }
+                }.map { grades ->
+                    grades.map { if (student.loginMode == Sdk.Mode.SCRAPPER.name) it.changeModifier(plusModifier, minusModifier) else it }
+                        .groupBy { it.subject }
+                        .map { Triple(it.key, it.value.calcAverage(), "") }
+                })
     }
 
-    private fun getSemesterDetailsWithAverage(student: Student, semester: Semester, forceRefresh: Boolean): Single<List<GradeDetailsWithAverage>> {
-        return gradeRepository.getGrades(student, semester, forceRefresh).map { (details, summaries) ->
-            val isAnyAverage = summaries.any { it.average != .0 }
-            val allGrades = details.groupBy { it.subject }
+    private fun getOnlyOneSemesterAverage(student: Student, semesters: List<Semester>, semesterId: Int, forceRefresh: Boolean): Single<List<Triple<String, Double, String>>> {
+        val selectedSemester = semesters.single { it.semesterId == semesterId }
 
-            summaries.emulateEmptySummaries(student, semester, allGrades.toList(), isAnyAverage).map { summary ->
-                val grades = allGrades[summary.subject].orEmpty()
-                GradeDetailsWithAverage(
-                    subject = summary.subject,
-                    average = if (!isAnyAverage || preferencesRepository.gradeAverageForceCalc) {
-                        (if (student.loginMode == Sdk.Mode.SCRAPPER.name)
-                            grades.map { it.changeModifier(plusModifier, minusModifier) }
-                        else grades).calcAverage()
-                    } else summary.average,
-                    points = summary.pointsSum,
-                    summary = summary,
-                    grades = grades
-                )
-            }
-        }
+        return getAverageFromGradeSummary(selectedSemester, forceRefresh)
+            .switchIfEmpty(gradeRepository.getGrades(student, selectedSemester, forceRefresh)
+                .map { grades ->
+                    grades.map { if (student.loginMode == Sdk.Mode.SCRAPPER.name) it.changeModifier(plusModifier, minusModifier) else it }
+                        .groupBy { it.subject }
+                        .map { Triple(it.key, it.value.calcAverage(), "") }
+                })
     }
 
-    private fun List<GradeSummary>.emulateEmptySummaries(student: Student, semester: Semester, grades: List<Pair<String, List<Grade>>>, calcAverage: Boolean): List<GradeSummary> {
-        if (isNotEmpty() && size == grades.size) return this
-
-        return grades.mapIndexed { i, (subject, details) ->
-            singleOrNull { it.subject == subject }?.let { return@mapIndexed it }
-            GradeSummary(
-                studentId = student.studentId,
-                semesterId = semester.semesterId,
-                position = i,
-                subject = subject,
-                predictedGrade = "",
-                finalGrade = "",
-                proposedPoints = "",
-                finalPoints = "",
-                pointsSum = "",
-                average = if (calcAverage) (if (student.loginMode == Sdk.Mode.SCRAPPER.name) {
-                    details.map { it.changeModifier(plusModifier, minusModifier) }
-                } else details).calcAverage() else .0
-            )
-        }
+    private fun getAverageFromGradeSummary(selectedSemester: Semester, forceRefresh: Boolean): Maybe<List<Triple<String, Double, String>>> {
+        return gradeSummaryRepository.getGradesSummary(selectedSemester, forceRefresh)
+            .toMaybe()
+            .flatMap {
+                if (it.any { summary -> summary.average != .0 }) {
+                    Maybe.just(it.map { summary -> Triple(summary.subject, summary.average, summary.pointsSum) })
+                } else Maybe.empty()
+            }.filter { !preferencesRepository.gradeAverageForceCalc }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeDetailsWithAverage.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeDetailsWithAverage.kt
deleted file mode 100644
index 3f5d706b3..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeDetailsWithAverage.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package io.github.wulkanowy.ui.modules.grade
-
-import io.github.wulkanowy.data.db.entities.Grade
-import io.github.wulkanowy.data.db.entities.GradeSummary
-
-data class GradeDetailsWithAverage(
-    val subject: String,
-    val average: Double,
-    val points: String,
-    val summary: GradeSummary,
-    val grades: List<Grade>
-)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeFragment.kt
index 59b83c4b0..e8d970010 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeFragment.kt
@@ -1,15 +1,16 @@
 package io.github.wulkanowy.ui.modules.grade
 
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
 import android.view.View.INVISIBLE
 import android.view.View.VISIBLE
+import android.view.ViewGroup
 import androidx.appcompat.app.AlertDialog
 import io.github.wulkanowy.R
-import io.github.wulkanowy.databinding.FragmentGradeBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.base.BaseFragmentPagerAdapter
 import io.github.wulkanowy.ui.modules.grade.details.GradeDetailsFragment
@@ -18,9 +19,10 @@ import io.github.wulkanowy.ui.modules.grade.summary.GradeSummaryFragment
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.setOnSelectPageListener
+import kotlinx.android.synthetic.main.fragment_grade.*
 import javax.inject.Inject
 
-class GradeFragment : BaseFragment<FragmentGradeBinding>(R.layout.fragment_grade), GradeView, MainView.MainChildView, MainView.TitledView {
+class GradeFragment : BaseFragment(), GradeView, MainView.MainChildView, MainView.TitledView {
 
     @Inject
     lateinit var presenter: GradePresenter
@@ -38,18 +40,19 @@ class GradeFragment : BaseFragment<FragmentGradeBinding>(R.layout.fragment_grade
 
     override val titleStringId get() = R.string.grade_title
 
-    override var subtitleString = ""
-
-    override val currentPageIndex get() = binding.gradeViewPager.currentItem
+    override val currentPageIndex get() = gradeViewPager.currentItem
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setHasOptionsMenu(true)
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding = FragmentGradeBinding.bind(view)
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_grade, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
         presenter.onAttachView(this, savedInstanceState?.getInt(SAVED_SEMESTER_KEY))
     }
 
@@ -61,7 +64,7 @@ class GradeFragment : BaseFragment<FragmentGradeBinding>(R.layout.fragment_grade
 
     override fun initView() {
         with(pagerAdapter) {
-            containerId = binding.gradeViewPager.id
+            containerId = gradeViewPager.id
             addFragmentsWithTitle(mapOf(
                 GradeDetailsFragment.newInstance() to getString(R.string.all_details),
                 GradeSummaryFragment.newInstance() to getString(R.string.grade_menu_summary),
@@ -69,21 +72,19 @@ class GradeFragment : BaseFragment<FragmentGradeBinding>(R.layout.fragment_grade
             ))
         }
 
-        with(binding.gradeViewPager) {
+        with(gradeViewPager) {
             adapter = pagerAdapter
             offscreenPageLimit = 3
             setOnSelectPageListener(presenter::onPageSelected)
         }
 
-        with(binding.gradeTabLayout) {
-            setupWithViewPager(binding.gradeViewPager)
+        with(gradeTabLayout) {
+            setupWithViewPager(gradeViewPager)
             setElevationCompat(context.dpToPx(4f))
         }
 
-        with(binding) {
-            gradeErrorRetry.setOnClickListener { presenter.onRetry() }
-            gradeErrorDetails.setOnClickListener { presenter.onDetailsClick() }
-        }
+        gradeErrorRetry.setOnClickListener { presenter.onRetry() }
+        gradeErrorDetails.setOnClickListener { presenter.onDetailsClick() }
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
@@ -96,22 +97,20 @@ class GradeFragment : BaseFragment<FragmentGradeBinding>(R.layout.fragment_grade
     }
 
     override fun showContent(show: Boolean) {
-        with(binding) {
-            gradeViewPager.visibility = if (show) VISIBLE else INVISIBLE
-            gradeTabLayout.visibility = if (show) VISIBLE else INVISIBLE
-        }
+        gradeViewPager.visibility = if (show) VISIBLE else INVISIBLE
+        gradeTabLayout.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun showProgress(show: Boolean) {
-        binding.gradeProgress.visibility = if (show) VISIBLE else INVISIBLE
+        gradeProgress.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun showErrorView(show: Boolean) {
-        binding.gradeError.visibility = if (show) VISIBLE else INVISIBLE
+        gradeError.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun setErrorDetails(message: String) {
-        binding.gradeErrorMessage.text = message
+        gradeErrorMessage.text = message
     }
 
     override fun showSemesterSwitch(show: Boolean) {
@@ -134,11 +133,6 @@ class GradeFragment : BaseFragment<FragmentGradeBinding>(R.layout.fragment_grade
             .show()
     }
 
-    override fun setCurrentSemesterName(semester: Int, schoolYear: Int) {
-        subtitleString = getString(R.string.grade_subtitle, semester, schoolYear, schoolYear + 1)
-        (activity as MainView).setViewSubTitle(subtitleString)
-    }
-
     fun onChildRefresh() {
         presenter.onChildViewRefresh()
     }
@@ -165,7 +159,7 @@ class GradeFragment : BaseFragment<FragmentGradeBinding>(R.layout.fragment_grade
     }
 
     override fun onDestroyView() {
-        presenter.onDetachView()
         super.onDestroyView()
+        presenter.onDetachView()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeModule.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeModule.kt
index 342f356cb..6e6ca2d63 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeModule.kt
@@ -11,10 +11,11 @@ import io.github.wulkanowy.ui.modules.grade.statistics.GradeStatisticsFragment
 import io.github.wulkanowy.ui.modules.grade.summary.GradeSummaryFragment
 
 @Suppress("unused")
-@Module
+@Module(includes = [GradeModule.Static::class])
 abstract class GradeModule {
 
-    companion object {
+    @Module
+    object Static {
 
         @PerFragment
         @Provides
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradePresenter.kt
index ec66e2bd9..d8c202381 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradePresenter.kt
@@ -7,9 +7,7 @@ import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 import io.github.wulkanowy.utils.SchedulersProvider
-import io.github.wulkanowy.utils.getCurrentOrLast
 import timber.log.Timber
-import java.util.concurrent.TimeUnit.MILLISECONDS
 import javax.inject.Inject
 
 class GradePresenter @Inject constructor(
@@ -23,8 +21,6 @@ class GradePresenter @Inject constructor(
     var selectedIndex = 0
         private set
 
-    private var schoolYear = 0
-
     private var semesters = emptyList<Semester>()
 
     private val loadedSemesterId = mutableMapOf<Int, Int>()
@@ -60,7 +56,6 @@ class GradePresenter @Inject constructor(
             selectedIndex = index + 1
             loadedSemesterId.clear()
             view?.let {
-                it.setCurrentSemesterName(index + 1, schoolYear)
                 notifyChildrenSemesterChange()
                 loadChild(it.currentPageIndex)
             }
@@ -100,17 +95,17 @@ class GradePresenter @Inject constructor(
     private fun loadData() {
         Timber.i("Loading grade data started")
         disposable.add(studentRepository.getCurrentStudent()
-            .flatMap { semesterRepository.getSemesters(it, refreshOnNoCurrent = true) }
-            .delay(200, MILLISECONDS)
+            .flatMap { semesterRepository.getSemesters(it) }
+            .doOnSuccess {
+                it.first { item -> item.isCurrent }.also { current ->
+                    selectedIndex = if (selectedIndex == 0) current.semesterName else selectedIndex
+                    semesters = it.filter { semester -> semester.diaryId == current.diaryId }
+                }
+            }
             .subscribeOn(schedulers.backgroundThread)
             .observeOn(schedulers.mainThread)
+            .doFinally { view?.showProgress(false) }
             .subscribe({
-                val current = it.getCurrentOrLast()
-                selectedIndex = if (selectedIndex == 0) current.semesterName else selectedIndex
-                schoolYear = current.schoolYear
-                semesters = it.filter { semester -> semester.diaryId == current.diaryId }
-                view?.setCurrentSemesterName(current.semesterName, schoolYear)
-
                 view?.run {
                     Timber.i("Loading grade result: Attempt load index $currentPageIndex")
                     loadChild(currentPageIndex)
@@ -126,14 +121,12 @@ class GradePresenter @Inject constructor(
     private fun showErrorViewOnError(message: String, error: Throwable) {
         lastError = error
         view?.run {
-            showProgress(false)
             showErrorView(true)
             setErrorDetails(message)
         }
     }
 
     private fun loadChild(index: Int, forceRefresh: Boolean = false) {
-        Timber.d("Load grade tab child. Selected semester: $selectedIndex, semesters: ${semesters.joinToString { it.semesterName.toString() }}")
         semesters.first { it.semesterName == selectedIndex }.semesterId.also {
             if (forceRefresh || loadedSemesterId[index] != it) {
                 Timber.i("Load grade child view index: $index")
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeView.kt
index 7b52daa88..bbdbc32ea 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeView.kt
@@ -20,8 +20,6 @@ interface GradeView : BaseView {
 
     fun showSemesterDialog(selectedIndex: Int)
 
-    fun setCurrentSemesterName(semester: Int, schoolYear: Int)
-
     fun notifyChildLoadData(index: Int, semesterId: Int, forceRefresh: Boolean)
 
     fun notifyChildParentReselected(index: Int)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsAdapter.kt
deleted file mode 100644
index c129d9485..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsAdapter.kt
+++ /dev/null
@@ -1,198 +0,0 @@
-package io.github.wulkanowy.ui.modules.grade.details
-
-import android.annotation.SuppressLint
-import android.content.res.Resources
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.RecyclerView
-import androidx.recyclerview.widget.RecyclerView.NO_POSITION
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Grade
-import io.github.wulkanowy.databinding.HeaderGradeDetailsBinding
-import io.github.wulkanowy.databinding.ItemGradeDetailsBinding
-import io.github.wulkanowy.ui.base.BaseExpandableAdapter
-import io.github.wulkanowy.utils.getBackgroundColor
-import io.github.wulkanowy.utils.toFormattedString
-import timber.log.Timber
-import javax.inject.Inject
-
-class GradeDetailsAdapter @Inject constructor() : BaseExpandableAdapter<RecyclerView.ViewHolder>() {
-
-    private var headers = mutableListOf<GradeDetailsItem>()
-
-    private var items = mutableListOf<GradeDetailsItem>()
-
-    private var expandedPosition = NO_POSITION
-
-    private var isExpandable = false
-
-    var onClickListener: (Grade, position: Int) -> Unit = { _, _ -> }
-
-    var colorTheme = ""
-
-    fun setDataItems(data: List<GradeDetailsItem>, isExpanded: Boolean = isExpandable) {
-        headers = data.filter { it.viewType == ViewType.HEADER }.toMutableList()
-        items = if (isExpanded) headers else data.toMutableList()
-        isExpandable = isExpanded
-        expandedPosition = NO_POSITION
-    }
-
-    fun updateDetailsItem(position: Int, grade: Grade) {
-        if (items.getOrNull(position)?.viewType != ViewType.ITEM) {
-            Timber.e("Trying to update item $position on list ${items.size} size, expanded position: $expandedPosition")
-            return
-        }
-        items[position] = GradeDetailsItem(grade, ViewType.ITEM)
-        notifyItemChanged(position)
-    }
-
-    fun getHeaderItem(subject: String): GradeDetailsItem {
-        val candidates = headers.filter { (it.value as GradeDetailsHeader).subject == subject }
-
-        if (candidates.size > 1) {
-            Timber.e("Header with subject $subject found ${candidates.size} times! Expanded: $expandedPosition. Items: $candidates")
-        }
-
-        return candidates.first()
-    }
-
-    fun updateHeaderItem(item: GradeDetailsItem) {
-        val headerPosition = headers.indexOf(item)
-        val itemPosition = items.indexOf(item)
-
-        if (headerPosition == NO_POSITION || itemPosition == NO_POSITION) {
-            Timber.e("Invalid update header positions! Header: $headerPosition, item: $itemPosition")
-        }
-
-        headers[headerPosition] = item
-        items[itemPosition] = item
-        notifyItemChanged(itemPosition)
-    }
-
-    fun collapseAll() {
-        if (expandedPosition != -1) {
-            refreshList(headers)
-            expandedPosition = NO_POSITION
-        }
-    }
-
-    @Synchronized
-    private fun refreshList(newItems: MutableList<GradeDetailsItem>) {
-        val diffCallback = GradeDetailsDiffUtil(items, newItems)
-        val diffResult = DiffUtil.calculateDiff(diffCallback)
-        items = newItems
-        diffResult.dispatchUpdatesTo(this)
-    }
-
-    override fun getItemCount() = items.size
-
-    override fun getItemViewType(position: Int) = items[position].viewType.id
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        val inflater = LayoutInflater.from(parent.context)
-
-        return when (viewType) {
-            ViewType.HEADER.id -> HeaderViewHolder(HeaderGradeDetailsBinding.inflate(inflater, parent, false))
-            ViewType.ITEM.id -> ItemViewHolder(ItemGradeDetailsBinding.inflate(inflater, parent, false))
-            else -> throw IllegalStateException()
-        }
-    }
-
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        when (holder) {
-            is HeaderViewHolder -> bindHeaderViewHolder(
-                holder = holder,
-                header = items[position].value as GradeDetailsHeader,
-                position = position
-            )
-            is ItemViewHolder -> bindItemViewHolder(
-                holder = holder,
-                grade = items[position].value as Grade
-            )
-        }
-    }
-
-    private fun bindHeaderViewHolder(holder: HeaderViewHolder, header: GradeDetailsHeader, position: Int) {
-        val headerPosition = headers.indexOf(items[position])
-        val adapterPosition = holder.adapterPosition
-
-        with(holder.binding) {
-            gradeHeaderDivider.visibility = if (adapterPosition == 0) View.GONE else View.VISIBLE
-            with(gradeHeaderSubject) {
-                text = header.subject
-                maxLines = if (headerPosition == expandedPosition) 2 else 1
-            }
-            gradeHeaderAverage.text = formatAverage(header.average, root.context.resources)
-            gradeHeaderPointsSum.text = root.context.getString(R.string.grade_points_sum, header.pointsSum)
-            gradeHeaderPointsSum.visibility = if (!header.pointsSum.isNullOrEmpty()) View.VISIBLE else View.GONE
-            gradeHeaderNumber.text = root.context.resources.getQuantityString(R.plurals.grade_number_item, header.grades.size, header.grades.size)
-            gradeHeaderNote.visibility = if (header.newGrades > 0) View.VISIBLE else View.GONE
-            if (header.newGrades > 0) gradeHeaderNote.text = header.newGrades.toString(10)
-
-            gradeHeaderContainer.isEnabled = isExpandable
-            gradeHeaderContainer.setOnClickListener {
-                expandedPosition = if (expandedPosition == adapterPosition) -1 else adapterPosition
-
-                if (expandedPosition != NO_POSITION) {
-                    refreshList(headers.toMutableList().apply {
-                        addAll(headerPosition + 1, header.grades)
-                    })
-                    scrollToHeaderWithSubItems(headerPosition, header.grades.size)
-                } else {
-                    refreshList(headers)
-                }
-            }
-        }
-    }
-
-    private fun formatAverage(average: Double?, resources: Resources): String {
-        return if (average == null || average == .0) resources.getString(R.string.grade_no_average)
-        else resources.getString(R.string.grade_average, average)
-    }
-
-    @SuppressLint("SetTextI18n")
-    private fun bindItemViewHolder(holder: ItemViewHolder, grade: Grade) {
-        with(holder.binding) {
-            gradeItemValue.run {
-                text = grade.entry
-                setBackgroundResource(grade.getBackgroundColor(colorTheme))
-            }
-            gradeItemDescription.text = when {
-                grade.description.isNotBlank() -> grade.description
-                grade.gradeSymbol.isNotBlank() -> grade.gradeSymbol
-                else -> root.context.getString(R.string.all_no_description)
-            }
-            gradeItemDate.text = grade.date.toFormattedString()
-            gradeItemWeight.text = "${root.context.getString(R.string.grade_weight)}: ${grade.weight}"
-            gradeItemNote.visibility = if (!grade.isRead) View.VISIBLE else View.GONE
-
-            root.setOnClickListener {
-                holder.adapterPosition.let { if (it != NO_POSITION) onClickListener(grade, it) }
-            }
-        }
-    }
-
-    private class HeaderViewHolder(val binding: HeaderGradeDetailsBinding) :
-        RecyclerView.ViewHolder(binding.root)
-
-    private class ItemViewHolder(val binding: ItemGradeDetailsBinding) :
-        RecyclerView.ViewHolder(binding.root)
-
-    class GradeDetailsDiffUtil(private val old: List<GradeDetailsItem>, private val new: List<GradeDetailsItem>) :
-        DiffUtil.Callback() {
-
-        override fun getOldListSize() = old.size
-
-        override fun getNewListSize() = new.size
-
-        override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
-            return old[oldItemPosition] == new[newItemPosition]
-        }
-
-        override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
-            return old[oldItemPosition] == new[newItemPosition]
-        }
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsDialog.kt
index 698aff3ea..a8f8a8653 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsDialog.kt
@@ -8,17 +8,14 @@ import android.view.ViewGroup
 import androidx.fragment.app.DialogFragment
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Grade
-import io.github.wulkanowy.databinding.DialogGradeBinding
 import io.github.wulkanowy.utils.colorStringId
 import io.github.wulkanowy.utils.getBackgroundColor
 import io.github.wulkanowy.utils.getGradeColor
-import io.github.wulkanowy.utils.lifecycleAwareVariable
 import io.github.wulkanowy.utils.toFormattedString
+import kotlinx.android.synthetic.main.dialog_grade.*
 
 class GradeDetailsDialog : DialogFragment() {
 
-    private var binding: DialogGradeBinding by lifecycleAwareVariable()
-
     private lateinit var grade: Grade
 
     private lateinit var colorScheme: String
@@ -47,49 +44,47 @@ class GradeDetailsDialog : DialogFragment() {
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return DialogGradeBinding.inflate(inflater).apply { binding = this }.root
+        return inflater.inflate(R.layout.dialog_grade, container, false)
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
-        with(binding) {
-            gradeDialogSubject.text = grade.subject
+        gradeDialogSubject.text = grade.subject
 
-            gradeDialogColorAndWeightValue.run {
-                text = context.getString(R.string.grade_weight_value, grade.weight)
-                setBackgroundResource(grade.getGradeColor())
-            }
-
-            gradeDialogDateValue.text = grade.date.toFormattedString()
-            gradeDialogColorValue.text = getString(grade.colorStringId)
-
-            gradeDialogCommentValue.apply {
-                if (grade.comment.isBlank()) {
-                    visibility = GONE
-                    gradeDialogComment.visibility = GONE
-                } else text = grade.comment
-            }
-
-            gradeDialogValue.run {
-                text = grade.entry
-                setBackgroundResource(grade.getBackgroundColor(colorScheme))
-            }
-
-            gradeDialogTeacherValue.text = if (grade.teacher.isBlank()) {
-                getString(R.string.all_no_data)
-            } else grade.teacher
-
-            gradeDialogDescriptionValue.text = grade.run {
-                when {
-                    description.isBlank() && gradeSymbol.isNotBlank() -> gradeSymbol
-                    description.isBlank() && gradeSymbol.isBlank() -> getString(R.string.all_no_description)
-                    gradeSymbol.isNotBlank() && description.isNotBlank() -> "$gradeSymbol - $description"
-                    else -> description
-                }
-            }
-
-            gradeDialogClose.setOnClickListener { dismiss() }
+        gradeDialogColorAndWeightValue.run {
+            text = context.getString(R.string.grade_weight_value, grade.weight)
+            setBackgroundResource(grade.getGradeColor())
         }
+
+        gradeDialogDateValue.text = grade.date.toFormattedString()
+        gradeDialogColorValue.text = getString(grade.colorStringId)
+
+        gradeDialogCommentValue.apply {
+            if (grade.comment.isBlank()) {
+                visibility = GONE
+                gradeDialogComment.visibility = GONE
+            } else text = grade.comment
+        }
+
+        gradeDialogValue.run {
+            text = grade.entry
+            setBackgroundResource(grade.getBackgroundColor(colorScheme))
+        }
+
+        gradeDialogTeacherValue.text = if (grade.teacher.isBlank()) {
+            getString(R.string.all_no_data)
+        } else grade.teacher
+
+        gradeDialogDescriptionValue.text = grade.run {
+            when {
+                description.isBlank() && gradeSymbol.isNotBlank() -> gradeSymbol
+                description.isBlank() && gradeSymbol.isBlank() -> getString(R.string.all_no_description)
+                gradeSymbol.isNotBlank() && description.isNotBlank() -> "$gradeSymbol - $description"
+                else -> description
+            }
+        }
+
+        gradeDialogClose.setOnClickListener { dismiss() }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsFragment.kt
index ac50b9f53..9505d354f 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsFragment.kt
@@ -1,6 +1,7 @@
 package io.github.wulkanowy.ui.modules.grade.details
 
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
@@ -8,25 +9,29 @@ import android.view.View
 import android.view.View.GONE
 import android.view.View.INVISIBLE
 import android.view.View.VISIBLE
-import androidx.recyclerview.widget.LinearLayoutManager
+import android.view.ViewGroup
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import eu.davidea.flexibleadapter.items.IExpandable
+import eu.davidea.flexibleadapter.items.IFlexible
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Grade
-import io.github.wulkanowy.databinding.FragmentGradeDetailsBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.grade.GradeFragment
 import io.github.wulkanowy.ui.modules.grade.GradeView
 import io.github.wulkanowy.ui.modules.main.MainActivity
+import io.github.wulkanowy.utils.setOnItemClickListener
+import kotlinx.android.synthetic.main.fragment_grade_details.*
 import javax.inject.Inject
 
-class GradeDetailsFragment :
-    BaseFragment<FragmentGradeDetailsBinding>(R.layout.fragment_grade_details), GradeDetailsView,
-    GradeView.GradeChildView {
+class GradeDetailsFragment : BaseFragment(), GradeDetailsView, GradeView.GradeChildView {
 
     @Inject
     lateinit var presenter: GradeDetailsPresenter
 
     @Inject
-    lateinit var gradeDetailsAdapter: GradeDetailsAdapter
+    lateinit var gradeDetailsAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
 
     private var gradeDetailsMenu: Menu? = null
 
@@ -34,18 +39,36 @@ class GradeDetailsFragment :
         fun newInstance() = GradeDetailsFragment()
     }
 
+    override val emptyAverageString: String
+        get() = getString(R.string.grade_no_average)
+
+    override val averageString: String
+        get() = getString(R.string.grade_average)
+
+    override val pointsSumString: String
+        get() = getString(R.string.grade_points_sum)
+
+    override val weightString: String
+        get() = getString(R.string.grade_weight)
+
+    override val noDescriptionString: String
+        get() = getString(R.string.all_no_description)
+
     override val isViewEmpty
-        get() = gradeDetailsAdapter.itemCount == 0
+        get() = gradeDetailsAdapter.isEmpty
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setHasOptionsMenu(true)
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding = FragmentGradeDetailsBinding.bind(view)
-        messageContainer = binding.gradeDetailsRecycler
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_grade_details, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        messageContainer = gradeDetailsRecycler
         presenter.onAttachView(this)
     }
 
@@ -56,17 +79,22 @@ class GradeDetailsFragment :
     }
 
     override fun initView() {
-        gradeDetailsAdapter.onClickListener = presenter::onGradeItemSelected
-
-        with(binding) {
-            with(gradeDetailsRecycler) {
-                layoutManager = LinearLayoutManager(context)
-                adapter = gradeDetailsAdapter
-            }
-            gradeDetailsSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
-            gradeDetailsErrorRetry.setOnClickListener { presenter.onRetry() }
-            gradeDetailsErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+        gradeDetailsAdapter.run {
+            isAutoCollapseOnExpand = true
+            isAutoScrollOnExpand = true
+            setOnItemClickListener { presenter.onGradeItemSelected(it) }
         }
+
+        gradeDetailsRecycler.run {
+            layoutManager = SmoothScrollLinearLayoutManager(context)
+            adapter = gradeDetailsAdapter
+            addItemDecoration(GradeDetailsHeaderItemDecoration(context)
+                .withDefaultDivider(R.layout.header_grade_details)
+            )
+        }
+        gradeDetailsSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
+        gradeDetailsErrorRetry.setOnClickListener { presenter.onRetry() }
+        gradeDetailsErrorDetails.setOnClickListener { presenter.onDetailsClick() }
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
@@ -74,23 +102,16 @@ class GradeDetailsFragment :
         else false
     }
 
-    override fun updateData(data: List<GradeDetailsItem>, isGradeExpandable: Boolean, gradeColorTheme: String) {
-        with(gradeDetailsAdapter) {
-            colorTheme = gradeColorTheme
-            setDataItems(data, isGradeExpandable)
-            notifyDataSetChanged()
-        }
+    override fun updateData(data: List<GradeDetailsHeader>) {
+        gradeDetailsAdapter.updateDataSet(data, true)
     }
 
-    override fun updateItem(item: Grade, position: Int) {
-        gradeDetailsAdapter.updateDetailsItem(position, item)
+    override fun updateItem(item: AbstractFlexibleItem<*>) {
+        gradeDetailsAdapter.updateItem(item)
     }
 
     override fun clearView() {
-        with(gradeDetailsAdapter) {
-            setDataItems(mutableListOf())
-            notifyDataSetChanged()
-        }
+        gradeDetailsAdapter.clear()
     }
 
     override fun collapseAllItems() {
@@ -98,43 +119,43 @@ class GradeDetailsFragment :
     }
 
     override fun scrollToStart() {
-        binding.gradeDetailsRecycler.smoothScrollToPosition(0)
+        gradeDetailsRecycler.scrollToPosition(0)
     }
 
-    override fun getHeaderOfItem(subject: String): GradeDetailsItem {
-        return gradeDetailsAdapter.getHeaderItem(subject)
+    override fun getHeaderOfItem(item: AbstractFlexibleItem<*>): IExpandable<*, out IFlexible<*>>? {
+        return gradeDetailsAdapter.getExpandableOf(item)
     }
 
-    override fun updateHeaderItem(item: GradeDetailsItem) {
-        gradeDetailsAdapter.updateHeaderItem(item)
+    override fun getGradeNumberString(number: Int): String {
+        return resources.getQuantityString(R.plurals.grade_number_item, number, number)
     }
 
     override fun showProgress(show: Boolean) {
-        binding.gradeDetailsProgress.visibility = if (show) VISIBLE else GONE
+        gradeDetailsProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun enableSwipe(enable: Boolean) {
-        binding.gradeDetailsSwipe.isEnabled = enable
+        gradeDetailsSwipe.isEnabled = enable
     }
 
     override fun showContent(show: Boolean) {
-        binding.gradeDetailsRecycler.visibility = if (show) VISIBLE else INVISIBLE
+        gradeDetailsRecycler.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun showEmpty(show: Boolean) {
-        binding.gradeDetailsEmpty.visibility = if (show) VISIBLE else INVISIBLE
+        gradeDetailsEmpty.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun showErrorView(show: Boolean) {
-        binding.gradeDetailsError.visibility = if (show) VISIBLE else GONE
+        gradeDetailsError.visibility = if (show) VISIBLE else GONE
     }
 
     override fun setErrorDetails(message: String) {
-        binding.gradeDetailsErrorMessage.text = message
+        gradeDetailsErrorMessage.text = message
     }
 
     override fun showRefresh(show: Boolean) {
-        binding.gradeDetailsSwipe.isRefreshing = show
+        gradeDetailsSwipe.isRefreshing = show
     }
 
     override fun showGradeDialog(grade: Grade, colorScheme: String) {
@@ -166,7 +187,7 @@ class GradeDetailsFragment :
     }
 
     override fun onDestroyView() {
-        presenter.onDetachView()
         super.onDestroyView()
+        presenter.onDetachView()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsHeader.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsHeader.kt
new file mode 100644
index 000000000..4a34a1457
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsHeader.kt
@@ -0,0 +1,94 @@
+package io.github.wulkanowy.ui.modules.grade.details
+
+import android.view.View
+import android.view.View.GONE
+import android.view.View.VISIBLE
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractExpandableItem
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.ExpandableViewHolder
+import io.github.wulkanowy.R
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.header_grade_details.*
+
+class GradeDetailsHeader(
+    private val subject: String,
+    private val number: String,
+    private val average: String,
+    private val pointsSum: String,
+    var newGrades: Int,
+    private val isExpandable: Boolean
+) : AbstractExpandableItem<GradeDetailsHeader.ViewHolder, GradeDetailsItem>() {
+
+    init {
+        isExpanded = !isExpandable
+    }
+
+    override fun getLayoutRes() = R.layout.header_grade_details
+
+    override fun createViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?): ViewHolder {
+        return ViewHolder(view, adapter)
+    }
+
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>?, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
+        holder.run {
+            gradeHeaderSubject.apply {
+                text = subject
+                maxLines = if (isExpanded) 2 else 1
+            }
+            gradeHeaderAverage.text = average
+            gradeHeaderPointsSum.text = pointsSum
+            gradeHeaderPointsSum.visibility = if (pointsSum.isNotEmpty()) VISIBLE else GONE
+            gradeHeaderNumber.text = number
+            gradeHeaderNote.visibility = if (newGrades > 0) VISIBLE else GONE
+            if (newGrades > 0) gradeHeaderNote.text = newGrades.toString(10)
+            gradeHeaderContainer.isEnabled = isExpandable
+
+            isViewExpandable = isExpandable
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as GradeDetailsHeader
+
+        if (subject != other.subject) return false
+        if (number != other.number) return false
+        if (average != other.average) return false
+        if (isExpandable != other.isExpandable) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = subject.hashCode()
+        result = 31 * result + number.hashCode()
+        result = 31 * result + average.hashCode()
+        result = 31 * result + isExpandable.hashCode()
+        return result
+    }
+
+    class ViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?) :
+        ExpandableViewHolder(view, adapter), LayoutContainer {
+
+        var isViewExpandable = true
+
+        init {
+            contentView.setOnClickListener(this)
+        }
+
+        override val containerView: View
+            get() = contentView
+
+        override fun isViewCollapsibleOnClick() = isViewExpandable
+
+        override fun isViewExpandableOnClick() = isViewExpandable
+
+        override fun onClick(view: View?) {
+            super.onClick(view)
+            mAdapter.getItem(adapterPosition)?.let { mAdapter.updateItem(it) }
+        }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsHeaderItemDecoration.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsHeaderItemDecoration.kt
new file mode 100644
index 000000000..39a911e62
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsHeaderItemDecoration.kt
@@ -0,0 +1,38 @@
+package io.github.wulkanowy.ui.modules.grade.details
+
+import android.content.Context
+import android.graphics.Canvas
+import androidx.recyclerview.widget.RecyclerView
+import eu.davidea.flexibleadapter.common.FlexibleItemDecoration
+
+class GradeDetailsHeaderItemDecoration(context: Context) : FlexibleItemDecoration(context) {
+
+    override fun drawVertical(canvas: Canvas, parent: RecyclerView) {
+        canvas.save()
+        val left: Int
+        val right: Int
+        if (parent.clipToPadding) {
+            left = parent.paddingLeft
+            right = parent.width - parent.paddingRight
+            canvas.clipRect(left, parent.paddingTop, right,
+                parent.height - parent.paddingBottom)
+        } else {
+            left = 0
+            right = parent.width
+        }
+
+        val itemCount = parent.childCount
+        for (i in 1 until itemCount) {
+            val child = parent.getChildAt(i)
+            val viewHolder = parent.getChildViewHolder(child)
+            if (shouldDrawDivider(viewHolder)) {
+                parent.getDecoratedBoundsWithMargins(child, mBounds)
+                val bottom = mBounds.top + Math.round(child.translationY)
+                val top = bottom - mDivider.intrinsicHeight
+                mDivider.setBounds(left, top, right, bottom)
+                mDivider.draw(canvas)
+            }
+        }
+        canvas.restore()
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsItem.kt
index 281974969..1e47eca5d 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsItem.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsItem.kt
@@ -1,19 +1,74 @@
 package io.github.wulkanowy.ui.modules.grade.details
 
-enum class ViewType(val id: Int) {
-    HEADER(1),
-    ITEM(2)
+import android.annotation.SuppressLint
+import android.view.View
+import android.view.View.GONE
+import android.view.View.VISIBLE
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.FlexibleViewHolder
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Grade
+import io.github.wulkanowy.utils.toFormattedString
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.item_grade_details.*
+
+class GradeDetailsItem(
+    val grade: Grade,
+    private val valueBgColor: Int,
+    private val weightString: String,
+    private val noDescriptionString: String
+) : AbstractFlexibleItem<GradeDetailsItem.ViewHolder>() {
+
+    override fun getLayoutRes() = R.layout.item_grade_details
+
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): ViewHolder {
+        return ViewHolder(view, adapter)
+    }
+
+    @SuppressLint("SetTextI18n")
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
+        holder.run {
+            gradeItemValue.run {
+                text = grade.entry
+                setBackgroundResource(valueBgColor)
+            }
+            gradeItemDescription.text = when {
+                grade.description.isNotBlank() -> grade.description
+                grade.gradeSymbol.isNotBlank() -> grade.gradeSymbol
+                else -> noDescriptionString
+            }
+            gradeItemDate.text = grade.date.toFormattedString()
+            gradeItemWeight.text = "$weightString: ${grade.weight}"
+            gradeItemNote.visibility = if (!grade.isRead) VISIBLE else GONE
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as GradeDetailsItem
+
+        if (grade != other.grade) return false
+        if (grade.id != other.grade.id) return false
+        if (weightString != other.weightString) return false
+        if (valueBgColor != other.valueBgColor) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = grade.hashCode()
+        result = 31 * result + grade.id.toInt()
+        result = 31 * result + weightString.hashCode()
+        result = 31 * result + valueBgColor
+        return result
+    }
+
+    class ViewHolder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter), LayoutContainer {
+        override val containerView: View
+            get() = contentView
+    }
 }
-
-data class GradeDetailsItem(
-    val value: Any,
-    val viewType: ViewType
-)
-
-data class GradeDetailsHeader(
-    val subject: String,
-    val average: Double?,
-    val pointsSum: String?,
-    var newGrades: Int,
-    val grades: List<GradeDetailsItem>
-)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsPresenter.kt
index 37f2c935a..a9e5b2b7d 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsPresenter.kt
@@ -1,5 +1,6 @@
 package io.github.wulkanowy.ui.modules.grade.details
 
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.db.entities.Grade
 import io.github.wulkanowy.data.repositories.grade.GradeRepository
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
@@ -8,9 +9,9 @@ import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.ui.modules.grade.GradeAverageProvider
-import io.github.wulkanowy.ui.modules.grade.GradeDetailsWithAverage
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 import io.github.wulkanowy.utils.SchedulersProvider
+import io.github.wulkanowy.utils.getBackgroundColor
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -42,20 +43,24 @@ class GradeDetailsPresenter @Inject constructor(
         loadData(semesterId, forceRefresh)
     }
 
-    fun onGradeItemSelected(grade: Grade, position: Int) {
-        Timber.i("Select grade item ${grade.id}, position: $position")
-        view?.apply {
-            showGradeDialog(grade, preferencesRepository.gradeColorTheme)
-            if (!grade.isRead) {
-                grade.isRead = true
-                updateItem(grade, position)
-                getHeaderOfItem(grade.subject).let { header ->
-                    (header.value as GradeDetailsHeader).newGrades--
-                    updateHeaderItem(header)
+    fun onGradeItemSelected(item: AbstractFlexibleItem<*>?) {
+        if (item is GradeDetailsItem) {
+            Timber.i("Select grade item ${item.grade.id}")
+            view?.apply {
+                showGradeDialog(item.grade, preferencesRepository.gradeColorTheme)
+                if (!item.grade.isRead) {
+                    item.grade.isRead = true
+                    updateItem(item)
+                    getHeaderOfItem(item)?.let { header ->
+                        if (header is GradeDetailsHeader) {
+                            header.newGrades--
+                            updateItem(header)
+                        }
+                    }
+                    newGradesAmount--
+                    updateMarkAsDoneButton()
+                    updateGrade(item.grade)
                 }
-                newGradesAmount--
-                updateMarkAsDoneButton()
-                updateGrade(grade)
             }
         }
     }
@@ -127,7 +132,16 @@ class GradeDetailsPresenter @Inject constructor(
     private fun loadData(semesterId: Int, forceRefresh: Boolean) {
         Timber.i("Loading grade details data started")
         disposable.add(studentRepository.getCurrentStudent()
-            .flatMap { averageProvider.getGradesDetailsWithAverage(it, semesterId, forceRefresh) }
+            .flatMap { semesterRepository.getSemesters(it).map { semester -> it to semester } }
+            .flatMap { (student, semesters) ->
+                averageProvider.getGradeAverage(student, semesters, semesterId, forceRefresh)
+                    .flatMap { averages ->
+                        gradeRepository.getGrades(student, semesters.first { it.semesterId == semesterId }, forceRefresh)
+                            .map { it.sortedByDescending { grade -> grade.date } }
+                            .map { it.groupBy { grade -> grade.subject }.toSortedMap() }
+                            .map { createGradeItems(it, averages) }
+                    }
+            }
             .subscribeOn(schedulers.backgroundThread)
             .observeOn(schedulers.mainThread)
             .doFinally {
@@ -138,26 +152,17 @@ class GradeDetailsPresenter @Inject constructor(
                     notifyParentDataLoaded(semesterId)
                 }
             }
-            .subscribe({ grades ->
+            .subscribe({
                 Timber.i("Loading grade details result: Success")
-                newGradesAmount = grades.sumBy { it.grades.sumBy { grade -> if (!grade.isRead) 1 else 0 } }
+                newGradesAmount = it.sumBy { gradeDetailsHeader -> gradeDetailsHeader.newGrades }
                 updateMarkAsDoneButton()
                 view?.run {
-                    showEmpty(grades.isEmpty())
+                    showEmpty(it.isEmpty())
                     showErrorView(false)
-                    showContent(grades.isNotEmpty())
-                    updateData(
-                        data = createGradeItems(grades),
-                        isGradeExpandable = preferencesRepository.isGradeExpandable,
-                        gradeColorTheme = preferencesRepository.gradeColorTheme
-                    )
+                    showContent(it.isNotEmpty())
+                    updateData(it)
                 }
-                analytics.logEvent(
-                    "load_data",
-                    "type" to "grade_details",
-                    "items" to grades.size,
-                    "force_refresh" to forceRefresh
-                )
+                analytics.logEvent("load_grade_details", "items" to it.size, "force_refresh" to forceRefresh)
             }) {
                 Timber.i("Loading grade details result: An exception occurred")
                 errorHandler.dispatch(it)
@@ -175,23 +180,40 @@ class GradeDetailsPresenter @Inject constructor(
         }
     }
 
-    private fun createGradeItems(items: List<GradeDetailsWithAverage>): List<GradeDetailsItem> {
-        return items
-            .filter { it.grades.isNotEmpty() }
-            .sortedBy { it.subject }
-            .map { (subject, average, points, _, grades) ->
-                val subItems = grades
-                    .sortedByDescending { it.date }
-                    .map { GradeDetailsItem(it, ViewType.ITEM) }
+    private fun createGradeItems(items: Map<String, List<Grade>>, averages: List<Triple<String, Double, String>>): List<GradeDetailsHeader> {
+        val isGradeExpandable = preferencesRepository.isGradeExpandable
+        val gradeColorTheme = preferencesRepository.gradeColorTheme
 
-                listOf(GradeDetailsItem(GradeDetailsHeader(
-                    subject = subject,
-                    average = average,
-                    pointsSum = points,
-                    newGrades = grades.filter { grade -> !grade.isRead }.size,
-                    grades = subItems
-                ), ViewType.HEADER)) + if (preferencesRepository.isGradeExpandable) emptyList() else subItems
-            }.flatten()
+        val noDescriptionString = view?.noDescriptionString.orEmpty()
+        val weightString = view?.weightString.orEmpty()
+        val pointsSumString = view?.pointsSumString.orEmpty()
+
+        return items.map { subject ->
+            GradeDetailsHeader(
+                subject = subject.key,
+                average = formatAverage(averages.singleOrNull { subject.key == it.first }?.second),
+                pointsSum = averages.singleOrNull { subject.key == it.first }?.takeIf { it.third.isNotEmpty() }?.let { pointsSumString.format(it.third) }.orEmpty(),
+                number = view?.getGradeNumberString(subject.value.size).orEmpty(),
+                newGrades = subject.value.filter { grade -> !grade.isRead }.size,
+                isExpandable = isGradeExpandable
+            ).apply {
+                subItems = subject.value.map { item ->
+                    GradeDetailsItem(
+                        grade = item,
+                        valueBgColor = item.getBackgroundColor(gradeColorTheme),
+                        weightString = weightString,
+                        noDescriptionString = noDescriptionString
+                    )
+                }
+            }
+        }
+    }
+
+    private fun formatAverage(average: Double?): String {
+        return view?.run {
+            if (average == null || average == .0) emptyAverageString
+            else averageString.format(average)
+        }.orEmpty()
     }
 
     private fun updateGrade(grade: Grade) {
@@ -199,9 +221,8 @@ class GradeDetailsPresenter @Inject constructor(
         disposable.add(gradeRepository.updateGrade(grade)
             .subscribeOn(schedulers.backgroundThread)
             .observeOn(schedulers.mainThread)
-            .subscribe({
-                Timber.i("Update grade result: Success")
-            }) { error ->
+            .subscribe({ Timber.i("Update grade result: Success") })
+            { error ->
                 Timber.i("Update grade result: An exception occurred")
                 errorHandler.dispatch(error)
             })
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsView.kt
index e71fcc3c8..e2977bcbe 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsView.kt
@@ -1,5 +1,8 @@
 package io.github.wulkanowy.ui.modules.grade.details
 
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import eu.davidea.flexibleadapter.items.IExpandable
+import eu.davidea.flexibleadapter.items.IFlexible
 import io.github.wulkanowy.data.db.entities.Grade
 import io.github.wulkanowy.ui.base.BaseView
 
@@ -7,13 +10,21 @@ interface GradeDetailsView : BaseView {
 
     val isViewEmpty: Boolean
 
+    val emptyAverageString: String
+
+    val averageString: String
+
+    val pointsSumString: String
+
+    val weightString: String
+
+    val noDescriptionString: String
+
     fun initView()
 
-    fun updateData(data: List<GradeDetailsItem>, isGradeExpandable: Boolean, gradeColorTheme: String)
+    fun updateData(data: List<GradeDetailsHeader>)
 
-    fun updateItem(item: Grade, position: Int)
-
-    fun updateHeaderItem(item: GradeDetailsItem)
+    fun updateItem(item: AbstractFlexibleItem<*>)
 
     fun clearView()
 
@@ -43,5 +54,7 @@ interface GradeDetailsView : BaseView {
 
     fun enableMarkAsDoneButton(enable: Boolean)
 
-    fun getHeaderOfItem(subject: String): GradeDetailsItem
+    fun getGradeNumberString(number: Int): String
+
+    fun getHeaderOfItem(item: AbstractFlexibleItem<*>): IExpandable<*, out IFlexible<*>>?
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsAdapter.kt
deleted file mode 100644
index dbb60910a..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsAdapter.kt
+++ /dev/null
@@ -1,208 +0,0 @@
-package io.github.wulkanowy.ui.modules.grade.statistics
-
-import android.graphics.Color
-import android.view.LayoutInflater
-import android.view.View.GONE
-import android.view.View.VISIBLE
-import android.view.ViewGroup
-import androidx.core.content.ContextCompat
-import androidx.recyclerview.widget.RecyclerView
-import com.github.mikephil.charting.components.Legend
-import com.github.mikephil.charting.components.LegendEntry
-import com.github.mikephil.charting.data.BarData
-import com.github.mikephil.charting.data.BarDataSet
-import com.github.mikephil.charting.data.BarEntry
-import com.github.mikephil.charting.data.PieData
-import com.github.mikephil.charting.data.PieDataSet
-import com.github.mikephil.charting.data.PieEntry
-import com.github.mikephil.charting.formatter.ValueFormatter
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.GradePointsStatistics
-import io.github.wulkanowy.data.db.entities.GradeStatistics
-import io.github.wulkanowy.data.pojos.GradeStatisticsItem
-import io.github.wulkanowy.databinding.ItemGradeStatisticsBarBinding
-import io.github.wulkanowy.databinding.ItemGradeStatisticsPieBinding
-import io.github.wulkanowy.utils.getThemeAttrColor
-import javax.inject.Inject
-
-class GradeStatisticsAdapter @Inject constructor() :
-    RecyclerView.Adapter<RecyclerView.ViewHolder>() {
-
-    var items = emptyList<GradeStatisticsItem>()
-
-    var theme: String = "vulcan"
-
-    var showAllSubjectsOnList: Boolean = false
-
-    private val vulcanGradeColors = listOf(
-        6 to R.color.grade_vulcan_six,
-        5 to R.color.grade_vulcan_five,
-        4 to R.color.grade_vulcan_four,
-        3 to R.color.grade_vulcan_three,
-        2 to R.color.grade_vulcan_two,
-        1 to R.color.grade_vulcan_one
-    )
-
-    private val materialGradeColors = listOf(
-        6 to R.color.grade_material_six,
-        5 to R.color.grade_material_five,
-        4 to R.color.grade_material_four,
-        3 to R.color.grade_material_three,
-        2 to R.color.grade_material_two,
-        1 to R.color.grade_material_one
-    )
-
-    private val gradePointsColors = listOf(
-        Color.parseColor("#37c69c"),
-        Color.parseColor("#d8b12a")
-    )
-
-    private val gradeLabels = listOf(
-        "6, 6-", "5, 5-, 5+", "4, 4-, 4+", "3, 3-, 3+", "2, 2-, 2+", "1, 1+"
-    )
-
-    override fun getItemCount() = if (showAllSubjectsOnList) items.size else (if (items.isEmpty()) 0 else 1)
-
-    override fun getItemViewType(position: Int) = items[position].type.id
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        val inflater = LayoutInflater.from(parent.context)
-        return when (viewType) {
-            ViewType.PARTIAL.id, ViewType.SEMESTER.id -> PieViewHolder(ItemGradeStatisticsPieBinding.inflate(inflater, parent, false))
-            ViewType.POINTS.id -> BarViewHolder(ItemGradeStatisticsBarBinding.inflate(inflater, parent, false))
-            else -> throw IllegalStateException()
-        }
-    }
-
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        when (holder) {
-            is PieViewHolder -> bindPieChart(holder, items[position].partial)
-            is BarViewHolder -> bindBarChart(holder, items[position].points!!)
-        }
-    }
-
-    private fun bindPieChart(holder: PieViewHolder, partials: List<GradeStatistics>) {
-        with(holder.binding.gradeStatisticsPieTitle) {
-            text = partials.firstOrNull()?.subject
-            visibility = if (items.size == 1 || !showAllSubjectsOnList) GONE else VISIBLE
-        }
-
-        val gradeColors = when (theme) {
-            "vulcan" -> vulcanGradeColors
-            else -> materialGradeColors
-        }
-
-        val dataset = PieDataSet(partials.map {
-            PieEntry(it.amount.toFloat(), it.grade.toString())
-        }, "Legenda")
-
-        with(dataset) {
-            valueTextSize = 12f
-            sliceSpace = 1f
-            valueTextColor = Color.WHITE
-            setColors(partials.map {
-                gradeColors.single { color -> color.first == it.grade }.second
-            }.toIntArray(), holder.binding.root.context)
-        }
-
-        with(holder.binding.gradeStatisticsPie) {
-            setTouchEnabled(false)
-            if (partials.size == 1) animateXY(1000, 1000)
-            data = PieData(dataset).apply {
-                setValueFormatter(object : ValueFormatter() {
-                    override fun getPieLabel(value: Float, pieEntry: PieEntry): String {
-                        return resources.getQuantityString(R.plurals.grade_number_item, value.toInt(), value.toInt())
-                    }
-                })
-            }
-            with(legend) {
-                textColor = context.getThemeAttrColor(android.R.attr.textColorPrimary)
-                setCustom(gradeLabels.mapIndexed { i, it ->
-                    LegendEntry().apply {
-                        label = it
-                        formColor = ContextCompat.getColor(context, gradeColors[i].second)
-                        form = Legend.LegendForm.SQUARE
-                    }
-                })
-            }
-
-            minAngleForSlices = 25f
-            description.isEnabled = false
-            centerText = partials.fold(0) { acc, it -> acc + it.amount }
-                .let { resources.getQuantityString(R.plurals.grade_number_item, it, it) }
-
-            setHoleColor(context.getThemeAttrColor(android.R.attr.windowBackground))
-            setCenterTextColor(context.getThemeAttrColor(android.R.attr.textColorPrimary))
-            invalidate()
-        }
-    }
-
-    private fun bindBarChart(holder: BarViewHolder, points: GradePointsStatistics) {
-        with(holder.binding.gradeStatisticsBarTitle) {
-            text = points.subject
-            visibility = if (items.size == 1) GONE else VISIBLE
-        }
-
-        val dataset = BarDataSet(listOf(
-            BarEntry(1f, points.others.toFloat()),
-            BarEntry(2f, points.student.toFloat())
-        ), "Legenda")
-
-        with(dataset) {
-            valueTextSize = 12f
-            valueTextColor = holder.binding.root.context.getThemeAttrColor(android.R.attr.textColorPrimary)
-            valueFormatter = object : ValueFormatter() {
-                override fun getBarLabel(barEntry: BarEntry) = "${barEntry.y}%"
-            }
-            colors = gradePointsColors
-        }
-
-        with(holder.binding.gradeStatisticsBar) {
-            setTouchEnabled(false)
-            if (items.size == 1) animateXY(1000, 1000)
-            data = BarData(dataset).apply {
-                barWidth = 0.5f
-                setFitBars(true)
-            }
-            legend.setCustom(listOf(
-                LegendEntry().apply {
-                    label = "Średnia klasy"
-                    formColor = gradePointsColors[0]
-                    form = Legend.LegendForm.SQUARE
-                },
-                LegendEntry().apply {
-                    label = "Uczeń"
-                    formColor = gradePointsColors[1]
-                    form = Legend.LegendForm.SQUARE
-                }
-            ))
-            legend.textColor = context.getThemeAttrColor(android.R.attr.textColorPrimary)
-
-            description.isEnabled = false
-
-            holder.binding.root.context.getThemeAttrColor(android.R.attr.textColorPrimary).let {
-                axisLeft.textColor = it
-                axisRight.textColor = it
-            }
-            xAxis.setDrawLabels(false)
-            xAxis.setDrawGridLines(false)
-            with(axisLeft) {
-                axisMinimum = 0f
-                axisMaximum = 100f
-                labelCount = 11
-            }
-            with(axisRight) {
-                axisMinimum = 0f
-                axisMaximum = 100f
-                labelCount = 11
-            }
-            invalidate()
-        }
-    }
-
-    private class PieViewHolder(val binding: ItemGradeStatisticsPieBinding) :
-        RecyclerView.ViewHolder(binding.root)
-
-    private class BarViewHolder(val binding: ItemGradeStatisticsBarBinding) :
-        RecyclerView.ViewHolder(binding.root)
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsFragment.kt
index 3a8f40073..1c54f387e 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsFragment.kt
@@ -1,30 +1,40 @@
 package io.github.wulkanowy.ui.modules.grade.statistics
 
+import android.graphics.Color
+import android.graphics.Color.WHITE
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
+import android.view.ViewGroup
 import android.widget.ArrayAdapter
 import android.widget.TextView
-import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.core.content.ContextCompat
+import com.github.mikephil.charting.components.Legend
+import com.github.mikephil.charting.components.LegendEntry
+import com.github.mikephil.charting.data.BarData
+import com.github.mikephil.charting.data.BarDataSet
+import com.github.mikephil.charting.data.BarEntry
+import com.github.mikephil.charting.data.PieData
+import com.github.mikephil.charting.data.PieDataSet
+import com.github.mikephil.charting.data.PieEntry
+import com.github.mikephil.charting.formatter.ValueFormatter
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.pojos.GradeStatisticsItem
-import io.github.wulkanowy.databinding.FragmentGradeStatisticsBinding
+import io.github.wulkanowy.data.db.entities.GradePointsStatistics
+import io.github.wulkanowy.data.db.entities.GradeStatistics
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.grade.GradeFragment
 import io.github.wulkanowy.ui.modules.grade.GradeView
 import io.github.wulkanowy.utils.dpToPx
+import io.github.wulkanowy.utils.getThemeAttrColor
 import io.github.wulkanowy.utils.setOnItemSelectedListener
+import kotlinx.android.synthetic.main.fragment_grade_statistics.*
 import javax.inject.Inject
 
-class GradeStatisticsFragment :
-    BaseFragment<FragmentGradeStatisticsBinding>(R.layout.fragment_grade_statistics),
-    GradeStatisticsView, GradeView.GradeChildView {
+class GradeStatisticsFragment : BaseFragment(), GradeStatisticsView, GradeView.GradeChildView {
 
     @Inject
     lateinit var presenter: GradeStatisticsPresenter
 
-    @Inject
-    lateinit var statisticsAdapter: GradeStatisticsAdapter
-
     private lateinit var subjectsAdapter: ArrayAdapter<String>
 
     companion object {
@@ -33,43 +43,97 @@ class GradeStatisticsFragment :
         fun newInstance() = GradeStatisticsFragment()
     }
 
-    override val isViewEmpty get() = statisticsAdapter.items.isEmpty()
+    override val isPieViewEmpty get() = gradeStatisticsChart.isEmpty
+
+    override val isBarViewEmpty get() = gradeStatisticsChartPoints.isEmpty
 
     override val currentType
-        get() = when (binding.gradeStatisticsTypeSwitch.checkedRadioButtonId) {
+        get() = when (gradeStatisticsTypeSwitch.checkedRadioButtonId) {
             R.id.gradeStatisticsTypeSemester -> ViewType.SEMESTER
             R.id.gradeStatisticsTypePartial -> ViewType.PARTIAL
             else -> ViewType.POINTS
         }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding = FragmentGradeStatisticsBinding.bind(view)
-        messageContainer = binding.gradeStatisticsSwipe
+    private lateinit var gradeColors: List<Pair<Int, Int>>
+
+    private val vulcanGradeColors = listOf(
+        6 to R.color.grade_vulcan_six,
+        5 to R.color.grade_vulcan_five,
+        4 to R.color.grade_vulcan_four,
+        3 to R.color.grade_vulcan_three,
+        2 to R.color.grade_vulcan_two,
+        1 to R.color.grade_vulcan_one
+    )
+
+    private val materialGradeColors = listOf(
+        6 to R.color.grade_material_six,
+        5 to R.color.grade_material_five,
+        4 to R.color.grade_material_four,
+        3 to R.color.grade_material_three,
+        2 to R.color.grade_material_two,
+        1 to R.color.grade_material_one
+    )
+
+    private val gradePointsColors = listOf(
+        Color.parseColor("#37c69c"),
+        Color.parseColor("#d8b12a")
+    )
+
+    private val gradeLabels = listOf(
+        "6, 6-", "5, 5-, 5+", "4, 4-, 4+", "3, 3-, 3+", "2, 2-, 2+", "1, 1+"
+    )
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_grade_statistics, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        messageContainer = gradeStatisticsSwipe
         presenter.onAttachView(this, savedInstanceState?.getSerializable(SAVED_CHART_TYPE) as? ViewType)
     }
 
     override fun initView() {
-        with(binding.gradeStatisticsRecycler) {
-            layoutManager = LinearLayoutManager(requireContext())
-            adapter = statisticsAdapter
+        with(gradeStatisticsChart) {
+            description.isEnabled = false
+            setHoleColor(context.getThemeAttrColor(android.R.attr.windowBackground))
+            setCenterTextColor(context.getThemeAttrColor(android.R.attr.textColorPrimary))
+            animateXY(1000, 1000)
+            minAngleForSlices = 25f
+            legend.textColor = context.getThemeAttrColor(android.R.attr.textColorPrimary)
+        }
+
+        with(gradeStatisticsChartPoints) {
+            description.isEnabled = false
+
+            animateXY(1000, 1000)
+            legend.textColor = context.getThemeAttrColor(android.R.attr.textColorPrimary)
+
+            with(axisLeft) {
+                axisMinimum = 0f
+                axisMaximum = 100f
+                labelCount = 11
+            }
+            with(axisRight) {
+                axisMinimum = 0f
+                axisMaximum = 100f
+                labelCount = 11
+            }
         }
 
         subjectsAdapter = ArrayAdapter(requireContext(), android.R.layout.simple_spinner_item, mutableListOf())
         subjectsAdapter.setDropDownViewResource(R.layout.item_attendance_summary_subject)
 
-        with(binding.gradeStatisticsSubjects) {
+        with(gradeStatisticsSubjects) {
             adapter = subjectsAdapter
             setOnItemSelectedListener<TextView> { presenter.onSubjectSelected(it?.text?.toString()) }
         }
 
-        with(binding) {
-            gradeStatisticsSubjectsContainer.setElevationCompat(requireContext().dpToPx(1f))
+        gradeStatisticsSubjectsContainer.setElevationCompat(requireContext().dpToPx(1f))
 
-            gradeStatisticsSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
-            gradeStatisticsErrorRetry.setOnClickListener { presenter.onRetry() }
-            gradeStatisticsErrorDetails.setOnClickListener { presenter.onDetailsClick() }
-        }
+        gradeStatisticsSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
+        gradeStatisticsErrorRetry.setOnClickListener { presenter.onRetry() }
+        gradeStatisticsErrorDetails.setOnClickListener { presenter.onDetailsClick() }
     }
 
     override fun updateSubjects(data: ArrayList<String>) {
@@ -80,53 +144,128 @@ class GradeStatisticsFragment :
         }
     }
 
-    override fun updateData(items: List<GradeStatisticsItem>, theme: String, showAllSubjectsOnStatisticsList: Boolean) {
-        with(statisticsAdapter) {
-            this.showAllSubjectsOnList = showAllSubjectsOnStatisticsList
-            this.theme = theme
-            this.items = items
-            notifyDataSetChanged()
+    override fun updatePieData(items: List<GradeStatistics>, theme: String) {
+        gradeColors = when (theme) {
+            "vulcan" -> vulcanGradeColors
+            else -> materialGradeColors
+        }
+
+        val dataset = PieDataSet(items.map {
+            PieEntry(it.amount.toFloat(), it.grade.toString())
+        }, "Legenda").apply {
+            valueTextSize = 12f
+            sliceSpace = 1f
+            valueTextColor = WHITE
+            setColors(items.map {
+                gradeColors.single { color -> color.first == it.grade }.second
+            }.toIntArray(), context)
+        }
+
+        with(gradeStatisticsChart) {
+            data = PieData(dataset).apply {
+                setTouchEnabled(false)
+                setValueFormatter(object : ValueFormatter() {
+                    override fun getPieLabel(value: Float, pieEntry: PieEntry): String {
+                        return resources.getQuantityString(R.plurals.grade_number_item, value.toInt(), value.toInt())
+                    }
+                })
+                centerText = items.fold(0) { acc, it -> acc + it.amount }
+                    .let { resources.getQuantityString(R.plurals.grade_number_item, it, it) }
+            }
+            legend.apply {
+                setCustom(gradeLabels.mapIndexed { i, it ->
+                    LegendEntry().apply {
+                        label = it
+                        formColor = ContextCompat.getColor(context, gradeColors[i].second)
+                        form = Legend.LegendForm.SQUARE
+                    }
+                })
+            }
+            invalidate()
+        }
+    }
+
+    override fun updateBarData(item: GradePointsStatistics) {
+        val dataset = BarDataSet(listOf(
+            BarEntry(1f, item.others.toFloat()),
+            BarEntry(2f, item.student.toFloat())
+        ), "Legenda").apply {
+            valueTextSize = 12f
+            valueTextColor = requireContext().getThemeAttrColor(android.R.attr.textColorPrimary)
+            valueFormatter = object : ValueFormatter() {
+                override fun getBarLabel(barEntry: BarEntry) = "${barEntry.y}%"
+            }
+            colors = gradePointsColors
+        }
+
+        with(gradeStatisticsChartPoints) {
+            data = BarData(dataset).apply {
+                barWidth = 0.5f
+                setFitBars(true)
+            }
+            setTouchEnabled(false)
+            xAxis.setDrawLabels(false)
+            xAxis.setDrawGridLines(false)
+            requireContext().getThemeAttrColor(android.R.attr.textColorPrimary).let {
+                axisLeft.textColor = it
+                axisRight.textColor = it
+            }
+            legend.setCustom(listOf(
+                LegendEntry().apply {
+                    label = "Średnia klasy"
+                    formColor = gradePointsColors[0]
+                    form = Legend.LegendForm.SQUARE
+                },
+                LegendEntry().apply {
+                    label = "Uczeń"
+                    formColor = gradePointsColors[1]
+                    form = Legend.LegendForm.SQUARE
+                }
+            ))
+            invalidate()
         }
     }
 
     override fun showSubjects(show: Boolean) {
-        binding.gradeStatisticsSubjectsContainer.visibility = if (show) View.VISIBLE else View.GONE
+        gradeStatisticsSubjectsContainer.visibility = if (show) View.VISIBLE else View.INVISIBLE
+        gradeStatisticsTypeSwitch.visibility = if (show) View.VISIBLE else View.INVISIBLE
     }
 
     override fun clearView() {
-        statisticsAdapter.items = emptyList()
+        gradeStatisticsChart.clear()
+        gradeStatisticsChartPoints.clear()
     }
 
-    override fun resetView() {
-        binding.gradeStatisticsScroll.scrollTo(0, 0)
+    override fun showPieContent(show: Boolean) {
+        gradeStatisticsChart.visibility = if (show) View.VISIBLE else View.GONE
     }
 
-    override fun showContent(show: Boolean) {
-        binding.gradeStatisticsRecycler.visibility = if (show) View.VISIBLE else View.GONE
+    override fun showBarContent(show: Boolean) {
+        gradeStatisticsChartPoints.visibility = if (show) View.VISIBLE else View.GONE
     }
 
     override fun showEmpty(show: Boolean) {
-        binding.gradeStatisticsEmpty.visibility = if (show) View.VISIBLE else View.INVISIBLE
+        gradeStatisticsEmpty.visibility = if (show) View.VISIBLE else View.INVISIBLE
     }
 
     override fun showErrorView(show: Boolean) {
-        binding.gradeStatisticsError.visibility = if (show) View.VISIBLE else View.GONE
+        gradeStatisticsError.visibility = if (show) View.VISIBLE else View.GONE
     }
 
     override fun setErrorDetails(message: String) {
-        binding.gradeStatisticsErrorMessage.text = message
+        gradeStatisticsErrorMessage.text = message
     }
 
     override fun showProgress(show: Boolean) {
-        binding.gradeStatisticsProgress.visibility = if (show) View.VISIBLE else View.GONE
+        gradeStatisticsProgress.visibility = if (show) View.VISIBLE else View.GONE
     }
 
     override fun enableSwipe(enable: Boolean) {
-        binding.gradeStatisticsSwipe.isEnabled = enable
+        gradeStatisticsSwipe.isEnabled = enable
     }
 
     override fun showRefresh(show: Boolean) {
-        binding.gradeStatisticsSwipe.isRefreshing = show
+        gradeStatisticsSwipe.isRefreshing = show
     }
 
     override fun onParentLoadData(semesterId: Int, forceRefresh: Boolean) {
@@ -134,7 +273,7 @@ class GradeStatisticsFragment :
     }
 
     override fun onParentReselected() {
-        presenter.onParentViewReselected()
+        //
     }
 
     override fun onParentChangeSemester() {
@@ -151,7 +290,7 @@ class GradeStatisticsFragment :
 
     override fun onResume() {
         super.onResume()
-        binding.gradeStatisticsTypeSwitch.setOnCheckedChangeListener { _, _ -> presenter.onTypeChange() }
+        gradeStatisticsTypeSwitch.setOnCheckedChangeListener { _, _ -> presenter.onTypeChange() }
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
@@ -160,7 +299,7 @@ class GradeStatisticsFragment :
     }
 
     override fun onDestroyView() {
-        presenter.onDetachView()
         super.onDestroyView()
+        presenter.onDetachView()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsPresenter.kt
index 590e9ce12..833782619 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsPresenter.kt
@@ -48,18 +48,12 @@ class GradeStatisticsPresenter @Inject constructor(
         loadDataByType(semesterId, currentSubjectName, currentType, forceRefresh)
     }
 
-    fun onParentViewReselected() {
-        view?.run {
-            if (!isViewEmpty) resetView()
-        }
-    }
-
     fun onParentViewChangeSemester() {
         view?.run {
             showProgress(true)
             enableSwipe(false)
             showRefresh(false)
-            showContent(false)
+            showBarContent(false)
             showErrorView(false)
             showEmpty(false)
             clearView()
@@ -87,7 +81,8 @@ class GradeStatisticsPresenter @Inject constructor(
     fun onSubjectSelected(name: String?) {
         Timber.i("Select grade stats subject $name")
         view?.run {
-            showContent(false)
+            showBarContent(false)
+            showPieContent(false)
             showProgress(true)
             enableSwipe(false)
             showEmpty(false)
@@ -104,7 +99,8 @@ class GradeStatisticsPresenter @Inject constructor(
         Timber.i("Select grade stats semester: $type")
         disposable.clear()
         view?.run {
-            showContent(false)
+            showBarContent(false)
+            showPieContent(false)
             showProgress(true)
             enableSwipe(false)
             showEmpty(false)
@@ -117,44 +113,42 @@ class GradeStatisticsPresenter @Inject constructor(
     private fun loadSubjects() {
         Timber.i("Loading grade stats subjects started")
         disposable.add(studentRepository.getCurrentStudent()
-            .flatMap { student ->
-                semesterRepository.getCurrentSemester(student).flatMap { semester ->
-                    subjectRepository.getSubjects(student, semester)
-                }
-            }
+            .flatMap { semesterRepository.getCurrentSemester(it) }
+            .flatMap { subjectRepository.getSubjects(it) }
             .doOnSuccess { subjects = it }
             .map { ArrayList(it.map { subject -> subject.name }) }
             .subscribeOn(schedulers.backgroundThread)
             .observeOn(schedulers.mainThread)
             .subscribe({
                 Timber.i("Loading grade stats subjects result: Success")
-                view?.updateSubjects(it)
+                view?.run {
+                    updateSubjects(it)
+                    showSubjects(true)
+                }
             }, {
-                Timber.i("Loading grade stats subjects result: An exception occurred")
+                Timber.e("Loading grade stats subjects result: An exception occurred")
                 errorHandler.dispatch(it)
             })
         )
     }
 
     private fun loadDataByType(semesterId: Int, subjectName: String, type: ViewType, forceRefresh: Boolean = false) {
-        currentSubjectName = if (preferencesRepository.showAllSubjectsOnStatisticsList) "Wszystkie" else subjectName
+        currentSubjectName = subjectName
         currentType = type
+        when (type) {
+            ViewType.SEMESTER -> loadData(semesterId, subjectName, true, forceRefresh)
+            ViewType.PARTIAL -> loadData(semesterId, subjectName, false, forceRefresh)
+            ViewType.POINTS -> loadPointsData(semesterId, subjectName, forceRefresh)
+        }
+    }
 
+    private fun loadData(semesterId: Int, subjectName: String, isSemester: Boolean, forceRefresh: Boolean = false) {
         Timber.i("Loading grade stats data started")
         disposable.add(studentRepository.getCurrentStudent()
-            .flatMap { student ->
-                semesterRepository.getSemesters(student).flatMap { semesters ->
-                    val semester = semesters.first { item -> item.semesterId == semesterId }
-
-                    with(gradeStatisticsRepository) {
-                        when (type) {
-                            ViewType.SEMESTER -> getGradesStatistics(student, semester, currentSubjectName, true, forceRefresh)
-                            ViewType.PARTIAL -> getGradesStatistics(student, semester, currentSubjectName, false, forceRefresh)
-                            ViewType.POINTS -> getGradesPointsStatistics(student, semester, currentSubjectName, forceRefresh)
-                        }
-                    }
-                }
-            }
+            .flatMap { semesterRepository.getSemesters(it) }
+            .flatMap { gradeStatisticsRepository.getGradesStatistics(it.first { item -> item.semesterId == semesterId }, subjectName, isSemester, forceRefresh) }
+            .map { list -> list.sortedByDescending { it.grade } }
+            .map { list -> list.filter { it.amount != 0 } }
             .subscribeOn(schedulers.backgroundThread)
             .observeOn(schedulers.mainThread)
             .doFinally {
@@ -169,26 +163,59 @@ class GradeStatisticsPresenter @Inject constructor(
                 Timber.i("Loading grade stats result: Success")
                 view?.run {
                     showEmpty(it.isEmpty())
-                    showContent(it.isNotEmpty())
+                    showBarContent(false)
+                    showPieContent(it.isNotEmpty())
                     showErrorView(false)
-                    updateData(it, preferencesRepository.gradeColorTheme, preferencesRepository.showAllSubjectsOnStatisticsList)
-                    showSubjects(!preferencesRepository.showAllSubjectsOnStatisticsList)
+                    updatePieData(it, preferencesRepository.gradeColorTheme)
                 }
-                analytics.logEvent(
-                    "load_data",
-                    "type" to "grade_statistics",
-                    "items" to it.size,
-                    "force_refresh" to forceRefresh
-                )
+                analytics.logEvent("load_grade_statistics", "items" to it.size, "force_refresh" to forceRefresh)
             }) {
-                Timber.i("Loading grade stats result: An exception occurred")
+                Timber.e("Loading grade stats result: An exception occurred")
                 errorHandler.dispatch(it)
             })
     }
 
+    private fun loadPointsData(semesterId: Int, subjectName: String, forceRefresh: Boolean = false) {
+        Timber.i("Loading grade points stats data started")
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { semesterRepository.getSemesters(it) }
+            .flatMapMaybe { gradeStatisticsRepository.getGradesPointsStatistics(it.first { item -> item.semesterId == semesterId }, subjectName, forceRefresh) }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doFinally {
+                view?.run {
+                    showRefresh(false)
+                    showProgress(false)
+                    enableSwipe(true)
+                    notifyParentDataLoaded(semesterId)
+                }
+            }
+            .subscribe({
+                Timber.i("Loading grade points stats result: Success")
+                view?.run {
+                    showEmpty(false)
+                    showPieContent(false)
+                    showBarContent(true)
+                    showErrorView(false)
+                    updateBarData(it)
+                }
+                analytics.logEvent("load_grade_points_statistics", "force_refresh" to forceRefresh)
+            }, {
+                Timber.e("Loading grade points stats result: An exception occurred")
+                errorHandler.dispatch(it)
+            }, {
+                Timber.d("Loading grade points stats result: No point stats found")
+                view?.run {
+                    showBarContent(false)
+                    showEmpty(true)
+                }
+            })
+        )
+    }
+
     private fun showErrorViewOnError(message: String, error: Throwable) {
         view?.run {
-            if (isViewEmpty) {
+            if ((isBarViewEmpty && currentType == ViewType.POINTS) || (isPieViewEmpty) && currentType != ViewType.POINTS) {
                 lastError = error
                 setErrorDetails(message)
                 showErrorView(true)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsView.kt
index 26b4a119a..003520fbd 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsView.kt
@@ -1,11 +1,14 @@
 package io.github.wulkanowy.ui.modules.grade.statistics
 
-import io.github.wulkanowy.data.pojos.GradeStatisticsItem
+import io.github.wulkanowy.data.db.entities.GradePointsStatistics
+import io.github.wulkanowy.data.db.entities.GradeStatistics
 import io.github.wulkanowy.ui.base.BaseView
 
 interface GradeStatisticsView : BaseView {
 
-    val isViewEmpty: Boolean
+    val isPieViewEmpty: Boolean
+
+    val isBarViewEmpty: Boolean
 
     val currentType: ViewType
 
@@ -13,7 +16,9 @@ interface GradeStatisticsView : BaseView {
 
     fun updateSubjects(data: ArrayList<String>)
 
-    fun updateData(items: List<GradeStatisticsItem>, theme: String, showAllSubjectsOnStatisticsList: Boolean)
+    fun updatePieData(items: List<GradeStatistics>, theme: String)
+
+    fun updateBarData(item: GradePointsStatistics)
 
     fun showSubjects(show: Boolean)
 
@@ -23,9 +28,9 @@ interface GradeStatisticsView : BaseView {
 
     fun clearView()
 
-    fun resetView()
+    fun showPieContent(show: Boolean)
 
-    fun showContent(show: Boolean)
+    fun showBarContent(show: Boolean)
 
     fun showEmpty(show: Boolean)
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/ViewType.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/ViewType.kt
index 02e95b0e5..08c37d587 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/ViewType.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/ViewType.kt
@@ -1,7 +1,7 @@
 package io.github.wulkanowy.ui.modules.grade.statistics
 
-enum class ViewType(val id: Int) {
-    SEMESTER(1),
-    PARTIAL(2),
-    POINTS(3)
+enum class ViewType {
+    SEMESTER,
+    PARTIAL,
+    POINTS
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryAdapter.kt
deleted file mode 100644
index 30c4ccc23..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryAdapter.kt
+++ /dev/null
@@ -1,85 +0,0 @@
-package io.github.wulkanowy.ui.modules.grade.summary
-
-import android.annotation.SuppressLint
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import io.github.wulkanowy.data.db.entities.GradeSummary
-import io.github.wulkanowy.databinding.ItemGradeSummaryBinding
-import io.github.wulkanowy.databinding.ScrollableHeaderGradeSummaryBinding
-import io.github.wulkanowy.utils.calcAverage
-import java.util.Locale
-import javax.inject.Inject
-
-class GradeSummaryAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
-
-    private enum class ViewType(val id: Int) {
-        HEADER(1),
-        ITEM(2)
-    }
-
-    var items = emptyList<GradeSummary>()
-
-    override fun getItemCount() = items.size + 1
-
-    override fun getItemViewType(position: Int) = when (position) {
-        0 -> ViewType.HEADER.id
-        else -> ViewType.ITEM.id
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        val inflater = LayoutInflater.from(parent.context)
-
-        return when (viewType) {
-            ViewType.HEADER.id -> HeaderViewHolder(ScrollableHeaderGradeSummaryBinding.inflate(inflater, parent, false))
-            ViewType.ITEM.id -> ItemViewHolder(ItemGradeSummaryBinding.inflate(inflater, parent, false))
-            else -> throw IllegalStateException()
-        }
-    }
-
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        when (holder) {
-            is HeaderViewHolder -> bindHeaderViewHolder(holder.binding)
-            is ItemViewHolder -> bindItemViewHolder(holder.binding, items[position - 1])
-        }
-    }
-
-    private fun bindHeaderViewHolder(binding: ScrollableHeaderGradeSummaryBinding) {
-        if (items.isEmpty()) return
-
-        with(binding) {
-            gradeSummaryScrollableHeaderFinal.text = formatAverage(items.calcAverage())
-            gradeSummaryScrollableHeaderCalculated.text = formatAverage(items
-                .filter { value -> value.average != 0.0 }
-                .map { values -> values.average }
-                .reversed() // fix average precision
-                .average()
-            )
-        }
-    }
-
-    @SuppressLint("SetTextI18n")
-    private fun bindItemViewHolder(binding: ItemGradeSummaryBinding, item: GradeSummary) {
-        with(binding) {
-            gradeSummaryItemTitle.text = item.subject
-            gradeSummaryItemPoints.text = item.pointsSum
-            gradeSummaryItemAverage.text = formatAverage(item.average, "")
-            gradeSummaryItemPredicted.text = "${item.predictedGrade} ${item.proposedPoints}".trim()
-            gradeSummaryItemFinal.text = "${item.finalGrade} ${item.finalPoints}".trim()
-
-            gradeSummaryItemPointsContainer.visibility = if (item.pointsSum.isBlank()) View.GONE else View.VISIBLE
-        }
-    }
-
-    private fun formatAverage(average: Double, defaultValue: String = "-- --"): String {
-        return if (average == 0.0) defaultValue
-        else String.format(Locale.FRANCE, "%.2f", average)
-    }
-
-    private class HeaderViewHolder(val binding: ScrollableHeaderGradeSummaryBinding) :
-        RecyclerView.ViewHolder(binding.root)
-
-    private class ItemViewHolder(val binding: ItemGradeSummaryBinding) :
-        RecyclerView.ViewHolder(binding.root)
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryFragment.kt
index d169f7c62..05fde5227 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryFragment.kt
@@ -1,35 +1,36 @@
 package io.github.wulkanowy.ui.modules.grade.summary
 
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
 import android.view.View.INVISIBLE
 import android.view.View.VISIBLE
-import androidx.recyclerview.widget.LinearLayoutManager
+import android.view.ViewGroup
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.GradeSummary
-import io.github.wulkanowy.databinding.FragmentGradeSummaryBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.grade.GradeFragment
 import io.github.wulkanowy.ui.modules.grade.GradeView
+import kotlinx.android.synthetic.main.fragment_grade_summary.*
 import javax.inject.Inject
 
-class GradeSummaryFragment :
-    BaseFragment<FragmentGradeSummaryBinding>(R.layout.fragment_grade_summary), GradeSummaryView,
-    GradeView.GradeChildView {
+class GradeSummaryFragment : BaseFragment(), GradeSummaryView, GradeView.GradeChildView {
 
     @Inject
     lateinit var presenter: GradeSummaryPresenter
 
     @Inject
-    lateinit var gradeSummaryAdapter: GradeSummaryAdapter
+    lateinit var gradeSummaryAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
 
     companion object {
         fun newInstance() = GradeSummaryFragment()
     }
 
     override val isViewEmpty
-        get() = gradeSummaryAdapter.items.isEmpty()
+        get() = gradeSummaryAdapter.isEmpty
 
     override val predictedString
         get() = getString(R.string.grade_summary_predicted_grade)
@@ -37,69 +38,70 @@ class GradeSummaryFragment :
     override val finalString
         get() = getString(R.string.grade_summary_final_grade)
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding = FragmentGradeSummaryBinding.bind(view)
-        messageContainer = binding.gradeSummaryRecycler
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_grade_summary, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        messageContainer = gradeSummaryRecycler
         presenter.onAttachView(this)
     }
 
     override fun initView() {
-        with(binding.gradeSummaryRecycler) {
-            layoutManager = LinearLayoutManager(context)
+        gradeSummaryAdapter.setDisplayHeadersAtStartUp(true)
+
+        gradeSummaryRecycler.run {
+            layoutManager = SmoothScrollLinearLayoutManager(context)
             adapter = gradeSummaryAdapter
         }
-        with(binding) {
-            gradeSummarySwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
-            gradeSummaryErrorRetry.setOnClickListener { presenter.onRetry() }
-            gradeSummaryErrorDetails.setOnClickListener { presenter.onDetailsClick() }
-        }
+        gradeSummarySwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
+        gradeSummaryErrorRetry.setOnClickListener { presenter.onRetry() }
+        gradeSummaryErrorDetails.setOnClickListener { presenter.onDetailsClick() }
     }
 
-    override fun updateData(data: List<GradeSummary>) {
-        with(gradeSummaryAdapter) {
-            items = data
-            notifyDataSetChanged()
+    override fun updateData(data: List<GradeSummaryItem>, header: GradeSummaryScrollableHeader) {
+        gradeSummaryAdapter.apply {
+            updateDataSet(data, true)
+            removeAllScrollableHeaders()
+            addScrollableHeader(header)
         }
     }
 
     override fun clearView() {
-        with(gradeSummaryAdapter) {
-            items = emptyList()
-            notifyDataSetChanged()
-        }
+        gradeSummaryAdapter.clear()
     }
 
     override fun resetView() {
-        binding.gradeSummaryRecycler.scrollToPosition(0)
+        gradeSummaryRecycler.scrollToPosition(0)
     }
 
     override fun showContent(show: Boolean) {
-        binding.gradeSummaryRecycler.visibility = if (show) VISIBLE else INVISIBLE
+        gradeSummaryRecycler.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun showEmpty(show: Boolean) {
-        binding.gradeSummaryEmpty.visibility = if (show) VISIBLE else INVISIBLE
+        gradeSummaryEmpty.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun showErrorView(show: Boolean) {
-        binding.gradeSummaryError.visibility = if (show) VISIBLE else INVISIBLE
+        gradeSummaryError.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun setErrorDetails(message: String) {
-        binding.gradeSummaryErrorMessage.text = message
+        gradeSummaryErrorMessage.text = message
     }
 
     override fun showProgress(show: Boolean) {
-        binding.gradeSummaryProgress.visibility = if (show) VISIBLE else GONE
+        gradeSummaryProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun enableSwipe(enable: Boolean) {
-        binding.gradeSummarySwipe.isEnabled = enable
+        gradeSummarySwipe.isEnabled = enable
     }
 
     override fun showRefresh(show: Boolean) {
-        binding.gradeSummarySwipe.isRefreshing = show
+        gradeSummarySwipe.isRefreshing = show
     }
 
     override fun onParentLoadData(semesterId: Int, forceRefresh: Boolean) {
@@ -123,7 +125,7 @@ class GradeSummaryFragment :
     }
 
     override fun onDestroyView() {
-        presenter.onDetachView()
         super.onDestroyView()
+        presenter.onDetachView()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryItem.kt
new file mode 100644
index 000000000..95c32d176
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryItem.kt
@@ -0,0 +1,64 @@
+package io.github.wulkanowy.ui.modules.grade.summary
+
+import android.annotation.SuppressLint
+import android.view.View
+import android.view.View.GONE
+import android.view.View.VISIBLE
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.FlexibleViewHolder
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.GradeSummary
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.item_grade_summary.*
+
+class GradeSummaryItem(
+    val summary: GradeSummary,
+    private val average: String
+) : AbstractFlexibleItem<GradeSummaryItem.ViewHolder>() {
+
+    override fun getLayoutRes() = R.layout.item_grade_summary
+
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): ViewHolder {
+        return ViewHolder(view, adapter)
+    }
+
+    @SuppressLint("SetTextI18n")
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
+        holder.run {
+            gradeSummaryItemTitle.text = summary.subject
+            gradeSummaryItemPoints.text = summary.pointsSum
+            gradeSummaryItemAverage.text = average
+            gradeSummaryItemPredicted.text = "${summary.predictedGrade} ${summary.proposedPoints}".trim()
+            gradeSummaryItemFinal.text = "${summary.finalGrade} ${summary.finalPoints}".trim()
+
+            gradeSummaryItemPointsContainer.visibility = if (summary.pointsSum.isBlank()) GONE else VISIBLE
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as GradeSummaryItem
+
+        if (average != other.average) return false
+        if (summary != other.summary) return false
+        if (summary.id != other.summary.id) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = summary.hashCode()
+        result = 31 * result + summary.id.hashCode()
+        result = 31 * result + average.hashCode()
+        return result
+    }
+
+    class ViewHolder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter), LayoutContainer {
+        override val containerView: View
+            get() = contentView
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryPresenter.kt
index 229a0107d..5f4412773 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryPresenter.kt
@@ -1,20 +1,26 @@
 package io.github.wulkanowy.ui.modules.grade.summary
 
 import io.github.wulkanowy.data.db.entities.GradeSummary
+import io.github.wulkanowy.data.repositories.gradessummary.GradeSummaryRepository
+import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.ui.modules.grade.GradeAverageProvider
-import io.github.wulkanowy.ui.modules.grade.GradeDetailsWithAverage
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 import io.github.wulkanowy.utils.SchedulersProvider
+import io.github.wulkanowy.utils.calcAverage
 import timber.log.Timber
+import java.lang.String.format
+import java.util.Locale.FRANCE
 import javax.inject.Inject
 
 class GradeSummaryPresenter @Inject constructor(
     schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
+    private val gradeSummaryRepository: GradeSummaryRepository,
+    private val semesterRepository: SemesterRepository,
     private val averageProvider: GradeAverageProvider,
     private val analytics: FirebaseAnalyticsHelper
 ) : BasePresenter<GradeSummaryView>(errorHandler, studentRepository, schedulers) {
@@ -30,8 +36,15 @@ class GradeSummaryPresenter @Inject constructor(
     fun onParentViewLoadData(semesterId: Int, forceRefresh: Boolean) {
         Timber.i("Loading grade summary data started")
         disposable.add(studentRepository.getCurrentStudent()
-            .flatMap { averageProvider.getGradesDetailsWithAverage(it, semesterId, forceRefresh) }
-            .map { createGradeSummaryItems(it) }
+            .flatMap { semesterRepository.getSemesters(it).map { semesters -> it to semesters } }
+            .flatMap { (student, semesters) ->
+                gradeSummaryRepository.getGradesSummary(semesters.first { it.semesterId == semesterId }, forceRefresh)
+                    .map { it.sortedBy { subject -> subject.subject } }
+                    .flatMap { gradesSummary ->
+                        averageProvider.getGradeAverage(student, semesters, semesterId, forceRefresh)
+                            .map { averages -> createGradeSummaryItemsAndHeader(gradesSummary, averages) }
+                    }
+            }
             .subscribeOn(schedulers.backgroundThread)
             .observeOn(schedulers.mainThread)
             .doFinally {
@@ -41,20 +54,15 @@ class GradeSummaryPresenter @Inject constructor(
                     enableSwipe(true)
                     notifyParentDataLoaded(semesterId)
                 }
-            }.subscribe({
+            }.subscribe({ (gradeSummaryItems, gradeSummaryHeader) ->
                 Timber.i("Loading grade summary result: Success")
                 view?.run {
-                    showEmpty(it.isEmpty())
-                    showContent(it.isNotEmpty())
+                    showEmpty(gradeSummaryItems.isEmpty())
+                    showContent(gradeSummaryItems.isNotEmpty())
                     showErrorView(false)
-                    updateData(it)
+                    updateData(gradeSummaryItems, gradeSummaryHeader)
                 }
-                analytics.logEvent(
-                    "load_data",
-                    "type" to "grade_summary",
-                    "items" to it.size,
-                    "force_refresh" to forceRefresh
-                )
+                analytics.logEvent("load_grade_summary", "items" to gradeSummaryItems.size, "force_refresh" to forceRefresh)
             }) {
                 Timber.i("Loading grade summary result: An exception occurred")
                 errorHandler.dispatch(it)
@@ -107,19 +115,31 @@ class GradeSummaryPresenter @Inject constructor(
         disposable.clear()
     }
 
-    private fun createGradeSummaryItems(items: List<GradeDetailsWithAverage>): List<GradeSummary> {
-        return items
-            .filter { !checkEmpty(it) }
-            .sortedBy { it.subject }
-            .map { it.summary.copy(average = it.average) }
+    private fun createGradeSummaryItemsAndHeader(gradesSummary: List<GradeSummary>, averages: List<Triple<String, Double, String>>): Pair<List<GradeSummaryItem>, GradeSummaryScrollableHeader> {
+        return averages.filter { value -> value.second != 0.0 }
+            .let { filteredAverages ->
+                gradesSummary.filter { !checkEmpty(it, filteredAverages) }
+                    .map { gradeSummary ->
+                        GradeSummaryItem(
+                            summary = gradeSummary,
+                            average = formatAverage(filteredAverages.singleOrNull { gradeSummary.subject == it.first }?.second ?: .0, "")
+                        )
+                    }.let {
+                        it to GradeSummaryScrollableHeader(
+                            formatAverage(gradesSummary.calcAverage()),
+                            formatAverage(filteredAverages.map { values -> values.second }.average()))
+                    }
+            }
     }
 
-    private fun checkEmpty(gradeSummary: GradeDetailsWithAverage): Boolean {
+    private fun checkEmpty(gradeSummary: GradeSummary, averages: List<Triple<String, Double, String>>): Boolean {
         return gradeSummary.run {
-            summary.finalGrade.isBlank()
-                && summary.predictedGrade.isBlank()
-                && average == .0
-                && points.isBlank()
+            finalGrade.isBlank() && predictedGrade.isBlank() && averages.singleOrNull { it.first == subject } == null
         }
     }
+
+    private fun formatAverage(average: Double, defaultValue: String = "-- --"): String {
+        return if (average == 0.0) defaultValue
+        else format(FRANCE, "%.2f", average)
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryScrollableHeader.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryScrollableHeader.kt
new file mode 100644
index 000000000..f1c535c71
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryScrollableHeader.kt
@@ -0,0 +1,53 @@
+package io.github.wulkanowy.ui.modules.grade.summary
+
+import android.view.View
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.FlexibleViewHolder
+import io.github.wulkanowy.R
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.scrollable_header_grade_summary.*
+
+class GradeSummaryScrollableHeader(private val finalAverage: String, private val calculatedAverage: String)
+    : AbstractFlexibleItem<GradeSummaryScrollableHeader.ViewHolder>() {
+
+    override fun getLayoutRes() = R.layout.scrollable_header_grade_summary
+
+    override fun createViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?): ViewHolder {
+        return ViewHolder(view, adapter)
+    }
+
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>?, holder: ViewHolder?,
+                                position: Int, payloads: MutableList<Any>?) {
+        holder?.apply {
+            gradeSummaryScrollableHeaderFinal.text = finalAverage
+            gradeSummaryScrollableHeaderCalculated.text = calculatedAverage
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as GradeSummaryScrollableHeader
+
+        if (calculatedAverage != other.calculatedAverage) return false
+        if (finalAverage != other.finalAverage) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = calculatedAverage.hashCode()
+        result = 31 * result + finalAverage.hashCode()
+        return result
+    }
+
+    class ViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?) : FlexibleViewHolder(view, adapter),
+            LayoutContainer {
+
+        override val containerView: View?
+            get() = contentView
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryView.kt
index 974d91415..cf3184873 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryView.kt
@@ -1,6 +1,5 @@
 package io.github.wulkanowy.ui.modules.grade.summary
 
-import io.github.wulkanowy.data.db.entities.GradeSummary
 import io.github.wulkanowy.ui.base.BaseView
 
 interface GradeSummaryView : BaseView {
@@ -13,7 +12,7 @@ interface GradeSummaryView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<GradeSummary>)
+    fun updateData(data: List<GradeSummaryItem>, header: GradeSummaryScrollableHeader)
 
     fun resetView()
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkAdapter.kt
deleted file mode 100644
index a87ad18e8..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkAdapter.kt
+++ /dev/null
@@ -1,67 +0,0 @@
-package io.github.wulkanowy.ui.modules.homework
-
-import android.annotation.SuppressLint
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import io.github.wulkanowy.data.db.entities.Homework
-import io.github.wulkanowy.databinding.HeaderHomeworkBinding
-import io.github.wulkanowy.databinding.ItemHomeworkBinding
-import io.github.wulkanowy.utils.toFormattedString
-import io.github.wulkanowy.utils.weekDayName
-import org.threeten.bp.LocalDate
-import javax.inject.Inject
-
-class HomeworkAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
-
-    var items = emptyList<HomeworkItem<*>>()
-
-    var onClickListener: (Homework) -> Unit = {}
-
-    override fun getItemCount() = items.size
-
-    override fun getItemViewType(position: Int) = items[position].viewType.id
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        val inflater = LayoutInflater.from(parent.context)
-
-        return when (viewType) {
-            HomeworkItem.ViewType.HEADER.id -> HeaderViewHolder(HeaderHomeworkBinding.inflate(inflater, parent, false))
-            HomeworkItem.ViewType.ITEM.id -> ItemViewHolder(ItemHomeworkBinding.inflate(inflater, parent, false))
-            else -> throw IllegalStateException()
-        }
-    }
-
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        when (holder) {
-            is HeaderViewHolder -> bindHeaderViewHolder(holder.binding, items[position].value as LocalDate)
-            is ItemViewHolder -> bindItemViewHolder(holder.binding, items[position].value as Homework)
-        }
-    }
-
-    @SuppressLint("DefaultLocale")
-    private fun bindHeaderViewHolder(binding: HeaderHomeworkBinding, date: LocalDate) {
-        with(binding) {
-            homeworkHeaderDay.text = date.weekDayName.capitalize()
-            homeworkHeaderDate.text = date.toFormattedString()
-        }
-    }
-
-    private fun bindItemViewHolder(binding: ItemHomeworkBinding, homework: Homework) {
-        with(binding) {
-            homeworkItemSubject.text = homework.subject
-            homeworkItemTeacher.text = homework.teacher
-            homeworkItemContent.text = homework.content
-            homeworkItemCheckImage.visibility = if (homework.isDone) View.VISIBLE else View.GONE
-            homeworkItemAttachmentImage.visibility = if (!homework.isDone && homework.attachments.isNotEmpty()) View.VISIBLE else View.GONE
-
-            root.setOnClickListener { onClickListener(homework) }
-        }
-    }
-
-    class HeaderViewHolder(val binding: HeaderHomeworkBinding) :
-        RecyclerView.ViewHolder(binding.root)
-
-    class ItemViewHolder(val binding: ItemHomeworkBinding) : RecyclerView.ViewHolder(binding.root)
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkDialog.kt
new file mode 100644
index 000000000..427841886
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkDialog.kt
@@ -0,0 +1,49 @@
+package io.github.wulkanowy.ui.modules.homework
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.DialogFragment
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Homework
+import io.github.wulkanowy.utils.toFormattedString
+import kotlinx.android.synthetic.main.dialog_homework.*
+
+class HomeworkDialog : DialogFragment() {
+
+    private lateinit var homework: Homework
+
+    companion object {
+        private const val ARGUMENT_KEY = "Item"
+
+        fun newInstance(homework: Homework): HomeworkDialog {
+            return HomeworkDialog().apply {
+                arguments = Bundle().apply { putSerializable(ARGUMENT_KEY, homework) }
+            }
+        }
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setStyle(STYLE_NO_TITLE, 0)
+        arguments?.run {
+            homework = getSerializable(HomeworkDialog.ARGUMENT_KEY) as Homework
+        }
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.dialog_homework, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+
+        homeworkDialogDate.text = homework.date.toFormattedString()
+        homeworkDialogEntryDate.text = homework.entryDate.toFormattedString()
+        homeworkDialogSubject.text = homework.subject
+        homeworkDialogTeacher.text = homework.teacher
+        homeworkDialogContent.text = homework.content
+        homeworkDialogClose.setOnClickListener { dismiss() }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkFragment.kt
index f30529575..3f8f1359a 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkFragment.kt
@@ -1,29 +1,32 @@
 package io.github.wulkanowy.ui.modules.homework
 
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
-import androidx.recyclerview.widget.LinearLayoutManager
+import android.view.ViewGroup
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.common.FlexibleItemDecoration
+import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Homework
-import io.github.wulkanowy.databinding.FragmentHomeworkBinding
 import io.github.wulkanowy.ui.base.BaseFragment
-import io.github.wulkanowy.ui.modules.homework.details.HomeworkDetailsDialog
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
-import io.github.wulkanowy.ui.widgets.DividerItemDecoration
 import io.github.wulkanowy.utils.dpToPx
+import io.github.wulkanowy.utils.setOnItemClickListener
+import kotlinx.android.synthetic.main.fragment_homework.*
 import javax.inject.Inject
 
-class HomeworkFragment : BaseFragment<FragmentHomeworkBinding>(R.layout.fragment_homework),
-    HomeworkView, MainView.TitledView {
+class HomeworkFragment : BaseFragment(), HomeworkView, MainView.TitledView {
 
     @Inject
     lateinit var presenter: HomeworkPresenter
 
     @Inject
-    lateinit var homeworkAdapter: HomeworkAdapter
+    lateinit var homeworkAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
 
     companion object {
         private const val SAVED_DATE_KEY = "CURRENT_DATE"
@@ -33,96 +36,89 @@ class HomeworkFragment : BaseFragment<FragmentHomeworkBinding>(R.layout.fragment
 
     override val titleStringId get() = R.string.homework_title
 
-    override val isViewEmpty get() = homeworkAdapter.items.isEmpty()
+    override val isViewEmpty get() = homeworkAdapter.isEmpty
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding = FragmentHomeworkBinding.bind(view)
-        messageContainer = binding.homeworkRecycler
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_homework, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        messageContainer = homeworkRecycler
         presenter.onAttachView(this, savedInstanceState?.getLong(SAVED_DATE_KEY))
     }
 
     override fun initView() {
-        homeworkAdapter.onClickListener = presenter::onHomeworkItemSelected
+        homeworkAdapter.setOnItemClickListener(presenter::onHomeworkItemSelected)
 
-        with(binding.homeworkRecycler) {
-            layoutManager = LinearLayoutManager(context)
+        with(homeworkRecycler) {
+            layoutManager = SmoothScrollLinearLayoutManager(context)
             adapter = homeworkAdapter
-            addItemDecoration(DividerItemDecoration(context))
+            addItemDecoration(FlexibleItemDecoration(context)
+                .withDefaultDivider()
+                .withDrawDividerOnLastItem(false))
         }
 
-        with(binding) {
-            homeworkSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
-            homeworkErrorRetry.setOnClickListener { presenter.onRetry() }
-            homeworkErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+        homeworkSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
+        homeworkErrorRetry.setOnClickListener { presenter.onRetry() }
+        homeworkErrorDetails.setOnClickListener { presenter.onDetailsClick() }
 
-            homeworkPreviousButton.setOnClickListener { presenter.onPreviousDay() }
-            homeworkNextButton.setOnClickListener { presenter.onNextDay() }
+        homeworkPreviousButton.setOnClickListener { presenter.onPreviousDay() }
+        homeworkNextButton.setOnClickListener { presenter.onNextDay() }
 
-            homeworkNavContainer.setElevationCompat(requireContext().dpToPx(8f))
-        }
+        homeworkNavContainer.setElevationCompat(requireContext().dpToPx(8f))
     }
 
-    override fun updateData(data: List<HomeworkItem<*>>) {
-        with(homeworkAdapter) {
-            items = data
-            notifyDataSetChanged()
-        }
-    }
-
-    fun onReloadList() {
-        presenter.reloadData()
+    override fun updateData(data: List<HomeworkItem>) {
+        homeworkAdapter.updateDataSet(data, true)
     }
 
     override fun clearData() {
-        with(homeworkAdapter) {
-            items = emptyList()
-            notifyDataSetChanged()
-        }
+        homeworkAdapter.clear()
     }
 
     override fun updateNavigationWeek(date: String) {
-        binding.homeworkNavDate.text = date
+        homeworkNavDate.text = date
     }
 
     override fun hideRefresh() {
-        binding.homeworkSwipe.isRefreshing = false
+        homeworkSwipe.isRefreshing = false
     }
 
     override fun showEmpty(show: Boolean) {
-        binding.homeworkEmpty.visibility = if (show) VISIBLE else GONE
+        homeworkEmpty.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showErrorView(show: Boolean) {
-        binding.homeworkError.visibility = if (show) VISIBLE else GONE
+        homeworkError.visibility = if (show) VISIBLE else GONE
     }
 
     override fun setErrorDetails(message: String) {
-        binding.homeworkErrorMessage.text = message
+        homeworkErrorMessage.text = message
     }
 
     override fun showProgress(show: Boolean) {
-        binding.homeworkProgress.visibility = if (show) VISIBLE else GONE
+        homeworkProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun enableSwipe(enable: Boolean) {
-        binding.homeworkSwipe.isEnabled = enable
+        homeworkSwipe.isEnabled = enable
     }
 
     override fun showContent(show: Boolean) {
-        binding.homeworkRecycler.visibility = if (show) VISIBLE else GONE
+        homeworkRecycler.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showPreButton(show: Boolean) {
-        binding.homeworkPreviousButton.visibility = if (show) VISIBLE else View.INVISIBLE
+        homeworkPreviousButton.visibility = if (show) VISIBLE else View.INVISIBLE
     }
 
     override fun showNextButton(show: Boolean) {
-        binding.homeworkNextButton.visibility = if (show) VISIBLE else View.INVISIBLE
+        homeworkNextButton.visibility = if (show) VISIBLE else View.INVISIBLE
     }
 
     override fun showTimetableDialog(homework: Homework) {
-        (activity as? MainActivity)?.showDialogFragment(HomeworkDetailsDialog.newInstance(homework))
+        (activity as? MainActivity)?.showDialogFragment(HomeworkDialog.newInstance(homework))
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkHeader.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkHeader.kt
new file mode 100644
index 000000000..490237883
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkHeader.kt
@@ -0,0 +1,54 @@
+package io.github.wulkanowy.ui.modules.homework
+
+import android.view.View
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractHeaderItem
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.ExpandableViewHolder
+import io.github.wulkanowy.R
+import io.github.wulkanowy.utils.toFormattedString
+import io.github.wulkanowy.utils.weekDayName
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.header_homework.*
+import org.threeten.bp.LocalDate
+
+class HomeworkHeader(private val date: LocalDate) : AbstractHeaderItem<HomeworkHeader.ViewHolder>() {
+
+    override fun getLayoutRes() = R.layout.header_homework
+
+    override fun createViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?): ViewHolder {
+        return ViewHolder(view, adapter)
+    }
+
+    override fun bindViewHolder(
+        adapter: FlexibleAdapter<IFlexible<*>>?, holder: HomeworkHeader.ViewHolder,
+        position: Int, payloads: MutableList<Any>?
+    ) {
+        holder.run {
+            homeworkHeaderDay.text = date.weekDayName.capitalize()
+            homeworkHeaderDate.text = date.toFormattedString()
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as HomeworkHeader
+
+        if (date != other.date) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        return date.hashCode()
+    }
+
+    class ViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?) : ExpandableViewHolder(view, adapter),
+        LayoutContainer {
+
+        override val containerView: View
+            get() = contentView
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkItem.kt
index 7e0039583..2de9233f2 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkItem.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkItem.kt
@@ -1,9 +1,50 @@
 package io.github.wulkanowy.ui.modules.homework
 
-data class HomeworkItem<out T>(val value: T, val viewType: ViewType) {
+import android.view.View
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractSectionableItem
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.FlexibleViewHolder
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Homework
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.item_homework.*
 
-    enum class ViewType(val id: Int) {
-        HEADER(1),
-        ITEM(2)
+class HomeworkItem(header: HomeworkHeader, val homework: Homework) :
+    AbstractSectionableItem<HomeworkItem.ViewHolder, HomeworkHeader>(header) {
+
+    override fun getLayoutRes() = R.layout.item_homework
+
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): ViewHolder {
+        return ViewHolder(view, adapter)
+    }
+
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
+        holder.apply {
+            homeworkItemSubject.text = homework.subject
+            homeworkItemTeacher.text = homework.teacher
+            homeworkItemContent.text = homework.content
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as HomeworkItem
+
+        if (homework != other.homework) return false
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = homework.hashCode()
+        result = 31 * result + homework.id.toInt()
+        return result
+    }
+
+    class ViewHolder(val view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter), LayoutContainer {
+        override val containerView: View
+            get() = contentView
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkPresenter.kt
index 41735a23f..7e1da314b 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkPresenter.kt
@@ -1,5 +1,6 @@
 package io.github.wulkanowy.ui.modules.homework
 
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.db.entities.Homework
 import io.github.wulkanowy.data.repositories.homework.HomeworkRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
@@ -8,7 +9,7 @@ import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 import io.github.wulkanowy.utils.SchedulersProvider
-import io.github.wulkanowy.utils.sunday
+import io.github.wulkanowy.utils.friday
 import io.github.wulkanowy.utils.getLastSchoolDayIfHoliday
 import io.github.wulkanowy.utils.isHolidays
 import io.github.wulkanowy.utils.monday
@@ -17,6 +18,7 @@ import io.github.wulkanowy.utils.toFormattedString
 import org.threeten.bp.LocalDate
 import org.threeten.bp.LocalDate.ofEpochDay
 import timber.log.Timber
+import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
 class HomeworkPresenter @Inject constructor(
@@ -72,9 +74,11 @@ class HomeworkPresenter @Inject constructor(
         view?.showErrorDetailsDialog(lastError)
     }
 
-    fun onHomeworkItemSelected(homework: Homework) {
-        Timber.i("Select homework item ${homework.id}")
-        view?.showTimetableDialog(homework)
+    fun onHomeworkItemSelected(item: AbstractFlexibleItem<*>?) {
+        if (item is HomeworkItem) {
+            Timber.i("Select homework item ${item.homework.id}")
+            view?.showTimetableDialog(item.homework)
+        }
     }
 
     private fun setBaseDateOnHolidays() {
@@ -91,21 +95,16 @@ class HomeworkPresenter @Inject constructor(
             })
     }
 
-    fun reloadData() {
-        loadData(currentDate, false)
-    }
-
     private fun loadData(date: LocalDate, forceRefresh: Boolean = false) {
         Timber.i("Loading homework data started")
         currentDate = date
         disposable.apply {
             clear()
             add(studentRepository.getCurrentStudent()
-                .flatMap { student ->
-                    semesterRepository.getCurrentSemester(student).flatMap { semester ->
-                        homeworkRepository.getHomework(student, semester, currentDate, currentDate, forceRefresh)
-                    }
-                }
+                .delay(200, TimeUnit.MILLISECONDS)
+                .flatMap { semesterRepository.getCurrentSemester(it) }
+                .flatMap { homeworkRepository.getHomework(it, currentDate, currentDate, forceRefresh) }
+                .map { it.groupBy { homework -> homework.date }.toSortedMap() }
                 .map { createHomeworkItem(it) }
                 .subscribeOn(schedulers.backgroundThread)
                 .observeOn(schedulers.mainThread)
@@ -124,12 +123,7 @@ class HomeworkPresenter @Inject constructor(
                         showErrorView(false)
                         showContent(it.isNotEmpty())
                     }
-                    analytics.logEvent(
-                        "load_data",
-                        "type" to "homework",
-                        "items" to it.size,
-                        "force_refresh" to forceRefresh
-                    )
+                    analytics.logEvent("load_homework", "items" to it.size, "force_refresh" to forceRefresh)
                 }) {
                     Timber.i("Loading homework result: An exception occurred")
 
@@ -149,12 +143,12 @@ class HomeworkPresenter @Inject constructor(
         }
     }
 
-    private fun createHomeworkItem(items: List<Homework>): List<HomeworkItem<*>> {
-        return items.groupBy { it.date }.toSortedMap().map { (date, exams) ->
-            listOf(HomeworkItem(date, HomeworkItem.ViewType.HEADER)) + exams.reversed().map { exam ->
-                HomeworkItem(exam, HomeworkItem.ViewType.ITEM)
+    private fun createHomeworkItem(items: Map<LocalDate, List<Homework>>): List<HomeworkItem> {
+        return items.flatMap {
+            HomeworkHeader(it.key).let { header ->
+                it.value.reversed().map { item -> HomeworkItem(header, item) }
             }
-        }.flatten()
+        }
     }
 
     private fun reloadView() {
@@ -175,7 +169,7 @@ class HomeworkPresenter @Inject constructor(
             showPreButton(!currentDate.minusDays(7).isHolidays)
             showNextButton(!currentDate.plusDays(7).isHolidays)
             updateNavigationWeek("${currentDate.monday.toFormattedString("dd.MM")} - " +
-                currentDate.sunday.toFormattedString("dd.MM"))
+                currentDate.friday.toFormattedString("dd.MM"))
         }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkView.kt
index 2a678cd4c..1d241df46 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkView.kt
@@ -9,7 +9,7 @@ interface HomeworkView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<HomeworkItem<*>>)
+    fun updateData(data: List<HomeworkItem>)
 
     fun clearData()
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsAdapter.kt
deleted file mode 100644
index 5d6ee162a..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsAdapter.kt
+++ /dev/null
@@ -1,102 +0,0 @@
-package io.github.wulkanowy.ui.modules.homework.details
-
-import android.view.LayoutInflater
-import android.view.View.GONE
-import android.view.View.VISIBLE
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import io.github.wulkanowy.data.db.entities.Homework
-import io.github.wulkanowy.databinding.ItemHomeworkDialogAttachmentBinding
-import io.github.wulkanowy.databinding.ItemHomeworkDialogAttachmentsHeaderBinding
-import io.github.wulkanowy.databinding.ItemHomeworkDialogDetailsBinding
-import io.github.wulkanowy.utils.toFormattedString
-import javax.inject.Inject
-
-class HomeworkDetailsAdapter @Inject constructor() :
-    RecyclerView.Adapter<RecyclerView.ViewHolder>() {
-
-    private enum class ViewType(val id: Int) {
-        DETAILS(1),
-        ATTACHMENTS_HEADER(2),
-        ATTACHMENT(3)
-    }
-
-    private var attachments = emptyList<Pair<String, String>>()
-
-    var homework: Homework? = null
-        set(value) {
-            field = value
-            attachments = value?.attachments.orEmpty()
-        }
-
-    var onAttachmentClickListener: (url: String) -> Unit = {}
-
-    var onFullScreenClickListener = {}
-
-    var onFullScreenExitClickListener = {}
-
-    override fun getItemCount() = 1 + if (attachments.isNotEmpty()) attachments.size + 1 else 0
-
-    override fun getItemViewType(position: Int) = when (position) {
-        0 -> ViewType.DETAILS.id
-        1 -> ViewType.ATTACHMENTS_HEADER.id
-        else -> ViewType.ATTACHMENT.id
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        val inflater = LayoutInflater.from(parent.context)
-
-        return when (viewType) {
-            ViewType.ATTACHMENTS_HEADER.id -> AttachmentsHeaderViewHolder(ItemHomeworkDialogAttachmentsHeaderBinding.inflate(inflater, parent, false))
-            ViewType.ATTACHMENT.id -> AttachmentViewHolder(ItemHomeworkDialogAttachmentBinding.inflate(inflater, parent, false))
-            else -> DetailsViewHolder(ItemHomeworkDialogDetailsBinding.inflate(inflater, parent, false))
-        }
-    }
-
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        when (holder) {
-            is DetailsViewHolder -> bindDetailsViewHolder(holder)
-            is AttachmentViewHolder -> bindAttachmentViewHolder(holder, position - 2)
-        }
-    }
-
-    private fun bindDetailsViewHolder(holder: DetailsViewHolder) {
-        with(holder.binding) {
-            homeworkDialogDate.text = homework?.date?.toFormattedString()
-            homeworkDialogEntryDate.text = homework?.entryDate?.toFormattedString()
-            homeworkDialogSubject.text = homework?.subject
-            homeworkDialogTeacher.text = homework?.teacher
-            homeworkDialogContent.text = homework?.content
-            homeworkDialogFullScreen.setOnClickListener {
-                homeworkDialogFullScreen.visibility = GONE
-                homeworkDialogFullScreenExit.visibility = VISIBLE
-                onFullScreenClickListener()
-            }
-            homeworkDialogFullScreenExit.setOnClickListener {
-                homeworkDialogFullScreen.visibility = VISIBLE
-                homeworkDialogFullScreenExit.visibility = GONE
-                onFullScreenExitClickListener()
-            }
-        }
-    }
-
-    private fun bindAttachmentViewHolder(holder: AttachmentViewHolder, position: Int) {
-        val item = attachments[position]
-
-        with(holder.binding) {
-            homeworkDialogAttachment.text = item.second
-            root.setOnClickListener {
-                onAttachmentClickListener(item.first)
-            }
-        }
-    }
-
-    class DetailsViewHolder(val binding: ItemHomeworkDialogDetailsBinding) :
-        RecyclerView.ViewHolder(binding.root)
-
-    class AttachmentsHeaderViewHolder(val binding: ItemHomeworkDialogAttachmentsHeaderBinding) :
-        RecyclerView.ViewHolder(binding.root)
-
-    class AttachmentViewHolder(val binding: ItemHomeworkDialogAttachmentBinding) :
-        RecyclerView.ViewHolder(binding.root)
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsDialog.kt
deleted file mode 100644
index 7b3b9821a..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsDialog.kt
+++ /dev/null
@@ -1,84 +0,0 @@
-package io.github.wulkanowy.ui.modules.homework.details
-
-import android.annotation.SuppressLint
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.view.ViewGroup.LayoutParams.MATCH_PARENT
-import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
-import androidx.recyclerview.widget.LinearLayoutManager
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Homework
-import io.github.wulkanowy.databinding.DialogHomeworkBinding
-import io.github.wulkanowy.ui.base.BaseDialogFragment
-import io.github.wulkanowy.ui.modules.homework.HomeworkFragment
-import io.github.wulkanowy.utils.openInternetBrowser
-import javax.inject.Inject
-
-class HomeworkDetailsDialog : BaseDialogFragment<DialogHomeworkBinding>(), HomeworkDetailsView {
-
-    @Inject
-    lateinit var presenter: HomeworkDetailsPresenter
-
-    @Inject
-    lateinit var detailsAdapter: HomeworkDetailsAdapter
-
-    private lateinit var homework: Homework
-
-    companion object {
-        private const val ARGUMENT_KEY = "Item"
-
-        fun newInstance(homework: Homework): HomeworkDetailsDialog {
-            return HomeworkDetailsDialog().apply {
-                arguments = Bundle().apply { putSerializable(ARGUMENT_KEY, homework) }
-            }
-        }
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setStyle(STYLE_NO_TITLE, 0)
-        arguments?.run {
-            homework = getSerializable(ARGUMENT_KEY) as Homework
-        }
-    }
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return DialogHomeworkBinding.inflate(inflater).apply { binding = this }.root
-    }
-
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
-        presenter.onAttachView(this)
-    }
-
-    @SuppressLint("SetTextI18n")
-    override fun initView() {
-        with(binding) {
-            homeworkDialogRead.text = view?.context?.getString(if (homework.isDone) R.string.homework_mark_as_undone else R.string.homework_mark_as_done)
-            homeworkDialogRead.setOnClickListener { presenter.toggleDone(homework) }
-            homeworkDialogClose.setOnClickListener { dismiss() }
-        }
-
-        with(binding.homeworkDialogRecycler) {
-            layoutManager = LinearLayoutManager(context)
-            adapter = detailsAdapter.apply {
-                onAttachmentClickListener = { context.openInternetBrowser(it, ::showMessage) }
-                onFullScreenClickListener = { dialog?.window?.setLayout(MATCH_PARENT, MATCH_PARENT) }
-                onFullScreenExitClickListener = { dialog?.window?.setLayout(WRAP_CONTENT, WRAP_CONTENT) }
-                homework = this@HomeworkDetailsDialog.homework
-            }
-        }
-    }
-
-    override fun updateMarkAsDoneLabel(isDone: Boolean) {
-        (parentFragment as? HomeworkFragment)?.onReloadList()
-        binding.homeworkDialogRead.text = view?.context?.getString(if (isDone) R.string.homework_mark_as_undone else R.string.homework_mark_as_done)
-    }
-
-    override fun onDestroyView() {
-        presenter.onDetachView()
-        super.onDestroyView()
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsPresenter.kt
deleted file mode 100644
index 04a97b8cd..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsPresenter.kt
+++ /dev/null
@@ -1,44 +0,0 @@
-package io.github.wulkanowy.ui.modules.homework.details
-
-import io.github.wulkanowy.data.db.entities.Homework
-import io.github.wulkanowy.data.repositories.homework.HomeworkRepository
-import io.github.wulkanowy.data.repositories.student.StudentRepository
-import io.github.wulkanowy.ui.base.BasePresenter
-import io.github.wulkanowy.ui.base.ErrorHandler
-import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.SchedulersProvider
-import timber.log.Timber
-import javax.inject.Inject
-
-class HomeworkDetailsPresenter @Inject constructor(
-    schedulers: SchedulersProvider,
-    errorHandler: ErrorHandler,
-    studentRepository: StudentRepository,
-    private val homeworkRepository: HomeworkRepository,
-    private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<HomeworkDetailsView>(errorHandler, studentRepository, schedulers) {
-
-    override fun onAttachView(view: HomeworkDetailsView) {
-        super.onAttachView(view)
-        view.initView()
-        Timber.i("Homework details view was initialized")
-    }
-
-    fun toggleDone(homework: Homework) {
-        Timber.i("Homework details update start")
-        disposable.add(homeworkRepository.toggleDone(homework)
-            .subscribeOn(schedulers.backgroundThread)
-            .observeOn(schedulers.mainThread)
-            .subscribe({
-                Timber.i("Homework details update: Success")
-                view?.run {
-                    updateMarkAsDoneLabel(homework.isDone)
-                }
-                analytics.logEvent("homework_mark_as_done")
-            }) {
-                Timber.i("Homework details update result: An exception occurred")
-                errorHandler.dispatch(it)
-            }
-        )
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsView.kt
deleted file mode 100644
index 697f22335..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsView.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package io.github.wulkanowy.ui.modules.homework.details
-
-import io.github.wulkanowy.ui.base.BaseView
-
-interface HomeworkDetailsView : BaseView {
-
-    fun initView()
-
-    fun updateMarkAsDoneLabel(isDone: Boolean)
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginActivity.kt
index ffb36fe6e..455d1e8ec 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginActivity.kt
@@ -4,19 +4,19 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.view.MenuItem
+import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.databinding.ActivityLoginBinding
 import io.github.wulkanowy.ui.base.BaseActivity
 import io.github.wulkanowy.ui.base.BaseFragmentPagerAdapter
 import io.github.wulkanowy.ui.modules.login.advanced.LoginAdvancedFragment
 import io.github.wulkanowy.ui.modules.login.form.LoginFormFragment
-import io.github.wulkanowy.ui.modules.login.recover.LoginRecoverFragment
 import io.github.wulkanowy.ui.modules.login.studentselect.LoginStudentSelectFragment
 import io.github.wulkanowy.ui.modules.login.symbol.LoginSymbolFragment
 import io.github.wulkanowy.utils.setOnSelectPageListener
+import kotlinx.android.synthetic.main.activity_login.*
 import javax.inject.Inject
 
-class LoginActivity : BaseActivity<LoginPresenter, ActivityLoginBinding>(), LoginView {
+class LoginActivity : BaseActivity<LoginPresenter>(), LoginView {
 
     @Inject
     override lateinit var presenter: LoginPresenter
@@ -29,13 +29,13 @@ class LoginActivity : BaseActivity<LoginPresenter, ActivityLoginBinding>(), Logi
         fun getStartIntent(context: Context) = Intent(context, LoginActivity::class.java)
     }
 
-    override val currentViewIndex get() = binding.loginViewpager.currentItem
+    override val currentViewIndex get() = loginViewpager.currentItem
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(ActivityLoginBinding.inflate(layoutInflater).apply { binding = this }.root)
-        setSupportActionBar(binding.loginToolbar)
-        messageContainer = binding.loginContainer
+        setContentView(R.layout.activity_login)
+        setSupportActionBar(loginToolbar)
+        messageContainer = loginContainer
 
         presenter.onAttachView(this)
     }
@@ -47,17 +47,16 @@ class LoginActivity : BaseActivity<LoginPresenter, ActivityLoginBinding>(), Logi
         }
 
         with(loginAdapter) {
-            containerId = binding.loginViewpager.id
+            containerId = loginViewpager.id
             addFragments(listOf(
                 LoginFormFragment.newInstance(),
                 LoginSymbolFragment.newInstance(),
                 LoginStudentSelectFragment.newInstance(),
-                LoginAdvancedFragment.newInstance(),
-                LoginRecoverFragment.newInstance()
+                LoginAdvancedFragment.newInstance()
             ))
         }
 
-        with(binding.loginViewpager) {
+        with(loginViewpager) {
             offscreenPageLimit = 2
             adapter = loginAdapter
             setOnSelectPageListener(presenter::onViewSelected)
@@ -70,7 +69,7 @@ class LoginActivity : BaseActivity<LoginPresenter, ActivityLoginBinding>(), Logi
     }
 
     override fun switchView(index: Int) {
-        binding.loginViewpager.setCurrentItem(index, false)
+        loginViewpager.setCurrentItem(index, false)
     }
 
     override fun showActionBar(show: Boolean) {
@@ -100,8 +99,4 @@ class LoginActivity : BaseActivity<LoginPresenter, ActivityLoginBinding>(), Logi
     fun onAdvancedLoginClick() {
         presenter.onAdvancedLoginClick()
     }
-
-    fun onRecoverClick() {
-        presenter.onRecoverClick()
-    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginErrorHandler.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginErrorHandler.kt
index 5ed181bf1..75a0ba6a6 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginErrorHandler.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginErrorHandler.kt
@@ -2,7 +2,7 @@ package io.github.wulkanowy.ui.modules.login
 
 import android.content.res.Resources
 import android.database.sqlite.SQLiteConstraintException
-import com.chuckerteam.chucker.api.ChuckerCollector
+import com.readystatesoftware.chuck.api.ChuckCollector
 import io.github.wulkanowy.R
 import io.github.wulkanowy.sdk.exception.BadCredentialsException
 import io.github.wulkanowy.sdk.mobile.exception.InvalidPinException
@@ -14,8 +14,8 @@ import javax.inject.Inject
 
 class LoginErrorHandler @Inject constructor(
     resources: Resources,
-    chuckerCollector: ChuckerCollector
-) : ErrorHandler(resources, chuckerCollector) {
+    chuckCollector: ChuckCollector
+) : ErrorHandler(resources, chuckCollector) {
 
     var onBadCredentials: () -> Unit = {}
 
@@ -43,8 +43,5 @@ class LoginErrorHandler @Inject constructor(
         super.clear()
         onBadCredentials = {}
         onStudentDuplicate = {}
-        onInvalidToken = {}
-        onInvalidPin = {}
-        onInvalidSymbol = {}
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginModule.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginModule.kt
index 26a243dcd..28339a467 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginModule.kt
@@ -8,15 +8,15 @@ import io.github.wulkanowy.di.scopes.PerFragment
 import io.github.wulkanowy.ui.base.BaseFragmentPagerAdapter
 import io.github.wulkanowy.ui.modules.login.advanced.LoginAdvancedFragment
 import io.github.wulkanowy.ui.modules.login.form.LoginFormFragment
-import io.github.wulkanowy.ui.modules.login.recover.LoginRecoverFragment
 import io.github.wulkanowy.ui.modules.login.studentselect.LoginStudentSelectFragment
 import io.github.wulkanowy.ui.modules.login.symbol.LoginSymbolFragment
 
 @Suppress("unused")
-@Module
+@Module(includes = [LoginModule.Static::class])
 internal abstract class LoginModule {
 
-    companion object {
+    @Module
+    object Static {
 
         @PerActivity
         @Provides
@@ -38,8 +38,4 @@ internal abstract class LoginModule {
     @PerFragment
     @ContributesAndroidInjector
     abstract fun bindLoginSelectStudentFragment(): LoginStudentSelectFragment
-
-    @PerFragment
-    @ContributesAndroidInjector
-    abstract fun bindLoginRecoverFragment(): LoginRecoverFragment
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginPresenter.kt
index 16342de4f..afa2d145d 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginPresenter.kt
@@ -49,15 +49,11 @@ class LoginPresenter @Inject constructor(
         view?.switchView(3)
     }
 
-    fun onRecoverClick() {
-        view?.switchView(4)
-    }
-
     fun onViewSelected(index: Int) {
         view?.apply {
             when (index) {
                 0 -> showActionBar(false)
-                1, 2, 3, 4 -> showActionBar(true)
+                1, 2 -> showActionBar(true)
             }
         }
     }
@@ -66,7 +62,7 @@ class LoginPresenter @Inject constructor(
         Timber.i("Back pressed in login view")
         view?.apply {
             when (currentViewIndex) {
-                1, 2, 3, 4 -> switchView(0)
+                1, 2, 3 -> switchView(0)
                 else -> default()
             }
         }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedFragment.kt
index 3b6a985be..353effa9b 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedFragment.kt
@@ -1,26 +1,25 @@
 package io.github.wulkanowy.ui.modules.login.advanced
 
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
-import android.view.View.GONE
-import android.view.View.VISIBLE
+import android.view.ViewGroup
+import android.view.inputmethod.EditorInfo
 import android.widget.ArrayAdapter
+import androidx.appcompat.widget.AppCompatEditText
 import androidx.core.widget.doOnTextChanged
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.databinding.FragmentLoginAdvancedBinding
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.ui.modules.login.form.LoginSymbolAdapter
 import io.github.wulkanowy.utils.hideSoftInput
-import io.github.wulkanowy.utils.setOnEditorDoneSignIn
 import io.github.wulkanowy.utils.showSoftInput
+import kotlinx.android.synthetic.main.fragment_login_advanced.*
 import javax.inject.Inject
 
-class LoginAdvancedFragment :
-    BaseFragment<FragmentLoginAdvancedBinding>(R.layout.fragment_login_advanced),
-    LoginAdvancedView {
+class LoginAdvancedFragment : BaseFragment(), LoginAdvancedView {
 
     @Inject
     lateinit var presenter: LoginAdvancedPresenter
@@ -30,251 +29,203 @@ class LoginAdvancedFragment :
     }
 
     override val formLoginType: String
-        get() = when (binding.loginTypeSwitch.checkedRadioButtonId) {
+        get() = when (loginTypeSwitch.checkedRadioButtonId) {
             R.id.loginTypeApi -> "API"
             R.id.loginTypeScrapper -> "SCRAPPER"
             else -> "HYBRID"
         }
 
-    override val formUsernameValue: String
-        get() = binding.loginFormUsername.text.toString().trim()
+    override val formNameValue: String
+        get() = loginFormName.text.toString().trim()
 
     override val formPassValue: String
-        get() = binding.loginFormPass.text.toString().trim()
+        get() = loginFormPass.text.toString().trim()
 
     private lateinit var hostKeys: Array<String>
 
     private lateinit var hostValues: Array<String>
 
-    private lateinit var hostSymbols: Array<String>
-
-    override val formHostValue: String
-        get() = hostValues.getOrNull(hostKeys.indexOf(binding.loginFormHost.text.toString())).orEmpty()
-
-    override val formHostSymbol: String
-        get() = hostSymbols.getOrNull(hostKeys.indexOf(binding.loginFormHost.text.toString())).orEmpty()
+    override val formHostValue: String?
+        get() = hostValues.getOrNull(hostKeys.indexOf(loginFormHost.text.toString()))
 
     override val formPinValue: String
-        get() = binding.loginFormPin.text.toString().trim()
+        get() = loginFormPin.text.toString().trim()
 
     override val formSymbolValue: String
-        get() = binding.loginFormSymbol.text.toString().trim()
+        get() = loginFormSymbol.text.toString().trim()
 
     override val formTokenValue: String
-        get() = binding.loginFormToken.text.toString().trim()
+        get() = loginFormToken.text.toString().trim()
 
-    override val nicknameLabel: String
-        get() = getString(R.string.login_nickname_hint)
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_login_advanced, container, false)
+    }
 
-    override val emailLabel: String
-        get() = getString(R.string.login_email_hint)
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding = FragmentLoginAdvancedBinding.bind(view)
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
         presenter.onAttachView(this)
     }
 
     override fun initView() {
         hostKeys = resources.getStringArray(R.array.hosts_keys)
         hostValues = resources.getStringArray(R.array.hosts_values)
-        hostSymbols = resources.getStringArray(R.array.hosts_symbols)
 
-        with(binding) {
-            loginFormUsername.doOnTextChanged { _, _, _, _ -> presenter.onUsernameTextChanged() }
-            loginFormPass.doOnTextChanged { _, _, _, _ -> presenter.onPassTextChanged() }
-            loginFormPin.doOnTextChanged { _, _, _, _ -> presenter.onPinTextChanged() }
-            loginFormSymbol.doOnTextChanged { _, _, _, _ -> presenter.onSymbolTextChanged() }
-            loginFormToken.doOnTextChanged { _, _, _, _ -> presenter.onTokenTextChanged() }
-            loginFormHost.setOnItemClickListener { _, _, _, _ -> presenter.onHostSelected() }
-            loginFormSignIn.setOnClickListener { presenter.onSignInClick() }
+        loginFormName.doOnTextChanged { _, _, _, _ -> presenter.onNameTextChanged() }
+        loginFormPass.doOnTextChanged { _, _, _, _ -> presenter.onPassTextChanged() }
+        loginFormPin.doOnTextChanged { _, _, _, _ -> presenter.onPinTextChanged() }
+        loginFormSymbol.doOnTextChanged { _, _, _, _ -> presenter.onSymbolTextChanged() }
+        loginFormToken.doOnTextChanged { _, _, _, _ -> presenter.onTokenTextChanged() }
+        loginFormHost.setOnItemClickListener { _, _, _, _ -> presenter.onHostSelected() }
+        loginFormSignIn.setOnClickListener { presenter.onSignInClick() }
 
-            loginTypeSwitch.setOnCheckedChangeListener { _, checkedId ->
-                presenter.onLoginModeSelected(when (checkedId) {
-                    R.id.loginTypeApi -> Sdk.Mode.API
-                    R.id.loginTypeScrapper -> Sdk.Mode.SCRAPPER
-                    else -> Sdk.Mode.HYBRID
-                })
-            }
-
-            loginFormPin.setOnEditorDoneSignIn { loginFormSignIn.callOnClick() }
-            loginFormPass.setOnEditorDoneSignIn { loginFormSignIn.callOnClick() }
-
-            loginFormSymbol.setAdapter(ArrayAdapter(requireContext(), android.R.layout.simple_list_item_1, resources.getStringArray(R.array.symbols_values)))
+        loginTypeSwitch.setOnCheckedChangeListener { _, checkedId ->
+            presenter.onLoginModeSelected(when (checkedId) {
+                R.id.loginTypeApi -> Sdk.Mode.API
+                R.id.loginTypeScrapper -> Sdk.Mode.SCRAPPER
+                else -> Sdk.Mode.HYBRID
+            })
         }
 
-        with(binding.loginFormHost) {
-            setText(hostKeys.getOrNull(0).orEmpty())
+        loginFormPin.setOnEditorDoneSignIn()
+        loginFormPass.setOnEditorDoneSignIn()
+
+        loginFormSymbol.setAdapter(ArrayAdapter(requireContext(), android.R.layout.simple_list_item_1, resources.getStringArray(R.array.symbols_values)))
+
+        with(loginFormHost) {
+            setText(hostKeys.getOrElse(0) { "" })
             setAdapter(LoginSymbolAdapter(context, R.layout.support_simple_spinner_dropdown_item, hostKeys))
-            setOnClickListener { if (binding.loginFormContainer.visibility == GONE) dismissDropDown() }
         }
     }
 
-    override fun showMobileApiWarningMessage() {
-        binding.loginFormAdvancedWarningInfo.text = getString(R.string.login_advanced_warning_mobile_api)
-    }
-
-    override fun showScraperWarningMessage() {
-        binding.loginFormAdvancedWarningInfo.text = getString(R.string.login_advanced_warning_scraper)
-    }
-
-    override fun showHybridWarningMessage() {
-        binding.loginFormAdvancedWarningInfo.text = getString(R.string.login_advanced_warning_hybrid)
-    }
-
-    override fun setDefaultCredentials(username: String, pass: String, symbol: String, token: String, pin: String) {
-        with(binding) {
-            loginFormUsername.setText(username)
-            loginFormPass.setText(pass)
-            loginFormToken.setText(token)
-            loginFormSymbol.setText(symbol)
-            loginFormPin.setText(pin)
+    private fun AppCompatEditText.setOnEditorDoneSignIn() {
+        setOnEditorActionListener { _, id, _ ->
+            if (id == EditorInfo.IME_ACTION_DONE || id == EditorInfo.IME_NULL) loginFormSignIn.callOnClick() else false
         }
     }
 
-    override fun setUsernameLabel(label: String) {
-        binding.loginFormUsernameLayout.hint = label
+    override fun setDefaultCredentials(name: String, pass: String, symbol: String, token: String, pin: String) {
+        loginFormName.setText(name)
+        loginFormPass.setText(pass)
+        loginFormToken.setText(token)
+        loginFormSymbol.setText(symbol)
+        loginFormPin.setText(pin)
     }
 
-    override fun setSymbol(symbol: String) {
-        binding.loginFormSymbol.setText(symbol)
-    }
-
-    override fun setErrorUsernameRequired() {
-        with(binding.loginFormUsernameLayout) {
+    override fun setErrorNameRequired() {
+        with(loginFormNameLayout) {
             requestFocus()
             error = getString(R.string.login_field_required)
         }
     }
 
-    override fun setErrorLoginRequired() {
-        with(binding.loginFormUsernameLayout) {
-            requestFocus()
-            error = getString(R.string.login_invalid_login)
-        }
-    }
-
-    override fun setErrorEmailRequired() {
-        with(binding.loginFormUsernameLayout) {
-            requestFocus()
-            error = getString(R.string.login_invalid_email)
-        }
-    }
-
     override fun setErrorPassRequired(focus: Boolean) {
-        with(binding.loginFormPassLayout) {
+        with(loginFormPassLayout) {
             if (focus) requestFocus()
             error = getString(R.string.login_field_required)
         }
     }
 
     override fun setErrorPassInvalid(focus: Boolean) {
-        with(binding.loginFormPassLayout) {
+        with(loginFormPassLayout) {
             if (focus) requestFocus()
             error = getString(R.string.login_invalid_password)
         }
     }
 
     override fun setErrorPassIncorrect() {
-        with(binding.loginFormPassLayout) {
+        with(loginFormPassLayout) {
             requestFocus()
             error = getString(R.string.login_incorrect_password)
         }
     }
 
     override fun setErrorPinRequired() {
-        with(binding.loginFormPinLayout) {
+        with(loginFormPinLayout) {
             requestFocus()
             error = getString(R.string.login_field_required)
         }
     }
 
     override fun setErrorPinInvalid(message: String) {
-        with(binding.loginFormPinLayout) {
+        with(loginFormPinLayout) {
             requestFocus()
             error = message
         }
     }
 
     override fun setErrorSymbolRequired() {
-        with(binding.loginFormSymbolLayout) {
+        with(loginFormSymbolLayout) {
             requestFocus()
             error = getString(R.string.login_field_required)
         }
     }
 
     override fun setErrorSymbolInvalid(message: String) {
-        with(binding.loginFormSymbolLayout) {
+        with(loginFormSymbolLayout) {
             requestFocus()
             error = message
         }
     }
 
     override fun setErrorTokenRequired() {
-        with(binding.loginFormTokenLayout) {
+        with(loginFormTokenLayout) {
             requestFocus()
             error = getString(R.string.login_field_required)
         }
     }
 
     override fun setErrorTokenInvalid(message: String) {
-        with(binding.loginFormTokenLayout) {
+        with(loginFormTokenLayout) {
             requestFocus()
             error = message
         }
     }
 
-    override fun clearUsernameError() {
-        binding.loginFormUsernameLayout.error = null
+    override fun clearNameError() {
+        loginFormNameLayout.error = null
     }
 
     override fun clearPassError() {
-        binding.loginFormPassLayout.error = null
+        loginFormPassLayout.error = null
     }
 
     override fun clearPinKeyError() {
-        binding.loginFormPinLayout.error = null
+        loginFormPinLayout.error = null
     }
 
     override fun clearSymbolError() {
-        binding.loginFormSymbolLayout.error = null
+        loginFormSymbolLayout.error = null
     }
 
     override fun clearTokenError() {
-        binding.loginFormTokenLayout.error = null
+        loginFormTokenLayout.error = null
     }
 
     override fun showOnlyHybridModeInputs() {
-        with(binding) {
-            loginFormUsernameLayout.visibility = VISIBLE
-            loginFormPassLayout.visibility = VISIBLE
-            loginFormHostLayout.visibility = VISIBLE
-            loginFormPinLayout.visibility = GONE
-            loginFormSymbolLayout.visibility = VISIBLE
-            loginFormTokenLayout.visibility = GONE
-        }
+        loginFormNameLayout.visibility = View.VISIBLE
+        loginFormPassLayout.visibility = View.VISIBLE
+        loginFormHostLayout.visibility = View.VISIBLE
+        loginFormPinLayout.visibility = View.GONE
+        loginFormSymbolLayout.visibility = View.VISIBLE
+        loginFormTokenLayout.visibility = View.GONE
     }
 
     override fun showOnlyScrapperModeInputs() {
-        with(binding) {
-            loginFormUsernameLayout.visibility = VISIBLE
-            loginFormPassLayout.visibility = VISIBLE
-            loginFormHostLayout.visibility = VISIBLE
-            loginFormPinLayout.visibility = GONE
-            loginFormSymbolLayout.visibility = VISIBLE
-            loginFormTokenLayout.visibility = GONE
-        }
+        loginFormNameLayout.visibility = View.VISIBLE
+        loginFormPassLayout.visibility = View.VISIBLE
+        loginFormHostLayout.visibility = View.VISIBLE
+        loginFormPinLayout.visibility = View.GONE
+        loginFormSymbolLayout.visibility = View.VISIBLE
+        loginFormTokenLayout.visibility = View.GONE
     }
 
     override fun showOnlyMobileApiModeInputs() {
-        with(binding) {
-            loginFormUsernameLayout.visibility = GONE
-            loginFormPassLayout.visibility = GONE
-            loginFormHostLayout.visibility = GONE
-            loginFormPinLayout.visibility = VISIBLE
-            loginFormSymbolLayout.visibility = VISIBLE
-            loginFormTokenLayout.visibility = VISIBLE
-        }
+        loginFormNameLayout.visibility = View.GONE
+        loginFormPassLayout.visibility = View.GONE
+        loginFormHostLayout.visibility = View.GONE
+        loginFormPinLayout.visibility = View.VISIBLE
+        loginFormSymbolLayout.visibility = View.VISIBLE
+        loginFormTokenLayout.visibility = View.VISIBLE
     }
 
     override fun showSoftKeyboard() {
@@ -286,28 +237,23 @@ class LoginAdvancedFragment :
     }
 
     override fun showProgress(show: Boolean) {
-        binding.loginFormProgress.visibility = if (show) VISIBLE else GONE
+        loginFormProgress.visibility = if (show) View.VISIBLE else View.GONE
     }
 
     override fun showContent(show: Boolean) {
-        binding.loginFormContainer.visibility = if (show) VISIBLE else GONE
+        loginFormContainer.visibility = if (show) View.VISIBLE else View.GONE
     }
 
     override fun notifyParentAccountLogged(students: List<Student>) {
         (activity as? LoginActivity)?.onFormFragmentAccountLogged(students, Triple(
-            binding.loginFormUsername.text.toString(),
-            binding.loginFormPass.text.toString(),
+            loginFormName.text.toString(),
+            loginFormPass.text.toString(),
             resources.getStringArray(R.array.hosts_values)[1]
         ))
     }
 
-    override fun onResume() {
-        super.onResume()
-        presenter.updateUsernameLabel()
-    }
-
     override fun onDestroyView() {
-        presenter.onDetachView()
         super.onDestroyView()
+        presenter.onDetachView()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedPresenter.kt
index 3a0d4a0d8..1e49e5d8b 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedPresenter.kt
@@ -65,39 +65,22 @@ class LoginAdvancedPresenter @Inject constructor(
         }
     }
 
-    fun updateUsernameLabel() {
-        view?.apply {
-            setUsernameLabel(if ("vulcan" in formHostValue || "fakelog" in formHostValue) emailLabel else nicknameLabel)
-        }
-    }
-
     fun onHostSelected() {
         view?.apply {
             clearPassError()
-            clearUsernameError()
-            if (formHostValue.contains("fakelog")) {
+            clearNameError()
+            if (formHostValue?.contains("fakelog") == true) {
                 setDefaultCredentials("jan@fakelog.cf", "jan123", "powiatwulkanowy", "FK100000", "999999")
             }
-            setSymbol(formHostSymbol)
-            updateUsernameLabel()
         }
     }
 
     fun onLoginModeSelected(type: Sdk.Mode) {
         view?.run {
             when (type) {
-                Sdk.Mode.API -> {
-                    showOnlyMobileApiModeInputs()
-                    showMobileApiWarningMessage()
-                }
-                Sdk.Mode.SCRAPPER -> {
-                    showOnlyScrapperModeInputs()
-                    showScraperWarningMessage()
-                }
-                Sdk.Mode.HYBRID -> {
-                    showOnlyHybridModeInputs()
-                    showHybridWarningMessage()
-                }
+                Sdk.Mode.API -> showOnlyMobileApiModeInputs()
+                Sdk.Mode.SCRAPPER -> showOnlyScrapperModeInputs()
+                Sdk.Mode.HYBRID -> showOnlyHybridModeInputs()
             }
         }
     }
@@ -106,8 +89,8 @@ class LoginAdvancedPresenter @Inject constructor(
         view?.clearPassError()
     }
 
-    fun onUsernameTextChanged() {
-        view?.clearUsernameError()
+    fun onNameTextChanged() {
+        view?.clearNameError()
     }
 
     fun onPinTextChanged() {
@@ -154,7 +137,7 @@ class LoginAdvancedPresenter @Inject constructor(
     }
 
     private fun getStudentsAppropriatesToLoginType(): Single<List<Student>> {
-        val email = view?.formUsernameValue.orEmpty()
+        val email = view?.formNameValue.orEmpty()
         val password = view?.formPassValue.orEmpty()
         val endpoint = view?.formHostValue.orEmpty()
 
@@ -170,11 +153,9 @@ class LoginAdvancedPresenter @Inject constructor(
     }
 
     private fun validateCredentials(): Boolean {
-        val login = view?.formUsernameValue.orEmpty()
+        val login = view?.formNameValue.orEmpty()
         val password = view?.formPassValue.orEmpty()
 
-        val host = view?.formHostValue.orEmpty()
-
         val pin = view?.formPinValue.orEmpty()
         val symbol = view?.formSymbolValue.orEmpty()
         val token = view?.formTokenValue.orEmpty()
@@ -198,20 +179,26 @@ class LoginAdvancedPresenter @Inject constructor(
                     isCorrect = false
                 }
             }
-            Sdk.Mode.HYBRID, Sdk.Mode.SCRAPPER -> {
+            Sdk.Mode.SCRAPPER -> {
                 if (login.isEmpty()) {
-                    view?.setErrorUsernameRequired()
+                    view?.setErrorNameRequired()
                     isCorrect = false
-                } else {
-                    if ("@" in login && "standard" !in host) {
-                        view?.setErrorLoginRequired()
-                        isCorrect = false
-                    }
+                }
 
-                    if ("@" !in login && "standard" in host) {
-                        view?.setErrorEmailRequired()
-                        isCorrect = false
-                    }
+                if (password.isEmpty()) {
+                    view?.setErrorPassRequired(focus = isCorrect)
+                    isCorrect = false
+                }
+
+                if (password.length < 6 && password.isNotEmpty()) {
+                    view?.setErrorPassInvalid(focus = isCorrect)
+                    isCorrect = false
+                }
+            }
+            Sdk.Mode.HYBRID -> {
+                if (login.isEmpty()) {
+                    view?.setErrorNameRequired()
+                    isCorrect = false
                 }
 
                 if (password.isEmpty()) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedView.kt
index 36c9a93f8..85a85a331 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedView.kt
@@ -5,13 +5,11 @@ import io.github.wulkanowy.ui.base.BaseView
 
 interface LoginAdvancedView : BaseView {
 
-    val formUsernameValue: String
+    val formNameValue: String
 
     val formPassValue: String
 
-    val formHostValue: String
-
-    val formHostSymbol: String
+    val formHostValue: String?
 
     val formLoginType: String
 
@@ -21,29 +19,11 @@ interface LoginAdvancedView : BaseView {
 
     val formTokenValue: String
 
-    val nicknameLabel: String
-
-    val emailLabel: String
-
     fun initView()
 
-    fun showMobileApiWarningMessage()
+    fun setDefaultCredentials(name: String, pass: String, symbol: String, token: String, pin: String)
 
-    fun showScraperWarningMessage()
-
-    fun showHybridWarningMessage()
-
-    fun setDefaultCredentials(username: String, pass: String, symbol: String, token: String, pin: String)
-
-    fun setUsernameLabel(label: String)
-
-    fun setSymbol(symbol: String)
-
-    fun setErrorUsernameRequired()
-
-    fun setErrorLoginRequired()
-
-    fun setErrorEmailRequired()
+    fun setErrorNameRequired()
 
     fun setErrorPassRequired(focus: Boolean)
 
@@ -51,7 +31,7 @@ interface LoginAdvancedView : BaseView {
 
     fun setErrorPassIncorrect()
 
-    fun clearUsernameError()
+    fun clearNameError()
 
     fun clearPassError()
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt
index a2a083c00..cbd405c28 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt
@@ -2,25 +2,27 @@ package io.github.wulkanowy.ui.modules.login.form
 
 import android.annotation.SuppressLint
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
+import android.view.ViewGroup
+import android.view.inputmethod.EditorInfo.IME_ACTION_DONE
+import android.view.inputmethod.EditorInfo.IME_NULL
 import androidx.core.widget.doOnTextChanged
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.databinding.FragmentLoginFormBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.hideSoftInput
 import io.github.wulkanowy.utils.openEmailClient
 import io.github.wulkanowy.utils.openInternetBrowser
-import io.github.wulkanowy.utils.setOnEditorDoneSignIn
 import io.github.wulkanowy.utils.showSoftInput
+import kotlinx.android.synthetic.main.fragment_login_form.*
 import javax.inject.Inject
 
-class LoginFormFragment : BaseFragment<FragmentLoginFormBinding>(R.layout.fragment_login_form),
-    LoginFormView {
+class LoginFormFragment : BaseFragment(), LoginFormView {
 
     @Inject
     lateinit var presenter: LoginFormPresenter
@@ -32,120 +34,87 @@ class LoginFormFragment : BaseFragment<FragmentLoginFormBinding>(R.layout.fragme
         fun newInstance() = LoginFormFragment()
     }
 
-    override val formUsernameValue: String
-        get() = binding.loginFormUsername.text.toString()
+    override val formNameValue get() = loginFormName.text.toString()
 
-    override val formPassValue: String
-        get() = binding.loginFormPass.text.toString()
+    override val formPassValue get() = loginFormPass.text.toString()
 
-    override val formHostValue: String
-        get() = hostValues.getOrNull(hostKeys.indexOf(binding.loginFormHost.text.toString())).orEmpty()
-
-    override val formHostSymbol: String
-        get() = hostSymbols.getOrNull(hostKeys.indexOf(binding.loginFormHost.text.toString())).orEmpty()
-
-    override val nicknameLabel: String
-        get() = getString(R.string.login_nickname_hint)
-
-    override val emailLabel: String
-        get() = getString(R.string.login_email_hint)
+    override val formHostValue get() = hostValues.getOrNull(hostKeys.indexOf(loginFormHost.text.toString()))
 
     private lateinit var hostKeys: Array<String>
 
     private lateinit var hostValues: Array<String>
 
-    private lateinit var hostSymbols: Array<String>
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_login_form, container, false)
+    }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding = FragmentLoginFormBinding.bind(view)
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
         presenter.onAttachView(this)
     }
 
     override fun initView() {
         hostKeys = resources.getStringArray(R.array.hosts_keys)
         hostValues = resources.getStringArray(R.array.hosts_values)
-        hostSymbols = resources.getStringArray(R.array.hosts_symbols)
 
-        with(binding) {
-            loginFormUsername.doOnTextChanged { _, _, _, _ -> presenter.onUsernameTextChanged() }
-            loginFormPass.doOnTextChanged { _, _, _, _ -> presenter.onPassTextChanged() }
-            loginFormHost.setOnItemClickListener { _, _, _, _ -> presenter.onHostSelected() }
-            loginFormSignIn.setOnClickListener { presenter.onSignInClick() }
-            loginFormAdvancedButton.setOnClickListener { presenter.onAdvancedLoginClick() }
-            loginFormPrivacyLink.setOnClickListener { presenter.onPrivacyLinkClick() }
-            loginFormFaq.setOnClickListener { presenter.onFaqClick() }
-            loginFormContactEmail.setOnClickListener { presenter.onEmailClick() }
-            loginFormRecoverLink.setOnClickListener { presenter.onRecoverClick() }
-            loginFormPass.setOnEditorDoneSignIn { loginFormSignIn.callOnClick() }
+        loginFormName.doOnTextChanged { _, _, _, _ -> presenter.onNameTextChanged() }
+        loginFormPass.doOnTextChanged { _, _, _, _ -> presenter.onPassTextChanged() }
+        loginFormHost.setOnItemClickListener { _, _, _, _ -> presenter.onHostSelected() }
+        loginFormSignIn.setOnClickListener { presenter.onSignInClick() }
+        loginFormAdvancedButton.setOnClickListener { presenter.onAdvancedLoginClick() }
+        loginFormPrivacyLink.setOnClickListener { presenter.onPrivacyLinkClick() }
+        loginFormFaq.setOnClickListener { presenter.onFaqClick() }
+        loginFormContactEmail.setOnClickListener { presenter.onEmailClick() }
+
+        loginFormPass.setOnEditorActionListener { _, id, _ ->
+            if (id == IME_ACTION_DONE || id == IME_NULL) loginFormSignIn.callOnClick() else false
         }
 
-        with(binding.loginFormHost) {
-            setText(hostKeys.getOrNull(0).orEmpty())
+        with(loginFormHost) {
+            setText(hostKeys.getOrElse(0) { "" })
             setAdapter(LoginSymbolAdapter(context, R.layout.support_simple_spinner_dropdown_item, hostKeys))
-            setOnClickListener { if (binding.loginFormContainer.visibility == GONE) dismissDropDown() }
         }
     }
 
-    override fun setCredentials(username: String, pass: String) {
-        with(binding) {
-            loginFormUsername.setText(username)
-            loginFormPass.setText(pass)
-        }
+    override fun setCredentials(name: String, pass: String) {
+        loginFormName.setText(name)
+        loginFormPass.setText(pass)
     }
 
-    override fun setUsernameLabel(label: String) {
-        binding.loginFormUsernameLayout.hint = label
-    }
-
-    override fun setErrorUsernameRequired() {
-        with(binding.loginFormUsernameLayout) {
+    override fun setErrorNameRequired() {
+        with(loginFormNameLayout) {
             requestFocus()
             error = getString(R.string.login_field_required)
         }
     }
 
-    override fun setErrorLoginRequired() {
-        with(binding.loginFormUsernameLayout) {
-            requestFocus()
-            error = getString(R.string.login_invalid_login)
-        }
-    }
-
-    override fun setErrorEmailRequired() {
-        with(binding.loginFormUsernameLayout) {
-            requestFocus()
-            error = getString(R.string.login_invalid_email)
-        }
-    }
-
     override fun setErrorPassRequired(focus: Boolean) {
-        with(binding.loginFormPassLayout) {
+        with(loginFormPassLayout) {
             if (focus) requestFocus()
             error = getString(R.string.login_field_required)
         }
     }
 
     override fun setErrorPassInvalid(focus: Boolean) {
-        with(binding.loginFormPassLayout) {
+        with(loginFormPassLayout) {
             if (focus) requestFocus()
             error = getString(R.string.login_invalid_password)
         }
     }
 
     override fun setErrorPassIncorrect() {
-        with(binding.loginFormPassLayout) {
+        with(loginFormPassLayout) {
             requestFocus()
             error = getString(R.string.login_incorrect_password)
         }
     }
 
-    override fun clearUsernameError() {
-        binding.loginFormUsernameLayout.error = null
+    override fun clearNameError() {
+        loginFormNameLayout.error = null
     }
 
     override fun clearPassError() {
-        binding.loginFormPassLayout.error = null
+        loginFormPassLayout.error = null
     }
 
     override fun showSoftKeyboard() {
@@ -157,16 +126,16 @@ class LoginFormFragment : BaseFragment<FragmentLoginFormBinding>(R.layout.fragme
     }
 
     override fun showProgress(show: Boolean) {
-        binding.loginFormProgress.visibility = if (show) VISIBLE else GONE
+        loginFormProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showContent(show: Boolean) {
-        binding.loginFormContainer.visibility = if (show) VISIBLE else GONE
+        loginFormContainer.visibility = if (show) VISIBLE else GONE
     }
 
     @SuppressLint("SetTextI18n")
     override fun showVersion() {
-        binding.loginFormVersion.text = "v${appInfo.versionName}"
+        loginFormVersion.text = "v${appInfo.versionName}"
     }
 
     override fun notifyParentAccountLogged(students: List<Student>, loginData: Triple<String, String, String>) {
@@ -178,43 +147,28 @@ class LoginFormFragment : BaseFragment<FragmentLoginFormBinding>(R.layout.fragme
     }
 
     override fun showContact(show: Boolean) {
-        binding.loginFormContact.visibility = if (show) VISIBLE else GONE
+        loginFormContact.visibility = if (show) VISIBLE else GONE
     }
 
     override fun openAdvancedLogin() {
         (activity as? LoginActivity)?.onAdvancedLoginClick()
     }
 
-    override fun onRecoverClick() {
-        (activity as? LoginActivity)?.onRecoverClick()
-    }
-
     override fun onDestroyView() {
-        presenter.onDetachView()
         super.onDestroyView()
+        presenter.onDetachView()
     }
 
     override fun openFaqPage() {
         context?.openInternetBrowser("https://wulkanowy.github.io/czesto-zadawane-pytania/dlaczego-nie-moge-sie-zalogowac", ::showMessage)
     }
 
-    override fun onResume() {
-        super.onResume()
-        presenter.updateUsernameLabel()
-    }
-
-    override fun openEmail(lastError: String) {
+    override fun openEmail() {
         context?.openEmailClient(
-            chooserTitle = requireContext().getString(R.string.login_email_intent_title),
-            email = "wulkanowyinc@gmail.com",
-            subject = requireContext().getString(R.string.login_email_subject),
-            body = requireContext().getString(R.string.login_email_text,
-                "${appInfo.systemManufacturer} ${appInfo.systemModel}",
-                appInfo.systemVersion.toString(),
-                appInfo.versionName,
-                "$formHostValue/$formHostSymbol",
-                lastError
-            )
+            requireContext().getString(R.string.login_email_intent_title),
+            "wulkanowyinc@gmail.com",
+            requireContext().getString(R.string.login_email_subject),
+            requireContext().getString(R.string.login_email_text, appInfo.systemModel, appInfo.systemVersion.toString(), appInfo.versionName)
         )
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt
index 997e1e85f..0b45c9a53 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt
@@ -16,8 +16,6 @@ class LoginFormPresenter @Inject constructor(
     private val analytics: FirebaseAnalyticsHelper
 ) : BasePresenter<LoginFormView>(loginErrorHandler, studentRepository, schedulers) {
 
-    private var lastError: Throwable? = null
-
     override fun onAttachView(view: LoginFormView) {
         super.onAttachView(view)
         view.run {
@@ -44,17 +42,10 @@ class LoginFormPresenter @Inject constructor(
     fun onHostSelected() {
         view?.apply {
             clearPassError()
-            clearUsernameError()
-            if (formHostValue.contains("fakelog")) {
+            clearNameError()
+            if (formHostValue?.contains("fakelog") == true) {
                 setCredentials("jan@fakelog.cf", "jan123")
             }
-            updateUsernameLabel()
-        }
-    }
-
-    fun updateUsernameLabel() {
-        view?.run {
-            setUsernameLabel(if ("standard" in formHostValue) emailLabel else nicknameLabel)
         }
     }
 
@@ -62,19 +53,18 @@ class LoginFormPresenter @Inject constructor(
         view?.clearPassError()
     }
 
-    fun onUsernameTextChanged() {
-        view?.clearUsernameError()
+    fun onNameTextChanged() {
+        view?.clearNameError()
     }
 
     fun onSignInClick() {
-        val email = view?.formUsernameValue.orEmpty().trim()
+        val email = view?.formNameValue.orEmpty().trim()
         val password = view?.formPassValue.orEmpty().trim()
-        val host = view?.formHostValue.orEmpty().trim()
-        val symbol = view?.formHostSymbol.orEmpty().trim()
+        val endpoint = view?.formHostValue.orEmpty().trim()
 
-        if (!validateCredentials(email, password, host)) return
+        if (!validateCredentials(email, password)) return
 
-        disposable.add(studentRepository.getStudentsScrapper(email, password, host, symbol)
+        disposable.add(studentRepository.getStudentsScrapper(email, password, endpoint)
             .subscribeOn(schedulers.backgroundThread)
             .observeOn(schedulers.mainThread)
             .doOnSubscribe {
@@ -93,13 +83,12 @@ class LoginFormPresenter @Inject constructor(
             }
             .subscribe({
                 Timber.i("Login result: Success")
-                analytics.logEvent("registration_form", "success" to true, "students" to it.size, "scrapperBaseUrl" to host, "error" to "No error")
-                view?.notifyParentAccountLogged(it, Triple(email, password, host))
+                analytics.logEvent("registration_form", "success" to true, "students" to it.size, "scrapperBaseUrl" to endpoint, "error" to "No error")
+                view?.notifyParentAccountLogged(it, Triple(email, password, endpoint))
             }, {
                 Timber.i("Login result: An exception occurred")
-                analytics.logEvent("registration_form", "success" to false, "students" to -1, "scrapperBaseUrl" to host, "error" to it.message.ifNullOrBlank { "No message" })
+                analytics.logEvent("registration_form", "success" to false, "students" to -1, "scrapperBaseUrl" to endpoint, "error" to it.message.ifNullOrBlank { "No message" })
                 loginErrorHandler.dispatch(it)
-                lastError = it
                 view?.showContact(true)
             }))
     }
@@ -109,29 +98,15 @@ class LoginFormPresenter @Inject constructor(
     }
 
     fun onEmailClick() {
-        view?.openEmail(lastError?.message.ifNullOrBlank { "none" })
+        view?.openEmail()
     }
 
-    fun onRecoverClick() {
-        view?.onRecoverClick()
-    }
-
-    private fun validateCredentials(login: String, password: String, host: String): Boolean {
+    private fun validateCredentials(login: String, password: String): Boolean {
         var isCorrect = true
 
         if (login.isEmpty()) {
-            view?.setErrorUsernameRequired()
+            view?.setErrorNameRequired()
             isCorrect = false
-        } else {
-            if ("@" in login && "standard" !in host) {
-                view?.setErrorLoginRequired()
-                isCorrect = false
-            }
-
-            if ("@" !in login && "standard" in host) {
-                view?.setErrorEmailRequired()
-                isCorrect = false
-            }
         }
 
         if (password.isEmpty()) {
@@ -143,7 +118,6 @@ class LoginFormPresenter @Inject constructor(
             view?.setErrorPassInvalid(focus = isCorrect)
             isCorrect = false
         }
-
         return isCorrect
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt
index 6506fa88f..6da57c8c5 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt
@@ -7,27 +7,15 @@ interface LoginFormView : BaseView {
 
     fun initView()
 
-    val formUsernameValue: String
+    val formNameValue: String
 
     val formPassValue: String
 
-    val formHostValue: String
+    val formHostValue: String?
 
-    val formHostSymbol: String
+    fun setCredentials(name: String, pass: String)
 
-    val nicknameLabel: String
-
-    val emailLabel: String
-
-    fun setCredentials(username: String, pass: String)
-
-    fun setUsernameLabel(label: String)
-
-    fun setErrorUsernameRequired()
-
-    fun setErrorLoginRequired()
-
-    fun setErrorEmailRequired()
+    fun setErrorNameRequired()
 
     fun setErrorPassRequired(focus: Boolean)
 
@@ -35,7 +23,7 @@ interface LoginFormView : BaseView {
 
     fun setErrorPassIncorrect()
 
-    fun clearUsernameError()
+    fun clearNameError()
 
     fun clearPassError()
 
@@ -57,9 +45,7 @@ interface LoginFormView : BaseView {
 
     fun openFaqPage()
 
-    fun openEmail(lastError: String)
+    fun openEmail()
 
     fun openAdvancedLogin()
-
-    fun onRecoverClick()
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/LoginRecoverFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/LoginRecoverFragment.kt
deleted file mode 100644
index e27c845a6..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/LoginRecoverFragment.kt
+++ /dev/null
@@ -1,210 +0,0 @@
-package io.github.wulkanowy.ui.modules.login.recover
-
-import android.annotation.SuppressLint
-import android.graphics.Color
-import android.os.Bundle
-import android.view.View
-import android.view.View.GONE
-import android.view.View.VISIBLE
-import android.webkit.JavascriptInterface
-import android.webkit.WebView
-import android.webkit.WebViewClient
-import androidx.core.widget.doOnTextChanged
-import io.github.wulkanowy.R
-import io.github.wulkanowy.databinding.FragmentLoginRecoverBinding
-import io.github.wulkanowy.ui.base.BaseFragment
-import io.github.wulkanowy.ui.modules.login.LoginActivity
-import io.github.wulkanowy.ui.modules.login.form.LoginSymbolAdapter
-import io.github.wulkanowy.utils.hideSoftInput
-import io.github.wulkanowy.utils.showSoftInput
-import javax.inject.Inject
-
-class LoginRecoverFragment :
-    BaseFragment<FragmentLoginRecoverBinding>(R.layout.fragment_login_recover), LoginRecoverView {
-
-    private var _binding: FragmentLoginRecoverBinding? = null
-
-    private val bindingLocal: FragmentLoginRecoverBinding get() = _binding!!
-
-    @Inject
-    lateinit var presenter: LoginRecoverPresenter
-
-    companion object {
-        fun newInstance() = LoginRecoverFragment()
-    }
-
-    private lateinit var hostKeys: Array<String>
-
-    private lateinit var hostValues: Array<String>
-
-    private lateinit var hostSymbols: Array<String>
-
-    override val recoverHostValue: String
-        get() = hostValues.getOrNull(hostKeys.indexOf(bindingLocal.loginRecoverHost.text.toString())).orEmpty()
-
-    override val formHostSymbol: String
-        get() = hostSymbols.getOrNull(hostKeys.indexOf(bindingLocal.loginRecoverHost.text.toString())).orEmpty()
-
-    override val recoverNameValue: String
-        get() = bindingLocal.loginRecoverName.text.toString().trim()
-
-    override val emailHintString: String
-        get() = getString(R.string.login_email_hint)
-
-    override val loginPeselEmailHintString: String
-        get() = getString(R.string.login_login_pesel_email_hint)
-
-    override val invalidEmailString: String
-        get() = getString(R.string.login_invalid_email)
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        _binding = FragmentLoginRecoverBinding.bind(view)
-        presenter.onAttachView(this)
-    }
-
-    override fun initView() {
-        hostKeys = resources.getStringArray(R.array.hosts_keys)
-        hostValues = resources.getStringArray(R.array.hosts_values)
-        hostSymbols = resources.getStringArray(R.array.hosts_symbols)
-
-        with(bindingLocal) {
-            loginRecoverWebView.setBackgroundColor(Color.TRANSPARENT)
-            loginRecoverName.doOnTextChanged { _, _, _, _ -> presenter.onNameTextChanged() }
-            loginRecoverHost.setOnItemClickListener { _, _, _, _ -> presenter.onHostSelected() }
-            loginRecoverButton.setOnClickListener { presenter.onRecoverClick() }
-            loginRecoverErrorRetry.setOnClickListener { presenter.onRecoverClick() }
-            loginRecoverErrorDetails.setOnClickListener { presenter.onDetailsClick() }
-            loginRecoverLogin.setOnClickListener { (activity as LoginActivity).switchView(0) }
-        }
-
-        with(bindingLocal.loginRecoverHost) {
-            setText(hostKeys.getOrNull(0).orEmpty())
-            setAdapter(LoginSymbolAdapter(context, R.layout.support_simple_spinner_dropdown_item, hostKeys))
-            setOnClickListener { if (bindingLocal.loginRecoverFormContainer.visibility == GONE) dismissDropDown() }
-        }
-    }
-
-    override fun setDefaultCredentials(username: String) {
-        bindingLocal.loginRecoverName.setText(username)
-    }
-
-    override fun setErrorNameRequired() {
-        with(bindingLocal.loginRecoverNameLayout) {
-            requestFocus()
-            error = getString(R.string.login_field_required)
-        }
-    }
-
-    override fun setUsernameHint(hint: String) {
-        bindingLocal.loginRecoverNameLayout.hint = hint
-    }
-
-    override fun setUsernameError(message: String) {
-        with(bindingLocal.loginRecoverNameLayout) {
-            requestFocus()
-            error = message
-        }
-    }
-
-    override fun clearUsernameError() {
-        bindingLocal.loginRecoverNameLayout.error = null
-    }
-
-    override fun showProgress(show: Boolean) {
-        bindingLocal.loginRecoverProgress.visibility = if (show) VISIBLE else GONE
-    }
-
-    override fun showRecoverForm(show: Boolean) {
-        bindingLocal.loginRecoverFormContainer.visibility = if (show) VISIBLE else GONE
-    }
-
-    override fun showCaptcha(show: Boolean) {
-        bindingLocal.loginRecoverCaptchaContainer.visibility = if (show) VISIBLE else GONE
-    }
-
-    override fun showErrorView(show: Boolean) {
-        bindingLocal.loginRecoverError.visibility = if (show) VISIBLE else GONE
-    }
-
-    override fun setErrorDetails(message: String) {
-        bindingLocal.loginRecoverErrorMessage.text = message
-    }
-
-    override fun showSuccessView(show: Boolean) {
-        bindingLocal.loginRecoverSuccess.visibility = if (show) VISIBLE else GONE
-    }
-
-    override fun setSuccessTitle(title: String) {
-        bindingLocal.loginRecoverSuccessTitle.text = title
-    }
-
-    override fun setSuccessMessage(message: String) {
-        bindingLocal.loginRecoverSuccessMessage.text = message
-    }
-
-    override fun showSoftKeyboard() {
-        activity?.showSoftInput()
-    }
-
-    override fun hideSoftKeyboard() {
-        activity?.hideSoftInput()
-    }
-
-    @SuppressLint("SetJavaScriptEnabled", "AddJavascriptInterface")
-    override fun loadReCaptcha(siteKey: String, url: String) {
-        val html = """
-            <div style="position: absolute; left: 50%; top: 50%; transform: translate(-50%, -50%);" id="recaptcha"></div>
-            <script src="https://www.google.com/recaptcha/api.js?onload=cl&render=explicit&hl=pl" async defer></script>
-            <script>var cl=()=>grecaptcha.render("recaptcha",{
-            sitekey:'$siteKey',
-            callback:e =>Android.captchaCallback(e)})</script>
-        """.trimIndent()
-
-        with(bindingLocal.loginRecoverWebView) {
-            settings.javaScriptEnabled = true
-            webViewClient = object : WebViewClient() {
-                private var recoverWebViewSuccess: Boolean = true
-
-                override fun onPageFinished(view: WebView?, url: String?) {
-                    if (recoverWebViewSuccess) {
-                        showCaptcha(true)
-                        showProgress(false)
-                    } else {
-                        showProgress(false)
-                        showErrorView(true)
-                    }
-                }
-
-                override fun onReceivedError(view: WebView, errorCode: Int, description: String, failingUrl: String) {
-                    recoverWebViewSuccess = false
-                }
-            }
-
-            loadDataWithBaseURL(url, html, "text/html", "UTF-8", null)
-            addJavascriptInterface(object {
-
-                @Suppress("UNUSED")
-                @JavascriptInterface
-                fun captchaCallback(reCaptchaResponse: String) {
-                    activity?.runOnUiThread {
-                        presenter.onReCaptchaVerified(reCaptchaResponse)
-                    }
-                }
-            }, "Android")
-        }
-    }
-
-    override fun onResume() {
-        super.onResume()
-        presenter.updateFields()
-    }
-
-    override fun onDestroyView() {
-        bindingLocal.loginRecoverWebView.destroy()
-        _binding = null
-        presenter.onDetachView()
-
-        super.onDestroyView()
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/LoginRecoverPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/LoginRecoverPresenter.kt
deleted file mode 100644
index 9a21fb910..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/LoginRecoverPresenter.kt
+++ /dev/null
@@ -1,159 +0,0 @@
-package io.github.wulkanowy.ui.modules.login.recover
-
-import io.github.wulkanowy.data.repositories.recover.RecoverRepository
-import io.github.wulkanowy.data.repositories.student.StudentRepository
-import io.github.wulkanowy.ui.base.BasePresenter
-import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.SchedulersProvider
-import io.github.wulkanowy.utils.ifNullOrBlank
-import timber.log.Timber
-import javax.inject.Inject
-
-class LoginRecoverPresenter @Inject constructor(
-    schedulers: SchedulersProvider,
-    studentRepository: StudentRepository,
-    private val loginErrorHandler: RecoverErrorHandler,
-    private val analytics: FirebaseAnalyticsHelper,
-    private val recoverRepository: RecoverRepository
-) : BasePresenter<LoginRecoverView>(loginErrorHandler, studentRepository, schedulers) {
-
-    private lateinit var lastError: Throwable
-
-    override fun onAttachView(view: LoginRecoverView) {
-        super.onAttachView(view)
-        view.initView()
-
-        with(loginErrorHandler) {
-            showErrorMessage = ::showErrorMessage
-            onInvalidUsername = ::onInvalidUsername
-            onInvalidCaptcha = ::onInvalidCaptcha
-        }
-    }
-
-    fun onNameTextChanged() {
-        view?.clearUsernameError()
-    }
-
-    fun onHostSelected() {
-        view?.run {
-            if ("fakelog" in recoverHostValue) setDefaultCredentials("jan@fakelog.cf")
-            clearUsernameError()
-            updateFields()
-        }
-    }
-
-    fun updateFields() {
-        view?.run {
-            setUsernameHint(if ("standard" in recoverHostValue) emailHintString else loginPeselEmailHintString)
-        }
-    }
-
-    fun onRecoverClick() {
-        val username = view?.recoverNameValue.orEmpty()
-        val host = view?.recoverHostValue.orEmpty()
-        val symbol = view?.formHostSymbol.orEmpty()
-
-        if (!validateInput(username, host)) return
-
-        disposable.add(recoverRepository.getReCaptchaSiteKey(host, symbol.ifBlank { "Default" })
-            .subscribeOn(schedulers.backgroundThread)
-            .observeOn(schedulers.mainThread)
-            .doOnSubscribe {
-                view?.run {
-                    hideSoftKeyboard()
-                    showRecoverForm(false)
-                    showProgress(true)
-                    showErrorView(false)
-                    showCaptcha(false)
-                }
-            }
-            .subscribe({ (resetUrl, siteKey) ->
-                view?.loadReCaptcha(siteKey, resetUrl)
-            }) {
-                Timber.i("Obtain captcha site key result: An exception occurred")
-                errorHandler.dispatch(it)
-            })
-    }
-
-    private fun validateInput(username: String, host: String): Boolean {
-        var isCorrect = true
-
-        if (username.isEmpty()) {
-            view?.setErrorNameRequired()
-            isCorrect = false
-        }
-
-        if ("standard" in host && "@" !in username) {
-            view?.setUsernameError(view?.invalidEmailString.orEmpty())
-            isCorrect = false
-        }
-
-        return isCorrect
-    }
-
-    fun onReCaptchaVerified(reCaptchaResponse: String) {
-        val username = view?.recoverNameValue.orEmpty()
-        val host = view?.recoverHostValue.orEmpty()
-        val symbol = view?.formHostSymbol.ifNullOrBlank { "Default" }
-
-        with(disposable) {
-            clear()
-            add(recoverRepository.sendRecoverRequest(host, symbol, username, reCaptchaResponse)
-                .subscribeOn(schedulers.backgroundThread)
-                .observeOn(schedulers.mainThread)
-                .doOnSubscribe {
-                    view?.run {
-                        showProgress(true)
-                        showRecoverForm(false)
-                        showCaptcha(false)
-                    }
-                }
-                .doFinally {
-                    view?.showProgress(false)
-                }
-                .subscribe({
-                    view?.run {
-                        showSuccessView(true)
-                        setSuccessTitle(it.substringBefore(". "))
-                        setSuccessMessage(it.substringAfter(". "))
-                    }
-
-                    analytics.logEvent("account_recover", "register" to host, "symbol" to symbol, "success" to true)
-                }) {
-                    Timber.i("Send recover request result: An exception occurred")
-                    errorHandler.dispatch(it)
-                    analytics.logEvent("account_recover", "register" to host, "symbol" to symbol, "success" to false)
-                })
-        }
-    }
-
-    fun onDetailsClick() {
-        view?.showErrorDetailsDialog(lastError)
-    }
-
-    private fun showErrorMessage(message: String, error: Throwable) {
-        view?.run {
-            lastError = error
-            showProgress(false)
-            setErrorDetails(message)
-            showErrorView(true)
-        }
-    }
-
-    private fun onInvalidUsername(message: String) {
-        view?.run {
-            setUsernameError(message)
-            showRecoverForm(true)
-        }
-    }
-
-    private fun onInvalidCaptcha(message: String, error: Throwable) {
-        view?.run {
-            lastError = error
-            setErrorDetails(message)
-            showCaptcha(false)
-            showRecoverForm(false)
-            showErrorView(true)
-        }
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/LoginRecoverView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/LoginRecoverView.kt
deleted file mode 100644
index 2e21d3351..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/LoginRecoverView.kt
+++ /dev/null
@@ -1,52 +0,0 @@
-package io.github.wulkanowy.ui.modules.login.recover
-
-import io.github.wulkanowy.ui.base.BaseView
-
-interface LoginRecoverView : BaseView {
-
-    val recoverHostValue: String
-
-    val formHostSymbol: String
-
-    val recoverNameValue: String
-
-    val emailHintString: String
-
-    val loginPeselEmailHintString: String
-
-    val invalidEmailString: String
-
-    fun initView()
-
-    fun setDefaultCredentials(username: String)
-
-    fun clearUsernameError()
-
-    fun setErrorNameRequired()
-
-    fun setUsernameHint(hint: String)
-
-    fun setUsernameError(message: String)
-
-    fun showSoftKeyboard()
-
-    fun hideSoftKeyboard()
-
-    fun showProgress(show: Boolean)
-
-    fun showRecoverForm(show: Boolean)
-
-    fun showCaptcha(show: Boolean)
-
-    fun showErrorView(show: Boolean)
-
-    fun setErrorDetails(message: String)
-
-    fun showSuccessView(show: Boolean)
-
-    fun setSuccessMessage(message: String)
-
-    fun setSuccessTitle(title: String)
-
-    fun loadReCaptcha(siteKey: String, url: String)
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/RecoverErrorHandler.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/RecoverErrorHandler.kt
deleted file mode 100644
index 110dd82e5..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/RecoverErrorHandler.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package io.github.wulkanowy.ui.modules.login.recover
-
-import android.content.res.Resources
-import com.chuckerteam.chucker.api.ChuckerCollector
-import io.github.wulkanowy.sdk.scrapper.exception.InvalidCaptchaException
-import io.github.wulkanowy.sdk.scrapper.exception.InvalidEmailException
-import io.github.wulkanowy.sdk.scrapper.exception.NoAccountFoundException
-import io.github.wulkanowy.ui.base.ErrorHandler
-import javax.inject.Inject
-
-class RecoverErrorHandler @Inject constructor(
-    resources: Resources,
-    chuckerCollector: ChuckerCollector
-) : ErrorHandler(resources, chuckerCollector) {
-
-    var onInvalidUsername: (String) -> Unit = {}
-
-    var onInvalidCaptcha: (String, Throwable) -> Unit = { _, _ -> }
-
-    override fun proceed(error: Throwable) {
-        when (error) {
-            is InvalidEmailException, is NoAccountFoundException -> onInvalidUsername(error.localizedMessage.orEmpty())
-            is InvalidCaptchaException -> onInvalidCaptcha(error.localizedMessage.orEmpty(), error)
-            else -> super.proceed(error)
-        }
-    }
-
-    override fun clear() {
-        super.clear()
-        onInvalidUsername = {}
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectAdapter.kt
deleted file mode 100644
index 3332f2be8..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectAdapter.kt
+++ /dev/null
@@ -1,63 +0,0 @@
-package io.github.wulkanowy.ui.modules.login.studentselect
-
-import android.annotation.SuppressLint
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.databinding.ItemLoginStudentSelectBinding
-import javax.inject.Inject
-
-class LoginStudentSelectAdapter @Inject constructor() :
-    RecyclerView.Adapter<LoginStudentSelectAdapter.ItemViewHolder>() {
-
-    private val checkedList = mutableMapOf<Int, Boolean>()
-
-    var items = emptyList<Pair<Student, Boolean>>()
-        set(value) {
-            field = value
-            checkedList.clear()
-        }
-
-    var onClickListener: (Student, alreadySaved: Boolean) -> Unit = { _, _ -> }
-
-    override fun getItemCount() = items.size
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        ItemLoginStudentSelectBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-    )
-
-    @SuppressLint("SetTextI18n")
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        val (student, alreadySaved) = items[position]
-
-        with(holder.binding) {
-            loginItemName.text = "${student.studentName} ${student.className}"
-            loginItemSchool.text = student.schoolName
-            loginItemName.isEnabled = !alreadySaved
-            loginItemSchool.isEnabled = !alreadySaved
-            loginItemSignedIn.visibility = if (alreadySaved) View.VISIBLE else View.GONE
-
-            with(loginItemCheck) {
-                isEnabled = !alreadySaved
-                keyListener = null
-                isChecked = checkedList[position] ?: false
-            }
-
-            root.setOnClickListener {
-                onClickListener(student, alreadySaved)
-
-                with(loginItemCheck) {
-                    if (isEnabled) {
-                        isChecked = !isChecked
-                        checkedList[position] = isChecked
-                    }
-                }
-            }
-        }
-    }
-
-    class ItemViewHolder(val binding: ItemLoginStudentSelectBinding) :
-        RecyclerView.ViewHolder(binding.root)
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectFragment.kt
index b0df51991..8478f7ccf 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectFragment.kt
@@ -1,30 +1,33 @@
 package io.github.wulkanowy.ui.modules.login.studentselect
 
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
-import androidx.recyclerview.widget.LinearLayoutManager
+import android.view.ViewGroup
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.databinding.FragmentLoginStudentSelectBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.openEmailClient
 import io.github.wulkanowy.utils.openInternetBrowser
+import io.github.wulkanowy.utils.setOnItemClickListener
+import kotlinx.android.synthetic.main.fragment_login_student_select.*
 import java.io.Serializable
 import javax.inject.Inject
 
-class LoginStudentSelectFragment :
-    BaseFragment<FragmentLoginStudentSelectBinding>(R.layout.fragment_login_student_select),
-    LoginStudentSelectView {
+class LoginStudentSelectFragment : BaseFragment(), LoginStudentSelectView {
 
     @Inject
     lateinit var presenter: LoginStudentSelectPresenter
 
     @Inject
-    lateinit var loginAdapter: LoginStudentSelectAdapter
+    lateinit var loginAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
 
     @Inject
     lateinit var appInfo: AppInfo
@@ -35,32 +38,29 @@ class LoginStudentSelectFragment :
         fun newInstance() = LoginStudentSelectFragment()
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding = FragmentLoginStudentSelectBinding.bind(view)
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_login_student_select, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
         presenter.onAttachView(this, savedInstanceState?.getSerializable(SAVED_STUDENTS))
     }
 
     override fun initView() {
-        loginAdapter.onClickListener = presenter::onItemSelected
+        loginStudentSelectSignIn.setOnClickListener { presenter.onSignIn() }
+        loginAdapter.apply { setOnItemClickListener { presenter.onItemSelected(it) } }
+        loginStudentSelectContactDiscord.setOnClickListener { presenter.onDiscordClick() }
+        loginStudentSelectContactEmail.setOnClickListener { presenter.onEmailClick() }
 
-        with(binding) {
-            loginStudentSelectSignIn.setOnClickListener { presenter.onSignIn() }
-            loginStudentSelectContactDiscord.setOnClickListener { presenter.onDiscordClick() }
-            loginStudentSelectContactEmail.setOnClickListener { presenter.onEmailClick() }
-
-            with(loginStudentSelectRecycler) {
-                layoutManager = LinearLayoutManager(context)
-                adapter = loginAdapter
-            }
+        loginStudentSelectRecycler.apply {
+            adapter = loginAdapter
+            layoutManager = SmoothScrollLinearLayoutManager(context)
         }
     }
 
-    override fun updateData(data: List<Pair<Student, Boolean>>) {
-        with(loginAdapter) {
-            items = data
-            notifyDataSetChanged()
-        }
+    override fun updateData(data: List<LoginStudentSelectItem>) {
+        loginAdapter.updateDataSet(data)
     }
 
     override fun openMainView() {
@@ -68,15 +68,15 @@ class LoginStudentSelectFragment :
     }
 
     override fun showProgress(show: Boolean) {
-        binding.loginStudentSelectProgress.visibility = if (show) VISIBLE else GONE
+        loginStudentSelectProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showContent(show: Boolean) {
-        binding.loginStudentSelectContent.visibility = if (show) VISIBLE else GONE
+        loginStudentSelectContent.visibility = if (show) VISIBLE else GONE
     }
 
     override fun enableSignIn(enable: Boolean) {
-        binding.loginStudentSelectSignIn.isEnabled = enable
+        loginStudentSelectSignIn.isEnabled = enable
     }
 
     fun onParentInitStudentSelectFragment(students: List<Student>) {
@@ -89,7 +89,7 @@ class LoginStudentSelectFragment :
     }
 
     override fun showContact(show: Boolean) {
-        binding.loginStudentSelectContact.visibility = if (show) VISIBLE else GONE
+        loginStudentSelectContact.visibility = if (show) VISIBLE else GONE
     }
 
     override fun onDestroyView() {
@@ -101,17 +101,12 @@ class LoginStudentSelectFragment :
         context?.openInternetBrowser("https://discord.gg/vccAQBr", ::showMessage)
     }
 
-    override fun openEmail(lastError: String) {
+    override fun openEmail() {
         context?.openEmailClient(
-            chooserTitle = requireContext().getString(R.string.login_email_intent_title),
-            email = "wulkanowyinc@gmail.com",
-            subject = requireContext().getString(R.string.login_email_subject),
-            body = requireContext().getString(R.string.login_email_text, appInfo.systemModel,
-                appInfo.systemVersion.toString(),
-                appInfo.versionName,
-                "Select users to log in",
-                lastError
-            )
+            requireContext().getString(R.string.login_email_intent_title),
+            "wulkanowyinc@gmail.com",
+            requireContext().getString(R.string.login_email_subject),
+            requireContext().getString(R.string.login_email_text, appInfo.systemModel, appInfo.systemVersion.toString(), appInfo.versionName)
         )
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectItem.kt
new file mode 100644
index 000000000..fa21cff94
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectItem.kt
@@ -0,0 +1,59 @@
+package io.github.wulkanowy.ui.modules.login.studentselect
+
+import android.annotation.SuppressLint
+import android.view.View
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.FlexibleViewHolder
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Student
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.item_login_student_select.*
+
+class LoginStudentSelectItem(val student: Student) : AbstractFlexibleItem<LoginStudentSelectItem.ItemViewHolder>() {
+
+    override fun getLayoutRes() = R.layout.item_login_student_select
+
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): ItemViewHolder {
+        return ItemViewHolder(view, adapter)
+    }
+
+    @SuppressLint("SetTextI18n")
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ItemViewHolder, position: Int, payloads: MutableList<Any>) {
+        holder.apply {
+            loginItemName.text = "${student.studentName} ${student.className}"
+            loginItemSchool.text = student.schoolName
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as LoginStudentSelectItem
+
+        if (student != other.student) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        return student.hashCode()
+    }
+
+    class ItemViewHolder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter), LayoutContainer {
+
+        override val containerView: View
+            get() = itemView
+
+        init {
+            loginItemCheck.keyListener = null
+        }
+
+        override fun onClick(view: View?) {
+            super.onClick(view)
+            loginItemCheck.apply { isChecked = !isChecked }
+        }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenter.kt
index db25c0da3..841c225d7 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenter.kt
@@ -1,5 +1,6 @@
 package io.github.wulkanowy.ui.modules.login.studentselect
 
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
@@ -18,11 +19,9 @@ class LoginStudentSelectPresenter @Inject constructor(
     private val analytics: FirebaseAnalyticsHelper
 ) : BasePresenter<LoginStudentSelectView>(loginErrorHandler, studentRepository, schedulers) {
 
-    private var lastError: Throwable? = null
-
     var students = emptyList<Student>()
 
-    private val selectedStudents = mutableListOf<Student>()
+    private var selectedStudents = mutableListOf<Student>()
 
     fun onAttachView(view: LoginStudentSelectView, students: Serializable?) {
         super.onAttachView(view)
@@ -50,48 +49,20 @@ class LoginStudentSelectPresenter @Inject constructor(
         if (students.size == 1) registerStudents(students)
     }
 
-    fun onItemSelected(student: Student, alreadySaved: Boolean) {
-        if (alreadySaved) return
+    fun onItemSelected(item: AbstractFlexibleItem<*>?) {
+        if (item is LoginStudentSelectItem) {
+            selectedStudents.removeAll { it == item.student }
+                .let { if (!it) selectedStudents.add(item.student) }
 
-        selectedStudents
-            .removeAll { it == student }
-            .let { if (!it) selectedStudents.add(student) }
-
-        view?.enableSignIn(selectedStudents.isNotEmpty())
-    }
-
-    private fun compareStudents(a: Student, b: Student): Boolean {
-        return a.email == b.email
-            && a.symbol == b.symbol
-            && a.studentId == b.studentId
-            && a.schoolSymbol == b.schoolSymbol
-            && a.classId == b.classId
+            view?.enableSignIn(selectedStudents.isNotEmpty())
+        }
     }
 
     private fun loadData(students: List<Student>) {
-        resetSelectedState()
         this.students = students
-        disposable.add(studentRepository.getSavedStudents()
-            .map { savedStudents ->
-                students.map { student ->
-                    student to savedStudents.any { compareStudents(student, it) }
-                }
-            }
-            .subscribeOn(schedulers.backgroundThread)
-            .observeOn(schedulers.mainThread)
-            .subscribe({
-                view?.updateData(it)
-            }, {
-                errorHandler.dispatch(it)
-                lastError = it
-                view?.updateData(students.map { student -> student to false })
-            })
-        )
-    }
-
-    private fun resetSelectedState() {
-        selectedStudents.clear()
-        view?.enableSignIn(false)
+        view?.apply {
+            updateData(students.map { LoginStudentSelectItem(it) })
+        }
     }
 
     private fun registerStudents(students: List<Student>) {
@@ -115,7 +86,6 @@ class LoginStudentSelectPresenter @Inject constructor(
                 students.forEach { analytics.logEvent("registration_student_select", "success" to false, "scrapperBaseUrl" to it.scrapperBaseUrl, "symbol" to it.symbol, "error" to error.message.ifNullOrBlank { "No message" }) }
                 Timber.i("Registration result: An exception occurred ")
                 loginErrorHandler.dispatch(error)
-                lastError = error
                 view?.apply {
                     showProgress(false)
                     showContent(true)
@@ -129,6 +99,6 @@ class LoginStudentSelectPresenter @Inject constructor(
     }
 
     fun onEmailClick() {
-        view?.openEmail(lastError?.message.ifNullOrBlank { "empty" })
+        view?.openEmail()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectView.kt
index 89431dfc6..238771009 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectView.kt
@@ -1,13 +1,12 @@
 package io.github.wulkanowy.ui.modules.login.studentselect
 
-import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.ui.base.BaseView
 
 interface LoginStudentSelectView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<Pair<Student, Boolean>>)
+    fun updateData(data: List<LoginStudentSelectItem>)
 
     fun openMainView()
 
@@ -21,5 +20,5 @@ interface LoginStudentSelectView : BaseView {
 
     fun openDiscordInvite()
 
-    fun openEmail(lastError: String)
+    fun openEmail()
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolFragment.kt
index befbffd50..5e9ce3ba3 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolFragment.kt
@@ -1,16 +1,17 @@
 package io.github.wulkanowy.ui.modules.login.symbol
 
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
+import android.view.ViewGroup
 import android.view.inputmethod.EditorInfo.IME_ACTION_DONE
 import android.view.inputmethod.EditorInfo.IME_NULL
 import android.widget.ArrayAdapter
 import androidx.core.widget.doOnTextChanged
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.databinding.FragmentLoginSymbolBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.utils.AppInfo
@@ -18,10 +19,10 @@ import io.github.wulkanowy.utils.hideSoftInput
 import io.github.wulkanowy.utils.openEmailClient
 import io.github.wulkanowy.utils.openInternetBrowser
 import io.github.wulkanowy.utils.showSoftInput
+import kotlinx.android.synthetic.main.fragment_login_symbol.*
 import javax.inject.Inject
 
-class LoginSymbolFragment :
-    BaseFragment<FragmentLoginSymbolBinding>(R.layout.fragment_login_symbol), LoginSymbolView {
+class LoginSymbolFragment : BaseFragment(), LoginSymbolView {
 
     @Inject
     lateinit var presenter: LoginSymbolPresenter
@@ -36,28 +37,29 @@ class LoginSymbolFragment :
     }
 
     override val symbolNameError: CharSequence?
-        get() = binding.loginSymbolNameLayout.error
+        get() = loginSymbolNameLayout.error
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding = FragmentLoginSymbolBinding.bind(view)
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_login_symbol, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
         presenter.onAttachView(this, savedInstanceState?.getSerializable(SAVED_LOGIN_DATA))
     }
 
     override fun initView() {
-        with(binding) {
-            loginSymbolSignIn.setOnClickListener { presenter.attemptLogin(loginSymbolName.text.toString()) }
-            loginSymbolFaq.setOnClickListener { presenter.onFaqClick() }
-            loginSymbolContactEmail.setOnClickListener { presenter.onEmailClick() }
+        loginSymbolSignIn.setOnClickListener { presenter.attemptLogin(loginSymbolName.text.toString()) }
+        loginSymbolFaq.setOnClickListener { presenter.onFaqClick() }
+        loginSymbolContactEmail.setOnClickListener { presenter.onEmailClick() }
 
-            loginSymbolName.doOnTextChanged { _, _, _, _ -> presenter.onSymbolTextChanged() }
+        loginSymbolName.doOnTextChanged { _, _, _, _ -> presenter.onSymbolTextChanged() }
 
-            loginSymbolName.apply {
-                setOnEditorActionListener { _, id, _ ->
-                    if (id == IME_ACTION_DONE || id == IME_NULL) loginSymbolSignIn.callOnClick() else false
-                }
-                setAdapter(ArrayAdapter(context, android.R.layout.simple_list_item_1, resources.getStringArray(R.array.symbols_values)))
+        loginSymbolName.apply {
+            setOnEditorActionListener { _, id, _ ->
+                if (id == IME_ACTION_DONE || id == IME_NULL) loginSymbolSignIn.callOnClick() else false
             }
+            setAdapter(ArrayAdapter(context, android.R.layout.simple_list_item_1, resources.getStringArray(R.array.symbols_values)))
         }
     }
 
@@ -66,25 +68,25 @@ class LoginSymbolFragment :
     }
 
     override fun setErrorSymbolIncorrect() {
-        binding.loginSymbolNameLayout.apply {
+        loginSymbolNameLayout.apply {
             requestFocus()
             error = getString(R.string.login_incorrect_symbol)
         }
     }
 
     override fun setErrorSymbolRequire() {
-        binding.loginSymbolNameLayout.apply {
+        loginSymbolNameLayout.apply {
             requestFocus()
             error = getString(R.string.login_field_required)
         }
     }
 
     override fun clearSymbolError() {
-        binding.loginSymbolNameLayout.error = null
+        loginSymbolNameLayout.error = null
     }
 
     override fun clearAndFocusSymbol() {
-        binding.loginSymbolNameLayout.apply {
+        loginSymbolNameLayout.apply {
             editText?.text = null
             requestFocus()
         }
@@ -99,11 +101,11 @@ class LoginSymbolFragment :
     }
 
     override fun showProgress(show: Boolean) {
-        binding.loginSymbolProgress.visibility = if (show) VISIBLE else GONE
+        loginSymbolProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showContent(show: Boolean) {
-        binding.loginSymbolContainer.visibility = if (show) VISIBLE else GONE
+        loginSymbolContainer.visibility = if (show) VISIBLE else GONE
     }
 
     override fun notifyParentAccountLogged(students: List<Student>) {
@@ -116,30 +118,24 @@ class LoginSymbolFragment :
     }
 
     override fun showContact(show: Boolean) {
-        binding.loginSymbolContact.visibility = if (show) VISIBLE else GONE
+        loginSymbolContact.visibility = if (show) VISIBLE else GONE
     }
 
     override fun onDestroyView() {
-        presenter.onDetachView()
         super.onDestroyView()
+        presenter.onDetachView()
     }
 
     override fun openFaqPage() {
         context?.openInternetBrowser("https://wulkanowy.github.io/czesto-zadawane-pytania/co-to-jest-symbol", ::showMessage)
     }
 
-    override fun openEmail(host: String, lastError: String) {
+    override fun openEmail() {
         context?.openEmailClient(
-            chooserTitle = requireContext().getString(R.string.login_email_intent_title),
-            email = "wulkanowyinc@gmail.com",
-            subject = requireContext().getString(R.string.login_email_subject),
-            body = requireContext().getString(R.string.login_email_text,
-                "${appInfo.systemManufacturer} ${appInfo.systemModel}",
-                appInfo.systemVersion.toString(),
-                appInfo.versionName,
-                "$host/${binding.loginSymbolName.text}",
-                lastError
-            )
+            requireContext().getString(R.string.login_email_intent_title),
+            "wulkanowyinc@gmail.com",
+            requireContext().getString(R.string.login_email_subject),
+            requireContext().getString(R.string.login_email_text, appInfo.systemModel, appInfo.systemVersion.toString(), appInfo.versionName)
         )
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolPresenter.kt
index 1f9e66b70..ee6c30c3b 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolPresenter.kt
@@ -18,8 +18,6 @@ class LoginSymbolPresenter @Inject constructor(
     private val analytics: FirebaseAnalyticsHelper
 ) : BasePresenter<LoginSymbolView>(loginErrorHandler, studentRepository, schedulers) {
 
-    private var lastError: Throwable? = null
-
     var loginData: Triple<String, String, String>? = null
 
     @Suppress("UNCHECKED_CAST")
@@ -39,15 +37,13 @@ class LoginSymbolPresenter @Inject constructor(
     }
 
     fun attemptLogin(symbol: String) {
-        if (loginData == null) throw IllegalArgumentException("Login data is null")
-
         if (symbol.isBlank()) {
             view?.setErrorSymbolRequire()
             return
         }
 
         disposable.add(
-            Single.fromCallable { loginData }
+            Single.fromCallable { if (loginData == null) throw IllegalArgumentException("Login data is null") else loginData }
                 .flatMap { studentRepository.getStudentsScrapper(it.first, it.second, it.third, symbol) }
                 .subscribeOn(schedulers.backgroundThread)
                 .observeOn(schedulers.mainThread)
@@ -81,7 +77,6 @@ class LoginSymbolPresenter @Inject constructor(
                     Timber.i("Login with symbol result: An exception occurred")
                     analytics.logEvent("registration_symbol", "success" to false, "students" to -1, "scrapperBaseUrl" to loginData?.third, "symbol" to symbol, "error" to it.message.ifNullOrBlank { "No message" })
                     loginErrorHandler.dispatch(it)
-                    lastError = it
                     view?.showContact(true)
                 }))
     }
@@ -99,6 +94,6 @@ class LoginSymbolPresenter @Inject constructor(
     }
 
     fun onEmailClick() {
-        view?.openEmail(loginData?.third.orEmpty(), lastError?.message.ifNullOrBlank { "empty" })
+        view?.openEmail()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolView.kt
index 6938bf138..1afc15327 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolView.kt
@@ -31,5 +31,5 @@ interface LoginSymbolView : BaseView {
 
     fun openFaqPage()
 
-    fun openEmail(host: String, lastError: String)
+    fun openEmail()
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberFragment.kt
index 0775ce189..12bf1a132 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberFragment.kt
@@ -1,19 +1,19 @@
 package io.github.wulkanowy.ui.modules.luckynumber
 
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
+import android.view.ViewGroup
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.LuckyNumber
-import io.github.wulkanowy.databinding.FragmentLuckyNumberBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainView
+import kotlinx.android.synthetic.main.fragment_lucky_number.*
 import javax.inject.Inject
 
-class LuckyNumberFragment :
-    BaseFragment<FragmentLuckyNumberBinding>(R.layout.fragment_lucky_number), LuckyNumberView,
-    MainView.TitledView {
+class LuckyNumberFragment : BaseFragment(), LuckyNumberView, MainView.TitledView {
 
     @Inject
     lateinit var presenter: LuckyNumberPresenter
@@ -25,57 +25,58 @@ class LuckyNumberFragment :
     override val titleStringId: Int
         get() = R.string.lucky_number_title
 
-    override val isViewEmpty get() = binding.luckyNumberText.text.isBlank()
+    override val isViewEmpty get() = luckyNumberText.text.isBlank()
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding = FragmentLuckyNumberBinding.bind(view)
-        messageContainer = binding.luckyNumberSwipe
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_lucky_number, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        messageContainer = luckyNumberSwipe
         presenter.onAttachView(this)
     }
 
     override fun initView() {
-        with(binding) {
-            luckyNumberSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
-            luckyNumberErrorRetry.setOnClickListener { presenter.onRetry() }
-            luckyNumberErrorDetails.setOnClickListener { presenter.onDetailsClick() }
-        }
+        luckyNumberSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
+        luckyNumberErrorRetry.setOnClickListener { presenter.onRetry() }
+        luckyNumberErrorDetails.setOnClickListener { presenter.onDetailsClick() }
     }
 
     override fun updateData(data: LuckyNumber) {
-        binding.luckyNumberText.text = data.luckyNumber.toString()
+        luckyNumberText.text = data.luckyNumber.toString()
     }
 
     override fun hideRefresh() {
-        binding.luckyNumberSwipe.isRefreshing = false
+        luckyNumberSwipe.isRefreshing = false
     }
 
     override fun showEmpty(show: Boolean) {
-        binding.luckyNumberEmpty.visibility = if (show) VISIBLE else GONE
+        luckyNumberEmpty.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showErrorView(show: Boolean) {
-        binding.luckyNumberError.visibility = if (show) VISIBLE else GONE
+        luckyNumberError.visibility = if (show) VISIBLE else GONE
     }
 
     override fun setErrorDetails(message: String) {
-        binding.luckyNumberErrorMessage.text = message
+        luckyNumberErrorMessage.text = message
     }
 
     override fun showProgress(show: Boolean) {
-        binding.luckyNumberProgress.visibility = if (show) VISIBLE else GONE
+        luckyNumberProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun enableSwipe(enable: Boolean) {
-        binding.luckyNumberSwipe.isEnabled = enable
+        luckyNumberSwipe.isEnabled = enable
     }
 
     override fun showContent(show: Boolean) {
-        binding.luckyNumberContent.visibility = if (show) VISIBLE else GONE
+        luckyNumberContent.visibility = if (show) VISIBLE else GONE
     }
 
     override fun onDestroyView() {
-        presenter.onDetachView()
         super.onDestroyView()
+        presenter.onDetachView()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberPresenter.kt
index e932fedc0..c86aab976 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberPresenter.kt
@@ -1,6 +1,7 @@
 package io.github.wulkanowy.ui.modules.luckynumber
 
 import io.github.wulkanowy.data.repositories.luckynumber.LuckyNumberRepository
+import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
@@ -14,6 +15,7 @@ class LuckyNumberPresenter @Inject constructor(
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val luckyNumberRepository: LuckyNumberRepository,
+    private val semesterRepository: SemesterRepository,
     private val analytics: FirebaseAnalyticsHelper
 ) : BasePresenter<LuckyNumberView>(errorHandler, studentRepository, schedulers) {
 
@@ -36,6 +38,7 @@ class LuckyNumberPresenter @Inject constructor(
         disposable.apply {
             clear()
             add(studentRepository.getCurrentStudent()
+                .flatMap { semesterRepository.getCurrentSemester(it) }
                 .flatMapMaybe { luckyNumberRepository.getLuckyNumber(it, forceRefresh) }
                 .subscribeOn(schedulers.backgroundThread)
                 .observeOn(schedulers.mainThread)
@@ -54,12 +57,7 @@ class LuckyNumberPresenter @Inject constructor(
                         showEmpty(false)
                         showErrorView(false)
                     }
-                    analytics.logEvent(
-                        "load_item",
-                        "type" to "lucky_number",
-                        "number" to it.luckyNumber,
-                        "force_refresh" to forceRefresh
-                    )
+                    analytics.logEvent("load_lucky_number", "lucky_number" to it.luckyNumber, "force_refresh" to forceRefresh)
                 }, {
                     Timber.i("Loading lucky number result: An exception occurred")
                     errorHandler.dispatch(it)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureActivity.kt
index 961ac6338..e8ce3bcfb 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureActivity.kt
@@ -4,39 +4,34 @@ import android.appwidget.AppWidgetManager.ACTION_APPWIDGET_UPDATE
 import android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_ID
 import android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_IDS
 import android.content.Intent
-import android.os.Build
 import android.os.Bundle
 import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
-import androidx.recyclerview.widget.LinearLayoutManager
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.databinding.ActivityWidgetConfigureBinding
 import io.github.wulkanowy.ui.base.BaseActivity
-import io.github.wulkanowy.ui.base.WidgetConfigureAdapter
 import io.github.wulkanowy.ui.modules.login.LoginActivity
-import io.github.wulkanowy.utils.AppInfo
+import io.github.wulkanowy.utils.setOnItemClickListener
+import kotlinx.android.synthetic.main.activity_widget_configure.*
 import javax.inject.Inject
 
-class LuckyNumberWidgetConfigureActivity :
-    BaseActivity<LuckyNumberWidgetConfigurePresenter, ActivityWidgetConfigureBinding>(),
+class LuckyNumberWidgetConfigureActivity : BaseActivity<LuckyNumberWidgetConfigurePresenter>(),
     LuckyNumberWidgetConfigureView {
 
     @Inject
-    lateinit var configureAdapter: WidgetConfigureAdapter
+    lateinit var configureAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
 
     @Inject
     override lateinit var presenter: LuckyNumberWidgetConfigurePresenter
 
-    @Inject
-    lateinit var appInfo: AppInfo
-
     private var dialog: AlertDialog? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setResult(RESULT_CANCELED)
-        setContentView(ActivityWidgetConfigureBinding.inflate(layoutInflater).apply { binding = this }.root)
+        setContentView(R.layout.activity_widget_configure)
 
         intent.extras.let {
             presenter.onAttachView(this, it?.getInt(EXTRA_APPWIDGET_ID))
@@ -44,35 +39,31 @@ class LuckyNumberWidgetConfigureActivity :
     }
 
     override fun initView() {
-        with(binding.widgetConfigureRecycler) {
+        with(widgetConfigureRecycler) {
             adapter = configureAdapter
-            layoutManager = LinearLayoutManager(context)
+            layoutManager = SmoothScrollLinearLayoutManager(context)
         }
 
-        configureAdapter.onClickListener = presenter::onItemSelect
+        configureAdapter.setOnItemClickListener(presenter::onItemSelect)
     }
 
     override fun showThemeDialog() {
-        var items = arrayOf(
+        val items = arrayOf(
             getString(R.string.widget_timetable_theme_light),
             getString(R.string.widget_timetable_theme_dark)
         )
-        if (appInfo.systemVersion >= Build.VERSION_CODES.Q) items += (getString(R.string.widget_timetable_theme_system))
 
-        dialog = AlertDialog.Builder(this, R.style.WulkanowyTheme_WidgetAccountSwitcher)
+       dialog =  AlertDialog.Builder(this, R.style.WulkanowyTheme_WidgetAccountSwitcher)
             .setTitle(R.string.widget_timetable_theme_title)
-            .setOnDismissListener { presenter.onDismissThemeView() }
+           .setOnDismissListener { presenter.onDismissThemeView() }
             .setSingleChoiceItems(items, -1) { _, which ->
                 presenter.onThemeSelect(which)
             }
             .show()
     }
 
-    override fun updateData(data: List<Pair<Student, Boolean>>) {
-        with(configureAdapter) {
-            items = data
-            notifyDataSetChanged()
-        }
+    override fun updateData(data: List<LuckyNumberWidgetConfigureItem>) {
+        configureAdapter.updateDataSet(data)
     }
 
     override fun updateLuckyNumberWidget(widgetId: Int) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureItem.kt
new file mode 100644
index 000000000..e260b7fcb
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureItem.kt
@@ -0,0 +1,60 @@
+package io.github.wulkanowy.ui.modules.luckynumberwidget
+
+import android.annotation.SuppressLint
+import android.view.View
+import androidx.core.graphics.ColorUtils
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.FlexibleViewHolder
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetConfigureItem
+import io.github.wulkanowy.utils.getThemeAttrColor
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.item_account.*
+
+class LuckyNumberWidgetConfigureItem(var student: Student, val isCurrent: Boolean) :
+    AbstractFlexibleItem<LuckyNumberWidgetConfigureItem.ViewHolder>() {
+
+    override fun getLayoutRes() = R.layout.item_account
+
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>) = ViewHolder(view, adapter)
+
+    @SuppressLint("SetTextI18n")
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>) {
+        val context = holder.contentView.context
+
+        val colorImage = if (isCurrent) context.getThemeAttrColor(R.attr.colorPrimary)
+        else ColorUtils.setAlphaComponent(context.getThemeAttrColor(R.attr.colorOnSurface), 153)
+
+        with(holder) {
+            accountItemName.text = "${student.studentName} ${student.className}"
+            accountItemSchool.text = student.schoolName
+            accountItemImage.setColorFilter(colorImage)
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as TimetableWidgetConfigureItem
+
+        if (student != other.student) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = student.hashCode()
+        result = 31 * result + student.id.toInt()
+        return result
+    }
+
+    class ViewHolder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter),
+        LayoutContainer {
+
+        override val containerView: View? get() = contentView
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigurePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigurePresenter.kt
index 468f9b575..6e4716bfa 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigurePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigurePresenter.kt
@@ -1,5 +1,6 @@
 package io.github.wulkanowy.ui.modules.luckynumberwidget
 
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.student.StudentRepository
@@ -28,9 +29,11 @@ class LuckyNumberWidgetConfigurePresenter @Inject constructor(
         loadData()
     }
 
-    fun onItemSelect(student: Student) {
-        selectedStudent = student
-        view?.showThemeDialog()
+    fun onItemSelect(item: AbstractFlexibleItem<*>) {
+        if (item is LuckyNumberWidgetConfigureItem) {
+            selectedStudent = item.student
+            view?.showThemeDialog()
+        }
     }
 
     fun onThemeSelect(index: Int) {
@@ -40,7 +43,7 @@ class LuckyNumberWidgetConfigurePresenter @Inject constructor(
         registerStudent(selectedStudent)
     }
 
-    fun onDismissThemeView() {
+    fun onDismissThemeView(){
         view?.finishView()
     }
 
@@ -48,7 +51,7 @@ class LuckyNumberWidgetConfigurePresenter @Inject constructor(
         disposable.add(studentRepository.getSavedStudents(false)
             .map { it to appWidgetId?.let { id -> sharedPref.getLong(getStudentWidgetKey(id), 0) } }
             .map { (students, currentStudentId) ->
-                students.map { student -> student to (student.id == currentStudentId) }
+                students.map { student -> LuckyNumberWidgetConfigureItem(student, student.id == currentStudentId) }
             }
             .subscribeOn(schedulers.backgroundThread)
             .observeOn(schedulers.mainThread)
@@ -56,7 +59,7 @@ class LuckyNumberWidgetConfigurePresenter @Inject constructor(
                 when {
                     it.isEmpty() -> view?.openLoginView()
                     it.size == 1 -> {
-                        selectedStudent = it.single().first
+                        selectedStudent = it.single().student
                         view?.showThemeDialog()
                     }
                     else -> view?.updateData(it)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureView.kt
index c8c348ed3..fa4c0cc61 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureView.kt
@@ -1,6 +1,5 @@
 package io.github.wulkanowy.ui.modules.luckynumberwidget
 
-import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.ui.base.BaseView
 
 interface LuckyNumberWidgetConfigureView : BaseView {
@@ -9,7 +8,7 @@ interface LuckyNumberWidgetConfigureView : BaseView {
 
     fun showThemeDialog()
 
-    fun updateData(data: List<Pair<Student, Boolean>>)
+    fun updateData(data: List<LuckyNumberWidgetConfigureItem>)
 
     fun updateLuckyNumberWidget(widgetId: Int)
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetProvider.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetProvider.kt
index 55a048b32..12753b35d 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetProvider.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetProvider.kt
@@ -1,15 +1,21 @@
 package io.github.wulkanowy.ui.modules.luckynumberwidget
 
+import android.annotation.TargetApi
 import android.app.PendingIntent
 import android.app.PendingIntent.FLAG_UPDATE_CURRENT
 import android.appwidget.AppWidgetManager
+import android.appwidget.AppWidgetManager.ACTION_APPWIDGET_DELETED
+import android.appwidget.AppWidgetManager.ACTION_APPWIDGET_OPTIONS_CHANGED
+import android.appwidget.AppWidgetManager.ACTION_APPWIDGET_UPDATE
+import android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_ID
+import android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_IDS
+import android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_OPTIONS
 import android.appwidget.AppWidgetManager.OPTION_APPWIDGET_MAX_HEIGHT
-import android.appwidget.AppWidgetManager.OPTION_APPWIDGET_MIN_WIDTH
-import android.appwidget.AppWidgetProvider
+import android.appwidget.AppWidgetManager.OPTION_APPWIDGET_MAX_WIDTH
+import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import android.content.res.Configuration
-import android.os.Bundle
+import android.os.Build
 import android.view.View.GONE
 import android.view.View.VISIBLE
 import android.widget.RemoteViews
@@ -19,6 +25,7 @@ import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.db.entities.LuckyNumber
 import io.github.wulkanowy.data.exceptions.NoCurrentStudentException
 import io.github.wulkanowy.data.repositories.luckynumber.LuckyNumberRepository
+import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
@@ -27,11 +34,14 @@ import io.reactivex.Maybe
 import timber.log.Timber
 import javax.inject.Inject
 
-class LuckyNumberWidgetProvider : AppWidgetProvider() {
+class LuckyNumberWidgetProvider : BroadcastReceiver() {
 
     @Inject
     lateinit var studentRepository: StudentRepository
 
+    @Inject
+    lateinit var semesterRepository: SemesterRepository
+
     @Inject
     lateinit var luckyNumberRepository: LuckyNumberRepository
 
@@ -49,92 +59,40 @@ class LuckyNumberWidgetProvider : AppWidgetProvider() {
         fun getStudentWidgetKey(appWidgetId: Int) = "lucky_number_widget_student_$appWidgetId"
 
         fun getThemeWidgetKey(appWidgetId: Int) = "lucky_number_widget_theme_$appWidgetId"
-
-        fun getHeightWidgetKey(appWidgetId: Int) = "lucky_number_widget_height_$appWidgetId"
-
-        fun getWidthWidgetKey(appWidgetId: Int) = "lucky_number_widget_width_$appWidgetId"
     }
 
+    @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
     override fun onReceive(context: Context, intent: Intent) {
         AndroidInjection.inject(this, context)
-        super.onReceive(context, intent)
+        when (intent.action) {
+            ACTION_APPWIDGET_UPDATE -> onUpdate(context, intent)
+            ACTION_APPWIDGET_DELETED -> onDelete(intent)
+            ACTION_APPWIDGET_OPTIONS_CHANGED -> onOptionsChange(context, intent)
+        }
     }
 
-    override fun onUpdate(context: Context, appWidgetManager: AppWidgetManager, appWidgetIds: IntArray?) {
-        super.onUpdate(context, appWidgetManager, appWidgetIds)
-        appWidgetIds?.forEach { appWidgetId ->
+    private fun onUpdate(context: Context, intent: Intent) {
+        intent.getIntArrayExtra(EXTRA_APPWIDGET_IDS)?.forEach { appWidgetId ->
+            val savedTheme = sharedPref.getLong(getThemeWidgetKey(appWidgetId), 0)
+            val layoutId = if (savedTheme == 0L) R.layout.widget_luckynumber else R.layout.widget_luckynumber_dark
 
             val luckyNumber = getLuckyNumber(sharedPref.getLong(getStudentWidgetKey(appWidgetId), 0), appWidgetId)
             val appIntent = PendingIntent.getActivity(context, MainView.Section.LUCKY_NUMBER.id,
                 MainActivity.getStartIntent(context, MainView.Section.LUCKY_NUMBER, true), FLAG_UPDATE_CURRENT)
 
-            val remoteView = RemoteViews(context.packageName, getCorrectLayoutId(appWidgetId, context)).apply {
+            val remoteView = RemoteViews(context.packageName, layoutId).apply {
                 setTextViewText(R.id.luckyNumberWidgetNumber, luckyNumber?.luckyNumber?.toString() ?: "#")
                 setOnClickPendingIntent(R.id.luckyNumberWidgetContainer, appIntent)
             }
 
-            setStyles(remoteView, appWidgetId)
+            setStyles(remoteView, intent)
             appWidgetManager.updateAppWidget(appWidgetId, remoteView)
         }
     }
 
-    override fun onDeleted(context: Context?, appWidgetIds: IntArray?) {
-        super.onDeleted(context, appWidgetIds)
-        appWidgetIds?.forEach { appWidgetId ->
-            with(sharedPref) {
-                delete(getHeightWidgetKey(appWidgetId))
-                delete(getStudentWidgetKey(appWidgetId))
-                delete(getThemeWidgetKey(appWidgetId))
-                delete(getWidthWidgetKey(appWidgetId))
-            }
-        }
-    }
-
-    override fun onAppWidgetOptionsChanged(context: Context, appWidgetManager: AppWidgetManager, appWidgetId: Int, newOptions: Bundle?) {
-        super.onAppWidgetOptionsChanged(context, appWidgetManager, appWidgetId, newOptions)
-
-        val remoteView = RemoteViews(context.packageName, getCorrectLayoutId(appWidgetId, context))
-
-        setStyles(remoteView, appWidgetId, newOptions)
-        appWidgetManager.updateAppWidget(appWidgetId, remoteView)
-    }
-
-    private fun setStyles(views: RemoteViews, appWidgetId: Int, options: Bundle? = null) {
-        val width = options?.getInt(OPTION_APPWIDGET_MIN_WIDTH) ?: sharedPref.getLong(getWidthWidgetKey(appWidgetId), 74).toInt()
-        val height = options?.getInt(OPTION_APPWIDGET_MAX_HEIGHT) ?: sharedPref.getLong(getHeightWidgetKey(appWidgetId), 74).toInt()
-
-        with(sharedPref) {
-            putLong(getWidthWidgetKey(appWidgetId), width.toLong())
-            putLong(getHeightWidgetKey(appWidgetId), height.toLong())
-        }
-
-        val rows = getCellsForSize(height)
-        val cols = getCellsForSize(width)
-
-        Timber.d("New lucky number widget measurement: %dx%d", width, height)
-        Timber.d("Widget size: $cols x $rows")
-
-        when {
-            1 == cols && 1 == rows -> views.setVisibility(imageTop = false, imageLeft = false)
-            1 == cols && 1 < rows -> views.setVisibility(imageTop = true, imageLeft = false)
-            1 < cols && 1 == rows -> views.setVisibility(imageTop = false, imageLeft = true)
-            1 == cols && 1 == rows -> views.setVisibility(imageTop = true, imageLeft = false)
-            2 == cols && 1 == rows -> views.setVisibility(imageTop = false, imageLeft = true)
-            else -> views.setVisibility(imageTop = false, imageLeft = false, title = true)
-        }
-    }
-
-    private fun RemoteViews.setVisibility(imageTop: Boolean, imageLeft: Boolean, title: Boolean = false) {
-        setViewVisibility(R.id.luckyNumberWidgetImageTop, if (imageTop) VISIBLE else GONE)
-        setViewVisibility(R.id.luckyNumberWidgetImageLeft, if (imageLeft) VISIBLE else GONE)
-        setViewVisibility(R.id.luckyNumberWidgetTitle, if (title) VISIBLE else GONE)
-        setViewVisibility(R.id.luckyNumberWidgetNumber, VISIBLE)
-    }
-
-    private fun getCellsForSize(size: Int): Int {
-        var n = 2
-        while (74 * n - 30 < size) ++n
-        return n - 1
+    private fun onDelete(intent: Intent) {
+        val appWidgetId = intent.getIntExtra(EXTRA_APPWIDGET_ID, 0)
+        if (appWidgetId != 0) sharedPref.delete(getStudentWidgetKey(appWidgetId))
     }
 
     private fun getLuckyNumber(studentId: Long, appWidgetId: Int): LuckyNumber? {
@@ -155,6 +113,7 @@ class LuckyNumberWidgetProvider : AppWidgetProvider() {
                         else -> Maybe.empty()
                     }
                 }
+                .flatMap { semesterRepository.getCurrentSemester(it).toMaybe() }
                 .flatMap { luckyNumberRepository.getLuckyNumber(it) }
                 .subscribeOn(schedulers.backgroundThread)
                 .blockingGet()
@@ -166,14 +125,68 @@ class LuckyNumberWidgetProvider : AppWidgetProvider() {
         }
     }
 
-    private fun getCorrectLayoutId(appWidgetId: Int, context: Context): Int {
-        val savedTheme = sharedPref.getLong(getThemeWidgetKey(appWidgetId), 0)
-        val isSystemDarkMode = context.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES
+    private fun onOptionsChange(context: Context, intent: Intent) {
+        intent.extras?.getInt(EXTRA_APPWIDGET_ID)?.let { appWidgetId ->
+            val savedTheme = sharedPref.getLong(getThemeWidgetKey(appWidgetId), 0)
+            val layoutId = if (savedTheme == 0L) R.layout.widget_luckynumber else R.layout.widget_luckynumber_dark
 
-        return if (savedTheme == 1L || (savedTheme == 2L && isSystemDarkMode)) {
-            R.layout.widget_luckynumber_dark
-        } else {
-            R.layout.widget_luckynumber
+            val remoteView = RemoteViews(context.packageName, layoutId)
+
+            setStyles(remoteView, intent)
+            appWidgetManager.updateAppWidget(appWidgetId, remoteView)
+        }
+    }
+
+    @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
+    private fun setStyles(views: RemoteViews, intent: Intent) {
+        val options = intent.extras?.getBundle(EXTRA_APPWIDGET_OPTIONS)
+
+        val maxWidth = options?.getInt(OPTION_APPWIDGET_MAX_WIDTH) ?: 150
+        val maxHeight = options?.getInt(OPTION_APPWIDGET_MAX_HEIGHT) ?: 40
+
+        Timber.d("New lucky number widget measurement: %dx%d", maxWidth, maxHeight)
+
+        when {
+            // 1x1
+            maxWidth < 150 && maxHeight < 110 -> {
+                Timber.d("Lucky number widget size: 1x1")
+                with(views) {
+                    setViewVisibility(R.id.luckyNumberWidgetImageTop, GONE)
+                    setViewVisibility(R.id.luckyNumberWidgetImageLeft, GONE)
+                    setViewVisibility(R.id.luckyNumberWidgetTitle, GONE)
+                    setViewVisibility(R.id.luckyNumberWidgetNumber, VISIBLE)
+                }
+            }
+            // 1x2
+            maxWidth < 150 && maxHeight > 110 -> {
+                Timber.d("Lucky number widget size: 1x2")
+                with(views) {
+                    setViewVisibility(R.id.luckyNumberWidgetImageTop, VISIBLE)
+                    setViewVisibility(R.id.luckyNumberWidgetImageLeft, GONE)
+                    setViewVisibility(R.id.luckyNumberWidgetTitle, GONE)
+                    setViewVisibility(R.id.luckyNumberWidgetNumber, VISIBLE)
+                }
+            }
+            // 2x1
+            maxWidth >= 150 && maxHeight <= 110 -> {
+                Timber.d("Lucky number widget size: 2x1")
+                with(views) {
+                    setViewVisibility(R.id.luckyNumberWidgetImageTop, GONE)
+                    setViewVisibility(R.id.luckyNumberWidgetImageLeft, VISIBLE)
+                    setViewVisibility(R.id.luckyNumberWidgetTitle, GONE)
+                    setViewVisibility(R.id.luckyNumberWidgetNumber, VISIBLE)
+                }
+            }
+            // 2x2 and bigger
+            else -> {
+                Timber.d("Lucky number widget size: 2x2 and bigger")
+                with(views) {
+                    setViewVisibility(R.id.luckyNumberWidgetImageTop, GONE)
+                    setViewVisibility(R.id.luckyNumberWidgetImageLeft, GONE)
+                    setViewVisibility(R.id.luckyNumberWidgetTitle, VISIBLE)
+                    setViewVisibility(R.id.luckyNumberWidgetNumber, VISIBLE)
+                }
+            }
         }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt
index f5b7c47c8..ae4be9530 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt
@@ -9,6 +9,7 @@ import android.os.Build.VERSION_CODES.LOLLIPOP
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
+import androidx.core.graphics.ColorUtils
 import androidx.core.view.ViewCompat
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.Fragment
@@ -19,7 +20,6 @@ import com.ncapdevi.fragnav.FragNavController
 import com.ncapdevi.fragnav.FragNavController.Companion.HIDE
 import dagger.Lazy
 import io.github.wulkanowy.R
-import io.github.wulkanowy.databinding.ActivityMainBinding
 import io.github.wulkanowy.ui.base.BaseActivity
 import io.github.wulkanowy.ui.modules.account.AccountDialog
 import io.github.wulkanowy.ui.modules.attendance.AttendanceFragment
@@ -31,15 +31,15 @@ import io.github.wulkanowy.ui.modules.message.MessageFragment
 import io.github.wulkanowy.ui.modules.more.MoreFragment
 import io.github.wulkanowy.ui.modules.note.NoteFragment
 import io.github.wulkanowy.ui.modules.timetable.TimetableFragment
-import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.getThemeAttrColor
 import io.github.wulkanowy.utils.safelyPopFragments
 import io.github.wulkanowy.utils.setOnViewChangeListener
+import kotlinx.android.synthetic.main.activity_main.*
 import timber.log.Timber
 import javax.inject.Inject
 
-class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainView {
+class MainActivity : BaseActivity<MainPresenter>(), MainView {
 
     @Inject
     override lateinit var presenter: MainPresenter
@@ -47,9 +47,6 @@ class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainVie
     @Inject
     lateinit var navController: FragNavController
 
-    @Inject
-    lateinit var analytics: FirebaseAnalyticsHelper
-
     @Inject
     lateinit var overlayProvider: Lazy<ElevationOverlayProvider>
 
@@ -71,8 +68,6 @@ class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainVie
 
     override val currentViewTitle get() = (navController.currentFrag as? MainView.TitledView)?.titleStringId?.let { getString(it) }
 
-    override val currentViewSubtitle get() = (navController.currentFrag as? MainView.TitledView)?.subtitleString
-
     override var startMenuIndex = 0
 
     override var startMenuMoreIndex = -1
@@ -86,9 +81,9 @@ class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainVie
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(ActivityMainBinding.inflate(layoutInflater).apply { binding = this }.root)
-        setSupportActionBar(binding.mainToolbar)
-        messageContainer = binding.mainFragmentContainer
+        setContentView(R.layout.activity_main)
+        setSupportActionBar(mainToolbar)
+        messageContainer = mainFragmentContainer
 
         presenter.onAttachView(this, intent.getSerializableExtra(EXTRA_START_MENU) as? MainView.Section)
 
@@ -104,12 +99,12 @@ class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainVie
     }
 
     override fun initView() {
-        with(binding.mainToolbar) {
+        with(mainToolbar) {
             if (SDK_INT >= LOLLIPOP) stateListAnimator = null
             setBackgroundColor(overlayProvider.get().compositeOverlayWithThemeSurfaceColorIfNeeded(dpToPx(4f)))
         }
 
-        with(binding.mainBottomNav) {
+        with(mainBottomNav) {
             addItems(listOf(
                 AHBottomNavigationItem(R.string.grade_title, R.drawable.ic_main_grade, 0),
                 AHBottomNavigationItem(R.string.attendance_title, R.drawable.ic_main_attendance, 0),
@@ -118,7 +113,7 @@ class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainVie
                 AHBottomNavigationItem(R.string.more_title, R.drawable.ic_main_more, 0)
             ))
             accentColor = getThemeAttrColor(R.attr.colorPrimary)
-            inactiveColor = getThemeAttrColor(R.attr.colorOnSurface, 153)
+            inactiveColor = ColorUtils.setAlphaComponent(getThemeAttrColor(R.attr.colorOnSurface), 153)
             defaultBackgroundColor = overlayProvider.get().compositeOverlayWithThemeSurfaceColorIfNeeded(dpToPx(8f))
             titleState = ALWAYS_SHOW
             currentItem = startMenuIndex
@@ -140,10 +135,6 @@ class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainVie
         }
     }
 
-    override fun setCurrentScreen(name: String?) {
-        analytics.setCurrentScreen(this, name)
-    }
-
     override fun onOptionsItemSelected(item: MenuItem?): Boolean {
         return if (item?.itemId == R.id.mainMenuAccount) presenter.onAccountManagerSelected()
         else false
@@ -161,10 +152,6 @@ class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainVie
         supportActionBar?.title = title
     }
 
-    override fun setViewSubTitle(subtitle: String?) {
-        supportActionBar?.subtitle = subtitle
-    }
-
     override fun showHomeArrow(show: Boolean) {
         supportActionBar?.setDisplayHomeAsUpEnabled(show)
     }
@@ -174,7 +161,7 @@ class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainVie
     }
 
     override fun showActionBarElevation(show: Boolean) {
-        ViewCompat.setElevation(binding.mainToolbar, if (show) dpToPx(4f) else 0f)
+        ViewCompat.setElevation(mainToolbar, if (show) dpToPx(4f) else 0f)
     }
 
     override fun notifyMenuViewReselected() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainModule.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainModule.kt
index 03f6ac382..50e5896fe 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainModule.kt
@@ -8,23 +8,23 @@ import dagger.android.ContributesAndroidInjector
 import io.github.wulkanowy.R
 import io.github.wulkanowy.di.scopes.PerFragment
 import io.github.wulkanowy.ui.modules.about.AboutFragment
-import io.github.wulkanowy.ui.modules.about.contributor.ContributorFragment
+import io.github.wulkanowy.ui.modules.about.creator.CreatorFragment
 import io.github.wulkanowy.ui.modules.about.license.LicenseFragment
 import io.github.wulkanowy.ui.modules.about.license.LicenseModule
-import io.github.wulkanowy.ui.modules.about.logviewer.LogViewerFragment
 import io.github.wulkanowy.ui.modules.account.AccountDialog
 import io.github.wulkanowy.ui.modules.attendance.AttendanceFragment
+import io.github.wulkanowy.ui.modules.attendance.AttendanceModule
 import io.github.wulkanowy.ui.modules.attendance.summary.AttendanceSummaryFragment
 import io.github.wulkanowy.ui.modules.exam.ExamFragment
 import io.github.wulkanowy.ui.modules.grade.GradeFragment
 import io.github.wulkanowy.ui.modules.grade.GradeModule
 import io.github.wulkanowy.ui.modules.homework.HomeworkFragment
-import io.github.wulkanowy.ui.modules.homework.details.HomeworkDetailsDialog
 import io.github.wulkanowy.ui.modules.luckynumber.LuckyNumberFragment
 import io.github.wulkanowy.ui.modules.message.MessageFragment
 import io.github.wulkanowy.ui.modules.message.MessageModule
 import io.github.wulkanowy.ui.modules.message.preview.MessagePreviewFragment
 import io.github.wulkanowy.ui.modules.mobiledevice.MobileDeviceFragment
+import io.github.wulkanowy.ui.modules.mobiledevice.MobileDeviceModule
 import io.github.wulkanowy.ui.modules.mobiledevice.token.MobileDeviceTokenDialog
 import io.github.wulkanowy.ui.modules.more.MoreFragment
 import io.github.wulkanowy.ui.modules.note.NoteFragment
@@ -35,14 +35,16 @@ import io.github.wulkanowy.ui.modules.timetable.TimetableFragment
 import io.github.wulkanowy.ui.modules.timetable.completed.CompletedLessonsFragment
 
 @Suppress("unused")
-@Module
+@Module(includes = [MainModule.Static::class])
 abstract class MainModule {
 
-    companion object {
+    @Module
+    object Static {
 
         @Provides
-        fun provideFragNavController(activity: MainActivity) =
-            FragNavController(activity.supportFragmentManager, R.id.mainFragmentContainer)
+        fun provideFragNavController(activity: MainActivity): FragNavController {
+            return FragNavController(activity.supportFragmentManager, R.id.mainFragmentContainer)
+        }
 
         //In activities must be injected as Lazy
         @Provides
@@ -50,7 +52,7 @@ abstract class MainModule {
     }
 
     @PerFragment
-    @ContributesAndroidInjector
+    @ContributesAndroidInjector(modules = [AttendanceModule::class])
     abstract fun bindAttendanceFragment(): AttendanceFragment
 
     @PerFragment
@@ -97,10 +99,6 @@ abstract class MainModule {
     @ContributesAndroidInjector
     abstract fun bindHomeworkFragment(): HomeworkFragment
 
-    @PerFragment
-    @ContributesAndroidInjector
-    abstract fun bindHomeworkDetailsDialog(): HomeworkDetailsDialog
-
     @PerFragment
     @ContributesAndroidInjector
     abstract fun bindLuckyNumberFragment(): LuckyNumberFragment
@@ -114,7 +112,7 @@ abstract class MainModule {
     abstract fun bindAccountDialog(): AccountDialog
 
     @PerFragment
-    @ContributesAndroidInjector
+    @ContributesAndroidInjector(modules = [MobileDeviceModule::class])
     abstract fun bindMobileDevices(): MobileDeviceFragment
 
     @PerFragment
@@ -126,12 +124,8 @@ abstract class MainModule {
     abstract fun bindLicenseFragment(): LicenseFragment
 
     @PerFragment
-    @ContributesAndroidInjector
-    abstract fun bindLogViewerFragment(): LogViewerFragment
-
-    @PerFragment
-    @ContributesAndroidInjector
-    abstract fun bindContributorFragment(): ContributorFragment
+    @ContributesAndroidInjector()
+    abstract fun bindCreatorsFragment(): CreatorFragment
 
     @PerFragment
     @ContributesAndroidInjector(modules = [SchoolAndTeachersModule::class])
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt
index 233d44917..8eccbc67e 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt
@@ -33,16 +33,14 @@ class MainPresenter @Inject constructor(
             Timber.i("Main view was initialized with $startMenuIndex menu index and $startMenuMoreIndex more index")
         }
 
-        syncManager.startPeriodicSyncWorker()
+        syncManager.startSyncWorker()
         analytics.logEvent("app_open", "destination" to initMenu?.name)
     }
 
-    fun onViewChange(section: MainView.Section?, name: String?) {
+    fun onViewChange(section: MainView.Section?) {
         view?.apply {
-            setCurrentScreen(name)
             showActionBarElevation(section != GRADE && section != MESSAGE && section != SCHOOL)
             currentViewTitle?.let { setViewTitle(it) }
-            currentViewSubtitle?.let { setViewSubTitle(it.ifBlank { null }) }
             currentStackSize?.let {
                 if (it > 1) showHomeArrow(true)
                 else showHomeArrow(false)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainView.kt
index 7e5831471..0d8b14169 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainView.kt
@@ -12,8 +12,6 @@ interface MainView : BaseView {
 
     val currentViewTitle: String?
 
-    val currentViewSubtitle: String?
-
     val currentStackSize: Int?
 
     fun initView()
@@ -24,8 +22,6 @@ interface MainView : BaseView {
 
     fun showAccountPicker()
 
-    fun setCurrentScreen(name: String?)
-
     fun showActionBarElevation(show: Boolean)
 
     fun notifyMenuViewReselected()
@@ -34,8 +30,6 @@ interface MainView : BaseView {
 
     fun setViewTitle(title: String)
 
-    fun setViewSubTitle(subtitle: String?)
-
     fun popView(depth: Int = 1)
 
     interface MainChildView {
@@ -48,10 +42,6 @@ interface MainView : BaseView {
     interface TitledView {
 
         val titleStringId: Int
-
-        var subtitleString: String
-            get() = ""
-            set(_) {}
     }
 
     enum class Section(val id: Int) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageFragment.kt
index 4a9d217b0..7a3e135dd 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageFragment.kt
@@ -1,15 +1,16 @@
 package io.github.wulkanowy.ui.modules.message
 
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
 import android.view.View.INVISIBLE
 import android.view.View.VISIBLE
+import android.view.ViewGroup
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.repositories.message.MessageFolder.RECEIVED
 import io.github.wulkanowy.data.repositories.message.MessageFolder.SENT
 import io.github.wulkanowy.data.repositories.message.MessageFolder.TRASHED
-import io.github.wulkanowy.databinding.FragmentMessageBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.base.BaseFragmentPagerAdapter
 import io.github.wulkanowy.ui.modules.main.MainView
@@ -17,10 +18,10 @@ import io.github.wulkanowy.ui.modules.message.send.SendMessageActivity
 import io.github.wulkanowy.ui.modules.message.tab.MessageTabFragment
 import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.setOnSelectPageListener
+import kotlinx.android.synthetic.main.fragment_message.*
 import javax.inject.Inject
 
-class MessageFragment : BaseFragment<FragmentMessageBinding>(R.layout.fragment_message),
-    MessageView, MainView.TitledView {
+class MessageFragment : BaseFragment(), MessageView, MainView.TitledView {
 
     @Inject
     lateinit var presenter: MessagePresenter
@@ -34,17 +35,20 @@ class MessageFragment : BaseFragment<FragmentMessageBinding>(R.layout.fragment_m
 
     override val titleStringId get() = R.string.message_title
 
-    override val currentPageIndex get() = binding.messageViewPager.currentItem
+    override val currentPageIndex get() = messageViewPager.currentItem
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding = FragmentMessageBinding.bind(view)
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_message, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
         presenter.onAttachView(this)
     }
 
     override fun initView() {
         with(pagerAdapter) {
-            containerId = binding.messageViewPager.id
+            containerId = messageViewPager.id
             addFragmentsWithTitle(mapOf(
                 MessageTabFragment.newInstance(RECEIVED) to getString(R.string.message_inbox),
                 MessageTabFragment.newInstance(SENT) to getString(R.string.message_sent),
@@ -52,29 +56,27 @@ class MessageFragment : BaseFragment<FragmentMessageBinding>(R.layout.fragment_m
             ))
         }
 
-        with(binding.messageViewPager) {
+        with(messageViewPager) {
             adapter = pagerAdapter
             offscreenPageLimit = 2
             setOnSelectPageListener(presenter::onPageSelected)
         }
 
-        with(binding.messageTabLayout) {
-            setupWithViewPager(binding.messageViewPager)
+        with(messageTabLayout) {
+            setupWithViewPager(messageViewPager)
             setElevationCompat(context.dpToPx(4f))
         }
 
-        binding.openSendMessageButton.setOnClickListener { presenter.onSendMessageButtonClicked() }
+        openSendMessageButton.setOnClickListener { presenter.onSendMessageButtonClicked() }
     }
 
     override fun showContent(show: Boolean) {
-        with(binding) {
-            messageViewPager.visibility = if (show) VISIBLE else INVISIBLE
-            messageTabLayout.visibility = if (show) VISIBLE else INVISIBLE
-        }
+        messageViewPager.visibility = if (show) VISIBLE else INVISIBLE
+        messageTabLayout.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun showProgress(show: Boolean) {
-        binding.messageProgress.visibility = if (show) VISIBLE else INVISIBLE
+        messageProgress.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     fun onDeleteMessage(message: Message) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageItem.kt
new file mode 100644
index 000000000..19d6ad1de
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageItem.kt
@@ -0,0 +1,63 @@
+package io.github.wulkanowy.ui.modules.message
+
+import android.graphics.Typeface.BOLD
+import android.graphics.Typeface.NORMAL
+import android.view.View
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.FlexibleViewHolder
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Message
+import io.github.wulkanowy.data.repositories.message.MessageFolder
+import io.github.wulkanowy.utils.toFormattedString
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.item_message.*
+
+class MessageItem(val message: Message, private val noSubjectString: String) :
+    AbstractFlexibleItem<MessageItem.ViewHolder>() {
+
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): ViewHolder {
+        return ViewHolder(view, adapter)
+    }
+
+    override fun getLayoutRes() = R.layout.item_message
+
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
+        holder.apply {
+            val style = if (message.unread) BOLD else NORMAL
+
+            messageItemAuthor.run {
+                text = if (message.folderId == MessageFolder.SENT.id) message.recipient else message.sender
+                setTypeface(null, style)
+            }
+            messageItemSubject.run {
+                text = if (message.subject.isNotBlank()) message.subject else noSubjectString
+                setTypeface(null, style)
+            }
+            messageItemDate.run {
+                text = message.date.toFormattedString()
+                setTypeface(null, style)
+            }
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as MessageItem
+
+        if (message != other.message) return false
+        return true
+    }
+
+    override fun hashCode(): Int {
+        return message.hashCode()
+    }
+
+    class ViewHolder(val view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter), LayoutContainer {
+        override val containerView: View
+            get() = contentView
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageModule.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageModule.kt
index bf7950209..b25219025 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageModule.kt
@@ -9,10 +9,11 @@ import io.github.wulkanowy.ui.base.BaseFragmentPagerAdapter
 import io.github.wulkanowy.ui.modules.message.tab.MessageTabFragment
 
 @Suppress("unused")
-@Module
+@Module(includes = [MessageModule.Static::class])
 abstract class MessageModule {
 
-    companion object {
+    @Module
+    object Static {
 
         @PerFragment
         @Provides
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewAdapter.kt
deleted file mode 100644
index 436dee53f..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewAdapter.kt
+++ /dev/null
@@ -1,92 +0,0 @@
-package io.github.wulkanowy.ui.modules.message.preview
-
-import android.annotation.SuppressLint
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Message
-import io.github.wulkanowy.data.db.entities.MessageAttachment
-import io.github.wulkanowy.data.db.entities.MessageWithAttachment
-import io.github.wulkanowy.data.repositories.message.MessageFolder
-import io.github.wulkanowy.databinding.ItemMessageAttachmentBinding
-import io.github.wulkanowy.databinding.ItemMessageDividerBinding
-import io.github.wulkanowy.databinding.ItemMessagePreviewBinding
-import io.github.wulkanowy.utils.openInternetBrowser
-import io.github.wulkanowy.utils.toFormattedString
-import javax.inject.Inject
-
-class MessagePreviewAdapter @Inject constructor() :
-    RecyclerView.Adapter<RecyclerView.ViewHolder>() {
-
-    enum class ViewType(val id: Int) {
-        MESSAGE(1),
-        DIVIDER(2),
-        ATTACHMENT(3)
-    }
-
-    var messageWithAttachment: MessageWithAttachment? = null
-        set(value) {
-            field = value
-            attachments = value?.attachments.orEmpty()
-        }
-
-    private var attachments: List<MessageAttachment> = emptyList()
-
-    override fun getItemCount() = if (messageWithAttachment == null) 0 else attachments.size + 1 + if (attachments.isNotEmpty()) 1 else 0
-
-    override fun getItemViewType(position: Int) = when (position) {
-        0 -> ViewType.MESSAGE.id
-        1 -> ViewType.DIVIDER.id
-        else -> ViewType.ATTACHMENT.id
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        val inflater = LayoutInflater.from(parent.context)
-
-        return when (viewType) {
-            ViewType.MESSAGE.id -> MessageViewHolder(ItemMessagePreviewBinding.inflate(inflater, parent, false))
-            ViewType.DIVIDER.id -> DividerViewHolder(ItemMessageDividerBinding.inflate(inflater, parent, false))
-            ViewType.ATTACHMENT.id -> AttachmentViewHolder(ItemMessageAttachmentBinding.inflate(inflater, parent, false))
-            else -> throw IllegalStateException()
-        }
-    }
-
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        when (holder) {
-            is MessageViewHolder -> bindMessage(holder, requireNotNull(messageWithAttachment).message)
-            is AttachmentViewHolder -> bindAttachment(holder, requireNotNull(messageWithAttachment).attachments[position - 2])
-        }
-    }
-
-    @SuppressLint("SetTextI18n")
-    private fun bindMessage(holder: MessageViewHolder, message: Message) {
-        with(holder.binding) {
-            messagePreviewSubject.text = if (message.subject.isNotBlank()) message.subject else root.context.getString(R.string.message_no_subject)
-            messagePreviewDate.text = root.context.getString(R.string.message_date, message.date.toFormattedString("yyyy-MM-dd HH:mm:ss"))
-            messagePreviewContent.text = message.content
-            messagePreviewAuthor.text = if (message.folderId == MessageFolder.SENT.id) "${root.context.getString(R.string.message_to)} ${message.recipient}"
-            else "${root.context.getString(R.string.message_from)} ${message.sender}"
-        }
-    }
-
-    private fun bindAttachment(holder: AttachmentViewHolder, attachment: MessageAttachment) {
-        with(holder.binding) {
-            messagePreviewAttachment.visibility = View.VISIBLE
-            messagePreviewAttachment.text = attachment.filename
-            root.setOnClickListener {
-                root.context.openInternetBrowser(attachment.url) { }
-            }
-        }
-    }
-
-    class MessageViewHolder(val binding: ItemMessagePreviewBinding) :
-        RecyclerView.ViewHolder(binding.root)
-
-    class DividerViewHolder(val binding: ItemMessageDividerBinding) :
-        RecyclerView.ViewHolder(binding.root)
-
-    class AttachmentViewHolder(val binding: ItemMessageAttachmentBinding) :
-        RecyclerView.ViewHolder(binding.root)
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewFragment.kt
index 99eede15a..22231e429 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewFragment.kt
@@ -1,34 +1,30 @@
 package io.github.wulkanowy.ui.modules.message.preview
 
+import android.annotation.SuppressLint
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
-import androidx.recyclerview.widget.LinearLayoutManager
+import android.view.ViewGroup
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Message
-import io.github.wulkanowy.data.db.entities.MessageWithAttachment
-import io.github.wulkanowy.databinding.FragmentMessagePreviewBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.ui.modules.message.MessageFragment
 import io.github.wulkanowy.ui.modules.message.send.SendMessageActivity
+import kotlinx.android.synthetic.main.fragment_message_preview.*
 import javax.inject.Inject
 
-class MessagePreviewFragment :
-    BaseFragment<FragmentMessagePreviewBinding>(R.layout.fragment_message_preview),
-    MessagePreviewView, MainView.TitledView {
+class MessagePreviewFragment : BaseFragment(), MessagePreviewView, MainView.TitledView {
 
     @Inject
     lateinit var presenter: MessagePreviewPresenter
 
-    @Inject
-    lateinit var previewAdapter: MessagePreviewAdapter
-
     private var menuReplyButton: MenuItem? = null
 
     private var menuForwardButton: MenuItem? = null
@@ -38,15 +34,18 @@ class MessagePreviewFragment :
     override val titleStringId: Int
         get() = R.string.message_title
 
+    override val noSubjectString: String
+        get() = getString(R.string.message_no_subject)
+
     override val deleteMessageSuccessString: String
         get() = getString(R.string.message_delete_success)
 
     companion object {
         const val MESSAGE_ID_KEY = "message_id"
 
-        fun newInstance(message: Message): MessagePreviewFragment {
+        fun newInstance(messageId: Long): MessagePreviewFragment {
             return MessagePreviewFragment().apply {
-                arguments = Bundle().apply { putSerializable(MESSAGE_ID_KEY, message) }
+                arguments = Bundle().apply { putLong(MESSAGE_ID_KEY, messageId) }
             }
         }
     }
@@ -56,20 +55,18 @@ class MessagePreviewFragment :
         setHasOptionsMenu(true)
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding = FragmentMessagePreviewBinding.bind(view)
-        messageContainer = binding.messagePreviewContainer
-        presenter.onAttachView(this, (savedInstanceState ?: arguments)?.getSerializable(MESSAGE_ID_KEY) as? Message)
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_message_preview, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        messageContainer = messagePreviewContainer
+        presenter.onAttachView(this, (savedInstanceState ?: arguments)?.getLong(MESSAGE_ID_KEY) ?: 0L)
     }
 
     override fun initView() {
-        binding.messagePreviewErrorDetails.setOnClickListener { presenter.onDetailsClick() }
-
-        with(binding.messagePreviewRecycler) {
-            layoutManager = LinearLayoutManager(context)
-            adapter = previewAdapter
-        }
+        messagePreviewErrorDetails.setOnClickListener { presenter.onDetailsClick() }
     }
 
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
@@ -89,19 +86,34 @@ class MessagePreviewFragment :
         }
     }
 
-    override fun setMessageWithAttachment(item: MessageWithAttachment) {
-        with(previewAdapter) {
-            messageWithAttachment = item
-            notifyDataSetChanged()
-        }
+    override fun setSubject(subject: String) {
+        messagePreviewSubject.text = subject
+    }
+
+    @SuppressLint("SetTextI18n")
+    override fun setRecipient(recipient: String) {
+        messagePreviewAuthor.text = "${getString(R.string.message_to)} $recipient"
+    }
+
+    @SuppressLint("SetTextI18n")
+    override fun setSender(sender: String) {
+        messagePreviewAuthor.text = "${getString(R.string.message_from)} $sender"
+    }
+
+    override fun setDate(date: String) {
+        messagePreviewDate.text = getString(R.string.message_date, date)
+    }
+
+    override fun setContent(content: String) {
+        messagePreviewContent.text = content
     }
 
     override fun showProgress(show: Boolean) {
-        binding.messagePreviewProgress.visibility = if (show) VISIBLE else GONE
+        messagePreviewProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showContent(show: Boolean) {
-        binding.messagePreviewRecycler.visibility = if (show) VISIBLE else GONE
+        messagePreviewContentContainer.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showOptions(show: Boolean) {
@@ -119,15 +131,15 @@ class MessagePreviewFragment :
     }
 
     override fun showErrorView(show: Boolean) {
-        binding.messagePreviewError.visibility = if (show) VISIBLE else GONE
+        messagePreviewError.visibility = if (show) VISIBLE else GONE
     }
 
     override fun setErrorDetails(message: String) {
-        binding.messagePreviewErrorMessage.text = message
+        messagePreviewErrorMessage.text = message
     }
 
     override fun setErrorRetryCallback(callback: () -> Unit) {
-        binding.messagePreviewErrorRetry.setOnClickListener { callback() }
+        messagePreviewErrorRetry.setOnClickListener { callback() }
     }
 
     override fun openMessageReply(message: Message?) {
@@ -147,8 +159,8 @@ class MessagePreviewFragment :
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
-        outState.putSerializable(MESSAGE_ID_KEY, presenter.message)
         super.onSaveInstanceState(outState)
+        outState.putLong(MESSAGE_ID_KEY, presenter.messageId)
     }
 
     override fun onDestroyView() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewPresenter.kt
index 24678c70e..7b7404b86 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewPresenter.kt
@@ -1,12 +1,14 @@
 package io.github.wulkanowy.ui.modules.message.preview
 
 import io.github.wulkanowy.data.db.entities.Message
+import io.github.wulkanowy.data.repositories.message.MessageFolder
 import io.github.wulkanowy.data.repositories.message.MessageRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 import io.github.wulkanowy.utils.SchedulersProvider
+import io.github.wulkanowy.utils.toFormattedString
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -18,56 +20,61 @@ class MessagePreviewPresenter @Inject constructor(
     private val analytics: FirebaseAnalyticsHelper
 ) : BasePresenter<MessagePreviewView>(errorHandler, studentRepository, schedulers) {
 
-    var message: Message? = null
+    var messageId = 0L
+
+    private var message: Message? = null
 
     private lateinit var lastError: Throwable
 
     private var retryCallback: () -> Unit = {}
 
-    fun onAttachView(view: MessagePreviewView, message: Message?) {
+    fun onAttachView(view: MessagePreviewView, id: Long) {
         super.onAttachView(view)
         view.initView()
         errorHandler.showErrorMessage = ::showErrorViewOnError
-        this.message = message
-        loadData(requireNotNull(message))
+        loadData(id)
     }
 
-    private fun onMessageLoadRetry(message: Message) {
+    private fun onMessageLoadRetry() {
         view?.run {
             showErrorView(false)
             showProgress(true)
         }
-        loadData(message)
+        loadData(messageId)
     }
 
     fun onDetailsClick() {
         view?.showErrorDetailsDialog(lastError)
     }
 
-    private fun loadData(message: Message) {
-        Timber.i("Loading message ${message.messageId} preview started")
+    private fun loadData(id: Long) {
+        Timber.i("Loading message $id preview started")
+        messageId = id
         disposable.apply {
             clear()
-            add(studentRepository.getStudentById(message.studentId)
-                .flatMap { messageRepository.getMessage(it, message, true) }
+            add(studentRepository.getCurrentStudent()
+                .flatMap { messageRepository.getMessage(it, messageId, true) }
                 .subscribeOn(schedulers.backgroundThread)
                 .observeOn(schedulers.mainThread)
                 .doFinally { view?.showProgress(false) }
                 .subscribe({ message ->
-                    Timber.i("Loading message ${message.message.messageId} preview result: Success ")
-                    this@MessagePreviewPresenter.message = message.message
-                    view?.apply {
-                        setMessageWithAttachment(message)
-                        initOptions()
+                    Timber.i("Loading message $id preview result: Success ")
+                    this@MessagePreviewPresenter.message = message
+                    view?.run {
+                        message.let {
+                            setSubject(if (it.subject.isNotBlank()) it.subject else noSubjectString)
+                            setDate(it.date.toFormattedString("yyyy-MM-dd HH:mm:ss"))
+                            setContent(it.content)
+                            initOptions()
+
+                            if (it.folderId == MessageFolder.SENT.id) setRecipient(it.recipient)
+                            else setSender(it.sender)
+                        }
                     }
-                    analytics.logEvent(
-                        "load_item",
-                        "type" to "message_preview",
-                        "length" to message.message.content.length
-                    )
+                    analytics.logEvent("load_message_preview", "length" to message.content.length)
                 }) {
-                    Timber.i("Loading message ${message.messageId} preview result: An exception occurred ")
-                    retryCallback = { onMessageLoadRetry(message) }
+                    Timber.i("Loading message $id preview result: An exception occurred ")
+                    retryCallback = { onMessageLoadRetry() }
                     errorHandler.dispatch(it)
                 })
         }
@@ -89,8 +96,7 @@ class MessagePreviewPresenter @Inject constructor(
 
     private fun deleteMessage() {
         message?.let { message ->
-            disposable.add(studentRepository.getCurrentStudent()
-                .flatMap { messageRepository.deleteMessage(it, message) }
+            disposable.add(messageRepository.deleteMessage(message)
                 .subscribeOn(schedulers.backgroundThread)
                 .observeOn(schedulers.mainThread)
                 .doOnSubscribe {
@@ -113,6 +119,8 @@ class MessagePreviewPresenter @Inject constructor(
                 }, { error ->
                     retryCallback = { onMessageDelete() }
                     errorHandler.dispatch(error)
+                }, {
+                    view?.showErrorView(true)
                 })
             )
         }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewView.kt
index 3d620459c..d57766273 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewView.kt
@@ -1,16 +1,25 @@
 package io.github.wulkanowy.ui.modules.message.preview
 
 import io.github.wulkanowy.data.db.entities.Message
-import io.github.wulkanowy.data.db.entities.MessageWithAttachment
 import io.github.wulkanowy.ui.base.BaseView
 
 interface MessagePreviewView : BaseView {
 
+    val noSubjectString: String
+
     val deleteMessageSuccessString: String
 
     fun initView()
 
-    fun setMessageWithAttachment(item: MessageWithAttachment)
+    fun setSubject(subject: String)
+
+    fun setRecipient(recipient: String)
+
+    fun setSender(sender: String)
+
+    fun setDate(date: String)
+
+    fun setContent(content: String)
 
     fun showProgress(show: Boolean)
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageActivity.kt
index 7b7503433..7b15da713 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageActivity.kt
@@ -14,14 +14,14 @@ import android.widget.Toast.LENGTH_LONG
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.db.entities.ReportingUnit
-import io.github.wulkanowy.databinding.ActivitySendMessageBinding
 import io.github.wulkanowy.ui.base.BaseActivity
 import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.hideSoftInput
 import io.github.wulkanowy.utils.showSoftInput
+import kotlinx.android.synthetic.main.activity_send_message.*
 import javax.inject.Inject
 
-class SendMessageActivity : BaseActivity<SendMessagePresenter, ActivitySendMessageBinding>(), SendMessageView {
+class SendMessageActivity : BaseActivity<SendMessagePresenter>(), SendMessageView {
 
     @Inject
     override lateinit var presenter: SendMessagePresenter
@@ -41,17 +41,17 @@ class SendMessageActivity : BaseActivity<SendMessagePresenter, ActivitySendMessa
     }
 
     override val isDropdownListVisible: Boolean
-        get() = binding.sendMessageTo.isDropdownListVisible
+        get() = sendMessageTo.isDropdownListVisible
 
     @Suppress("UNCHECKED_CAST")
     override val formRecipientsData: List<RecipientChipItem>
-        get() = binding.sendMessageTo.addedChipItems as List<RecipientChipItem>
+        get() = sendMessageTo.addedChipItems as List<RecipientChipItem>
 
     override val formSubjectValue: String
-        get() = binding.sendMessageSubject.text.toString()
+        get() = sendMessageSubject.text.toString()
 
     override val formContentValue: String
-        get() = binding.sendMessageMessageContent.text.toString()
+        get() = sendMessageMessageContent.text.toString()
 
     override val messageRequiredRecipients: String
         get() = getString(R.string.message_required_recipients)
@@ -64,20 +64,18 @@ class SendMessageActivity : BaseActivity<SendMessagePresenter, ActivitySendMessa
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(ActivitySendMessageBinding.inflate(layoutInflater).apply { binding = this }.root)
-        setSupportActionBar(binding.sendMessageToolbar)
+        setContentView(R.layout.activity_send_message)
+        setSupportActionBar(sendMessageToolbar)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
-        messageContainer = binding.sendMessageContainer
+        messageContainer = sendMessageContainer
 
         presenter.onAttachView(this, intent.getSerializableExtra(EXTRA_MESSAGE) as? Message, intent.getSerializableExtra(EXTRA_REPLY) as? Boolean)
     }
 
     override fun initView() {
         setUpExtendedHitArea()
-        with(binding) {
-            sendMessageScroll.setOnTouchListener { _, _ -> presenter.onTouchScroll() }
-            sendMessageTo.onTextChangeListener = presenter::onRecipientsTextChange
-        }
+        sendMessageScroll.setOnTouchListener { _, _ -> presenter.onTouchScroll() }
+        sendMessageTo.onTextChangeListener = presenter::onRecipientsTextChange
     }
 
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {
@@ -95,27 +93,27 @@ class SendMessageActivity : BaseActivity<SendMessagePresenter, ActivitySendMessa
     }
 
     override fun setReportingUnit(unit: ReportingUnit) {
-        binding.sendMessageFrom.text = unit.senderName
+        sendMessageFrom.text = unit.senderName
     }
 
     override fun setRecipients(recipients: List<RecipientChipItem>) {
-        binding.sendMessageTo.filterableChipItems = recipients
+        sendMessageTo.filterableChipItems = recipients
     }
 
     override fun setSelectedRecipients(recipients: List<RecipientChipItem>) {
-        binding.sendMessageTo.addChips(recipients)
+        sendMessageTo.addChips(recipients)
     }
 
     override fun showProgress(show: Boolean) {
-        binding.sendMessageProgress.visibility = if (show) VISIBLE else GONE
+        sendMessageProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showContent(show: Boolean) {
-        binding.sendMessageContent.visibility = if (show) VISIBLE else GONE
+        sendMessageContent.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showEmpty(show: Boolean) {
-        binding.sendMessageEmpty.visibility = if (show) VISIBLE else GONE
+        sendMessageEmpty.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showActionBar(show: Boolean) {
@@ -123,11 +121,11 @@ class SendMessageActivity : BaseActivity<SendMessagePresenter, ActivitySendMessa
     }
 
     override fun setSubject(subject: String) {
-        binding.sendMessageSubject.setText(subject)
+        sendMessageSubject.setText(subject)
     }
 
     override fun setContent(content: String) {
-        binding.sendMessageMessageContent.setText(content)
+        sendMessageMessageContent.setText(content)
     }
 
     override fun showMessage(text: String) {
@@ -139,42 +137,40 @@ class SendMessageActivity : BaseActivity<SendMessagePresenter, ActivitySendMessa
     }
 
     override fun hideDropdownList() {
-        binding.sendMessageTo.hideDropdownList()
+        sendMessageTo.hideDropdownList()
     }
 
     override fun scrollToRecipients() {
-        with(binding.sendMessageScroll) {
-            post {
-                scrollTo(0, binding.sendMessageTo.bottom - dpToPx(53f).toInt())
-            }
+        sendMessageScroll.post {
+            sendMessageScroll.scrollTo(0, sendMessageTo.bottom - dpToPx(53f).toInt())
         }
     }
 
     override fun popView() {
-        finish()
+        onBackPressed()
     }
 
     private fun setUpExtendedHitArea() {
         fun extendHitArea() {
             val containerHitRect = Rect().apply {
-                binding.sendMessageContent.getHitRect(this)
+                sendMessageContent.getHitRect(this)
             }
 
             val contentHitRect = Rect().apply {
-                binding.sendMessageMessageContent.getHitRect(this)
+                sendMessageMessageContent.getHitRect(this)
             }
 
             contentHitRect.top = contentHitRect.bottom
             contentHitRect.bottom = containerHitRect.bottom
 
-            binding.sendMessageContent.touchDelegate = TouchDelegate(contentHitRect, binding.sendMessageMessageContent)
+            sendMessageContent.touchDelegate = TouchDelegate(contentHitRect, sendMessageMessageContent)
         }
 
-        with(binding.sendMessageMessageContent) {
-            post {
-                addOnLayoutChangeListener { _, _, _, _, _, _, _, _, _ -> extendHitArea() }
+        sendMessageMessageContent.post {
+            sendMessageMessageContent.addOnLayoutChangeListener { _, _, _, _, _, _, _, _, _ ->
                 extendHitArea()
             }
+            extendHitArea()
         }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessagePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessagePresenter.kt
index aec79f9db..3b89b5cae 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessagePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessagePresenter.kt
@@ -135,12 +135,12 @@ class SendMessagePresenter @Inject constructor(
                         if (selectedRecipientChips.isNotEmpty()) setSelectedRecipients(selectedRecipientChips)
                         showContent(true)
                     } else {
-                        Timber.i("Loading recipients result: Can't find the reporting unit")
+                        Timber.e("Loading recipients result: Can't find the reporting unit")
                         view?.showEmpty(true)
                     }
                 }
             }, {
-                Timber.i("Loading recipients result: An exception occurred")
+                Timber.e("Loading recipients result: An exception occurred")
                 view?.showContent(true)
                 errorHandler.dispatch(it)
             }))
@@ -148,8 +148,7 @@ class SendMessagePresenter @Inject constructor(
 
     private fun sendMessage(subject: String, content: String, recipients: List<Recipient>) {
         Timber.i("Sending message started")
-        disposable.add(studentRepository.getCurrentStudent()
-            .flatMap { messageRepository.sendMessage(it, subject, content, recipients) }
+        disposable.add(messageRepository.sendMessage(subject, content, recipients)
             .subscribeOn(schedulers.backgroundThread)
             .observeOn(schedulers.mainThread)
             .doOnSubscribe {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabAdapter.kt
deleted file mode 100644
index ece6773fd..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabAdapter.kt
+++ /dev/null
@@ -1,88 +0,0 @@
-package io.github.wulkanowy.ui.modules.message.tab
-
-import android.graphics.Typeface
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import androidx.recyclerview.widget.RecyclerView.NO_POSITION
-import androidx.recyclerview.widget.SortedList
-import androidx.recyclerview.widget.SortedListAdapterCallback
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Message
-import io.github.wulkanowy.data.repositories.message.MessageFolder
-import io.github.wulkanowy.databinding.ItemMessageBinding
-import io.github.wulkanowy.utils.toFormattedString
-import javax.inject.Inject
-
-class MessageTabAdapter @Inject constructor() :
-    RecyclerView.Adapter<MessageTabAdapter.ItemViewHolder>() {
-
-    var onClickListener: (Message, position: Int) -> Unit = { _, _ -> }
-
-    private val items = SortedList(Message::class.java, object :
-        SortedListAdapterCallback<Message>(this) {
-
-        override fun compare(item1: Message, item2: Message): Int {
-            return item2.date.compareTo(item1.date)
-        }
-
-        override fun areContentsTheSame(oldItem: Message?, newItem: Message?): Boolean {
-            return oldItem == newItem
-        }
-
-        override fun areItemsTheSame(item1: Message, item2: Message): Boolean {
-            return item1 == item2
-        }
-    })
-
-    fun replaceAll(models: List<Message>) {
-        items.beginBatchedUpdates()
-        for (i in items.size() - 1 downTo 0) {
-            val model = items.get(i)
-            if (model !in models) {
-                items.remove(model)
-            }
-        }
-        items.addAll(models)
-        items.endBatchedUpdates()
-    }
-
-    fun updateItem(position: Int, item: Message) {
-        items.updateItemAt(position, item)
-    }
-
-    override fun getItemCount() = items.size()
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        ItemMessageBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-    )
-
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        val item = items[position]
-
-        with(holder.binding) {
-            val style = if (item.unread) Typeface.BOLD else Typeface.NORMAL
-
-            messageItemAuthor.run {
-                text = if (item.folderId == MessageFolder.SENT.id) item.recipient else item.sender
-                setTypeface(null, style)
-            }
-            messageItemSubject.run {
-                text = if (item.subject.isNotBlank()) item.subject else context.getString(R.string.message_no_subject)
-                setTypeface(null, style)
-            }
-            messageItemDate.run {
-                text = item.date.toFormattedString()
-                setTypeface(null, style)
-            }
-            messageItemAttachmentIcon.visibility = if (item.hasAttachments) View.VISIBLE else View.GONE
-
-            root.setOnClickListener {
-                holder.adapterPosition.let { if (it != NO_POSITION) onClickListener(item, it) }
-            }
-        }
-    }
-
-    class ItemViewHolder(val binding: ItemMessageBinding) : RecyclerView.ViewHolder(binding.root)
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabFragment.kt
index 909bb6873..d6065983d 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabFragment.kt
@@ -1,33 +1,34 @@
 package io.github.wulkanowy.ui.modules.message.tab
 
 import android.os.Bundle
-import android.view.Menu
-import android.view.MenuInflater
+import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
 import android.view.View.INVISIBLE
 import android.view.View.VISIBLE
-import androidx.appcompat.widget.SearchView
-import androidx.recyclerview.widget.LinearLayoutManager
+import android.view.ViewGroup
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.common.FlexibleItemDecoration
+import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.repositories.message.MessageFolder
-import io.github.wulkanowy.databinding.FragmentMessageTabBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.message.MessageFragment
+import io.github.wulkanowy.ui.modules.message.MessageItem
 import io.github.wulkanowy.ui.modules.message.preview.MessagePreviewFragment
-import io.github.wulkanowy.ui.widgets.DividerItemDecoration
+import io.github.wulkanowy.utils.setOnItemClickListener
+import kotlinx.android.synthetic.main.fragment_message_tab.*
 import javax.inject.Inject
 
-class MessageTabFragment : BaseFragment<FragmentMessageTabBinding>(R.layout.fragment_message_tab),
-    MessageTabView {
+class MessageTabFragment : BaseFragment(), MessageTabView {
 
     @Inject
     lateinit var presenter: MessageTabPresenter
 
     @Inject
-    lateinit var tabAdapter: MessageTabAdapter
+    lateinit var tabAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
 
     companion object {
         const val MESSAGE_TAB_FOLDER_ID = "message_tab_folder_id"
@@ -41,96 +42,82 @@ class MessageTabFragment : BaseFragment<FragmentMessageTabBinding>(R.layout.frag
         }
     }
 
-    override val isViewEmpty
-        get() = tabAdapter.itemCount == 0
+    override val noSubjectString: String
+        get() = getString(R.string.message_no_subject)
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setHasOptionsMenu(true)
+    override val isViewEmpty
+        get() = tabAdapter.isEmpty
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_message_tab, container, false)
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding = FragmentMessageTabBinding.bind(view)
-        messageContainer = binding.messageTabRecycler
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        messageContainer = messageTabRecycler
         presenter.onAttachView(this, MessageFolder.valueOf(
             (savedInstanceState ?: arguments)?.getString(MESSAGE_TAB_FOLDER_ID).orEmpty()
         ))
     }
 
     override fun initView() {
-        tabAdapter.onClickListener = presenter::onMessageItemSelected
+        tabAdapter.setOnItemClickListener { presenter.onMessageItemSelected(it) }
 
-        with(binding.messageTabRecycler) {
-            layoutManager = LinearLayoutManager(context)
+        messageTabRecycler.run {
+            layoutManager = SmoothScrollLinearLayoutManager(context)
             adapter = tabAdapter
-            addItemDecoration(DividerItemDecoration(context))
-        }
-        with(binding) {
-            messageTabSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
-            messageTabErrorRetry.setOnClickListener { presenter.onRetry() }
-            messageTabErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+            addItemDecoration(FlexibleItemDecoration(context)
+                .withDefaultDivider()
+                .withDrawDividerOnLastItem(false)
+            )
         }
+        messageTabSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
+        messageTabErrorRetry.setOnClickListener { presenter.onRetry() }
+        messageTabErrorDetails.setOnClickListener { presenter.onDetailsClick() }
     }
 
-    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-        super.onCreateOptionsMenu(menu, inflater)
-        inflater.inflate(R.menu.action_menu_message_tab, menu)
-
-        val searchView = menu.findItem(R.id.action_search).actionView as SearchView
-        searchView.queryHint = getString(R.string.all_search_hint)
-        searchView.maxWidth = Int.MAX_VALUE
-        searchView.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
-            override fun onQueryTextSubmit(query: String) = false
-            override fun onQueryTextChange(query: String): Boolean {
-                presenter.onSearchQueryTextChange(query)
-                return true
-            }
-        })
+    override fun updateData(data: List<MessageItem>) {
+        tabAdapter.updateDataSet(data)
     }
 
-    override fun updateData(data: List<Message>) {
-        tabAdapter.replaceAll(data)
+    override fun updateItem(item: AbstractFlexibleItem<*>) {
+        tabAdapter.updateItem(item)
     }
 
-    override fun updateItem(item: Message, position: Int) {
-        tabAdapter.updateItem(position, item)
+    override fun clearView() {
+        tabAdapter.clear()
     }
 
     override fun showProgress(show: Boolean) {
-        binding.messageTabProgress.visibility = if (show) VISIBLE else GONE
+        messageTabProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun enableSwipe(enable: Boolean) {
-        binding.messageTabSwipe.isEnabled = enable
-    }
-
-    override fun resetListPosition() {
-        binding.messageTabRecycler.scrollToPosition(0)
+        messageTabSwipe.isEnabled = enable
     }
 
     override fun showContent(show: Boolean) {
-        binding.messageTabRecycler.visibility = if (show) VISIBLE else INVISIBLE
+        messageTabRecycler.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun showEmpty(show: Boolean) {
-        binding.messageTabEmpty.visibility = if (show) VISIBLE else INVISIBLE
+        messageTabEmpty.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun showErrorView(show: Boolean) {
-        binding.messageTabError.visibility = if (show) VISIBLE else GONE
+        messageTabError.visibility = if (show) VISIBLE else GONE
     }
 
     override fun setErrorDetails(message: String) {
-        binding.messageTabErrorMessage.text = message
+        messageTabErrorMessage.text = message
     }
 
     override fun showRefresh(show: Boolean) {
-        binding.messageTabSwipe.isRefreshing = show
+        messageTabSwipe.isRefreshing = show
     }
 
-    override fun openMessage(message: Message) {
-        (activity as? MainActivity)?.pushView(MessagePreviewFragment.newInstance(message))
+    override fun openMessage(messageId: Long) {
+        (activity as? MainActivity)?.pushView(MessagePreviewFragment.newInstance(messageId))
     }
 
     override fun notifyParentDataLoaded() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabPresenter.kt
index 221762d16..dc199207a 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabPresenter.kt
@@ -1,6 +1,6 @@
 package io.github.wulkanowy.ui.modules.message.tab
 
-import android.annotation.SuppressLint
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.repositories.message.MessageFolder
 import io.github.wulkanowy.data.repositories.message.MessageRepository
@@ -8,9 +8,9 @@ import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
+import io.github.wulkanowy.ui.modules.message.MessageItem
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 import io.github.wulkanowy.utils.SchedulersProvider
-import io.github.wulkanowy.utils.toFormattedString
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -27,10 +27,6 @@ class MessageTabPresenter @Inject constructor(
 
     private lateinit var lastError: Throwable
 
-    private var lastSearchQuery = ""
-
-    private var messages = emptyList<Message>()
-
     fun onAttachView(view: MessageTabView, folder: MessageFolder) {
         super.onAttachView(view)
         view.initView()
@@ -63,13 +59,16 @@ class MessageTabPresenter @Inject constructor(
         loadData(forceRefresh)
     }
 
-    fun onMessageItemSelected(message: Message, position: Int) {
-        Timber.i("Select message ${message.id} item (position: $position)")
-        view?.run {
-            openMessage(message)
-            if (message.unread) {
-                message.unread = false
-                updateItem(message, position)
+    fun onMessageItemSelected(item: AbstractFlexibleItem<*>) {
+        if (item is MessageItem) {
+            Timber.i("Select message ${item.message.id} item")
+            view?.run {
+                openMessage(item.message.id)
+                if (item.message.unread) {
+                    item.message.unread = false
+                    updateItem(item)
+                    updateMessage(item.message)
+                }
             }
         }
     }
@@ -82,6 +81,7 @@ class MessageTabPresenter @Inject constructor(
                 .flatMap { student ->
                     semesterRepository.getCurrentSemester(student)
                         .flatMap { messageRepository.getMessages(student, it, folder, forceRefresh) }
+                        .map { items -> items.map { MessageItem(it, view?.noSubjectString.orEmpty()) } }
                 }
                 .subscribeOn(schedulers.backgroundThread)
                 .observeOn(schedulers.mainThread)
@@ -95,14 +95,13 @@ class MessageTabPresenter @Inject constructor(
                 }
                 .subscribe({
                     Timber.i("Loading $folder message result: Success")
-                    messages = it
-                    onSearchQueryTextChange(lastSearchQuery)
-                    analytics.logEvent(
-                        "load_data",
-                        "type" to "messages",
-                        "items" to it.size,
-                        "folder" to folder.name
-                    )
+                    view?.run {
+                        showEmpty(it.isEmpty())
+                        showContent(it.isNotEmpty())
+                        showErrorView(false)
+                        updateData(it)
+                    }
+                    analytics.logEvent("load_messages", "items" to it.size, "folder" to folder.name)
                 }) {
                     Timber.i("Loading $folder message result: An exception occurred")
                     errorHandler.dispatch(it)
@@ -121,34 +120,15 @@ class MessageTabPresenter @Inject constructor(
         }
     }
 
-    @SuppressLint("DefaultLocale")
-    fun onSearchQueryTextChange(query: String) {
-        lastSearchQuery = query
-
-        val lowerCaseQuery = query.toLowerCase()
-        val filteredList = mutableListOf<Message>()
-        messages.forEach {
-            if (lowerCaseQuery in it.subject.toLowerCase() ||
-                lowerCaseQuery in it.sender.toLowerCase() ||
-                lowerCaseQuery in it.recipient.toLowerCase() ||
-                lowerCaseQuery in it.date.toFormattedString()
-            ) {
-                filteredList.add(it)
-            }
-        }
-
-        Timber.d("Applying filter. Full list: ${messages.size}, filtered: ${filteredList.size}")
-
-        updateData(filteredList)
-    }
-
-    private fun updateData(data: List<Message>) {
-        view?.run {
-            showEmpty(data.isEmpty())
-            showContent(data.isNotEmpty())
-            showErrorView(false)
-            updateData(data)
-            resetListPosition()
-        }
+    private fun updateMessage(message: Message) {
+        Timber.i("Attempt to update message ${message.id}")
+        disposable.add(messageRepository.updateMessage(message)
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({ Timber.d("Update message ${message.id} result: Success") })
+            { error ->
+                Timber.i("Update message ${message.id} result: An exception occurred")
+                errorHandler.dispatch(error)
+            })
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabView.kt
index f521191cf..e5705c739 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabView.kt
@@ -1,19 +1,22 @@
 package io.github.wulkanowy.ui.modules.message.tab
 
-import io.github.wulkanowy.data.db.entities.Message
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.ui.base.BaseView
+import io.github.wulkanowy.ui.modules.message.MessageItem
 
 interface MessageTabView : BaseView {
 
+    val noSubjectString: String
+
     val isViewEmpty: Boolean
 
     fun initView()
 
-    fun resetListPosition()
+    fun updateData(data: List<MessageItem>)
 
-    fun updateData(data: List<Message>)
+    fun updateItem(item: AbstractFlexibleItem<*>)
 
-    fun updateItem(item: Message, position: Int)
+    fun clearView()
 
     fun showProgress(show: Boolean)
 
@@ -29,7 +32,7 @@ interface MessageTabView : BaseView {
 
     fun showRefresh(show: Boolean)
 
-    fun openMessage(message: Message)
+    fun openMessage(messageId: Long)
 
     fun notifyParentDataLoaded()
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceAdapter.kt
index 4bc3097d6..27c72ce69 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceAdapter.kt
@@ -1,38 +1,10 @@
 package io.github.wulkanowy.ui.modules.mobiledevice
 
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.IFlexible
 import io.github.wulkanowy.data.db.entities.MobileDevice
-import io.github.wulkanowy.databinding.ItemMobileDeviceBinding
-import io.github.wulkanowy.utils.toFormattedString
-import javax.inject.Inject
 
-class MobileDeviceAdapter @Inject constructor() :
-    RecyclerView.Adapter<MobileDeviceAdapter.ItemViewHolder>() {
-
-    var items = mutableListOf<MobileDevice>()
+class MobileDeviceAdapter<T : IFlexible<*>> : FlexibleAdapter<T>(null, null, true) {
 
     var onDeviceUnregisterListener: (device: MobileDevice, position: Int) -> Unit = { _, _ -> }
-
-    override fun getItemCount() = items.size
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        ItemMobileDeviceBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-    )
-
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        val device = items[position]
-
-        with(holder.binding) {
-            mobileDeviceItemDate.text = device.date.toFormattedString("dd.MM.yyyy HH:mm:ss")
-            mobileDeviceItemName.text = device.name
-            mobileDeviceItemUnregister.setOnClickListener {
-                onDeviceUnregisterListener(device, position)
-            }
-        }
-    }
-
-    class ItemViewHolder(val binding: ItemMobileDeviceBinding) :
-        RecyclerView.ViewHolder(binding.root)
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceFragment.kt
index 6a3e5a441..d47574f60 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceFragment.kt
@@ -1,31 +1,31 @@
 package io.github.wulkanowy.ui.modules.mobiledevice
 
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
-import androidx.core.view.postDelayed
-import androidx.recyclerview.widget.LinearLayoutManager
-import com.google.android.material.snackbar.Snackbar
+import android.view.ViewGroup
+import eu.davidea.flexibleadapter.common.FlexibleItemDecoration
+import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
+import eu.davidea.flexibleadapter.helpers.UndoHelper
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.MobileDevice
-import io.github.wulkanowy.databinding.FragmentMobileDeviceBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.ui.modules.mobiledevice.token.MobileDeviceTokenDialog
-import io.github.wulkanowy.ui.widgets.DividerItemDecoration
+import kotlinx.android.synthetic.main.fragment_mobile_device.*
 import javax.inject.Inject
 
-class MobileDeviceFragment :
-    BaseFragment<FragmentMobileDeviceBinding>(R.layout.fragment_mobile_device), MobileDeviceView,
-    MainView.TitledView {
+class MobileDeviceFragment : BaseFragment(), MobileDeviceView, MainView.TitledView {
 
     @Inject
     lateinit var presenter: MobileDevicePresenter
 
     @Inject
-    lateinit var devicesAdapter: MobileDeviceAdapter
+    lateinit var devicesAdapter: MobileDeviceAdapter<AbstractFlexibleItem<*>>
 
     companion object {
         fun newInstance() = MobileDeviceFragment()
@@ -35,95 +35,92 @@ class MobileDeviceFragment :
         get() = R.string.mobile_devices_title
 
     override val isViewEmpty: Boolean
-        get() = devicesAdapter.items.isEmpty()
+        get() = devicesAdapter.isEmpty
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding = FragmentMobileDeviceBinding.bind(view)
-        messageContainer = binding.mobileDevicesRecycler
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_mobile_device, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        messageContainer = mobileDevicesRecycler
         presenter.onAttachView(this)
     }
 
     override fun initView() {
-        devicesAdapter.onDeviceUnregisterListener = presenter::onUnregisterDevice
-
-        with(binding.mobileDevicesRecycler) {
-            layoutManager = LinearLayoutManager(context)
+        with(mobileDevicesRecycler) {
+            layoutManager = SmoothScrollLinearLayoutManager(context)
             adapter = devicesAdapter
-            addItemDecoration(DividerItemDecoration(context))
+            addItemDecoration(FlexibleItemDecoration(context)
+                .withDefaultDivider()
+                .withDrawDividerOnLastItem(false)
+            )
         }
-
-        with(binding) {
-            mobileDevicesSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
-            mobileDevicesErrorRetry.setOnClickListener { presenter.onRetry() }
-            mobileDevicesErrorDetails.setOnClickListener { presenter.onDetailsClick() }
-            mobileDeviceAddButton.setOnClickListener { presenter.onRegisterDevice() }
-        }
-    }
-
-    override fun updateData(data: List<MobileDevice>) {
         with(devicesAdapter) {
-            items = data.toMutableList()
-            notifyDataSetChanged()
+            isPermanentDelete = false
+            onDeviceUnregisterListener = presenter::onUnregisterDevice
         }
+        mobileDevicesSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
+        mobileDevicesErrorRetry.setOnClickListener { presenter.onRetry() }
+        mobileDevicesErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+        mobileDeviceAddButton.setOnClickListener { presenter.onRegisterDevice() }
     }
 
-    override fun deleteItem(device: MobileDevice, position: Int) {
-        with(devicesAdapter) {
-            items.removeAt(position)
-            notifyItemRemoved(position)
-            notifyItemRangeChanged(position, itemCount)
-        }
+    override fun updateData(data: List<MobileDeviceItem>) {
+        devicesAdapter.updateDataSet(data)
     }
 
-    override fun restoreDeleteItem(device: MobileDevice, position: Int) {
-        with(devicesAdapter) {
-            items.add(position, device)
-            notifyItemInserted(position)
-            notifyItemRangeChanged(position, itemCount)
-        }
+    override fun restoreDeleteItem() {
+        devicesAdapter.restoreDeletedItems()
     }
 
-    override fun showUndo(device: MobileDevice, position: Int) {
-        var confirmed = true
+    override fun clearData() {
+        devicesAdapter.clear()
+    }
 
-        Snackbar.make(binding.mobileDevicesRecycler, getString(R.string.mobile_device_removed), 3000)
-            .setAction(R.string.all_undo) {
-                confirmed = false
-                presenter.onUnregisterCancelled(device, position)
-            }.show()
+    override fun showUndo(position: Int, device: MobileDevice) {
+        val onActionListener = object : UndoHelper.OnActionListener {
+            override fun onActionConfirmed(action: Int, event: Int) {
+                presenter.onUnregisterConfirmed(device)
+            }
 
-        view?.postDelayed(3000) {
-            if (confirmed) presenter.onUnregisterConfirmed(device)
+            override fun onActionCanceled(action: Int, positions: MutableList<Int>?) {
+                presenter.onUnregisterCancelled()
+            }
         }
+
+        UndoHelper(devicesAdapter, onActionListener)
+            .withConsecutive(false)
+            .withAction(UndoHelper.Action.REMOVE)
+            .start(listOf(position), mobileDevicesRecycler, R.string.mobile_device_removed, R.string.all_undo, 3000)
     }
 
     override fun hideRefresh() {
-        binding.mobileDevicesSwipe.isRefreshing = false
+        mobileDevicesSwipe.isRefreshing = false
     }
 
     override fun showProgress(show: Boolean) {
-        binding.mobileDevicesProgress.visibility = if (show) VISIBLE else GONE
+        mobileDevicesProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showEmpty(show: Boolean) {
-        binding.mobileDevicesEmpty.visibility = if (show) VISIBLE else GONE
+        mobileDevicesEmpty.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showErrorView(show: Boolean) {
-        binding.mobileDevicesError.visibility = if (show) VISIBLE else GONE
+        mobileDevicesError.visibility = if (show) VISIBLE else GONE
     }
 
     override fun setErrorDetails(message: String) {
-        binding.mobileDevicesErrorMessage.text = message
+        mobileDevicesErrorMessage.text = message
     }
 
     override fun enableSwipe(enable: Boolean) {
-        binding.mobileDevicesSwipe.isEnabled = enable
+        mobileDevicesSwipe.isEnabled = enable
     }
 
     override fun showContent(show: Boolean) {
-        binding.mobileDevicesRecycler.visibility = if (show) VISIBLE else GONE
+        mobileDevicesRecycler.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showTokenDialog() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceItem.kt
new file mode 100644
index 000000000..436c2d0e2
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceItem.kt
@@ -0,0 +1,53 @@
+package io.github.wulkanowy.ui.modules.mobiledevice
+
+import android.view.View
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.FlexibleViewHolder
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.MobileDevice
+import io.github.wulkanowy.utils.toFormattedString
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.item_mobile_device.*
+
+class MobileDeviceItem(val device: MobileDevice) : AbstractFlexibleItem<MobileDeviceItem.ViewHolder>() {
+
+    override fun getLayoutRes() = R.layout.item_mobile_device
+
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): ViewHolder {
+        return ViewHolder(view, adapter)
+    }
+
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
+        holder.apply {
+            mobileDeviceItemDate.text = device.date.toFormattedString("dd.MM.yyyy HH:mm:ss")
+            mobileDeviceItemName.text = device.name
+            mobileDeviceItemUnregister.setOnClickListener {
+                (adapter as MobileDeviceAdapter).onDeviceUnregisterListener(device, holder.flexibleAdapterPosition)
+            }
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as MobileDeviceItem
+
+        if (device.id != other.device.id) return false
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = device.hashCode()
+        result = 31 * result + device.id.toInt()
+        return result
+    }
+
+    class ViewHolder(val view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter), LayoutContainer {
+
+        override val containerView: View
+            get() = contentView
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceModule.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceModule.kt
new file mode 100644
index 000000000..59bbaa9f8
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceModule.kt
@@ -0,0 +1,12 @@
+package io.github.wulkanowy.ui.modules.mobiledevice
+
+import dagger.Module
+import dagger.Provides
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+
+@Module
+class MobileDeviceModule {
+
+    @Provides
+    fun provideMobileDeviceFlexibleAdapter() = MobileDeviceAdapter<AbstractFlexibleItem<*>>()
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDevicePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDevicePresenter.kt
index 459ca17e8..e95d2ce0e 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDevicePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDevicePresenter.kt
@@ -49,11 +49,9 @@ class MobileDevicePresenter @Inject constructor(
     private fun loadData(forceRefresh: Boolean = false) {
         Timber.i("Loading mobile devices data started")
         disposable.add(studentRepository.getCurrentStudent()
-            .flatMap { student ->
-                semesterRepository.getCurrentSemester(student).flatMap { semester ->
-                    mobileDeviceRepository.getDevices(student, semester, forceRefresh)
-                }
-            }
+            .flatMap { semesterRepository.getCurrentSemester(it) }
+            .flatMap { mobileDeviceRepository.getDevices(it, forceRefresh) }
+            .map { items -> items.map { MobileDeviceItem(it) } }
             .subscribeOn(schedulers.backgroundThread)
             .observeOn(schedulers.mainThread)
             .doFinally {
@@ -70,12 +68,7 @@ class MobileDevicePresenter @Inject constructor(
                     showEmpty(it.isEmpty())
                     showErrorView(false)
                 }
-                analytics.logEvent(
-                    "load_data",
-                    "type" to "devices",
-                    "items" to it.size,
-                    "force_refresh" to forceRefresh
-                )
+                analytics.logEvent("load_devices", "items" to it.size, "force_refresh" to forceRefresh)
             }) {
                 Timber.i("Loading mobile devices result: An exception occurred")
                 errorHandler.dispatch(it)
@@ -99,15 +92,14 @@ class MobileDevicePresenter @Inject constructor(
 
     fun onUnregisterDevice(device: MobileDevice, position: Int) {
         view?.run {
-            deleteItem(device, position)
-            showUndo(device, position)
+            showUndo(position, device)
             showEmpty(isViewEmpty)
         }
     }
 
-    fun onUnregisterCancelled(device: MobileDevice, position: Int) {
+    fun onUnregisterCancelled() {
         view?.run {
-            restoreDeleteItem(device, position)
+            restoreDeleteItem()
             showEmpty(isViewEmpty)
         }
     }
@@ -115,12 +107,12 @@ class MobileDevicePresenter @Inject constructor(
     fun onUnregisterConfirmed(device: MobileDevice) {
         Timber.i("Unregister device started")
         disposable.add(studentRepository.getCurrentStudent()
-            .flatMap { student ->
-                semesterRepository.getCurrentSemester(student).flatMap { semester ->
-                    mobileDeviceRepository.unregisterDevice(student, semester, device)
-                        .flatMap { mobileDeviceRepository.getDevices(student, semester, it) }
-                }
+            .flatMap { semesterRepository.getCurrentSemester(it) }
+            .flatMap { semester ->
+                mobileDeviceRepository.unregisterDevice(semester, device)
+                    .flatMap { mobileDeviceRepository.getDevices(semester, it) }
             }
+            .map { items -> items.map { MobileDeviceItem(it) } }
             .subscribeOn(schedulers.backgroundThread)
             .observeOn(schedulers.mainThread)
             .doFinally {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceView.kt
index ec2d3f87f..869b59bb1 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceView.kt
@@ -9,16 +9,14 @@ interface MobileDeviceView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<MobileDevice>)
+    fun updateData(data: List<MobileDeviceItem>)
 
-    fun deleteItem(device: MobileDevice, position: Int)
-
-    fun restoreDeleteItem(device: MobileDevice, position: Int)
-
-    fun showUndo(device: MobileDevice, position: Int)
+    fun restoreDeleteItem()
 
     fun hideRefresh()
 
+    fun clearData()
+
     fun showProgress(show: Boolean)
 
     fun enableSwipe(enable: Boolean)
@@ -31,5 +29,7 @@ interface MobileDeviceView : BaseView {
 
     fun setErrorDetails(message: String)
 
+    fun showUndo(position: Int, device: MobileDevice)
+
     fun showTokenDialog()
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/token/MobileDeviceTokenDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/token/MobileDeviceTokenDialog.kt
index 9ac6049e9..8b81156b1 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/token/MobileDeviceTokenDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/token/MobileDeviceTokenDialog.kt
@@ -14,11 +14,11 @@ import android.widget.Toast
 import androidx.core.content.getSystemService
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.pojos.MobileDeviceToken
-import io.github.wulkanowy.databinding.DialogMobileDeviceBinding
 import io.github.wulkanowy.ui.base.BaseDialogFragment
+import kotlinx.android.synthetic.main.dialog_mobile_device.*
 import javax.inject.Inject
 
-class MobileDeviceTokenDialog : BaseDialogFragment<DialogMobileDeviceBinding>(), MobileDeviceTokenVIew {
+class MobileDeviceTokenDialog : BaseDialogFragment(), MobileDeviceTokenVIew {
 
     @Inject
     lateinit var presenter: MobileDeviceTokenPresenter
@@ -33,7 +33,7 @@ class MobileDeviceTokenDialog : BaseDialogFragment<DialogMobileDeviceBinding>(),
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return DialogMobileDeviceBinding.inflate(inflater).apply { binding = this }.root
+        return inflater.inflate(R.layout.dialog_mobile_device, container, false)
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
@@ -42,24 +42,24 @@ class MobileDeviceTokenDialog : BaseDialogFragment<DialogMobileDeviceBinding>(),
     }
 
     override fun initView() {
-        binding.mobileDeviceDialogClose.setOnClickListener { dismiss() }
+        mobileDeviceDialogClose.setOnClickListener { dismiss() }
     }
 
     override fun updateData(token: MobileDeviceToken) {
-        with(binding.mobileDeviceDialogToken) {
+        with(mobileDeviceDialogToken) {
             text = token.token
             setOnClickListener { clickCopy(token.token) }
         }
-        with(binding.mobileDeviceDialogSymbol) {
+        with(mobileDeviceDialogSymbol) {
             text = token.symbol
             setOnClickListener { clickCopy(token.symbol) }
         }
-        with(binding.mobileDeviceDialogPin) {
+        with(mobileDeviceDialogPin) {
             text = token.pin
             setOnClickListener { clickCopy(token.pin) }
         }
 
-        binding.mobileDeviceQr.setImageBitmap(Base64.decode(token.qr, Base64.DEFAULT).let {
+        mobileDeviceQr.setImageBitmap(Base64.decode(token.qr, Base64.DEFAULT).let {
             BitmapFactory.decodeByteArray(it, 0, it.size)
         })
     }
@@ -71,11 +71,11 @@ class MobileDeviceTokenDialog : BaseDialogFragment<DialogMobileDeviceBinding>(),
     }
 
     override fun hideLoading() {
-        binding.mobileDeviceDialogProgress.visibility = GONE
+        mobileDeviceDialogProgress.visibility = GONE
     }
 
     override fun showContent() {
-        binding.mobileDeviceDialogContent.visibility = VISIBLE
+        mobileDeviceDialogContent.visibility = VISIBLE
     }
 
     override fun closeDialog() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/token/MobileDeviceTokenPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/token/MobileDeviceTokenPresenter.kt
index 6a2a6b98b..a778cbeda 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/token/MobileDeviceTokenPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/token/MobileDeviceTokenPresenter.kt
@@ -29,11 +29,8 @@ class MobileDeviceTokenPresenter @Inject constructor(
     private fun loadData() {
         Timber.i("Mobile device registration data started")
         disposable.add(studentRepository.getCurrentStudent()
-            .flatMap { student ->
-                semesterRepository.getCurrentSemester(student).flatMap { semester ->
-                    mobileDeviceRepository.getToken(student, semester)
-                }
-            }
+            .flatMap { semesterRepository.getCurrentSemester(it) }
+            .flatMap { mobileDeviceRepository.getToken(it) }
             .subscribeOn(schedulers.backgroundThread)
             .observeOn(schedulers.mainThread)
             .doFinally { view?.hideLoading() }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreAdapter.kt
deleted file mode 100644
index 70587b0cf..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreAdapter.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-package io.github.wulkanowy.ui.modules.more
-
-import android.graphics.drawable.Drawable
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import io.github.wulkanowy.databinding.ItemMoreBinding
-import javax.inject.Inject
-
-class MoreAdapter @Inject constructor() : RecyclerView.Adapter<MoreAdapter.ItemViewHolder>() {
-
-    var items = emptyList<Pair<String, Drawable?>>()
-
-    var onClickListener: (name: String) -> Unit = {}
-
-    override fun getItemCount() = items.size
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        ItemMoreBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-    )
-
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        val (title, drawable) = items[position]
-
-        with(holder.binding) {
-            moreItemTitle.text = title
-            moreItemImage.setImageDrawable(drawable)
-
-            root.setOnClickListener { onClickListener(title) }
-        }
-    }
-
-    class ItemViewHolder(val binding: ItemMoreBinding) : RecyclerView.ViewHolder(binding.root)
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreFragment.kt
index a79087de2..ef9c36fab 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreFragment.kt
@@ -2,10 +2,13 @@ package io.github.wulkanowy.ui.modules.more
 
 import android.graphics.drawable.Drawable
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
-import androidx.recyclerview.widget.LinearLayoutManager
+import android.view.ViewGroup
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.R
-import io.github.wulkanowy.databinding.FragmentMoreBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.about.AboutFragment
 import io.github.wulkanowy.ui.modules.homework.HomeworkFragment
@@ -18,16 +21,17 @@ import io.github.wulkanowy.ui.modules.note.NoteFragment
 import io.github.wulkanowy.ui.modules.schoolandteachers.SchoolAndTeachersFragment
 import io.github.wulkanowy.ui.modules.settings.SettingsFragment
 import io.github.wulkanowy.utils.getCompatDrawable
+import io.github.wulkanowy.utils.setOnItemClickListener
+import kotlinx.android.synthetic.main.fragment_more.*
 import javax.inject.Inject
 
-class MoreFragment : BaseFragment<FragmentMoreBinding>(R.layout.fragment_more), MoreView,
-    MainView.TitledView, MainView.MainChildView {
+class MoreFragment : BaseFragment(), MoreView, MainView.TitledView, MainView.MainChildView {
 
     @Inject
     lateinit var presenter: MorePresenter
 
     @Inject
-    lateinit var moreAdapter: MoreAdapter
+    lateinit var moreAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
 
     companion object {
         fun newInstance() = MoreFragment()
@@ -60,17 +64,20 @@ class MoreFragment : BaseFragment<FragmentMoreBinding>(R.layout.fragment_more),
     override val aboutRes: Pair<String, Drawable?>?
         get() = context?.run { getString(R.string.about_title) to getCompatDrawable(R.drawable.ic_all_about) }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding = FragmentMoreBinding.bind(view)
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_more, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
         presenter.onAttachView(this)
     }
 
     override fun initView() {
-        moreAdapter.onClickListener = presenter::onItemSelected
+        moreAdapter.setOnItemClickListener { presenter.onItemSelected(it) }
 
-        with(binding.moreRecycler) {
-            layoutManager = LinearLayoutManager(context)
+        moreRecycler.apply {
+            layoutManager = SmoothScrollLinearLayoutManager(context)
             adapter = moreAdapter
         }
     }
@@ -79,11 +86,8 @@ class MoreFragment : BaseFragment<FragmentMoreBinding>(R.layout.fragment_more),
         if (::presenter.isInitialized) presenter.onViewReselected()
     }
 
-    override fun updateData(data: List<Pair<String, Drawable?>>) {
-        with(moreAdapter) {
-            items = data
-            notifyDataSetChanged()
-        }
+    override fun updateData(data: List<MoreItem>) {
+        moreAdapter.updateDataSet(data)
     }
 
     override fun openMessagesView() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreItem.kt
new file mode 100644
index 000000000..85b604e77
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreItem.kt
@@ -0,0 +1,47 @@
+package io.github.wulkanowy.ui.modules.more
+
+import android.graphics.drawable.Drawable
+import android.view.View
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.FlexibleViewHolder
+import io.github.wulkanowy.R
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.item_more.*
+
+class MoreItem(val title: String, private val drawable: Drawable?) : AbstractFlexibleItem<MoreItem.ViewHolder>() {
+
+    override fun getLayoutRes() = R.layout.item_more
+
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): ViewHolder {
+        return ViewHolder(view, adapter)
+    }
+
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
+        holder.apply {
+            moreItemTitle.text = title
+            moreItemImage.setImageDrawable(drawable)
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as MoreItem
+
+        if (title != other.title) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        return title.hashCode()
+    }
+
+    class ViewHolder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter), LayoutContainer {
+        override val containerView: View
+            get() = contentView
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MorePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MorePresenter.kt
index 593645c19..096f89e9b 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MorePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MorePresenter.kt
@@ -1,5 +1,6 @@
 package io.github.wulkanowy.ui.modules.more
 
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
@@ -20,10 +21,11 @@ class MorePresenter @Inject constructor(
         loadData()
     }
 
-    fun onItemSelected(title: String) {
-        Timber.i("Select more item \"${title}\"")
+    fun onItemSelected(item: AbstractFlexibleItem<*>?) {
+        if (item !is MoreItem) return
+        Timber.i("Select more item \"${item.title}\"")
         view?.run {
-            when (title) {
+            when (item.title) {
                 messagesRes?.first -> openMessagesView()
                 homeworkRes?.first -> openHomeworkView()
                 noteRes?.first -> openNoteView()
@@ -45,15 +47,15 @@ class MorePresenter @Inject constructor(
         Timber.i("Load items for more view")
         view?.run {
             updateData(listOfNotNull(
-                messagesRes,
-                homeworkRes,
-                noteRes,
-                luckyNumberRes,
-                mobileDevicesRes,
-                schoolAndTeachersRes,
-                settingsRes,
-                aboutRes
-            ))
+                messagesRes?.let { MoreItem(it.first, it.second) },
+                homeworkRes?.let { MoreItem(it.first, it.second) },
+                noteRes?.let { MoreItem(it.first, it.second) },
+                luckyNumberRes?.let { MoreItem(it.first, it.second) },
+                mobileDevicesRes?.let { MoreItem(it.first, it.second) },
+                schoolAndTeachersRes?.let { MoreItem(it.first, it.second) },
+                settingsRes?.let { MoreItem(it.first, it.second) },
+                aboutRes?.let { MoreItem(it.first, it.second) })
+            )
         }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreView.kt
index 922afdfd5..41008176d 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreView.kt
@@ -23,7 +23,7 @@ interface MoreView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<Pair<String, Drawable?>>)
+    fun updateData(data: List<MoreItem>)
 
     fun openSettingsView()
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteAdapter.kt
deleted file mode 100644
index 2ffcad949..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteAdapter.kt
+++ /dev/null
@@ -1,60 +0,0 @@
-package io.github.wulkanowy.ui.modules.note
-
-import android.annotation.SuppressLint
-import android.graphics.Typeface
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.core.content.ContextCompat
-import io.github.wulkanowy.sdk.scrapper.notes.Note.CategoryType
-import androidx.recyclerview.widget.RecyclerView
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Note
-import io.github.wulkanowy.databinding.ItemNoteBinding
-import io.github.wulkanowy.utils.getThemeAttrColor
-import io.github.wulkanowy.utils.toFormattedString
-import javax.inject.Inject
-
-class NoteAdapter @Inject constructor() : RecyclerView.Adapter<NoteAdapter.ItemViewHolder>() {
-
-    var items = mutableListOf<Note>()
-
-    var onClickListener: (Note, position: Int) -> Unit = { _, _ -> }
-
-    override fun getItemCount() = items.size
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        ItemNoteBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-    )
-
-    @SuppressLint("SetTextI18n")
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        val item = items[position]
-
-        with(holder.binding) {
-            with(noteItemDate) {
-                text = item.date.toFormattedString()
-                setTypeface(null, if (item.isRead) Typeface.NORMAL else Typeface.BOLD)
-            }
-            with(noteItemType) {
-                text = item.category
-                setTypeface(null, if (item.isRead) Typeface.NORMAL else Typeface.BOLD)
-            }
-            with(noteItemPoints) {
-                text = "${if (item.points > 0) "+" else ""}${item.points}"
-                visibility = if (item.isPointsShow) View.VISIBLE else View.GONE
-                setTextColor(when (CategoryType.getByValue(item.categoryType)) {
-                    CategoryType.POSITIVE -> ContextCompat.getColor(context, R.color.note_positive)
-                    CategoryType.NEGATIVE -> ContextCompat.getColor(context, R.color.note_negative)
-                    else -> context.getThemeAttrColor(android.R.attr.textColorPrimary)
-                })
-            }
-            noteItemTeacher.text = item.teacher
-            noteItemContent.text = item.content
-
-            root.setOnClickListener { onClickListener(item, position) }
-        }
-    }
-
-    class ItemViewHolder(val binding: ItemNoteBinding) : RecyclerView.ViewHolder(binding.root)
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteDialog.kt
index 6d1b181ac..492aeab26 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteDialog.kt
@@ -1,24 +1,17 @@
 package io.github.wulkanowy.ui.modules.note
 
-import android.annotation.SuppressLint
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.core.content.ContextCompat
 import androidx.fragment.app.DialogFragment
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Note
-import io.github.wulkanowy.databinding.DialogNoteBinding
-import io.github.wulkanowy.utils.getThemeAttrColor
 import io.github.wulkanowy.utils.toFormattedString
-import io.github.wulkanowy.sdk.scrapper.notes.Note.CategoryType
-import io.github.wulkanowy.utils.lifecycleAwareVariable
+import kotlinx.android.synthetic.main.dialog_note.*
 
 class NoteDialog : DialogFragment() {
 
-    private var binding: DialogNoteBinding by lifecycleAwareVariable()
-
     private lateinit var note: Note
 
     companion object {
@@ -40,31 +33,16 @@ class NoteDialog : DialogFragment() {
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return DialogNoteBinding.inflate(inflater).apply { binding = this }.root
+        return inflater.inflate(R.layout.dialog_note, container, false)
     }
 
-    @SuppressLint("SetTextI18n")
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
-        with(binding) {
-            noteDialogDate.text = note.date.toFormattedString()
-            noteDialogCategory.text = note.category
-            noteDialogTeacher.text = note.teacher
-            noteDialogContent.text = note.content
-        }
-
-        if (note.isPointsShow) {
-            with(binding.noteDialogPoints) {
-                text = "${if (note.points > 0) "+" else ""}${note.points}"
-                setTextColor(when (CategoryType.getByValue(note.categoryType)) {
-                    CategoryType.POSITIVE -> ContextCompat.getColor(requireContext(), R.color.note_positive)
-                    CategoryType.NEGATIVE -> ContextCompat.getColor(requireContext(), R.color.note_negative)
-                    else -> requireContext().getThemeAttrColor(android.R.attr.textColorPrimary)
-                })
-            }
-        }
-
-        binding.noteDialogClose.setOnClickListener { dismiss() }
+        noteDialogDate.text = note.date.toFormattedString()
+        noteDialogCategory.text = note.category
+        noteDialogTeacher.text = note.teacher
+        noteDialogContent.text = note.content
+        noteDialogClose.setOnClickListener { dismiss() }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteFragment.kt
index 473381659..e5335e459 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteFragment.kt
@@ -1,27 +1,31 @@
 package io.github.wulkanowy.ui.modules.note
 
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
-import androidx.recyclerview.widget.LinearLayoutManager
+import android.view.ViewGroup
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.common.FlexibleItemDecoration
+import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Note
-import io.github.wulkanowy.databinding.FragmentNoteBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
-import io.github.wulkanowy.ui.widgets.DividerItemDecoration
+import io.github.wulkanowy.utils.setOnItemClickListener
+import kotlinx.android.synthetic.main.fragment_note.*
 import javax.inject.Inject
 
-class NoteFragment : BaseFragment<FragmentNoteBinding>(R.layout.fragment_note), NoteView,
-    MainView.TitledView {
+class NoteFragment : BaseFragment(), NoteView, MainView.TitledView {
 
     @Inject
     lateinit var presenter: NotePresenter
 
     @Inject
-    lateinit var noteAdapter: NoteAdapter
+    lateinit var noteAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
 
     companion object {
         fun newInstance() = NoteFragment()
@@ -31,80 +35,77 @@ class NoteFragment : BaseFragment<FragmentNoteBinding>(R.layout.fragment_note),
         get() = R.string.note_title
 
     override val isViewEmpty: Boolean
-        get() = noteAdapter.items.isEmpty()
+        get() = noteAdapter.isEmpty
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding = FragmentNoteBinding.bind(view)
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_note, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
         presenter.onAttachView(this)
     }
 
     override fun initView() {
-        noteAdapter.onClickListener = presenter::onNoteItemSelected
+        noteAdapter.run {
+            setOnItemClickListener { presenter.onNoteItemSelected(it) }
+        }
 
-        with(binding.noteRecycler) {
-            layoutManager = LinearLayoutManager(context)
+        noteRecycler.run {
+            layoutManager = SmoothScrollLinearLayoutManager(context)
             adapter = noteAdapter
-            addItemDecoration(DividerItemDecoration(context))
-        }
-        with(binding) {
-            noteSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
-            noteErrorRetry.setOnClickListener { presenter.onRetry() }
-            noteErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+            addItemDecoration(FlexibleItemDecoration(context)
+                .withDefaultDivider()
+                .withDrawDividerOnLastItem(false)
+            )
         }
+        noteSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
+        noteErrorRetry.setOnClickListener { presenter.onRetry() }
+        noteErrorDetails.setOnClickListener { presenter.onDetailsClick() }
     }
 
     override fun showNoteDialog(note: Note) {
         (activity as? MainActivity)?.showDialogFragment(NoteDialog.newInstance(note))
     }
 
-    override fun updateData(data: List<Note>) {
-        with(noteAdapter) {
-            items = data.toMutableList()
-            notifyDataSetChanged()
-        }
+    override fun updateData(data: List<NoteItem>) {
+        noteAdapter.updateDataSet(data, true)
     }
 
-    override fun updateItem(item: Note, position: Int) {
-        with(noteAdapter) {
-            items[position] = item
-            notifyItemChanged(position)
-        }
+    override fun updateItem(item: AbstractFlexibleItem<*>) {
+        noteAdapter.updateItem(item)
     }
 
     override fun clearData() {
-        with(noteAdapter) {
-            items = mutableListOf()
-            notifyDataSetChanged()
-        }
+        noteAdapter.clear()
     }
 
     override fun showEmpty(show: Boolean) {
-        binding.noteEmpty.visibility = if (show) VISIBLE else GONE
+        noteEmpty.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showErrorView(show: Boolean) {
-        binding.noteError.visibility = if (show) VISIBLE else GONE
+        noteError.visibility = if (show) VISIBLE else GONE
     }
 
     override fun setErrorDetails(message: String) {
-        binding.noteErrorMessage.text = message
+        noteErrorMessage.text = message
     }
 
     override fun showProgress(show: Boolean) {
-        binding.noteProgress.visibility = if (show) VISIBLE else GONE
+        noteProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun enableSwipe(enable: Boolean) {
-        binding.noteSwipe.isEnabled = enable
+        noteSwipe.isEnabled = enable
     }
 
     override fun showContent(show: Boolean) {
-        binding.noteRecycler.visibility = if (show) VISIBLE else GONE
+        noteRecycler.visibility = if (show) VISIBLE else GONE
     }
 
     override fun hideRefresh() {
-        binding.noteSwipe.isRefreshing = false
+        noteSwipe.isRefreshing = false
     }
 
     override fun onDestroyView() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteItem.kt
new file mode 100644
index 000000000..dabeef74a
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteItem.kt
@@ -0,0 +1,60 @@
+package io.github.wulkanowy.ui.modules.note
+
+import android.graphics.Typeface.BOLD
+import android.graphics.Typeface.NORMAL
+import android.view.View
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.FlexibleViewHolder
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Note
+import io.github.wulkanowy.utils.toFormattedString
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.item_note.*
+
+class NoteItem(val note: Note) : AbstractFlexibleItem<NoteItem.ViewHolder>() {
+
+    override fun getLayoutRes() = R.layout.item_note
+
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): NoteItem.ViewHolder {
+        return NoteItem.ViewHolder(view, adapter)
+    }
+
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: NoteItem.ViewHolder, position: Int, payloads: MutableList<Any>?) {
+        holder.apply {
+            noteItemDate.apply {
+                text = note.date.toFormattedString()
+                setTypeface(null, if (note.isRead) NORMAL else BOLD)
+            }
+            noteItemType.apply {
+                text = note.category
+                setTypeface(null, if (note.isRead) NORMAL else BOLD)
+            }
+            noteItemTeacher.text = note.teacher
+            noteItemContent.text = note.content
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as NoteItem
+
+        if (note != other.note) return false
+        if (note.id != other.note.id) return false
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = note.hashCode()
+        result = 31 * result + note.id.toInt()
+        return result
+    }
+
+    class ViewHolder(val view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter), LayoutContainer {
+        override val containerView: View
+            get() = contentView
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NotePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NotePresenter.kt
index 7d301c66b..7acf37a4c 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NotePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NotePresenter.kt
@@ -1,5 +1,6 @@
 package io.github.wulkanowy.ui.modules.note
 
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.db.entities.Note
 import io.github.wulkanowy.data.repositories.note.NoteRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
@@ -52,7 +53,8 @@ class NotePresenter @Inject constructor(
         disposable.add(studentRepository.getCurrentStudent()
             .flatMap { semesterRepository.getCurrentSemester(it).map { semester -> semester to it } }
             .flatMap { noteRepository.getNotes(it.second, it.first, forceRefresh) }
-            .map { items -> items.sortedByDescending { it.date } }
+            .map { items -> items.map { NoteItem(it) } }
+            .map { items -> items.sortedByDescending { it.note.date } }
             .subscribeOn(schedulers.backgroundThread)
             .observeOn(schedulers.mainThread)
             .doFinally {
@@ -69,12 +71,7 @@ class NotePresenter @Inject constructor(
                     showErrorView(false)
                     showContent(it.isNotEmpty())
                 }
-                analytics.logEvent(
-                    "load_data",
-                    "type" to "note",
-                    "items" to it.size,
-                    "force_refresh" to forceRefresh
-                )
+                analytics.logEvent("load_note", "items" to it.size, "force_refresh" to forceRefresh)
             }, {
                 Timber.i("Loading note result: An exception occurred")
                 errorHandler.dispatch(it)
@@ -93,14 +90,16 @@ class NotePresenter @Inject constructor(
         }
     }
 
-    fun onNoteItemSelected(note: Note, position: Int) {
-        Timber.i("Select note item ${note.id}")
-        view?.run {
-            showNoteDialog(note)
-            if (!note.isRead) {
-                note.isRead = true
-                updateItem(note, position)
-                updateNote(note)
+    fun onNoteItemSelected(item: AbstractFlexibleItem<*>?) {
+        if (item is NoteItem) {
+            Timber.i("Select note item ${item.note.id}")
+            view?.run {
+                showNoteDialog(item.note)
+                if (!item.note.isRead) {
+                    item.note.isRead = true
+                    updateItem(item)
+                    updateNote(item.note)
+                }
             }
         }
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteView.kt
index a7cbab8f4..a9c9f4f2f 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteView.kt
@@ -1,5 +1,6 @@
 package io.github.wulkanowy.ui.modules.note
 
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.db.entities.Note
 import io.github.wulkanowy.ui.base.BaseView
 
@@ -9,9 +10,9 @@ interface NoteView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<Note>)
+    fun updateData(data: List<NoteItem>)
 
-    fun updateItem(item: Note, position: Int)
+    fun updateItem(item: AbstractFlexibleItem<*>)
 
     fun clearData()
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersFragment.kt
index 0245aa076..5f9c0b9a0 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersFragment.kt
@@ -1,11 +1,12 @@
 package io.github.wulkanowy.ui.modules.schoolandteachers
 
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
 import android.view.View.INVISIBLE
 import android.view.View.VISIBLE
+import android.view.ViewGroup
 import io.github.wulkanowy.R
-import io.github.wulkanowy.databinding.FragmentSchoolandteachersBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.base.BaseFragmentPagerAdapter
 import io.github.wulkanowy.ui.modules.main.MainView
@@ -13,11 +14,10 @@ import io.github.wulkanowy.ui.modules.schoolandteachers.school.SchoolFragment
 import io.github.wulkanowy.ui.modules.schoolandteachers.teacher.TeacherFragment
 import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.setOnSelectPageListener
+import kotlinx.android.synthetic.main.fragment_schoolandteachers.*
 import javax.inject.Inject
 
-class SchoolAndTeachersFragment :
-    BaseFragment<FragmentSchoolandteachersBinding>(R.layout.fragment_schoolandteachers),
-    SchoolAndTeachersView, MainView.TitledView {
+class SchoolAndTeachersFragment : BaseFragment(), SchoolAndTeachersView, MainView.TitledView {
 
     @Inject
     lateinit var presenter: SchoolAndTeachersPresenter
@@ -31,44 +31,45 @@ class SchoolAndTeachersFragment :
 
     override val titleStringId: Int get() = R.string.schoolandteachers_title
 
-    override val currentPageIndex get() = binding.schoolandteachersViewPager.currentItem
+    override val currentPageIndex get() = schoolandteachersViewPager.currentItem
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding = FragmentSchoolandteachersBinding.bind(view)
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_schoolandteachers, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
         presenter.onAttachView(this)
     }
 
     override fun initView() {
         with(pagerAdapter) {
-            containerId = binding.schoolandteachersViewPager.id
+            containerId = schoolandteachersViewPager.id
             addFragmentsWithTitle(mapOf(
                 SchoolFragment.newInstance() to getString(R.string.school_title),
                 TeacherFragment.newInstance() to getString(R.string.teachers_title)
             ))
         }
 
-        with(binding.schoolandteachersViewPager) {
+        with(schoolandteachersViewPager) {
             adapter = pagerAdapter
             offscreenPageLimit = 2
             setOnSelectPageListener(presenter::onPageSelected)
         }
 
-        with(binding.schoolandteachersTabLayout) {
-            setupWithViewPager(binding.schoolandteachersViewPager)
+        with(schoolandteachersTabLayout) {
+            setupWithViewPager(schoolandteachersViewPager)
             setElevationCompat(context.dpToPx(4f))
         }
     }
 
     override fun showContent(show: Boolean) {
-        with(binding) {
-            schoolandteachersViewPager.visibility = if (show) VISIBLE else INVISIBLE
-            schoolandteachersTabLayout.visibility = if (show) VISIBLE else INVISIBLE
-        }
+        schoolandteachersViewPager.visibility = if (show) VISIBLE else INVISIBLE
+        schoolandteachersTabLayout.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun showProgress(show: Boolean) {
-        binding.schoolandteachersProgress.visibility = if (show) VISIBLE else INVISIBLE
+        schoolandteachersProgress.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     fun onChildFragmentLoaded() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersModule.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersModule.kt
index 2087b0b42..62803a28c 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersModule.kt
@@ -10,10 +10,11 @@ import io.github.wulkanowy.ui.modules.schoolandteachers.school.SchoolFragment
 import io.github.wulkanowy.ui.modules.schoolandteachers.teacher.TeacherFragment
 
 @Suppress("unused")
-@Module
+@Module(includes = [SchoolAndTeachersModule.Static::class])
 abstract class SchoolAndTeachersModule {
 
-    companion object {
+    @Module
+    object Static {
 
         @PerFragment
         @Provides
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/school/SchoolFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/school/SchoolFragment.kt
index 722999f86..5a7c4cade 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/school/SchoolFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/school/SchoolFragment.kt
@@ -1,89 +1,89 @@
 package io.github.wulkanowy.ui.modules.schoolandteachers.school
 
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
+import android.view.ViewGroup
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.School
-import io.github.wulkanowy.databinding.FragmentSchoolBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.ui.modules.schoolandteachers.SchoolAndTeachersChildView
 import io.github.wulkanowy.ui.modules.schoolandteachers.SchoolAndTeachersFragment
 import io.github.wulkanowy.utils.openDialer
 import io.github.wulkanowy.utils.openNavigation
+import kotlinx.android.synthetic.main.fragment_school.*
 import javax.inject.Inject
 
-class SchoolFragment : BaseFragment<FragmentSchoolBinding>(R.layout.fragment_school), SchoolView,
-    MainView.TitledView, SchoolAndTeachersChildView {
+class SchoolFragment : BaseFragment(), SchoolView, MainView.TitledView, SchoolAndTeachersChildView {
 
     @Inject
     lateinit var presenter: SchoolPresenter
 
     override val titleStringId get() = R.string.school_title
 
-    override val isViewEmpty get() = binding.schoolName.text.isBlank()
+    override val isViewEmpty get() = schoolName.text.isBlank()
 
     companion object {
         fun newInstance() = SchoolFragment()
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding = FragmentSchoolBinding.bind(view)
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_school, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
         presenter.onAttachView(this)
     }
 
     override fun initView() {
-        with(binding) {
-            schoolSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
-            schoolErrorRetry.setOnClickListener { presenter.onRetry() }
-            schoolErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+        schoolSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
+        schoolErrorRetry.setOnClickListener { presenter.onRetry() }
+        schoolErrorDetails.setOnClickListener { presenter.onDetailsClick() }
 
-            schoolAddressButton.setOnClickListener { presenter.onAddressSelected() }
-            schoolTelephoneButton.setOnClickListener { presenter.onTelephoneSelected() }
-        }
+        schoolAddressButton.setOnClickListener { presenter.onAddressSelected() }
+        schoolTelephoneButton.setOnClickListener { presenter.onTelephoneSelected() }
     }
 
     override fun updateData(data: School) {
-        with(binding) {
-            schoolName.text = data.name
-            schoolAddress.text = data.address.ifBlank { "-" }
-            schoolAddressButton.visibility = if (data.address.isNotBlank()) VISIBLE else GONE
-            schoolTelephone.text = data.contact.ifBlank { "-" }
-            schoolTelephoneButton.visibility = if (data.contact.isNotBlank()) VISIBLE else GONE
-            schoolHeadmaster.text = data.headmaster
-            schoolPedagogue.text = data.pedagogue
-        }
+        schoolName.text = data.name
+        schoolAddress.text = data.address.ifBlank { "-" }
+        schoolAddressButton.visibility = if (data.address.isNotBlank()) VISIBLE else GONE
+        schoolTelephone.text = data.contact.ifBlank { "-" }
+        schoolTelephoneButton.visibility = if (data.contact.isNotBlank()) VISIBLE else GONE
+        schoolHeadmaster.text = data.headmaster
+        schoolPedagogue.text = data.pedagogue
     }
 
     override fun showEmpty(show: Boolean) {
-        binding.schoolEmpty.visibility = if (show) VISIBLE else GONE
+        schoolEmpty.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showErrorView(show: Boolean) {
-        binding.schoolError.visibility = if (show) VISIBLE else GONE
+        schoolError.visibility = if (show) VISIBLE else GONE
     }
 
     override fun setErrorDetails(message: String) {
-        binding.schoolErrorMessage.text = message
+        schoolErrorMessage.text = message
     }
 
     override fun showProgress(show: Boolean) {
-        binding.schoolProgress.visibility = if (show) VISIBLE else GONE
+        schoolProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun enableSwipe(enable: Boolean) {
-        binding.schoolSwipe.isEnabled = enable
+        schoolSwipe.isEnabled = enable
     }
 
     override fun showContent(show: Boolean) {
-        binding.schoolContent.visibility = if (show) VISIBLE else GONE
+        schoolContent.visibility = if (show) VISIBLE else GONE
     }
 
     override fun hideRefresh() {
-        binding.schoolSwipe.isRefreshing = false
+        schoolSwipe.isRefreshing = false
     }
 
     override fun notifyParentDataLoaded() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/school/SchoolPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/school/SchoolPresenter.kt
index 7beff922d..d3299d90d 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/school/SchoolPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/school/SchoolPresenter.kt
@@ -64,11 +64,8 @@ class SchoolPresenter @Inject constructor(
     private fun loadData(forceRefresh: Boolean = false) {
         Timber.i("Loading school info started")
         disposable.add(studentRepository.getCurrentStudent()
-            .flatMapMaybe { student ->
-                semesterRepository.getCurrentSemester(student).flatMapMaybe {
-                    schoolRepository.getSchoolInfo(student, it, forceRefresh)
-                }
-            }
+            .flatMap { semesterRepository.getCurrentSemester(it) }
+            .flatMapMaybe { schoolRepository.getSchoolInfo(it, forceRefresh) }
             .subscribeOn(schedulers.backgroundThread)
             .observeOn(schedulers.mainThread)
             .doFinally {
@@ -88,11 +85,7 @@ class SchoolPresenter @Inject constructor(
                     showEmpty(false)
                     showErrorView(false)
                 }
-                analytics.logEvent(
-                    "load_item",
-                    "type" to "school",
-                    "force_refresh" to forceRefresh
-                )
+                analytics.logEvent("load_school", "force_refresh" to forceRefresh)
             }, {
                 Timber.i("Loading school result: An exception occurred")
                 errorHandler.dispatch(it)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherAdapter.kt
deleted file mode 100644
index 8deeae05b..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherAdapter.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-package io.github.wulkanowy.ui.modules.schoolandteachers.teacher
-
-import android.annotation.SuppressLint
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Teacher
-import io.github.wulkanowy.databinding.ItemTeacherBinding
-import javax.inject.Inject
-
-class TeacherAdapter @Inject constructor() : RecyclerView.Adapter<TeacherAdapter.ItemViewHolder>() {
-
-    var items = emptyList<Teacher>()
-
-    override fun getItemCount() = items.size
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        ItemTeacherBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-    )
-
-    @SuppressLint("SetTextI18n")
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        val teacher = items[position]
-
-        with(holder.binding) {
-            teacherItemName.text = teacher.name
-            teacherItemSubject.text = if (teacher.subject.isNotBlank()) teacher.subject else root.context.getString(R.string.teacher_no_subject)
-            if (teacher.shortName.isNotBlank()) {
-                teacherItemShortName.visibility = View.VISIBLE
-                teacherItemShortName.text = "[${teacher.shortName}]"
-            } else {
-                teacherItemShortName.visibility = View.GONE
-            }
-        }
-    }
-
-    class ItemViewHolder(val binding: ItemTeacherBinding) : RecyclerView.ViewHolder(binding.root)
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherFragment.kt
index aa50339c1..b6bb9c101 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherFragment.kt
@@ -1,28 +1,31 @@
 package io.github.wulkanowy.ui.modules.schoolandteachers.teacher
 
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
-import androidx.recyclerview.widget.LinearLayoutManager
+import android.view.ViewGroup
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.common.FlexibleItemDecoration
+import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Teacher
-import io.github.wulkanowy.databinding.FragmentTeacherBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.ui.modules.schoolandteachers.SchoolAndTeachersChildView
 import io.github.wulkanowy.ui.modules.schoolandteachers.SchoolAndTeachersFragment
-import io.github.wulkanowy.ui.widgets.DividerItemDecoration
+import kotlinx.android.synthetic.main.fragment_teacher.*
 import javax.inject.Inject
 
-class TeacherFragment : BaseFragment<FragmentTeacherBinding>(R.layout.fragment_teacher),
-    TeacherView, MainView.TitledView, SchoolAndTeachersChildView {
+class TeacherFragment : BaseFragment(), TeacherView, MainView.TitledView,
+    SchoolAndTeachersChildView {
 
     @Inject
     lateinit var presenter: TeacherPresenter
 
     @Inject
-    lateinit var teacherAdapter: TeacherAdapter
+    lateinit var teacherAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
 
     companion object {
         fun newInstance() = TeacherFragment()
@@ -34,60 +37,69 @@ class TeacherFragment : BaseFragment<FragmentTeacherBinding>(R.layout.fragment_t
     override val noSubjectString get() = getString(R.string.teacher_no_subject)
 
     override val isViewEmpty: Boolean
-        get() = teacherAdapter.items.isEmpty()
+        get() = teacherAdapter.isEmpty
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding = FragmentTeacherBinding.bind(view)
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_teacher, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
         presenter.onAttachView(this)
     }
 
     override fun initView() {
-        with(binding.teacherRecycler) {
-            layoutManager = LinearLayoutManager(context)
+        teacherRecycler.run {
+            layoutManager = SmoothScrollLinearLayoutManager(context)
             adapter = teacherAdapter
-            addItemDecoration(DividerItemDecoration(context))
-        }
-        with(binding) {
-            teacherSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
-            teacherErrorRetry.setOnClickListener { presenter.onRetry() }
-            teacherErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+            addItemDecoration(FlexibleItemDecoration(context)
+                .withDefaultDivider()
+                .withDrawDividerOnLastItem(false)
+            )
         }
+        teacherSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
+        teacherErrorRetry.setOnClickListener { presenter.onRetry() }
+        teacherErrorDetails.setOnClickListener { presenter.onDetailsClick() }
     }
 
-    override fun updateData(data: List<Teacher>) {
-        with(teacherAdapter) {
-            items = data
-            notifyDataSetChanged()
-        }
+    override fun updateData(data: List<TeacherItem>) {
+        teacherAdapter.updateDataSet(data, true)
+    }
+
+    override fun updateItem(item: AbstractFlexibleItem<*>) {
+        teacherAdapter.updateItem(item)
+    }
+
+    override fun clearData() {
+        teacherAdapter.clear()
     }
 
     override fun showEmpty(show: Boolean) {
-        binding.teacherEmpty.visibility = if (show) VISIBLE else GONE
+        teacherEmpty.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showErrorView(show: Boolean) {
-        binding.teacherError.visibility = if (show) VISIBLE else GONE
+        teacherError.visibility = if (show) VISIBLE else GONE
     }
 
     override fun setErrorDetails(message: String) {
-        binding.teacherErrorMessage.text = message
+        teacherErrorMessage.text = message
     }
 
     override fun showProgress(show: Boolean) {
-        binding.teacherProgress.visibility = if (show) VISIBLE else GONE
+        teacherProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun enableSwipe(enable: Boolean) {
-        binding.teacherSwipe.isEnabled = enable
+        teacherSwipe.isEnabled = enable
     }
 
     override fun showContent(show: Boolean) {
-        binding.teacherRecycler.visibility = if (show) VISIBLE else GONE
+        teacherRecycler.visibility = if (show) VISIBLE else GONE
     }
 
     override fun hideRefresh() {
-        binding.teacherSwipe.isRefreshing = false
+        teacherSwipe.isRefreshing = false
     }
 
     override fun notifyParentDataLoaded() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherItem.kt
new file mode 100644
index 000000000..368317744
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherItem.kt
@@ -0,0 +1,59 @@
+package io.github.wulkanowy.ui.modules.schoolandteachers.teacher
+
+import android.annotation.SuppressLint
+import android.view.View
+import android.view.View.GONE
+import android.view.View.VISIBLE
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.FlexibleViewHolder
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Teacher
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.item_teacher.*
+
+class TeacherItem(val teacher: Teacher, private val noSubjectText: String) : AbstractFlexibleItem<TeacherItem.ViewHolder>() {
+
+    override fun getLayoutRes() = R.layout.item_teacher
+
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): TeacherItem.ViewHolder {
+        return TeacherItem.ViewHolder(view, adapter)
+    }
+
+    @SuppressLint("SetTextI18n")
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: TeacherItem.ViewHolder, position: Int, payloads: MutableList<Any>?) {
+        holder.apply {
+            teacherItemName.text = teacher.name
+            teacherItemSubject.text = if (teacher.subject.isNotBlank()) teacher.subject else noSubjectText
+            if (teacher.shortName.isNotBlank()) {
+                teacherItemShortName.visibility = VISIBLE
+                teacherItemShortName.text = "[${teacher.shortName}]"
+            } else {
+                teacherItemShortName.visibility = GONE
+            }
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as TeacherItem
+
+        if (teacher != other.teacher) return false
+        if (teacher.id != other.teacher.id) return false
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = teacher.hashCode()
+        result = 31 * result + teacher.id.toInt()
+        return result
+    }
+
+    class ViewHolder(val view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter), LayoutContainer {
+        override val containerView: View
+            get() = contentView
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherPresenter.kt
index 0d8eec6d4..6aa4871d2 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherPresenter.kt
@@ -52,12 +52,10 @@ class TeacherPresenter @Inject constructor(
     private fun loadData(forceRefresh: Boolean = false) {
         Timber.i("Loading teachers data started")
         disposable.add(studentRepository.getCurrentStudent()
-            .flatMap { student ->
-                semesterRepository.getCurrentSemester(student).flatMap { semester ->
-                    teacherRepository.getTeachers(student, semester, forceRefresh)
-                }
-            }
+            .flatMap { semesterRepository.getCurrentSemester(it) }
+            .flatMap { teacherRepository.getTeachers(it, forceRefresh) }
             .map { it.filter { teacher -> teacher.name.isNotBlank() } }
+            .map { items -> items.map { TeacherItem(it, view?.noSubjectString.orEmpty()) } }
             .subscribeOn(schedulers.backgroundThread)
             .observeOn(schedulers.mainThread)
             .doFinally {
@@ -75,12 +73,7 @@ class TeacherPresenter @Inject constructor(
                     showEmpty(it.isEmpty())
                     showErrorView(false)
                 }
-                analytics.logEvent(
-                    "load_data",
-                    "type" to "teachers",
-                    "items" to it.size,
-                    "force_refresh" to forceRefresh
-                )
+                analytics.logEvent("load_teachers", "items" to it.size, "force_refresh" to forceRefresh)
             }) {
                 Timber.i("Loading teachers result: An exception occurred")
                 errorHandler.dispatch(it)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherView.kt
index c655bfad8..b16be8ff9 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherView.kt
@@ -1,6 +1,6 @@
 package io.github.wulkanowy.ui.modules.schoolandteachers.teacher
 
-import io.github.wulkanowy.data.db.entities.Teacher
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.ui.base.BaseView
 import io.github.wulkanowy.ui.modules.schoolandteachers.SchoolAndTeachersChildView
 
@@ -12,10 +12,14 @@ interface TeacherView : BaseView, SchoolAndTeachersChildView {
 
     fun initView()
 
-    fun updateData(data: List<Teacher>)
+    fun updateData(data: List<TeacherItem>)
+
+    fun updateItem(item: AbstractFlexibleItem<*>)
 
     fun hideRefresh()
 
+    fun clearData()
+
     fun showProgress(show: Boolean)
 
     fun enableSwipe(enable: Boolean)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsFragment.kt
index 248417fd1..03a89d274 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsFragment.kt
@@ -3,11 +3,8 @@ package io.github.wulkanowy.ui.modules.settings
 import android.content.Context
 import android.content.SharedPreferences
 import android.os.Bundle
-import androidx.appcompat.app.AlertDialog
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
-import com.thelittlefireman.appkillermanager.AppKillerManager
-import com.thelittlefireman.appkillermanager.exceptions.NoActionFoundException
 import com.yariksoffice.lingver.Lingver
 import dagger.android.support.AndroidSupportInjection
 import io.github.wulkanowy.R
@@ -15,7 +12,6 @@ import io.github.wulkanowy.ui.base.BaseActivity
 import io.github.wulkanowy.ui.base.ErrorDialog
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.AppInfo
-import io.github.wulkanowy.utils.openInternetBrowser
 import javax.inject.Inject
 
 class SettingsFragment : PreferenceFragmentCompat(),
@@ -37,31 +33,11 @@ class SettingsFragment : PreferenceFragmentCompat(),
 
     override val titleStringId get() = R.string.settings_title
 
-    override val syncSuccessString get() = getString(R.string.pref_services_message_sync_success)
-
-    override val syncFailedString get() = getString(R.string.pref_services_message_sync_failed)
-
     override fun onAttach(context: Context) {
         AndroidSupportInjection.inject(this)
         super.onAttach(context)
     }
 
-    override fun initView() {
-        findPreference<Preference>(getString(R.string.pref_key_services_force_sync))?.run {
-            onPreferenceClickListener = Preference.OnPreferenceClickListener {
-                presenter.onSyncNowClicked()
-                true
-            }
-        }
-        findPreference<Preference>(getString(R.string.pref_key_notifications_fix_issues))?.run {
-            isVisible = AppKillerManager.isDeviceSupported() && AppKillerManager.isAnyActionAvailable(requireContext())
-            setOnPreferenceClickListener {
-                presenter.onFixSyncIssuesClicked()
-                true
-            }
-        }
-    }
-
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
         presenter.onAttachView(this)
@@ -85,67 +61,32 @@ class SettingsFragment : PreferenceFragmentCompat(),
     }
 
     override fun setServicesSuspended(serviceEnablesKey: String, isHolidays: Boolean) {
-        findPreference<Preference>(serviceEnablesKey)?.run {
+        findPreference<Preference>(serviceEnablesKey)?.apply {
             summary = if (isHolidays) getString(R.string.pref_services_suspended) else ""
             isEnabled = !isHolidays
         }
     }
 
-    override fun setSyncInProgress(inProgress: Boolean) {
-        if (activity == null || !isAdded) return
-
-        findPreference<Preference>(getString(R.string.pref_key_services_force_sync))?.run {
-            isEnabled = !inProgress
-            summary = if (inProgress) getString(R.string.pref_services_sync_in_progress) else ""
-        }
-    }
-
     override fun showError(text: String, error: Throwable) {
-        (activity as? BaseActivity<*, *>)?.showError(text, error)
+        (activity as? BaseActivity<*>)?.showError(text, error)
     }
 
     override fun showMessage(text: String) {
-        (activity as? BaseActivity<*, *>)?.showMessage(text)
+        (activity as? BaseActivity<*>)?.showMessage(text)
     }
 
     override fun showExpiredDialog() {
-        (activity as? BaseActivity<*, *>)?.showExpiredDialog()
+        (activity as? BaseActivity<*>)?.showExpiredDialog()
     }
 
     override fun openClearLoginView() {
-        (activity as? BaseActivity<*, *>)?.openClearLoginView()
+        (activity as? BaseActivity<*>)?.openClearLoginView()
     }
 
     override fun showErrorDetailsDialog(error: Throwable) {
         ErrorDialog.newInstance(error).show(childFragmentManager, error.toString())
     }
 
-    override fun showForceSyncDialog() {
-        AlertDialog.Builder(requireContext())
-            .setTitle(R.string.pref_services_dialog_force_sync_title)
-            .setMessage(R.string.pref_services_dialog_force_sync_summary)
-            .setPositiveButton(android.R.string.ok) { _, _ -> presenter.onForceSyncDialogSubmit() }
-            .setNegativeButton(android.R.string.cancel) { _, _ -> }
-            .show()
-    }
-
-    override fun showFixSyncDialog() {
-        AlertDialog.Builder(requireContext())
-            .setTitle(R.string.pref_notify_fix_sync_issues)
-            .setMessage(R.string.pref_notify_fix_sync_issues_message)
-            .setNegativeButton(android.R.string.cancel) { _, _ -> }
-            .setPositiveButton(R.string.pref_notify_fix_sync_issues_settings_button) { _, _ ->
-                try {
-                    AppKillerManager.doActionPowerSaving(requireContext())
-                    AppKillerManager.doActionAutoStart(requireContext())
-                    AppKillerManager.doActionNotification(requireContext())
-                } catch (e: NoActionFoundException) {
-                    requireContext().openInternetBrowser("https://dontkillmyapp.com/${AppKillerManager.getDevice()?.manufacturer}", ::showMessage)
-                }
-            }
-            .show()
-    }
-
     override fun onResume() {
         super.onResume()
         preferenceScreen.sharedPreferences.registerOnSharedPreferenceChangeListener(this)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsPresenter.kt
index bccb6f0bb..89ba0ee5e 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsPresenter.kt
@@ -1,10 +1,8 @@
 package io.github.wulkanowy.ui.modules.settings
 
-import androidx.work.WorkInfo
-import com.chuckerteam.chucker.api.ChuckerCollector
+import com.readystatesoftware.chuck.api.ChuckCollector
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
-import io.github.wulkanowy.services.alarm.TimetableNotificationSchedulerHelper
 import io.github.wulkanowy.services.sync.SyncManager
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
@@ -21,10 +19,9 @@ class SettingsPresenter @Inject constructor(
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val preferencesRepository: PreferencesRepository,
-    private val timetableNotificationHelper: TimetableNotificationSchedulerHelper,
     private val analytics: FirebaseAnalyticsHelper,
     private val syncManager: SyncManager,
-    private val chuckerCollector: ChuckerCollector,
+    private val chuckCollector: ChuckCollector,
     private val appInfo: AppInfo
 ) : BasePresenter<SettingsView>(errorHandler, studentRepository, schedulers) {
 
@@ -32,63 +29,24 @@ class SettingsPresenter @Inject constructor(
         super.onAttachView(view)
         Timber.i("Settings view was initialized")
         view.setServicesSuspended(preferencesRepository.serviceEnableKey, now().isHolidays)
-        view.initView()
     }
 
     fun onSharedPreferenceChanged(key: String) {
         Timber.i("Change settings $key")
 
-        preferencesRepository.apply {
+        with(preferencesRepository) {
             when (key) {
-                serviceEnableKey -> with(syncManager) { if (isServiceEnabled) startPeriodicSyncWorker() else stopSyncWorker() }
-                servicesIntervalKey, servicesOnlyWifiKey -> syncManager.startPeriodicSyncWorker(true)
-                isDebugNotificationEnableKey -> chuckerCollector.showNotification = isDebugNotificationEnable
+                serviceEnableKey -> with(syncManager) { if (isServiceEnabled) startSyncWorker() else stopSyncWorker() }
+                servicesIntervalKey, servicesOnlyWifiKey -> syncManager.startSyncWorker(true)
+                isDebugNotificationEnableKey -> chuckCollector.showNotification(isDebugNotificationEnable)
                 appThemeKey -> view?.recreateView()
-                isUpcomingLessonsNotificationsEnableKey -> if (!isUpcomingLessonsNotificationsEnable) timetableNotificationHelper.cancelNotification()
                 appLanguageKey -> view?.run {
                     updateLanguage(if (appLanguage == "system") appInfo.systemLanguage else appLanguage)
                     recreateView()
                 }
+                else -> Unit
             }
         }
         analytics.logEvent("setting_changed", "name" to key)
     }
-
-    fun onSyncNowClicked() {
-        view?.showForceSyncDialog()
-    }
-
-    fun onFixSyncIssuesClicked() {
-        view?.showFixSyncDialog()
-    }
-
-    fun onForceSyncDialogSubmit() {
-        view?.run {
-            val successString = syncSuccessString
-            val failedString = syncFailedString
-            disposable.add(syncManager.startOneTimeSyncWorker()
-                .doOnSubscribe {
-                    setSyncInProgress(true)
-                    Timber.i("Setting sync now started")
-                    analytics.logEvent("sync_now", "status" to "started")
-                }
-                .doFinally { setSyncInProgress(false) }
-                .subscribe({ workInfo ->
-                    when (workInfo.state) {
-                        WorkInfo.State.SUCCEEDED -> {
-                            showMessage(successString)
-                            analytics.logEvent("sync_now", "status" to "success")
-                        }
-                        WorkInfo.State.FAILED -> {
-                            showError(failedString, Throwable(workInfo.outputData.getString("error")))
-                            analytics.logEvent("sync_now", "status" to "failed")
-                        }
-                        else -> Timber.d("Sync now state: ${workInfo.state}")
-                    }
-                }, {
-                    Timber.e(it, "Sync now failed")
-                })
-            )
-        }
-    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsView.kt
index 3786ba4b2..e50eb47b3 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsView.kt
@@ -4,20 +4,9 @@ import io.github.wulkanowy.ui.base.BaseView
 
 interface SettingsView : BaseView {
 
-    val syncSuccessString: String
-
-    val syncFailedString: String
-
-    fun initView()
-
     fun recreateView()
 
     fun updateLanguage(langCode: String)
 
     fun setServicesSuspended(serviceEnablesKey: String, isHolidays: Boolean)
-
-    fun setSyncInProgress(inProgress: Boolean)
-
-    fun showForceSyncDialog()
-    fun showFixSyncDialog()
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashActivity.kt
index 23a437506..3e0106d1a 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashActivity.kt
@@ -3,13 +3,12 @@ package io.github.wulkanowy.ui.modules.splash
 import android.os.Bundle
 import android.widget.Toast
 import android.widget.Toast.LENGTH_LONG
-import androidx.viewbinding.ViewBinding
 import io.github.wulkanowy.ui.base.BaseActivity
 import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import javax.inject.Inject
 
-class SplashActivity : BaseActivity<SplashPresenter, ViewBinding>(), SplashView {
+class SplashActivity : BaseActivity<SplashPresenter>(), SplashView {
 
     @Inject
     override lateinit var presenter: SplashPresenter
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableAdapter.kt
deleted file mode 100644
index 85ded2025..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableAdapter.kt
+++ /dev/null
@@ -1,299 +0,0 @@
-package io.github.wulkanowy.ui.modules.timetable
-
-import android.graphics.Paint
-import android.view.LayoutInflater
-import android.view.View.GONE
-import android.view.View.VISIBLE
-import android.view.ViewGroup
-import android.widget.TextView
-import androidx.recyclerview.widget.RecyclerView
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Timetable
-import io.github.wulkanowy.databinding.ItemTimetableBinding
-import io.github.wulkanowy.databinding.ItemTimetableSmallBinding
-import io.github.wulkanowy.utils.getThemeAttrColor
-import io.github.wulkanowy.utils.isJustFinished
-import io.github.wulkanowy.utils.isShowTimeUntil
-import io.github.wulkanowy.utils.left
-import io.github.wulkanowy.utils.toFormattedString
-import io.github.wulkanowy.utils.until
-import org.threeten.bp.LocalDateTime
-import timber.log.Timber
-import java.util.Timer
-import javax.inject.Inject
-import kotlin.concurrent.timer
-
-class TimetableAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
-
-    private enum class ViewType(val id: Int) {
-        ITEM_NORMAL(1),
-        ITEM_SMALL(2)
-    }
-
-    var items = mutableListOf<Timetable>()
-        set(value) {
-            field = value
-            resetTimers()
-        }
-
-    var onClickListener: (Timetable) -> Unit = {}
-
-    var showWholeClassPlan: String = "no"
-
-    var showTimers: Boolean = false
-
-    private val timers = mutableMapOf<Int, Timer>()
-
-    private fun resetTimers() {
-        Timber.d("Timetable timers reset")
-        with(timers) {
-            forEach { (_, timer) -> timer.cancel() }
-            clear()
-        }
-    }
-
-    override fun getItemCount() = items.size
-
-    override fun getItemViewType(position: Int) = when {
-        !items[position].isStudentPlan && showWholeClassPlan == "small" -> ViewType.ITEM_SMALL.id
-        else -> ViewType.ITEM_NORMAL.id
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        val inflater = LayoutInflater.from(parent.context)
-
-        return when (viewType) {
-            ViewType.ITEM_NORMAL.id -> ItemViewHolder(ItemTimetableBinding.inflate(inflater, parent, false))
-            ViewType.ITEM_SMALL.id -> SmallItemViewHolder(ItemTimetableSmallBinding.inflate(inflater, parent, false))
-            else -> throw IllegalStateException()
-        }
-    }
-
-    override fun onDetachedFromRecyclerView(recyclerView: RecyclerView) {
-        super.onDetachedFromRecyclerView(recyclerView)
-        resetTimers()
-    }
-
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        val lesson = items[position]
-
-        when (holder) {
-            is ItemViewHolder -> bindNormalView(holder.binding, lesson, position)
-            is SmallItemViewHolder -> bindSmallView(holder.binding, lesson)
-        }
-    }
-
-    private fun bindSmallView(binding: ItemTimetableSmallBinding, lesson: Timetable) {
-        with(binding) {
-            timetableSmallItemNumber.text = lesson.number.toString()
-            timetableSmallItemSubject.text = lesson.subject
-            timetableSmallItemTimeStart.text = lesson.start.toFormattedString("HH:mm")
-            timetableSmallItemRoom.text = lesson.room
-            timetableSmallItemTeacher.text = lesson.teacher
-
-            bindSubjectStyle(timetableSmallItemSubject, lesson)
-            bindSmallDescription(binding, lesson)
-            bindSmallColors(binding, lesson)
-
-            root.setOnClickListener { onClickListener(lesson) }
-        }
-    }
-
-    private fun bindNormalView(binding: ItemTimetableBinding, lesson: Timetable, position: Int) {
-        with(binding) {
-            timetableItemNumber.text = lesson.number.toString()
-            timetableItemSubject.text = lesson.subject
-            timetableItemRoom.text = lesson.room
-            timetableItemTeacher.text = lesson.teacher
-            timetableItemTimeStart.text = lesson.start.toFormattedString("HH:mm")
-            timetableItemTimeFinish.text = lesson.end.toFormattedString("HH:mm")
-
-            bindSubjectStyle(timetableItemSubject, lesson)
-            bindNormalDescription(binding, lesson)
-            bindNormalColors(binding, lesson)
-
-            if (lesson.isStudentPlan && showTimers) timers[position] = timer(period = 1000) {
-                root.post { updateTimeLeft(binding, lesson, position) }
-            } else {
-                // reset item on set changed
-                timetableItemTimeUntil.visibility = GONE
-                timetableItemTimeLeft.visibility = GONE
-            }
-
-            root.setOnClickListener { onClickListener(lesson) }
-        }
-    }
-
-    private fun getPreviousLesson(position: Int): LocalDateTime? {
-        return items.filter { it.isStudentPlan }.getOrNull(position - 1 - items.filterIndexed { i, item -> i < position && !item.isStudentPlan }.size)?.let {
-            if (!it.canceled && it.isStudentPlan) it.end
-            else null
-        }
-    }
-
-    private fun updateTimeLeft(binding: ItemTimetableBinding, lesson: Timetable, position: Int) {
-        val isShowTimeUntil = lesson.isShowTimeUntil(getPreviousLesson(position))
-        val until = lesson.until
-        val left = lesson.left
-        val isJustFinished = lesson.isJustFinished
-
-        with(binding) {
-            when {
-                // before lesson
-                isShowTimeUntil -> {
-                    Timber.d("Show time until lesson: $position")
-                    timetableItemTimeLeft.visibility = GONE
-                    with(timetableItemTimeUntil) {
-                        visibility = VISIBLE
-                        text = context.getString(R.string.timetable_time_until,
-                            if (until.seconds <= 60) {
-                                context.getString(R.string.timetable_seconds, until.seconds.toString(10))
-                            } else {
-                                context.getString(R.string.timetable_minutes, until.toMinutes().toString(10))
-                            }
-                        )
-                    }
-                }
-                // after lesson start
-                left != null -> {
-                    Timber.d("Show time left lesson: $position")
-                    timetableItemTimeUntil.visibility = GONE
-                    with(timetableItemTimeLeft) {
-                        visibility = VISIBLE
-                        text = context.getString(
-                            R.string.timetable_time_left,
-                            if (left.seconds < 60) {
-                                context.getString(R.string.timetable_seconds, left.seconds.toString(10))
-                            } else {
-                                context.getString(R.string.timetable_minutes, left.toMinutes().toString(10))
-                            }
-                        )
-                    }
-                }
-                // right after lesson finish
-                isJustFinished -> {
-                    Timber.d("Show just finished lesson: $position")
-                    timetableItemTimeUntil.visibility = GONE
-                    timetableItemTimeLeft.visibility = VISIBLE
-                    timetableItemTimeLeft.text = root.context.getString(R.string.timetable_finished)
-                }
-                else -> {
-                    timetableItemTimeUntil.visibility = GONE
-                    timetableItemTimeLeft.visibility = GONE
-                }
-            }
-        }
-    }
-
-    private fun bindSubjectStyle(subjectView: TextView, lesson: Timetable) {
-        subjectView.paintFlags = if (lesson.canceled) subjectView.paintFlags or Paint.STRIKE_THRU_TEXT_FLAG
-        else subjectView.paintFlags and Paint.STRIKE_THRU_TEXT_FLAG.inv()
-    }
-
-    private fun bindSmallDescription(binding: ItemTimetableSmallBinding, lesson: Timetable) {
-        with(binding) {
-            if (lesson.info.isNotBlank() && !lesson.changes) {
-                timetableSmallItemDescription.visibility = VISIBLE
-                timetableSmallItemDescription.text = lesson.info
-
-                timetableSmallItemRoom.visibility = GONE
-                timetableSmallItemTeacher.visibility = GONE
-
-                timetableSmallItemDescription.setTextColor(root.context.getThemeAttrColor(
-                    if (lesson.canceled) R.attr.colorPrimary
-                    else R.attr.colorTimetableChange
-                ))
-            } else {
-                timetableSmallItemDescription.visibility = GONE
-                timetableSmallItemRoom.visibility = VISIBLE
-                timetableSmallItemTeacher.visibility = VISIBLE
-            }
-        }
-    }
-
-    private fun bindNormalDescription(binding: ItemTimetableBinding, lesson: Timetable) {
-        with(binding) {
-            if (lesson.info.isNotBlank() && !lesson.changes) {
-                timetableItemDescription.visibility = VISIBLE
-                timetableItemDescription.text = lesson.info
-
-                timetableItemRoom.visibility = GONE
-                timetableItemTeacher.visibility = GONE
-
-                timetableItemDescription.setTextColor(root.context.getThemeAttrColor(
-                    if (lesson.canceled) R.attr.colorPrimary
-                    else R.attr.colorTimetableChange
-                ))
-            } else {
-                timetableItemDescription.visibility = GONE
-                timetableItemRoom.visibility = VISIBLE
-                timetableItemTeacher.visibility = VISIBLE
-            }
-        }
-    }
-
-    private fun bindSmallColors(binding: ItemTimetableSmallBinding, lesson: Timetable) {
-        with(binding) {
-            if (lesson.canceled) {
-                updateNumberAndSubjectCanceledColor(timetableSmallItemNumber, timetableSmallItemSubject)
-            } else {
-                updateNumberColor(timetableSmallItemNumber, lesson)
-                updateSubjectColor(timetableSmallItemSubject, lesson)
-                updateRoomColor(timetableSmallItemRoom, lesson)
-                updateTeacherColor(timetableSmallItemTeacher, lesson)
-            }
-        }
-    }
-
-    private fun bindNormalColors(binding: ItemTimetableBinding, lesson: Timetable) {
-        with(binding) {
-            if (lesson.canceled) {
-                updateNumberAndSubjectCanceledColor(timetableItemNumber, timetableItemSubject)
-            } else {
-                updateNumberColor(timetableItemNumber, lesson)
-                updateSubjectColor(timetableItemSubject, lesson)
-                updateRoomColor(timetableItemRoom, lesson)
-                updateTeacherColor(timetableItemTeacher, lesson)
-            }
-        }
-    }
-
-    private fun updateNumberAndSubjectCanceledColor(numberView: TextView, subjectView: TextView) {
-        numberView.setTextColor(numberView.context.getThemeAttrColor(R.attr.colorPrimary))
-        subjectView.setTextColor(subjectView.context.getThemeAttrColor(R.attr.colorPrimary))
-    }
-
-    private fun updateNumberColor(numberView: TextView, lesson: Timetable) {
-        numberView.setTextColor(numberView.context.getThemeAttrColor(
-            if (lesson.changes || lesson.info.isNotBlank()) R.attr.colorTimetableChange
-            else android.R.attr.textColorPrimary
-        ))
-    }
-
-    private fun updateSubjectColor(subjectView: TextView, lesson: Timetable) {
-        subjectView.setTextColor(subjectView.context.getThemeAttrColor(
-            if (lesson.subjectOld.isNotBlank() && lesson.subjectOld != lesson.subject) R.attr.colorTimetableChange
-            else android.R.attr.textColorPrimary
-        ))
-    }
-
-    private fun updateRoomColor(roomView: TextView, lesson: Timetable) {
-        roomView.setTextColor(roomView.context.getThemeAttrColor(
-            if (lesson.roomOld.isNotBlank() && lesson.roomOld != lesson.room) R.attr.colorTimetableChange
-            else android.R.attr.textColorSecondary
-        ))
-    }
-
-    private fun updateTeacherColor(teacherTextView: TextView, lesson: Timetable) {
-        teacherTextView.setTextColor(teacherTextView.context.getThemeAttrColor(
-            if (lesson.teacherOld.isNotBlank() && lesson.teacherOld != lesson.teacher) R.attr.colorTimetableChange
-            else android.R.attr.textColorSecondary
-        ))
-    }
-
-    private class ItemViewHolder(val binding: ItemTimetableBinding) :
-        RecyclerView.ViewHolder(binding.root)
-
-    private class SmallItemViewHolder(val binding: ItemTimetableSmallBinding) :
-        RecyclerView.ViewHolder(binding.root)
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableDialog.kt
index 8efecf07c..57ec5998d 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableDialog.kt
@@ -11,16 +11,13 @@ import android.view.ViewGroup
 import androidx.fragment.app.DialogFragment
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Timetable
-import io.github.wulkanowy.databinding.DialogTimetableBinding
 import io.github.wulkanowy.utils.getThemeAttrColor
-import io.github.wulkanowy.utils.lifecycleAwareVariable
 import io.github.wulkanowy.utils.toFormattedString
+import kotlinx.android.synthetic.main.dialog_timetable.*
 import org.threeten.bp.LocalDateTime
 
 class TimetableDialog : DialogFragment() {
 
-    private var binding: DialogTimetableBinding by lifecycleAwareVariable()
-
     private lateinit var lesson: Timetable
 
     companion object {
@@ -42,13 +39,13 @@ class TimetableDialog : DialogFragment() {
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return DialogTimetableBinding.inflate(inflater).apply { binding = this }.root
+        return inflater.inflate(R.layout.dialog_timetable, container, false)
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
-        with(lesson) {
+        lesson.run {
             setInfo(info, teacher, canceled, changes)
             setSubject(subject, subjectOld)
             setTeacher(teacher, teacherOld)
@@ -57,81 +54,74 @@ class TimetableDialog : DialogFragment() {
             setTime(start, end)
         }
 
-        binding.timetableDialogClose.setOnClickListener { dismiss() }
+        timetableDialogClose.setOnClickListener { dismiss() }
     }
 
     private fun setSubject(subject: String, subjectOld: String) {
-        with(binding) {
-            timetableDialogSubject.text = subject
-            if (subjectOld.isNotBlank() && subjectOld != subject) {
-                timetableDialogSubject.run {
-                    paintFlags = paintFlags or STRIKE_THRU_TEXT_FLAG
-                    text = subjectOld
-                }
-                timetableDialogSubjectNew.run {
-                    visibility = VISIBLE
-                    text = subject
-                }
+        timetableDialogSubject.text = subject
+        if (subjectOld.isNotBlank() && subjectOld != subject) {
+            timetableDialogSubject.run {
+                paintFlags = paintFlags or STRIKE_THRU_TEXT_FLAG
+                text = subjectOld
+            }
+            timetableDialogSubjectNew.run {
+                visibility = VISIBLE
+                text = subject
             }
         }
     }
 
     private fun setInfo(info: String, teacher: String, canceled: Boolean, changes: Boolean) {
-        with(binding) {
-            when {
-                info.isNotBlank() -> {
-                    if (canceled) {
-                        timetableDialogChangesTitle.setTextColor(requireContext().getThemeAttrColor(R.attr.colorPrimary))
-                        timetableDialogChanges.setTextColor(requireContext().getThemeAttrColor(R.attr.colorPrimary))
-                    } else {
-                        timetableDialogChangesTitle.setTextColor(requireContext().getThemeAttrColor(R.attr.colorTimetableChange))
-                        timetableDialogChanges.setTextColor(requireContext().getThemeAttrColor(R.attr.colorTimetableChange))
-                    }
+        when {
+            info.isNotBlank() -> {
+                if (canceled) {
+                    timetableDialogChangesTitle.setTextColor(requireContext().getThemeAttrColor(R.attr.colorPrimary))
+                    timetableDialogChanges.setTextColor(requireContext().getThemeAttrColor(R.attr.colorPrimary))
+                } else {
+                    timetableDialogChangesTitle.setTextColor(requireContext().getThemeAttrColor(R.attr.colorTimetableChange))
+                    timetableDialogChanges.setTextColor(requireContext().getThemeAttrColor(R.attr.colorTimetableChange))
+                }
 
-                    timetableDialogChanges.text = when {
-                        canceled && !changes -> "Lekcja odwołana: $info"
-                        changes && teacher.isNotBlank() -> "Zastępstwo: $teacher"
-                        changes && teacher.isBlank() -> "Zastępstwo, ${info.decapitalize()}"
-                        else -> info.capitalize()
-                    }
-                }
-                else -> {
-                    timetableDialogChangesTitle.visibility = GONE
-                    timetableDialogChanges.visibility = GONE
+                timetableDialogChanges.text = when {
+                    canceled && !changes -> "Lekcja odwołana: $info"
+                    changes && teacher.isNotBlank() -> "Zastępstwo: $teacher"
+                    changes && teacher.isBlank() -> "Zastępstwo, ${info.decapitalize()}"
+                    else -> info.capitalize()
                 }
+            } else -> {
+                timetableDialogChangesTitle.visibility = GONE
+                timetableDialogChanges.visibility = GONE
             }
         }
     }
 
     private fun setTeacher(teacher: String, teacherOld: String) {
-        with(binding) {
-            when {
-                teacherOld.isNotBlank() && teacherOld != teacher -> {
-                    timetableDialogTeacher.run {
+        when {
+            teacherOld.isNotBlank() && teacherOld != teacher -> {
+                timetableDialogTeacher.run {
+                    visibility = VISIBLE
+                    paintFlags = paintFlags or STRIKE_THRU_TEXT_FLAG
+                    text = teacherOld
+                }
+                if (teacher.isNotBlank()) {
+                    timetableDialogTeacherNew.run {
                         visibility = VISIBLE
-                        paintFlags = paintFlags or STRIKE_THRU_TEXT_FLAG
-                        text = teacherOld
-                    }
-                    if (teacher.isNotBlank()) {
-                        timetableDialogTeacherNew.run {
-                            visibility = VISIBLE
-                            text = teacher
-                        }
+                        text = teacher
                     }
                 }
-                teacher.isNotBlank() -> timetableDialogTeacher.text = teacher
-                else -> {
-                    timetableDialogTeacherTitle.visibility = GONE
-                    timetableDialogTeacher.visibility = GONE
-                }
+            }
+            teacher.isNotBlank() -> timetableDialogTeacher.text = teacher
+            else -> {
+                timetableDialogTeacherTitle.visibility = GONE
+                timetableDialogTeacher.visibility = GONE
             }
         }
     }
 
     private fun setGroup(group: String) {
-        with(binding) {
+        group.let {
             when {
-                group.isNotBlank() -> timetableDialogGroup.text = group
+                it.isNotBlank() -> timetableDialogGroup.text = it
                 else -> {
                     timetableDialogGroupTitle.visibility = GONE
                     timetableDialogGroup.visibility = GONE
@@ -141,32 +131,30 @@ class TimetableDialog : DialogFragment() {
     }
 
     private fun setRoom(room: String, roomOld: String) {
-        with(binding) {
-            when {
-                roomOld.isNotBlank() && roomOld != room -> {
-                    timetableDialogRoom.run {
+        when {
+            roomOld.isNotBlank() && roomOld != room -> {
+                timetableDialogRoom.run {
+                    visibility = VISIBLE
+                    paintFlags = paintFlags or STRIKE_THRU_TEXT_FLAG
+                    text = roomOld
+                }
+                if (room.isNotBlank()) {
+                    timetableDialogRoomNew.run {
                         visibility = VISIBLE
-                        paintFlags = paintFlags or STRIKE_THRU_TEXT_FLAG
-                        text = roomOld
-                    }
-                    if (room.isNotBlank()) {
-                        timetableDialogRoomNew.run {
-                            visibility = VISIBLE
-                            text = room
-                        }
+                        text = room
                     }
                 }
-                room.isNotBlank() -> timetableDialogRoom.text = room
-                else -> {
-                    timetableDialogRoomTitle.visibility = GONE
-                    timetableDialogRoom.visibility = GONE
-                }
+            }
+            room.isNotBlank() -> timetableDialogRoom.text = room
+            else -> {
+                timetableDialogRoomTitle.visibility = GONE
+                timetableDialogRoom.visibility = GONE
             }
         }
     }
 
     @SuppressLint("SetTextI18n")
     private fun setTime(start: LocalDateTime, end: LocalDateTime) {
-        binding.timetableDialogTime.text = "${start.toFormattedString("HH:mm")} - ${end.toFormattedString("HH:mm")}"
+        timetableDialogTime.text = "${start.toFormattedString("HH:mm")} - ${end.toFormattedString("HH:mm")}"
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableFragment.kt
index 2f01511ad..ef6057dfa 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableFragment.kt
@@ -1,35 +1,40 @@
 package io.github.wulkanowy.ui.modules.timetable
 
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
-import androidx.recyclerview.widget.LinearLayoutManager
+import android.view.ViewGroup
 import com.wdullaer.materialdatetimepicker.date.DatePickerDialog
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.common.FlexibleItemDecoration
+import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Timetable
-import io.github.wulkanowy.databinding.FragmentTimetableBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.ui.modules.timetable.completed.CompletedLessonsFragment
-import io.github.wulkanowy.ui.widgets.DividerItemDecoration
 import io.github.wulkanowy.utils.SchooldaysRangeLimiter
 import io.github.wulkanowy.utils.dpToPx
+import io.github.wulkanowy.utils.setOnItemClickListener
+import kotlinx.android.synthetic.main.fragment_timetable.*
 import org.threeten.bp.LocalDate
 import javax.inject.Inject
 
-class TimetableFragment : BaseFragment<FragmentTimetableBinding>(R.layout.fragment_timetable),
-    TimetableView, MainView.MainChildView, MainView.TitledView {
+class TimetableFragment : BaseFragment(), TimetableView, MainView.MainChildView,
+    MainView.TitledView {
 
     @Inject
     lateinit var presenter: TimetablePresenter
 
     @Inject
-    lateinit var timetableAdapter: TimetableAdapter
+    lateinit var timetableAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
 
     companion object {
         private const val SAVED_DATE_KEY = "CURRENT_DATE"
@@ -39,7 +44,7 @@ class TimetableFragment : BaseFragment<FragmentTimetableBinding>(R.layout.fragme
 
     override val titleStringId get() = R.string.timetable_title
 
-    override val isViewEmpty get() = timetableAdapter.items.isEmpty()
+    override val isViewEmpty get() = timetableAdapter.isEmpty
 
     override val currentStackSize get() = (activity as? MainActivity)?.currentStackSize
 
@@ -48,33 +53,37 @@ class TimetableFragment : BaseFragment<FragmentTimetableBinding>(R.layout.fragme
         setHasOptionsMenu(true)
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding = FragmentTimetableBinding.bind(view)
-        messageContainer = binding.timetableRecycler
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_timetable, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        messageContainer = timetableRecycler
         presenter.onAttachView(this, savedInstanceState?.getLong(SAVED_DATE_KEY))
     }
 
     override fun initView() {
-        timetableAdapter.onClickListener = presenter::onTimetableItemSelected
+        timetableAdapter.setOnItemClickListener(presenter::onTimetableItemSelected)
 
-        with(binding.timetableRecycler) {
-            layoutManager = LinearLayoutManager(context)
+        with(timetableRecycler) {
+            layoutManager = SmoothScrollLinearLayoutManager(context)
             adapter = timetableAdapter
-            addItemDecoration(DividerItemDecoration(context))
+            addItemDecoration(FlexibleItemDecoration(context)
+                .withDefaultDivider()
+                .withDrawDividerOnLastItem(false)
+            )
         }
 
-        with(binding) {
-            timetableSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
-            timetableErrorRetry.setOnClickListener { presenter.onRetry() }
-            timetableErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+        timetableSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
+        timetableErrorRetry.setOnClickListener { presenter.onRetry() }
+        timetableErrorDetails.setOnClickListener { presenter.onDetailsClick() }
 
-            timetablePreviousButton.setOnClickListener { presenter.onPreviousDay() }
-            timetableNavDate.setOnClickListener { presenter.onPickDate() }
-            timetableNextButton.setOnClickListener { presenter.onNextDay() }
+        timetablePreviousButton.setOnClickListener { presenter.onPreviousDay() }
+        timetableNavDate.setOnClickListener { presenter.onPickDate() }
+        timetableNextButton.setOnClickListener { presenter.onNextDay() }
 
-            timetableNavContainer.setElevationCompat(requireContext().dpToPx(8f))
-        }
+        timetableNavContainer.setElevationCompat(requireContext().dpToPx(8f))
     }
 
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
@@ -86,32 +95,24 @@ class TimetableFragment : BaseFragment<FragmentTimetableBinding>(R.layout.fragme
         else false
     }
 
-    override fun updateData(data: List<Timetable>, showWholeClassPlanType: String, showTimetableTimers: Boolean) {
-        with(timetableAdapter) {
-            items = data.toMutableList()
-            showTimers = showTimetableTimers
-            showWholeClassPlan = showWholeClassPlanType
-            notifyDataSetChanged()
-        }
+    override fun updateData(data: List<TimetableItem>) {
+        timetableAdapter.updateDataSet(data, true)
     }
 
     override fun clearData() {
-        with(timetableAdapter) {
-            items = mutableListOf()
-            notifyDataSetChanged()
-        }
+        timetableAdapter.clear()
     }
 
     override fun updateNavigationDay(date: String) {
-        binding.timetableNavDate.text = date
+        timetableNavDate.text = date
     }
 
     override fun hideRefresh() {
-        binding.timetableSwipe.isRefreshing = false
+        timetableSwipe.isRefreshing = false
     }
 
     override fun resetView() {
-        binding.timetableRecycler.smoothScrollToPosition(0)
+        timetableRecycler.smoothScrollToPosition(0)
     }
 
     override fun onFragmentReselected() {
@@ -123,35 +124,35 @@ class TimetableFragment : BaseFragment<FragmentTimetableBinding>(R.layout.fragme
     }
 
     override fun showEmpty(show: Boolean) {
-        binding.timetableEmpty.visibility = if (show) VISIBLE else GONE
+        timetableEmpty.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showErrorView(show: Boolean) {
-        binding.timetableError.visibility = if (show) VISIBLE else GONE
+        timetableError.visibility = if (show) VISIBLE else GONE
     }
 
     override fun setErrorDetails(message: String) {
-        binding.timetableErrorMessage.text = message
+        timetableErrorMessage.text = message
     }
 
     override fun showProgress(show: Boolean) {
-        binding.timetableProgress.visibility = if (show) VISIBLE else GONE
+        timetableProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun enableSwipe(enable: Boolean) {
-        binding.timetableSwipe.isEnabled = enable
+        timetableSwipe.isEnabled = enable
     }
 
     override fun showContent(show: Boolean) {
-        binding.timetableRecycler.visibility = if (show) VISIBLE else GONE
+        timetableRecycler.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showPreButton(show: Boolean) {
-        binding.timetablePreviousButton.visibility = if (show) VISIBLE else View.INVISIBLE
+        timetablePreviousButton.visibility = if (show) VISIBLE else View.INVISIBLE
     }
 
     override fun showNextButton(show: Boolean) {
-        binding.timetableNextButton.visibility = if (show) VISIBLE else View.INVISIBLE
+        timetableNextButton.visibility = if (show) VISIBLE else View.INVISIBLE
     }
 
     override fun showTimetableDialog(lesson: Timetable) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableItem.kt
new file mode 100644
index 000000000..99aca2a23
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableItem.kt
@@ -0,0 +1,160 @@
+package io.github.wulkanowy.ui.modules.timetable
+
+import android.annotation.SuppressLint
+import android.graphics.Paint
+import android.view.View
+import android.view.View.GONE
+import android.view.View.VISIBLE
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.FlexibleViewHolder
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Timetable
+import io.github.wulkanowy.utils.getThemeAttrColor
+import io.github.wulkanowy.utils.toFormattedString
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.item_timetable.*
+import kotlinx.android.synthetic.main.item_timetable_small.*
+
+class TimetableItem(val lesson: Timetable, private val showWholeClassPlan: String) :
+    AbstractFlexibleItem<TimetableItem.ViewHolder>() {
+
+    override fun getLayoutRes() = when {
+        showWholeClassPlan == "small" && !lesson.studentPlan -> R.layout.item_timetable_small
+        else -> R.layout.item_timetable
+    }
+
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): ViewHolder {
+        return ViewHolder(view, adapter)
+    }
+
+    @SuppressLint("SetTextI18n")
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
+        when (itemViewType) {
+            R.layout.item_timetable_small -> {
+                with(holder) {
+                    timetableSmallItemNumber.text = lesson.number.toString()
+                    timetableSmallItemSubject.text = lesson.subject
+                    timetableSmallItemTimeStart.text = lesson.start.toFormattedString("HH:mm")
+                    timetableSmallItemRoom.text = lesson.room
+                    timetableSmallItemTeacher.text = lesson.teacher
+                }
+            }
+            R.layout.item_timetable -> {
+                updateFields(holder)
+
+                with(holder) {
+                    timetableItemSubject.paintFlags =
+                        if (lesson.canceled) timetableItemSubject.paintFlags or Paint.STRIKE_THRU_TEXT_FLAG
+                        else timetableItemSubject.paintFlags and Paint.STRIKE_THRU_TEXT_FLAG.inv()
+                }
+
+                updateDescription(holder)
+                updateColors(holder)
+            }
+        }
+    }
+
+    private fun updateFields(holder: ViewHolder) {
+        with(holder) {
+            timetableItemNumber.text = lesson.number.toString()
+            timetableItemSubject.text = lesson.subject
+            timetableItemRoom.text = lesson.room
+            timetableItemTeacher.text = lesson.teacher
+            timetableItemTimeStart.text = lesson.start.toFormattedString("HH:mm")
+            timetableItemTimeFinish.text = lesson.end.toFormattedString("HH:mm")
+        }
+    }
+
+    private fun updateDescription(holder: ViewHolder) {
+        with(holder) {
+            if (lesson.info.isNotBlank() && !lesson.changes) {
+                updateDescriptionNoChanges(this)
+            } else {
+                timetableItemDescription.visibility = GONE
+
+                timetableItemRoom.visibility = VISIBLE
+                timetableItemTeacher.visibility = VISIBLE
+            }
+        }
+    }
+
+    private fun updateDescriptionNoChanges(holder: ViewHolder) {
+        with(holder) {
+            timetableItemDescription.visibility = VISIBLE
+            timetableItemDescription.text = lesson.info
+
+            timetableItemRoom.visibility = GONE
+            timetableItemTeacher.visibility = GONE
+
+            timetableItemDescription.setTextColor(holder.view.context.getThemeAttrColor(
+                if (lesson.canceled) R.attr.colorPrimary
+                else R.attr.colorTimetableChange
+            ))
+        }
+    }
+
+    private fun updateColors(holder: ViewHolder) {
+        with(holder) {
+            if (lesson.canceled) {
+                timetableItemNumber.setTextColor(holder.view.context.getThemeAttrColor(R.attr.colorPrimary))
+                timetableItemSubject.setTextColor(holder.view.context.getThemeAttrColor(R.attr.colorPrimary))
+            } else {
+                updateNumberColor(this)
+                updateSubjectColor(this)
+                updateRoomColor(this)
+                updateTeacherColor(this)
+            }
+        }
+    }
+
+    private fun updateNumberColor(holder: ViewHolder) {
+        holder.timetableItemNumber.setTextColor(holder.view.context.getThemeAttrColor(
+            if (lesson.changes || lesson.info.isNotBlank()) R.attr.colorTimetableChange
+            else android.R.attr.textColorPrimary
+        ))
+    }
+
+    private fun updateSubjectColor(holder: ViewHolder) {
+        holder.timetableItemSubject.setTextColor(holder.view.context.getThemeAttrColor(
+            if (lesson.subjectOld.isNotBlank() && lesson.subjectOld != lesson.subject) R.attr.colorTimetableChange
+            else android.R.attr.textColorPrimary
+        ))
+    }
+
+    private fun updateRoomColor(holder: ViewHolder) {
+        holder.timetableItemRoom.setTextColor(holder.view.context.getThemeAttrColor(
+            if (lesson.roomOld.isNotBlank() && lesson.roomOld != lesson.room) R.attr.colorTimetableChange
+            else android.R.attr.textColorSecondary
+        ))
+    }
+
+    private fun updateTeacherColor(holder: ViewHolder) {
+        holder.timetableItemTeacher.setTextColor(holder.view.context.getThemeAttrColor(
+            if (lesson.teacherOld.isNotBlank() && lesson.teacherOld != lesson.teacher) R.attr.colorTimetableChange
+            else android.R.attr.textColorSecondary
+        ))
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as TimetableItem
+
+        if (lesson != other.lesson) return false
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = lesson.hashCode()
+        result = 31 * result + lesson.id.toInt()
+        return result
+    }
+
+    class ViewHolder(val view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter), LayoutContainer {
+        override val containerView: View
+            get() = contentView
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt
index e1ce005e3..d9eb44785 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt
@@ -1,6 +1,7 @@
 package io.github.wulkanowy.ui.modules.timetable
 
 import android.annotation.SuppressLint
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.db.entities.Timetable
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
@@ -21,6 +22,7 @@ import org.threeten.bp.LocalDate.now
 import org.threeten.bp.LocalDate.of
 import org.threeten.bp.LocalDate.ofEpochDay
 import timber.log.Timber
+import java.util.concurrent.TimeUnit.MILLISECONDS
 import javax.inject.Inject
 
 class TimetablePresenter @Inject constructor(
@@ -100,9 +102,11 @@ class TimetablePresenter @Inject constructor(
         }
     }
 
-    fun onTimetableItemSelected(lesson: Timetable) {
-        Timber.i("Select timetable item ${lesson.id}")
-        view?.showTimetableDialog(lesson)
+    fun onTimetableItemSelected(item: AbstractFlexibleItem<*>?) {
+        if (item is TimetableItem) {
+            Timber.i("Select timetable item ${item.lesson.id}")
+            view?.showTimetableDialog(item.lesson)
+        }
     }
 
     fun onCompletedLessonsSwitchSelected(): Boolean {
@@ -130,13 +134,11 @@ class TimetablePresenter @Inject constructor(
         disposable.apply {
             clear()
             add(studentRepository.getCurrentStudent()
-                .flatMap { student ->
-                    semesterRepository.getCurrentSemester(student).flatMap { semester ->
-                        timetableRepository.getTimetable(student, semester, currentDate, currentDate, forceRefresh)
-                    }
-                }
-                .map { items -> items.filter { if (prefRepository.showWholeClassPlan == "no") it.isStudentPlan else true } }
-                .map { items -> items.sortedWith(compareBy({ it.number }, { !it.isStudentPlan })) }
+                .flatMap { semesterRepository.getCurrentSemester(it) }
+                .delay(200, MILLISECONDS)
+                .flatMap { timetableRepository.getTimetable(it, currentDate, currentDate, forceRefresh) }
+                .map { createTimetableItems(it) }
+                .map { items -> items.sortedBy { it.lesson.number } }
                 .subscribeOn(schedulers.backgroundThread)
                 .observeOn(schedulers.mainThread)
                 .doFinally {
@@ -149,17 +151,12 @@ class TimetablePresenter @Inject constructor(
                 .subscribe({
                     Timber.i("Loading timetable result: Success")
                     view?.apply {
-                        updateData(it, prefRepository.showWholeClassPlan, prefRepository.showTimetableTimers)
+                        updateData(it)
                         showEmpty(it.isEmpty())
                         showErrorView(false)
                         showContent(it.isNotEmpty())
                     }
-                    analytics.logEvent(
-                        "load_data",
-                        "type" to "timetable",
-                        "items" to it.size,
-                        "force_refresh" to forceRefresh
-                    )
+                    analytics.logEvent("load_timetable", "items" to it.size, "force_refresh" to forceRefresh)
                 }) {
                     Timber.i("Loading timetable result: An exception occurred")
                     errorHandler.dispatch(it)
@@ -178,6 +175,12 @@ class TimetablePresenter @Inject constructor(
         }
     }
 
+    private fun createTimetableItems(items: List<Timetable>): List<TimetableItem> {
+        return items
+            .filter { if (prefRepository.showWholeClassPlan == "no") it.studentPlan else true }
+            .map { TimetableItem(it, prefRepository.showWholeClassPlan) }
+    }
+
     private fun reloadView() {
         Timber.i("Reload timetable view with the date ${currentDate.toFormattedString()}")
         view?.apply {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableView.kt
index 1efa320fc..f730a2712 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableView.kt
@@ -12,7 +12,7 @@ interface TimetableView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<Timetable>, showWholeClassPlanType: String, showTimetableTimers: Boolean)
+    fun updateData(data: List<TimetableItem>)
 
     fun updateNavigationDay(date: String)
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonDialog.kt
index 56ea16cfa..8f7b1ec5b 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonDialog.kt
@@ -6,14 +6,12 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.DialogFragment
+import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.CompletedLesson
-import io.github.wulkanowy.databinding.DialogLessonCompletedBinding
-import io.github.wulkanowy.utils.lifecycleAwareVariable
+import kotlinx.android.synthetic.main.dialog_lesson_completed.*
 
 class CompletedLessonDialog : DialogFragment() {
 
-    private var binding: DialogLessonCompletedBinding by lifecycleAwareVariable()
-
     private lateinit var completedLesson: CompletedLesson
 
     companion object {
@@ -30,54 +28,46 @@ class CompletedLessonDialog : DialogFragment() {
         super.onCreate(savedInstanceState)
         setStyle(STYLE_NO_TITLE, 0)
         arguments?.run {
-            completedLesson = getSerializable(ARGUMENT_KEY) as CompletedLesson
+            completedLesson = getSerializable(CompletedLessonDialog.ARGUMENT_KEY) as CompletedLesson
         }
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return DialogLessonCompletedBinding.inflate(inflater).apply { binding = this }.root
+        return inflater.inflate(R.layout.dialog_lesson_completed, container, false)
     }
 
     @SuppressLint("SetTextI18n")
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
-        with(binding) {
-            completedLessonDialogSubject.text = completedLesson.subject
-            completedLessonDialogTopic.text = completedLesson.topic
-            completedLessonDialogTeacher.text = completedLesson.teacher
-            completedLessonDialogAbsence.text = completedLesson.absence
-            completedLessonDialogChanges.text = completedLesson.substitution
-            completedLessonDialogResources.text = completedLesson.resources
-        }
+        completedLessonDialogSubject.text = completedLesson.subject
+        completedLessonDialogTopic.text = completedLesson.topic
+        completedLessonDialogTeacher.text = completedLesson.teacher
+        completedLessonDialogAbsence.text = completedLesson.absence
+        completedLessonDialogChanges.text = completedLesson.substitution
+        completedLessonDialogResources.text = completedLesson.resources
 
         completedLesson.substitution.let {
             if (it.isBlank()) {
-                with(binding) {
-                    completedLessonDialogChangesTitle.visibility = View.GONE
-                    completedLessonDialogChanges.visibility = View.GONE
-                }
-            } else binding.completedLessonDialogChanges.text = it
+                completedLessonDialogChangesTitle.visibility = View.GONE
+                completedLessonDialogChanges.visibility = View.GONE
+            } else completedLessonDialogChanges.text = it
         }
 
         completedLesson.absence.let {
             if (it.isBlank()) {
-                with(binding) {
-                    completedLessonDialogAbsenceTitle.visibility = View.GONE
-                    completedLessonDialogAbsence.visibility = View.GONE
-                }
-            } else binding.completedLessonDialogAbsence.text = it
+                completedLessonDialogAbsenceTitle.visibility = View.GONE
+                completedLessonDialogAbsence.visibility = View.GONE
+            } else completedLessonDialogAbsence.text = it
         }
 
         completedLesson.resources.let {
             if (it.isBlank()) {
-                with(binding) {
-                    completedLessonDialogResourcesTitle.visibility = View.GONE
-                    completedLessonDialogResources.visibility = View.GONE
-                }
-            } else binding.completedLessonDialogResources.text = it
+                completedLessonDialogResourcesTitle.visibility = View.GONE
+                completedLessonDialogResources.visibility = View.GONE
+            } else completedLessonDialogResources.text = it
         }
 
-        binding.completedLessonDialogClose.setOnClickListener { dismiss() }
+        completedLessonDialogClose.setOnClickListener { dismiss() }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonItem.kt
new file mode 100644
index 000000000..fd6dc8a66
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonItem.kt
@@ -0,0 +1,58 @@
+package io.github.wulkanowy.ui.modules.timetable.completed
+
+import android.view.View
+import android.view.View.GONE
+import android.view.View.VISIBLE
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.FlexibleViewHolder
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.CompletedLesson
+import io.github.wulkanowy.utils.getThemeAttrColor
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.item_completed_lesson.*
+
+class CompletedLessonItem(val completedLesson: CompletedLesson) : AbstractFlexibleItem<CompletedLessonItem.ViewHolder>() {
+
+    override fun getLayoutRes() = R.layout.item_completed_lesson
+
+    override fun createViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?): CompletedLessonItem.ViewHolder {
+        return CompletedLessonItem.ViewHolder(view, adapter)
+    }
+
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>?, holder: CompletedLessonItem.ViewHolder?, position: Int, payloads: MutableList<Any>?) {
+        holder?.apply {
+            completedLessonItemNumber.text = completedLesson.number.toString()
+            completedLessonItemNumber.setTextColor(holder.contentView.context.getThemeAttrColor(
+                if (completedLesson.substitution.isNotEmpty()) R.attr.colorTimetableChange
+                else android.R.attr.textColorPrimary
+            ))
+            completedLessonItemSubject.text = completedLesson.subject
+            completedLessonItemTopic.text = completedLesson.topic
+            completedLessonItemAlert.visibility = if (completedLesson.substitution.isNotEmpty()) VISIBLE else GONE
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as CompletedLessonItem
+
+        if (completedLesson != other.completedLesson) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        return completedLesson.hashCode()
+    }
+
+    class ViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?) : FlexibleViewHolder(view, adapter),
+        LayoutContainer {
+
+        override val containerView: View?
+            get() = contentView
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsAdapter.kt
deleted file mode 100644
index 3399a8a23..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsAdapter.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-package io.github.wulkanowy.ui.modules.timetable.completed
-
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.CompletedLesson
-import io.github.wulkanowy.databinding.ItemCompletedLessonBinding
-import io.github.wulkanowy.utils.getThemeAttrColor
-import javax.inject.Inject
-
-class CompletedLessonsAdapter @Inject constructor() :
-    RecyclerView.Adapter<CompletedLessonsAdapter.ItemViewHolder>() {
-
-    var items = emptyList<CompletedLesson>()
-
-    var onClickListener: (CompletedLesson) -> Unit = {}
-
-    override fun getItemCount() = items.size
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        ItemCompletedLessonBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-    )
-
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        val item = items[position]
-
-        with(holder.binding) {
-            completedLessonItemNumber.text = item.number.toString()
-            completedLessonItemNumber.setTextColor(root.context.getThemeAttrColor(
-                if (item.substitution.isNotEmpty()) R.attr.colorTimetableChange
-                else android.R.attr.textColorPrimary
-            ))
-            completedLessonItemSubject.text = item.subject
-            completedLessonItemTopic.text = item.topic
-            completedLessonItemAlert.visibility = if (item.substitution.isNotEmpty()) View.VISIBLE else View.GONE
-
-            root.setOnClickListener { onClickListener(item) }
-        }
-    }
-
-    class ItemViewHolder(val binding: ItemCompletedLessonBinding) :
-        RecyclerView.ViewHolder(binding.root)
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsErrorHandler.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsErrorHandler.kt
index c1389cedd..1d043af3a 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsErrorHandler.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsErrorHandler.kt
@@ -1,15 +1,15 @@
 package io.github.wulkanowy.ui.modules.timetable.completed
 
 import android.content.res.Resources
-import com.chuckerteam.chucker.api.ChuckerCollector
+import com.readystatesoftware.chuck.api.ChuckCollector
 import io.github.wulkanowy.sdk.exception.FeatureDisabledException
 import io.github.wulkanowy.ui.base.ErrorHandler
 import javax.inject.Inject
 
 class CompletedLessonsErrorHandler @Inject constructor(
     resources: Resources,
-    chuckerCollector: ChuckerCollector
-) : ErrorHandler(resources, chuckerCollector) {
+    chuckCollector: ChuckCollector
+) : ErrorHandler(resources, chuckCollector) {
 
     var onFeatureDisabled: () -> Unit = {}
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsFragment.kt
index 2efd30a34..60c16b2dc 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsFragment.kt
@@ -1,34 +1,36 @@
 package io.github.wulkanowy.ui.modules.timetable.completed
 
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
 import android.view.View.INVISIBLE
 import android.view.View.VISIBLE
-import androidx.recyclerview.widget.LinearLayoutManager
+import android.view.ViewGroup
 import com.wdullaer.materialdatetimepicker.date.DatePickerDialog
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.CompletedLesson
-import io.github.wulkanowy.databinding.FragmentTimetableCompletedBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
-import io.github.wulkanowy.ui.widgets.DividerItemDecoration
 import io.github.wulkanowy.utils.SchooldaysRangeLimiter
 import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.getCompatDrawable
+import io.github.wulkanowy.utils.setOnItemClickListener
+import kotlinx.android.synthetic.main.fragment_timetable_completed.*
 import org.threeten.bp.LocalDate
 import javax.inject.Inject
 
-class CompletedLessonsFragment :
-    BaseFragment<FragmentTimetableCompletedBinding>(R.layout.fragment_timetable_completed),
-    CompletedLessonsView, MainView.TitledView {
+class CompletedLessonsFragment : BaseFragment(), CompletedLessonsView, MainView.TitledView {
 
     @Inject
     lateinit var presenter: CompletedLessonsPresenter
 
     @Inject
-    lateinit var completedLessonsAdapter: CompletedLessonsAdapter
+    lateinit var completedLessonsAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
 
     companion object {
         private const val SAVED_DATE_KEY = "CURRENT_DATE"
@@ -38,96 +40,88 @@ class CompletedLessonsFragment :
 
     override val titleStringId get() = R.string.completed_lessons_title
 
-    override val isViewEmpty get() = completedLessonsAdapter.items.isEmpty()
+    override val isViewEmpty get() = completedLessonsAdapter.isEmpty
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding = FragmentTimetableCompletedBinding.bind(view)
-        messageContainer = binding.completedLessonsRecycler
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_timetable_completed, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        messageContainer = completedLessonsRecycler
         presenter.onAttachView(this, savedInstanceState?.getLong(SAVED_DATE_KEY))
     }
 
     override fun initView() {
-        completedLessonsAdapter.onClickListener = presenter::onCompletedLessonsItemSelected
+        completedLessonsAdapter.setOnItemClickListener(presenter::onCompletedLessonsItemSelected)
 
-        with(binding.completedLessonsRecycler) {
-            layoutManager = LinearLayoutManager(context)
+        with(completedLessonsRecycler) {
+            layoutManager = SmoothScrollLinearLayoutManager(context)
             adapter = completedLessonsAdapter
-            addItemDecoration(DividerItemDecoration(context))
         }
 
-        with(binding) {
-            completedLessonsSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
-            completedLessonErrorRetry.setOnClickListener { presenter.onRetry() }
-            completedLessonErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+        completedLessonsSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
+        completedLessonErrorRetry.setOnClickListener { presenter.onRetry() }
+        completedLessonErrorDetails.setOnClickListener { presenter.onDetailsClick() }
 
-            completedLessonsPreviousButton.setOnClickListener { presenter.onPreviousDay() }
-            completedLessonsNavDate.setOnClickListener { presenter.onPickDate() }
-            completedLessonsNextButton.setOnClickListener { presenter.onNextDay() }
+        completedLessonsPreviousButton.setOnClickListener { presenter.onPreviousDay() }
+        completedLessonsNavDate.setOnClickListener { presenter.onPickDate() }
+        completedLessonsNextButton.setOnClickListener { presenter.onNextDay() }
 
-            completedLessonsNavContainer.setElevationCompat(requireContext().dpToPx(8f))
-        }
+        completedLessonsNavContainer.setElevationCompat(requireContext().dpToPx(8f))
     }
 
-    override fun updateData(data: List<CompletedLesson>) {
-        with(completedLessonsAdapter) {
-            items = data
-            notifyDataSetChanged()
-        }
+    override fun updateData(data: List<CompletedLessonItem>) {
+        completedLessonsAdapter.updateDataSet(data, true)
     }
 
     override fun clearData() {
-        with(completedLessonsAdapter) {
-            items = emptyList()
-            notifyDataSetChanged()
-        }
+        completedLessonsAdapter.clear()
     }
 
     override fun updateNavigationDay(date: String) {
-        binding.completedLessonsNavDate.text = date
+        completedLessonsNavDate.text = date
     }
 
     override fun hideRefresh() {
-        binding.completedLessonsSwipe.isRefreshing = false
+        completedLessonsSwipe.isRefreshing = false
     }
 
     override fun showEmpty(show: Boolean) {
-        binding.completedLessonsEmpty.visibility = if (show) VISIBLE else GONE
+        completedLessonsEmpty.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showErrorView(show: Boolean) {
-        binding.completedLessonError.visibility = if (show) VISIBLE else GONE
+        completedLessonError.visibility = if (show) VISIBLE else GONE
     }
 
     override fun setErrorDetails(message: String) {
-        binding.completedLessonErrorMessage.text = message
+        completedLessonErrorMessage.text = message
     }
 
     override fun showFeatureDisabled() {
-        with(binding) {
-            completedLessonsInfo.text = getString(R.string.error_feature_disabled)
-            completedLessonsInfoImage.setImageDrawable(requireContext().getCompatDrawable(R.drawable.ic_all_close_circle))
-        }
+        completedLessonsInfo.text = getString(R.string.error_feature_disabled)
+        completedLessonsInfoImage.setImageDrawable(requireContext().getCompatDrawable(R.drawable.ic_all_close_circle))
     }
 
     override fun showProgress(show: Boolean) {
-        binding.completedLessonsProgress.visibility = if (show) VISIBLE else GONE
+        completedLessonsProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun enableSwipe(enable: Boolean) {
-        binding.completedLessonsSwipe.isEnabled = enable
+        completedLessonsSwipe.isEnabled = enable
     }
 
     override fun showContent(show: Boolean) {
-        binding.completedLessonsRecycler.visibility = if (show) VISIBLE else GONE
+        completedLessonsRecycler.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showPreButton(show: Boolean) {
-        binding.completedLessonsPreviousButton.visibility = if (show) VISIBLE else INVISIBLE
+        completedLessonsPreviousButton.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun showNextButton(show: Boolean) {
-        binding.completedLessonsNextButton.visibility = if (show) VISIBLE else INVISIBLE
+        completedLessonsNextButton.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun showCompletedLessonDialog(completedLesson: CompletedLesson) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsPresenter.kt
index 92aeb5814..e2b569508 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsPresenter.kt
@@ -1,7 +1,7 @@
 package io.github.wulkanowy.ui.modules.timetable.completed
 
 import android.annotation.SuppressLint
-import io.github.wulkanowy.data.db.entities.CompletedLesson
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.repositories.completedlessons.CompletedLessonsRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
@@ -18,6 +18,7 @@ import org.threeten.bp.LocalDate
 import org.threeten.bp.LocalDate.now
 import org.threeten.bp.LocalDate.ofEpochDay
 import timber.log.Timber
+import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
 class CompletedLessonsPresenter @Inject constructor(
@@ -43,7 +44,6 @@ class CompletedLessonsPresenter @Inject constructor(
         completedLessonsErrorHandler.showErrorMessage = ::showErrorViewOnError
         completedLessonsErrorHandler.onFeatureDisabled = {
             this.view?.showFeatureDisabled()
-            this.view?.showEmpty(true);
             Timber.i("Completed lessons feature disabled by school")
         }
         loadData(ofEpochDay(date ?: baseDate.toEpochDay()))
@@ -87,9 +87,11 @@ class CompletedLessonsPresenter @Inject constructor(
         view?.showErrorDetailsDialog(lastError)
     }
 
-    fun onCompletedLessonsItemSelected(completedLesson: CompletedLesson) {
-        Timber.i("Select completed lessons item ${completedLesson.id}")
-        view?.showCompletedLessonDialog(completedLesson)
+    fun onCompletedLessonsItemSelected(item: AbstractFlexibleItem<*>?) {
+        if (item is CompletedLessonItem) {
+            Timber.i("Select completed lessons item ${item.completedLesson.id}")
+            view?.showCompletedLessonDialog(item.completedLesson)
+        }
     }
 
     private fun setBaseDateOnHolidays() {
@@ -112,12 +114,11 @@ class CompletedLessonsPresenter @Inject constructor(
         disposable.apply {
             clear()
             add(studentRepository.getCurrentStudent()
-                .flatMap { student ->
-                    semesterRepository.getCurrentSemester(student).flatMap { semester ->
-                        completedLessonsRepository.getCompletedLessons(student, semester, currentDate, currentDate, forceRefresh)
-                    }
-                }
-                .map { items -> items.sortedBy { it.number } }
+                .flatMap { semesterRepository.getCurrentSemester(it) }
+                .delay(200, TimeUnit.MILLISECONDS)
+                .flatMap { completedLessonsRepository.getCompletedLessons(it, currentDate, currentDate, forceRefresh) }
+                .map { items -> items.map { CompletedLessonItem(it) } }
+                .map { items -> items.sortedBy { it.completedLesson.number } }
                 .subscribeOn(schedulers.backgroundThread)
                 .observeOn(schedulers.mainThread)
                 .doFinally {
@@ -135,12 +136,7 @@ class CompletedLessonsPresenter @Inject constructor(
                         showErrorView(false)
                         showContent(it.isNotEmpty())
                     }
-                    analytics.logEvent(
-                        "load_data",
-                        "type" to "completed_lessons",
-                        "items" to it.size,
-                        "force_refresh" to forceRefresh
-                    )
+                    analytics.logEvent("load_completed_lessons", "items" to it.size, "force_refresh" to forceRefresh)
                 }) {
                     Timber.i("Loading completed lessons result: An exception occurred")
                     completedLessonsErrorHandler.dispatch(it)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsView.kt
index 170e19694..a6a327e2d 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsView.kt
@@ -10,7 +10,7 @@ interface CompletedLessonsView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<CompletedLesson>)
+    fun updateData(data: List<CompletedLessonItem>)
 
     fun clearData()
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureActivity.kt
index 3dc7a3a8c..7636637f4 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureActivity.kt
@@ -4,41 +4,36 @@ import android.appwidget.AppWidgetManager.ACTION_APPWIDGET_UPDATE
 import android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_ID
 import android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_IDS
 import android.content.Intent
-import android.os.Build
 import android.os.Bundle
 import android.widget.Toast
 import android.widget.Toast.LENGTH_LONG
 import androidx.appcompat.app.AlertDialog
-import androidx.recyclerview.widget.LinearLayoutManager
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.databinding.ActivityWidgetConfigureBinding
 import io.github.wulkanowy.ui.base.BaseActivity
-import io.github.wulkanowy.ui.base.WidgetConfigureAdapter
 import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider.Companion.EXTRA_FROM_PROVIDER
-import io.github.wulkanowy.utils.AppInfo
+import io.github.wulkanowy.utils.setOnItemClickListener
+import kotlinx.android.synthetic.main.activity_widget_configure.*
 import javax.inject.Inject
 
-class TimetableWidgetConfigureActivity :
-    BaseActivity<TimetableWidgetConfigurePresenter, ActivityWidgetConfigureBinding>(),
+class TimetableWidgetConfigureActivity : BaseActivity<TimetableWidgetConfigurePresenter>(),
     TimetableWidgetConfigureView {
 
     @Inject
-    lateinit var configureAdapter: WidgetConfigureAdapter
+    lateinit var configureAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
 
     @Inject
     override lateinit var presenter: TimetableWidgetConfigurePresenter
 
-    @Inject
-    lateinit var appInfo: AppInfo
-
     private var dialog: AlertDialog? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setResult(RESULT_CANCELED)
-        setContentView(ActivityWidgetConfigureBinding.inflate(layoutInflater).apply { binding = this }.root)
+        setContentView(R.layout.activity_widget_configure)
 
         intent.extras.let {
             presenter.onAttachView(this, it?.getInt(EXTRA_APPWIDGET_ID), it?.getBoolean(EXTRA_FROM_PROVIDER))
@@ -46,20 +41,19 @@ class TimetableWidgetConfigureActivity :
     }
 
     override fun initView() {
-        with(binding.widgetConfigureRecycler) {
+        with(widgetConfigureRecycler) {
             adapter = configureAdapter
-            layoutManager = LinearLayoutManager(context)
+            layoutManager = SmoothScrollLinearLayoutManager(context)
         }
 
-        configureAdapter.onClickListener = presenter::onItemSelect
+        configureAdapter.setOnItemClickListener(presenter::onItemSelect)
     }
 
     override fun showThemeDialog() {
-        var items = arrayOf(
+        val items = arrayOf(
             getString(R.string.widget_timetable_theme_light),
             getString(R.string.widget_timetable_theme_dark)
         )
-        if (appInfo.systemVersion >= Build.VERSION_CODES.Q) items += getString(R.string.widget_timetable_theme_system)
 
         dialog = AlertDialog.Builder(this, R.style.WulkanowyTheme_WidgetAccountSwitcher)
             .setTitle(R.string.widget_timetable_theme_title)
@@ -70,11 +64,8 @@ class TimetableWidgetConfigureActivity :
             .show()
     }
 
-    override fun updateData(data: List<Pair<Student, Boolean>>) {
-        with(configureAdapter) {
-            items = data
-            notifyDataSetChanged()
-        }
+    override fun updateData(data: List<TimetableWidgetConfigureItem>) {
+        configureAdapter.updateDataSet(data)
     }
 
     override fun updateTimetableWidget(widgetId: Int) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureItem.kt
new file mode 100644
index 000000000..a3338c684
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureItem.kt
@@ -0,0 +1,59 @@
+package io.github.wulkanowy.ui.modules.timetablewidget
+
+import android.annotation.SuppressLint
+import android.view.View
+import androidx.core.graphics.ColorUtils
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.FlexibleViewHolder
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.utils.getThemeAttrColor
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.item_account.*
+
+class TimetableWidgetConfigureItem(val student: Student, private val isCurrent: Boolean) :
+    AbstractFlexibleItem<TimetableWidgetConfigureItem.ViewHolder>() {
+
+    override fun getLayoutRes() = R.layout.item_account
+
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>) = ViewHolder(view, adapter)
+
+    @SuppressLint("SetTextI18n")
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>) {
+        val context = holder.contentView.context
+
+        val colorImage = if (isCurrent) context.getThemeAttrColor(R.attr.colorPrimary)
+        else ColorUtils.setAlphaComponent(context.getThemeAttrColor(R.attr.colorOnSurface), 153)
+
+        with(holder) {
+            accountItemName.text = "${student.studentName} ${student.className}"
+            accountItemSchool.text = student.schoolName
+            accountItemImage.setColorFilter(colorImage)
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as TimetableWidgetConfigureItem
+
+        if (student != other.student) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = student.hashCode()
+        result = 31 * result + student.id.toInt()
+        return result
+    }
+
+    class ViewHolder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter),
+        LayoutContainer {
+
+        override val containerView: View? get() = contentView
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigurePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigurePresenter.kt
index 57dde824c..e16851083 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigurePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigurePresenter.kt
@@ -1,5 +1,6 @@
 package io.github.wulkanowy.ui.modules.timetablewidget
 
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.student.StudentRepository
@@ -31,11 +32,13 @@ class TimetableWidgetConfigurePresenter @Inject constructor(
         loadData()
     }
 
-    fun onItemSelect(student: Student) {
-        selectedStudent = student
+    fun onItemSelect(item: AbstractFlexibleItem<*>) {
+        if (item is TimetableWidgetConfigureItem) {
+            selectedStudent = item.student
 
-        if (isFromProvider) registerStudent(selectedStudent)
-        else view?.showThemeDialog()
+            if (isFromProvider) registerStudent(selectedStudent)
+            else view?.showThemeDialog()
+        }
     }
 
     fun onThemeSelect(index: Int) {
@@ -45,7 +48,7 @@ class TimetableWidgetConfigurePresenter @Inject constructor(
         registerStudent(selectedStudent)
     }
 
-    fun onDismissThemeView() {
+    fun onDismissThemeView(){
         view?.finishView()
     }
 
@@ -53,7 +56,7 @@ class TimetableWidgetConfigurePresenter @Inject constructor(
         disposable.add(studentRepository.getSavedStudents(false)
             .map { it to appWidgetId?.let { id -> sharedPref.getLong(getStudentWidgetKey(id), 0) } }
             .map { (students, currentStudentId) ->
-                students.map { student -> student to (student.id == currentStudentId) }
+                students.map { student -> TimetableWidgetConfigureItem(student, student.id == currentStudentId) }
             }
             .subscribeOn(schedulers.backgroundThread)
             .observeOn(schedulers.mainThread)
@@ -61,7 +64,7 @@ class TimetableWidgetConfigurePresenter @Inject constructor(
                 when {
                     it.isEmpty() -> view?.openLoginView()
                     it.size == 1 && !isFromProvider -> {
-                        selectedStudent = it.single().first
+                        selectedStudent = it.single().student
                         view?.showThemeDialog()
                     }
                     else -> view?.updateData(it)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureView.kt
index 056225ab5..7cac892d9 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureView.kt
@@ -1,13 +1,12 @@
 package io.github.wulkanowy.ui.modules.timetablewidget
 
-import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.ui.base.BaseView
 
 interface TimetableWidgetConfigureView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<Pair<Student, Boolean>>)
+    fun updateData(data: List<TimetableWidgetConfigureItem>)
 
     fun updateTimetableWidget(widgetId: Int)
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetFactory.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetFactory.kt
index dd223ad8b..fa989749a 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetFactory.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetFactory.kt
@@ -14,13 +14,12 @@ import android.widget.RemoteViewsService
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.db.entities.Timetable
-import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.data.repositories.timetable.TimetableRepository
-import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider.Companion.getCurrentThemeWidgetKey
 import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider.Companion.getDateWidgetKey
 import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider.Companion.getStudentWidgetKey
+import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider.Companion.getThemeWidgetKey
 import io.github.wulkanowy.utils.SchedulersProvider
 import io.github.wulkanowy.utils.getCompatColor
 import io.github.wulkanowy.utils.toFormattedString
@@ -32,7 +31,6 @@ class TimetableWidgetFactory(
     private val timetableRepository: TimetableRepository,
     private val studentRepository: StudentRepository,
     private val semesterRepository: SemesterRepository,
-    private val prefRepository: PreferencesRepository,
     private val sharedPref: SharedPrefProvider,
     private val schedulers: SchedulersProvider,
     private val context: Context,
@@ -41,7 +39,7 @@ class TimetableWidgetFactory(
 
     private var lessons = emptyList<Timetable>()
 
-    private var savedCurrentTheme: Long? = null
+    private var layoutId: Int? = null
 
     private var primaryColor: Int? = null
 
@@ -55,7 +53,7 @@ class TimetableWidgetFactory(
 
     override fun getCount() = lessons.size
 
-    override fun getViewTypeCount() = 2
+    override fun getViewTypeCount() = 1
 
     override fun getItemId(position: Int) = position.toLong()
 
@@ -69,33 +67,18 @@ class TimetableWidgetFactory(
             val studentId = sharedPref.getLong(getStudentWidgetKey(appWidgetId), 0)
 
             updateTheme(appWidgetId)
+
             updateLessons(date, studentId)
         }
     }
 
     private fun updateTheme(appWidgetId: Int) {
-        savedCurrentTheme = sharedPref.getLong(getCurrentThemeWidgetKey(appWidgetId), 0)
+        val savedTheme = sharedPref.getLong(getThemeWidgetKey(appWidgetId), 0)
+        layoutId = if (savedTheme == 0L) R.layout.item_widget_timetable else R.layout.item_widget_timetable_dark
 
-        if (savedCurrentTheme == 0L) {
-            primaryColor = R.color.colorPrimary
-            textColor = android.R.color.black
-            timetableChangeColor = R.color.timetable_change_dark
-        } else {
-            primaryColor = R.color.colorPrimaryLight
-            textColor = android.R.color.white
-            timetableChangeColor = R.color.timetable_change_light
-        }
-    }
-
-    private fun getItemLayout(lesson: Timetable): Int {
-        return when {
-            prefRepository.showWholeClassPlan == "small" && !lesson.isStudentPlan -> {
-                if (savedCurrentTheme == 0L) R.layout.item_widget_timetable_small
-                else R.layout.item_widget_timetable_small_dark
-            }
-            savedCurrentTheme == 1L -> R.layout.item_widget_timetable_dark
-            else -> R.layout.item_widget_timetable
-        }
+        primaryColor = if (savedTheme == 0L) R.color.colorPrimary else R.color.colorPrimaryLight
+        textColor = if (savedTheme == 0L) android.R.color.black else android.R.color.white
+        timetableChangeColor = if (savedTheme == 0L) R.color.timetable_change_dark else R.color.timetable_change_light
     }
 
     private fun updateLessons(date: LocalDate, studentId: Long) {
@@ -109,13 +92,9 @@ class TimetableWidgetFactory(
                     if (student != null) Maybe.just(student)
                     else Maybe.empty()
                 }
-                .flatMap { student ->
-                    semesterRepository.getCurrentSemester(student).toMaybe().flatMap { semester ->
-                        timetableRepository.getTimetable(student, semester, date, date).toMaybe()
-                    }
-                }
-                .map { items -> items.sortedWith(compareBy({ it.number }, { !it.isStudentPlan })) }
-                .map { lessons -> lessons.filter { if (prefRepository.showWholeClassPlan == "no") it.isStudentPlan else true } }
+                .flatMap { semesterRepository.getCurrentSemester(it).toMaybe() }
+                .flatMap { timetableRepository.getTimetable(it, date, date).toMaybe() }
+                .map { item -> item.sortedBy { it.number } }
                 .subscribeOn(schedulers.backgroundThread)
                 .blockingGet(emptyList())
         } catch (e: Exception) {
@@ -128,8 +107,9 @@ class TimetableWidgetFactory(
     override fun getViewAt(position: Int): RemoteViews? {
         if (position == INVALID_POSITION || lessons.getOrNull(position) == null) return null
 
-        val lesson = lessons[position]
-        return RemoteViews(context.packageName, getItemLayout(lesson)).apply {
+        return RemoteViews(context.packageName, layoutId!!).apply {
+            val lesson = lessons[position]
+
             setTextViewText(R.id.timetableWidgetItemSubject, lesson.subject)
             setTextViewText(R.id.timetableWidgetItemNumber, lesson.number.toString())
             setTextViewText(R.id.timetableWidgetItemTimeStart, lesson.start.toFormattedString("HH:mm"))
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetProvider.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetProvider.kt
index 79888f83d..62192a1b0 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetProvider.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetProvider.kt
@@ -13,7 +13,6 @@ import android.content.Context
 import android.content.Intent
 import android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK
 import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
-import android.content.res.Configuration
 import android.widget.RemoteViews
 import dagger.android.AndroidInjection
 import io.github.wulkanowy.R
@@ -72,8 +71,6 @@ class TimetableWidgetProvider : BroadcastReceiver() {
         fun getStudentWidgetKey(appWidgetId: Int) = "timetable_widget_student_$appWidgetId"
 
         fun getThemeWidgetKey(appWidgetId: Int) = "timetable_widget_theme_$appWidgetId"
-
-        fun getCurrentThemeWidgetKey(appWidgetId: Int) = "timetable_widget_current_theme_$appWidgetId"
     }
 
     override fun onReceive(context: Context, intent: Intent) {
@@ -113,23 +110,14 @@ class TimetableWidgetProvider : BroadcastReceiver() {
             with(sharedPref) {
                 delete(getStudentWidgetKey(appWidgetId))
                 delete(getDateWidgetKey(appWidgetId))
-                delete(getThemeWidgetKey(appWidgetId))
-                delete(getCurrentThemeWidgetKey(appWidgetId))
             }
         }
     }
 
     @SuppressLint("DefaultLocale")
     private fun updateWidget(context: Context, appWidgetId: Int, date: LocalDate, student: Student?) {
-        val savedConfigureTheme = sharedPref.getLong(getThemeWidgetKey(appWidgetId), 0)
-        val isSystemDarkMode = context.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES
-        var currentTheme = 0L
-        var layoutId = R.layout.widget_timetable
-
-        if (savedConfigureTheme == 1L || (savedConfigureTheme == 2L && isSystemDarkMode)) {
-            currentTheme = 1L
-            layoutId = R.layout.widget_timetable_dark
-        }
+        val savedTheme = sharedPref.getLong(getThemeWidgetKey(appWidgetId), 0)
+        val layoutId = if (savedTheme == 0L) R.layout.widget_timetable else R.layout.widget_timetable_dark
 
         val nextNavIntent = createNavIntent(context, appWidgetId, appWidgetId, BUTTON_NEXT)
         val prevNavIntent = createNavIntent(context, -appWidgetId, appWidgetId, BUTTON_PREV)
@@ -162,11 +150,7 @@ class TimetableWidgetProvider : BroadcastReceiver() {
             setPendingIntentTemplate(R.id.timetableWidgetList, appIntent)
         }
 
-        with(sharedPref) {
-            putLong(getCurrentThemeWidgetKey(appWidgetId), currentTheme)
-            putLong(getDateWidgetKey(appWidgetId), date.toEpochDay(), true)
-        }
-
+        sharedPref.putLong(getDateWidgetKey(appWidgetId), date.toEpochDay(), true)
         with(appWidgetManager) {
             notifyAppWidgetViewDataChanged(appWidgetId, R.id.timetableWidgetList)
             updateAppWidget(appWidgetId, remoteView)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/widgets/DividerItemDecoration.kt b/app/src/main/java/io/github/wulkanowy/ui/widgets/DividerItemDecoration.kt
deleted file mode 100644
index b0b6999eb..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/widgets/DividerItemDecoration.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package io.github.wulkanowy.ui.widgets
-
-import android.content.Context
-import android.graphics.Canvas
-import android.view.View
-import androidx.recyclerview.widget.DividerItemDecoration
-import androidx.recyclerview.widget.RecyclerView
-
-class DividerItemDecoration(context: Context) : DividerItemDecoration(context, VERTICAL) {
-
-    override fun onDraw(canvas: Canvas, parent: RecyclerView, state: RecyclerView.State) {
-        canvas.save()
-        val dividerLeft = parent.paddingLeft
-        val dividerRight = parent.width - parent.paddingRight
-        val childCount = parent.childCount
-
-        for (i in 0..childCount - 2) {
-            val child: View = parent.getChildAt(i)
-            val params = child.layoutParams as RecyclerView.LayoutParams
-            val dividerTop: Int = child.bottom + params.bottomMargin
-            val dividerBottom = dividerTop + drawable!!.intrinsicHeight
-            drawable?.setBounds(dividerLeft, dividerTop, dividerRight, dividerBottom)
-            drawable?.draw(canvas)
-        }
-        canvas.restore()
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/utils/AppInfo.kt b/app/src/main/java/io/github/wulkanowy/utils/AppInfo.kt
index 6912baa36..a444da6fe 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/AppInfo.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/AppInfo.kt
@@ -4,6 +4,7 @@ import android.content.res.Resources
 import android.os.Build.MANUFACTURER
 import android.os.Build.MODEL
 import android.os.Build.VERSION.SDK_INT
+import io.github.wulkanowy.BuildConfig.CRASHLYTICS_ENABLED
 import io.github.wulkanowy.BuildConfig.DEBUG
 import io.github.wulkanowy.BuildConfig.VERSION_CODE
 import io.github.wulkanowy.BuildConfig.VERSION_NAME
@@ -12,6 +13,8 @@ import javax.inject.Singleton
 @Singleton
 open class AppInfo {
 
+    open val isCrashlyticsEnabled get() = CRASHLYTICS_ENABLED
+
     open val isDebug get() = DEBUG
 
     open val versionCode get() = VERSION_CODE
diff --git a/app/src/main/java/io/github/wulkanowy/utils/ContextExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/ContextExtension.kt
index 2b40cb476..a265378e2 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/ContextExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/ContextExtension.kt
@@ -9,8 +9,6 @@ import androidx.annotation.ColorInt
 import androidx.annotation.ColorRes
 import androidx.annotation.DrawableRes
 import androidx.core.content.ContextCompat
-import androidx.core.graphics.ColorUtils
-import io.github.wulkanowy.BuildConfig.APPLICATION_ID
 
 @ColorInt
 fun Context.getThemeAttrColor(@AttrRes colorAttr: Int): Int {
@@ -22,11 +20,6 @@ fun Context.getThemeAttrColor(@AttrRes colorAttr: Int): Int {
     }
 }
 
-@ColorInt
-fun Context.getThemeAttrColor(@AttrRes colorAttr: Int, alpha: Int): Int {
-    return ColorUtils.setAlphaComponent(getThemeAttrColor(colorAttr), alpha)
-}
-
 @ColorInt
 fun Context.getCompatColor(@ColorRes colorRes: Int) = ContextCompat.getColor(this, colorRes)
 
@@ -39,22 +32,12 @@ fun Context.openInternetBrowser(uri: String, onActivityNotFound: (uri: String) -
     }
 }
 
-fun Context.openAppInMarket(onActivityNotFound: (uri: String) -> Unit) {
-    openInternetBrowser("market://details?id=${APPLICATION_ID}") {
-        openInternetBrowser("https://github.com/wulkanowy/wulkanowy/releases", onActivityNotFound)
-    }
-}
-
-fun Context.openEmailClient(chooserTitle: String, email: String, subject: String, body: String, onActivityNotFound: () -> Unit = {}) {
-    val intent = Intent(Intent.ACTION_SENDTO, Uri.parse("mailto:")).apply {
-        putExtra(Intent.EXTRA_EMAIL, arrayOf(email))
-        putExtra(Intent.EXTRA_SUBJECT, subject)
-        putExtra(Intent.EXTRA_TEXT, body)
-    }
-
-    if (intent.resolveActivity(packageManager) != null) {
-        startActivity(Intent.createChooser(intent, chooserTitle))
-    } else onActivityNotFound()
+fun Context.openEmailClient(chooserTitle: String, email: String, subject: String?, body: String?) {
+    val emailIntent = Intent(Intent.ACTION_SENDTO, Uri.fromParts("mailto", email, null))
+    emailIntent.putExtra(Intent.EXTRA_EMAIL, arrayOf(email))
+    if (subject != null) emailIntent.putExtra(Intent.EXTRA_SUBJECT, subject)
+    if (body != null) emailIntent.putExtra(Intent.EXTRA_TEXT, body)
+    startActivity(Intent.createChooser(emailIntent, chooserTitle))
 }
 
 fun Context.openNavigation(location: String) {
diff --git a/app/src/main/java/io/github/wulkanowy/utils/EditTextExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/EditTextExtension.kt
deleted file mode 100644
index 58c93729b..000000000
--- a/app/src/main/java/io/github/wulkanowy/utils/EditTextExtension.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package io.github.wulkanowy.utils
-
-import android.view.inputmethod.EditorInfo
-import android.widget.EditText
-
-fun EditText.setOnEditorDoneSignIn(callback: () -> Boolean) {
-    setOnEditorActionListener { _, id, _ ->
-        if (id == EditorInfo.IME_ACTION_DONE || id == EditorInfo.IME_NULL) callback() else false
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/utils/FlexibleAdapterExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/FlexibleAdapterExtension.kt
new file mode 100644
index 000000000..bd6867a38
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/utils/FlexibleAdapterExtension.kt
@@ -0,0 +1,11 @@
+package io.github.wulkanowy.utils
+
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+
+inline fun FlexibleAdapter<*>.setOnItemClickListener(crossinline listener: (item: AbstractFlexibleItem<*>) -> Unit) {
+    addListener(FlexibleAdapter.OnItemClickListener { _, position ->
+        listener(getItem(position) as AbstractFlexibleItem<*>)
+        true
+    })
+}
\ No newline at end of file
diff --git a/app/src/main/java/io/github/wulkanowy/utils/FragNavControlerExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/FragNavControlerExtension.kt
index 9dc1e18a0..9cec331f8 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/FragNavControlerExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/FragNavControlerExtension.kt
@@ -4,14 +4,14 @@ import androidx.fragment.app.Fragment
 import com.ncapdevi.fragnav.FragNavController
 import io.github.wulkanowy.ui.modules.main.MainView
 
-inline fun FragNavController.setOnViewChangeListener(crossinline listener: (section: MainView.Section?, name: String?) -> Unit) {
+inline fun FragNavController.setOnViewChangeListener(crossinline listener: (section: MainView.Section?) -> Unit) {
     transactionListener = object : FragNavController.TransactionListener {
         override fun onFragmentTransaction(fragment: Fragment?, transactionType: FragNavController.TransactionType) {
-            listener(fragment?.toSection(), fragment?.let { it::class.java.simpleName })
+            listener(fragment?.toSection())
         }
 
         override fun onTabTransaction(fragment: Fragment?, index: Int) {
-            listener(fragment?.toSection(), fragment?.let { it::class.java.simpleName })
+            listener(fragment?.toSection())
         }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/utils/LifecycleAwareVariable.kt b/app/src/main/java/io/github/wulkanowy/utils/LifecycleAwareVariable.kt
deleted file mode 100644
index 2c49ee97c..000000000
--- a/app/src/main/java/io/github/wulkanowy/utils/LifecycleAwareVariable.kt
+++ /dev/null
@@ -1,55 +0,0 @@
-package io.github.wulkanowy.utils
-
-import androidx.appcompat.app.AppCompatActivity
-import androidx.fragment.app.Fragment
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.LifecycleObserver
-import androidx.lifecycle.OnLifecycleEvent
-import kotlin.properties.ReadWriteProperty
-import kotlin.reflect.KProperty
-
-class LifecycleAwareVariable<T : Any> : ReadWriteProperty<Fragment, T>, LifecycleObserver {
-
-    private var _value: T? = null
-
-    override fun setValue(thisRef: Fragment, property: KProperty<*>, value: T) {
-        thisRef.viewLifecycleOwner.lifecycle.removeObserver(this)
-        _value = value
-        thisRef.viewLifecycleOwner.lifecycle.addObserver(this)
-    }
-
-    override fun getValue(thisRef: Fragment, property: KProperty<*>) = _value
-        ?: throw IllegalStateException("Trying to call an lifecycle-aware value outside of the view lifecycle, or the value has not been initialized")
-
-    @Suppress("unused")
-    @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
-    fun onDestroyView() {
-        _value = null
-    }
-}
-
-class LifecycleAwareVariableActivity<T : Any> : ReadWriteProperty<AppCompatActivity, T>, LifecycleObserver {
-
-    private var _value: T? = null
-
-    override fun setValue(thisRef: AppCompatActivity, property: KProperty<*>, value: T) {
-        thisRef.lifecycle.removeObserver(this)
-        _value = value
-        thisRef.lifecycle.addObserver(this)
-    }
-
-    override fun getValue(thisRef: AppCompatActivity, property: KProperty<*>) = _value
-        ?: throw IllegalStateException("Trying to call an lifecycle-aware value outside of the view lifecycle, or the value has not been initialized")
-
-    @Suppress("unused")
-    @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
-    fun onDestroyView() {
-        _value = null
-    }
-}
-
-
-@Suppress("unused")
-fun <T : Any> Fragment.lifecycleAwareVariable() = LifecycleAwareVariable<T>()
-
-fun <T : Any> AppCompatActivity.lifecycleAwareVariable() = LifecycleAwareVariableActivity<T>()
diff --git a/app/src/main/java/io/github/wulkanowy/utils/LoggerUtils.kt b/app/src/main/java/io/github/wulkanowy/utils/LoggerUtils.kt
index fc3528495..f9db04653 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/LoggerUtils.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/LoggerUtils.kt
@@ -18,8 +18,6 @@ class DebugLogTree : Timber.DebugTree() {
     }
 }
 
-private fun Bundle?.checkSavedState() = if (this == null) "(STATE IS NULL)" else "(STATE IS NOT NULL)"
-
 class ActivityLifecycleLogger : Application.ActivityLifecycleCallbacks {
 
     override fun onActivityPaused(activity: Activity?) {
@@ -47,7 +45,7 @@ class ActivityLifecycleLogger : Application.ActivityLifecycleCallbacks {
     }
 
     override fun onActivityCreated(activity: Activity?, savedInstanceState: Bundle?) {
-        activity?.let { Timber.d("${it::class.java.simpleName} CREATED ${savedInstanceState.checkSavedState()}") }
+        activity?.let { Timber.d("${it::class.java.simpleName} CREATED ${checkSavedState(savedInstanceState)}") }
     }
 }
 
@@ -55,7 +53,7 @@ class ActivityLifecycleLogger : Application.ActivityLifecycleCallbacks {
 class FragmentLifecycleLogger @Inject constructor() : FragmentManager.FragmentLifecycleCallbacks() {
 
     override fun onFragmentViewCreated(fm: FragmentManager, f: Fragment, v: View, savedInstanceState: Bundle?) {
-        Timber.d("${f::class.java.simpleName} VIEW CREATED ${savedInstanceState.checkSavedState()}")
+        Timber.d("${f::class.java.simpleName} VIEW CREATED ${checkSavedState(savedInstanceState)}")
     }
 
     override fun onFragmentStopped(fm: FragmentManager, f: Fragment) {
@@ -63,7 +61,7 @@ class FragmentLifecycleLogger @Inject constructor() : FragmentManager.FragmentLi
     }
 
     override fun onFragmentCreated(fm: FragmentManager, f: Fragment, savedInstanceState: Bundle?) {
-        Timber.d("${f::class.java.simpleName} CREATED ${savedInstanceState.checkSavedState()}")
+        Timber.d("${f::class.java.simpleName} CREATED ${checkSavedState(savedInstanceState)}")
     }
 
     override fun onFragmentResumed(fm: FragmentManager, f: Fragment) {
@@ -91,7 +89,7 @@ class FragmentLifecycleLogger @Inject constructor() : FragmentManager.FragmentLi
     }
 
     override fun onFragmentActivityCreated(fm: FragmentManager, f: Fragment, savedInstanceState: Bundle?) {
-        Timber.d("${f::class.java.simpleName} ACTIVITY CREATED ${savedInstanceState.checkSavedState()}")
+        Timber.d("${f::class.java.simpleName} ACTIVITY CREATED ${checkSavedState(savedInstanceState)}")
     }
 
     override fun onFragmentPaused(fm: FragmentManager, f: Fragment) {
@@ -102,3 +100,5 @@ class FragmentLifecycleLogger @Inject constructor() : FragmentManager.FragmentLi
         Timber.d("${f::class.java.simpleName} DETACHED")
     }
 }
+
+private fun checkSavedState(savedInstanceState: Bundle?) = if (savedInstanceState == null) "(STATE IS NULL)" else ""
diff --git a/app/src/main/java/io/github/wulkanowy/utils/NumberExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/NumberExtension.kt
new file mode 100644
index 000000000..12350a42a
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/utils/NumberExtension.kt
@@ -0,0 +1,7 @@
+package io.github.wulkanowy.utils
+
+import kotlin.math.round
+
+fun Double.roundToDecimalPlaces(places: Int = 2): Double {
+    return round(this * 10 * places) / (10 * places)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/utils/ResourcesExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/ResourcesExtension.kt
deleted file mode 100644
index a2d0384e3..000000000
--- a/app/src/main/java/io/github/wulkanowy/utils/ResourcesExtension.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package io.github.wulkanowy.utils
-
-import android.content.res.Resources
-import io.github.wulkanowy.R
-import io.github.wulkanowy.sdk.exception.FeatureDisabledException
-import io.github.wulkanowy.sdk.exception.FeatureNotAvailableException
-import io.github.wulkanowy.sdk.exception.NotLoggedInException
-import io.github.wulkanowy.sdk.exception.PasswordChangeRequiredException
-import io.github.wulkanowy.sdk.exception.ServiceUnavailableException
-import java.io.InterruptedIOException
-import java.net.SocketTimeoutException
-import java.net.UnknownHostException
-
-fun Resources.getString(error: Throwable) = when (error) {
-    is UnknownHostException -> getString(R.string.error_no_internet)
-    is SocketTimeoutException, is InterruptedIOException -> getString(R.string.error_timeout)
-    is NotLoggedInException -> getString(R.string.error_login_failed)
-    is PasswordChangeRequiredException -> getString(R.string.error_password_change_required)
-    is ServiceUnavailableException -> getString(R.string.error_service_unavailable)
-    is FeatureDisabledException -> getString(R.string.error_feature_disabled)
-    is FeatureNotAvailableException -> getString(R.string.error_feature_not_available)
-    else -> getString(R.string.error_unknown)
-}
diff --git a/app/src/main/java/io/github/wulkanowy/utils/SchooldaysRangeLimiter.kt b/app/src/main/java/io/github/wulkanowy/utils/SchooldaysRangeLimiter.kt
index 46a707abb..922aafbd8 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/SchooldaysRangeLimiter.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/SchooldaysRangeLimiter.kt
@@ -17,7 +17,7 @@ class SchooldaysRangeLimiter : DateRangeLimiter {
     override fun isOutOfRange(year: Int, month: Int, day: Int): Boolean {
         val date = LocalDate.of(year, month + 1, day)
         val dayOfWeek = date.dayOfWeek
-        return dayOfWeek == DayOfWeek.SUNDAY || date.isHolidays
+        return dayOfWeek == DayOfWeek.SUNDAY || dayOfWeek == DayOfWeek.SATURDAY || date.isHolidays
     }
 
     override fun getStartDate(): Calendar {
diff --git a/app/src/main/java/io/github/wulkanowy/utils/SdkExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/SdkExtension.kt
deleted file mode 100644
index e4d4163b4..000000000
--- a/app/src/main/java/io/github/wulkanowy/utils/SdkExtension.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package io.github.wulkanowy.utils
-
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.sdk.Sdk
-import timber.log.Timber
-
-fun Sdk.init(student: Student): Sdk {
-    email = student.email
-    password = student.password
-    symbol = student.symbol
-    schoolSymbol = student.schoolSymbol
-    studentId = student.studentId
-    classId = student.classId
-
-    if (Sdk.Mode.valueOf(student.loginMode) != Sdk.Mode.API) {
-        scrapperBaseUrl = student.scrapperBaseUrl
-        loginType = Sdk.ScrapperLoginType.valueOf(student.loginType)
-    }
-    loginId = student.userLoginId
-
-    mode = Sdk.Mode.valueOf(student.loginMode)
-    mobileBaseUrl = student.mobileBaseUrl
-    certKey = student.certificateKey
-    privateKey = student.privateKey
-
-    Timber.d("Sdk in ${student.loginMode} mode reinitialized")
-
-    return this
-}
diff --git a/app/src/main/java/io/github/wulkanowy/utils/SemesterExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/SemesterExtension.kt
deleted file mode 100644
index b3c479c38..000000000
--- a/app/src/main/java/io/github/wulkanowy/utils/SemesterExtension.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package io.github.wulkanowy.utils
-
-import io.github.wulkanowy.data.db.entities.Semester
-import org.threeten.bp.LocalDate.now
-
-inline val Semester.isCurrent: Boolean
-    get() = now() in start..end
-
-fun List<Semester>.getCurrentOrLast(): Semester {
-    if (isEmpty()) throw RuntimeException("Empty semester list")
-
-    // when there is only one current semester
-    singleOrNull { it.isCurrent }?.let { return it }
-
-    // when there is more than one current semester - find one with higher id
-    singleOrNull { semester -> semester.semesterId == maxBy { it.semesterId }?.semesterId }?.let { return it }
-
-    throw IllegalArgumentException("Duplicated last semester! Semesters: ${joinToString(separator = "\n")}")
-}
diff --git a/app/src/main/java/io/github/wulkanowy/utils/TimeExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/TimeExtension.kt
index 802b2ee0f..a2672f865 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/TimeExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/TimeExtension.kt
@@ -1,38 +1,42 @@
 package io.github.wulkanowy.utils
 
+import org.threeten.bp.DateTimeUtils
 import org.threeten.bp.DayOfWeek.FRIDAY
 import org.threeten.bp.DayOfWeek.MONDAY
 import org.threeten.bp.DayOfWeek.SATURDAY
 import org.threeten.bp.DayOfWeek.SUNDAY
+import org.threeten.bp.Instant
 import org.threeten.bp.Instant.ofEpochMilli
 import org.threeten.bp.LocalDate
 import org.threeten.bp.LocalDateTime
-import org.threeten.bp.LocalDateTime.ofInstant
 import org.threeten.bp.Month
 import org.threeten.bp.ZoneId
-import org.threeten.bp.ZoneOffset
 import org.threeten.bp.format.DateTimeFormatter.ofPattern
 import org.threeten.bp.format.TextStyle.FULL_STANDALONE
 import org.threeten.bp.temporal.TemporalAdjusters.firstInMonth
 import org.threeten.bp.temporal.TemporalAdjusters.next
 import org.threeten.bp.temporal.TemporalAdjusters.previous
+import java.util.Date
 import java.util.Locale
 
 private const val DATE_PATTERN = "dd.MM.yyyy"
 
+fun Date.toLocalDate(): LocalDate = Instant.ofEpochMilli(time).atZone(ZoneId.systemDefault()).toLocalDate()
+
+fun Date.toLocalDateTime(): LocalDateTime = ofEpochMilli(time).atZone(ZoneId.systemDefault()).toLocalDateTime()
+
 fun String.toLocalDate(format: String = DATE_PATTERN): LocalDate = LocalDate.parse(this, ofPattern(format))
 
-fun LocalDateTime.toTimestamp() = atZone(ZoneId.systemDefault()).withZoneSameInstant(ZoneOffset.UTC).toInstant().toEpochMilli()
-
-fun Long.toLocalDateTime() = ofInstant(ofEpochMilli(this), ZoneId.systemDefault())
-
 fun LocalDate.toFormattedString(format: String = DATE_PATTERN): String = format(ofPattern(format))
 
 fun LocalDateTime.toFormattedString(format: String = DATE_PATTERN): String = format(ofPattern(format))
 
+fun LocalDateTime.toDate(): Date = DateTimeUtils.toDate(atZone(ZoneId.systemDefault()).toInstant())
+
 /**
  * https://github.com/ThreeTen/threetenbp/issues/55
  */
+
 fun Month.getFormattedName(): String {
     return getDisplayName(FULL_STANDALONE, Locale.getDefault())
         .let {
@@ -89,15 +93,19 @@ inline val LocalDate.previousOrSameSchoolDay: LocalDate
 inline val LocalDate.weekDayName: String
     get() = format(ofPattern("EEEE", Locale.getDefault()))
 
+inline val LocalDate.shortcutWeekDayName: String
+    get() = format(ofPattern("EEE", Locale.getDefault()))
+
 inline val LocalDate.monday: LocalDate
     get() = with(MONDAY)
 
-inline val LocalDate.sunday: LocalDate
-    get() = with(SUNDAY)
+inline val LocalDate.friday: LocalDate
+    get() = with(FRIDAY)
 
 /**
  * [Dz.U. 2016 poz. 1335](http://prawo.sejm.gov.pl/isap.nsf/DocDetails.xsp?id=WDU20160001335)
  */
+
 inline val LocalDate.isHolidays: Boolean
     get() = isBefore(firstSchoolDay) && isAfter(lastSchoolDay)
 
@@ -113,6 +121,7 @@ inline val LocalDate.lastSchoolDay: LocalDate
     get() = LocalDate.of(year, 6, 20)
         .with(next(FRIDAY))
 
+
 private fun Int.getSchoolYearByMonth(monthValue: Int): Int {
     return when (monthValue) {
         in 9..12 -> this
diff --git a/app/src/main/java/io/github/wulkanowy/utils/TimetableExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/TimetableExtension.kt
deleted file mode 100644
index ccb2afeb0..000000000
--- a/app/src/main/java/io/github/wulkanowy/utils/TimetableExtension.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package io.github.wulkanowy.utils
-
-import io.github.wulkanowy.data.db.entities.Timetable
-import org.threeten.bp.Duration
-import org.threeten.bp.Duration.between
-import org.threeten.bp.LocalDateTime
-import org.threeten.bp.LocalDateTime.now
-
-fun Timetable.isShowTimeUntil(previousLessonEnd: LocalDateTime?) = when {
-    !isStudentPlan -> false
-    canceled -> false
-    now().isAfter(start) -> false
-    previousLessonEnd != null && now().isBefore(previousLessonEnd) -> false
-    else -> between(now(), start) <= Duration.ofMinutes(60)
-}
-
-inline val Timetable.left: Duration?
-    get() = when {
-        canceled -> null
-        !isStudentPlan -> null
-        end.isAfter(now()) && start.isBefore(now()) -> between(now(), end)
-        else -> null
-    }
-
-inline val Timetable.until: Duration
-    get() = between(now(), start)
-
-inline val Timetable.isJustFinished: Boolean
-    get() = end.isBefore(now()) && end.plusSeconds(15).isAfter(now()) && !canceled
diff --git a/app/src/main/play/release-notes/pl-PL/default.txt b/app/src/main/play/release-notes/pl-PL/default.txt
index 1908d2e26..813eeace2 100644
--- a/app/src/main/play/release-notes/pl-PL/default.txt
+++ b/app/src/main/play/release-notes/pl-PL/default.txt
@@ -1,9 +1,8 @@
-Wersja 0.18.2
-- naprawiliśmy zaznaczanie uczniów przy logowaniu
-- naprawiliśmy odświeżanie planu lekcji na samsungach
-- naprawiliśmy wysyłanie wiadomości
-- poprawiliśmy oznaczanie nowych wiadomości jako przeczytanych
-- w podsumowaniu ocen nie będą się już pokazywać „puste” przedmioty
-- w polu pisania wiadomości pierwsza litera w zdaniu będzie teraz domyślnie duża
+Wersja 0.15.0
+
+- dodaliśmy funkcję usprawiedliwiania nieobecności
+- w trybie hybrydowym i mobilnym pokazują się teraz domyślnie tylko lekcje grupy ucznia
+- odświezyliśmy wygląd okienka ze szczegółami oceny
+- dokonaliśmy kilku poprawek dla systemu punktowego: suma punktów wyświetla się teraz w szczegółach ocen, a w widoku ucznia na tle klasy wykres jest w końcu poprawnie skalowany
 
 Pełna lista zmian: https://github.com/wulkanowy/wulkanowy/releases
diff --git a/app/src/main/res/drawable-hdpi/ic_stat_push.png b/app/src/main/res/drawable-hdpi/ic_stat_push.png
deleted file mode 100644
index 84578183f..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_stat_push.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_stat_timetable.png b/app/src/main/res/drawable-hdpi/ic_stat_timetable.png
deleted file mode 100644
index 201419d5d..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_stat_timetable.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_stat_push.png b/app/src/main/res/drawable-mdpi/ic_stat_push.png
deleted file mode 100644
index d1e954b0c..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_stat_push.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_stat_timetable.png b/app/src/main/res/drawable-mdpi/ic_stat_timetable.png
deleted file mode 100644
index dcfe95f26..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_stat_timetable.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_stat_push.png b/app/src/main/res/drawable-xhdpi/ic_stat_push.png
deleted file mode 100644
index 79b38e63f..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_stat_push.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_stat_timetable.png b/app/src/main/res/drawable-xhdpi/ic_stat_timetable.png
deleted file mode 100644
index 7264bd92a..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_stat_timetable.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_stat_push.png b/app/src/main/res/drawable-xxhdpi/ic_stat_push.png
deleted file mode 100644
index bc33cb5b1..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_stat_push.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_stat_timetable.png b/app/src/main/res/drawable-xxhdpi/ic_stat_timetable.png
deleted file mode 100644
index 1fb37b092..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_stat_timetable.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_stat_push.png b/app/src/main/res/drawable-xxxhdpi/ic_stat_push.png
deleted file mode 100644
index b354bd06c..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_stat_push.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_stat_timetable.png b/app/src/main/res/drawable-xxxhdpi/ic_stat_timetable.png
deleted file mode 100644
index a95cc4f5d..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_stat_timetable.png and /dev/null differ
diff --git a/app/src/main/res/drawable/background_timetable_time_left.xml b/app/src/main/res/drawable/background_timetable_time_left.xml
deleted file mode 100644
index 0f3326112..000000000
--- a/app/src/main/res/drawable/background_timetable_time_left.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <corners android:radius="3dp"/>
-    <padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp" />
-</shape>
diff --git a/app/src/main/res/drawable/ic_attachment.xml b/app/src/main/res/drawable/ic_attachment.xml
deleted file mode 100644
index c18714f5c..000000000
--- a/app/src/main/res/drawable/ic_attachment.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M2,12.5C2,9.46 4.46,7 7.5,7H18c2.21,0 4,1.79 4,4s-1.79,4 -4,4H9.5C8.12,15 7,13.88 7,12.5S8.12,10 9.5,10H17v2H9.41c-0.55,0 -0.55,1 0,1H18c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2H7.5C5.57,9 4,10.57 4,12.5S5.57,16 7.5,16H17v2H7.5C4.46,18 2,15.54 2,12.5z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_check.xml b/app/src/main/res/drawable/ic_check.xml
deleted file mode 100644
index 3c728c59f..000000000
--- a/app/src/main/res/drawable/ic_check.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_fullscreen.xml b/app/src/main/res/drawable/ic_fullscreen.xml
deleted file mode 100644
index 86b7649b6..000000000
--- a/app/src/main/res/drawable/ic_fullscreen.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M7,14L5,14v5h5v-2L7,17v-3zM5,10h2L7,7h3L10,5L5,5v5zM17,17h-3v2h5v-5h-2v3zM14,5v2h3v3h2L19,5h-5z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_fullscreen_exit.xml b/app/src/main/res/drawable/ic_fullscreen_exit.xml
deleted file mode 100644
index bb7140f29..000000000
--- a/app/src/main/res/drawable/ic_fullscreen_exit.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M5,16h3v3h2v-5L5,14v2zM8,8L5,8v2h5L10,5L8,5v3zM14,19h2v-3h3v-2h-5v5zM16,8L16,5h-2v5h5L19,8h-3z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_refresh.xml b/app/src/main/res/drawable/ic_refresh.xml
deleted file mode 100644
index cc2d1e04f..000000000
--- a/app/src/main/res/drawable/ic_refresh.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml
deleted file mode 100644
index cd9985cb1..000000000
--- a/app/src/main/res/drawable/ic_search.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FFF"
-        android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_share.xml b/app/src/main/res/drawable/ic_share.xml
deleted file mode 100644
index 045bbc0c0..000000000
--- a/app/src/main/res/drawable/ic_share.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
-</vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 2ea0a4d39..d07dbbd8a 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/mainContainer"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -9,8 +8,7 @@
         android:id="@+id/mainToolbar"
         style="@style/Widget.MaterialComponents.Toolbar.Surface"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:contentInsetStartWithNavigation="0dp" />
+        android:layout_height="wrap_content" />
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/mainFragmentContainer"
diff --git a/app/src/main/res/layout/activity_send_message.xml b/app/src/main/res/layout/activity_send_message.xml
index e0ec52bb6..f59dcabdf 100644
--- a/app/src/main/res/layout/activity_send_message.xml
+++ b/app/src/main/res/layout/activity_send_message.xml
@@ -148,7 +148,7 @@
                     android:hint="@string/message_content"
                     android:imeOptions="flagNoExtractUi"
                     android:importantForAutofill="no"
-                    android:inputType="textMultiLine|textCapSentences"
+                    android:inputType="textMultiLine"
                     android:minHeight="58dp"
                     android:paddingStart="16dp"
                     android:paddingLeft="16dp"
diff --git a/app/src/main/res/layout/activity_widget_configure.xml b/app/src/main/res/layout/activity_widget_configure.xml
index 9a463284e..548b86041 100644
--- a/app/src/main/res/layout/activity_widget_configure.xml
+++ b/app/src/main/res/layout/activity_widget_configure.xml
@@ -10,7 +10,9 @@
         android:layout_width="match_parent"
         android:layout_height="64dp"
         android:paddingStart="24dp"
+        android:paddingLeft="24dp"
         android:paddingEnd="24dp"
+        android:paddingRight="24dp"
         android:text="@string/account_title"
         android:textSize="20sp"
         android:textStyle="bold"
diff --git a/app/src/main/res/layout/dialog_account.xml b/app/src/main/res/layout/dialog_account.xml
index 6e975c80d..f2ee0bca7 100644
--- a/app/src/main/res/layout/dialog_account.xml
+++ b/app/src/main/res/layout/dialog_account.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="300dp"
+    android:layout_width="280dp"
     android:layout_height="wrap_content">
 
     <TextView
@@ -44,6 +44,7 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/accountDialogRecycler"
         android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
         android:layout_margin="8dp"
         android:text="@string/account_logout" />
 </RelativeLayout>
diff --git a/app/src/main/res/layout/dialog_error.xml b/app/src/main/res/layout/dialog_error.xml
index 2d4e5d0ba..ec25f6a4f 100644
--- a/app/src/main/res/layout/dialog_error.xml
+++ b/app/src/main/res/layout/dialog_error.xml
@@ -1,49 +1,27 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:minWidth="300dp"
     android:orientation="vertical">
 
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingHorizontal="20dp"
-        android:paddingTop="20dp"
-        android:text="@string/all_details"
-        android:textSize="20sp" />
-
-    <TextView
-        android:id="@+id/errorDialogMessage"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingHorizontal="20dp"
-        android:paddingVertical="10dp"
-        android:textSize="21sp"
-        tools:text="@tools:sample/lorem" />
-
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
         android:orientation="vertical">
 
         <androidx.core.widget.NestedScrollView
-            android:id="@+id/errorDialogNestedScroll"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:overScrollMode="ifContentScrolls"
-            android:paddingHorizontal="24dp"
-            app:layout_constrainedHeight="true"
-            app:layout_constraintHeight_max="300dp"
-            app:layout_constraintHeight_min="200dp"
-            app:layout_constraintTop_toTopOf="parent">
+            android:overScrollMode="ifContentScrolls">
 
             <HorizontalScrollView
-                android:id="@+id/errorDialogHorizontalScroll"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_width="350dp"
+                android:layout_height="wrap_content"
+                android:paddingLeft="24dp"
+                android:paddingTop="24dp"
+                android:paddingRight="24dp">
 
                 <TextView
                     android:id="@+id/errorDialogContent"
@@ -55,31 +33,16 @@
                     tools:text="@tools:sample/lorem/random" />
             </HorizontalScrollView>
         </androidx.core.widget.NestedScrollView>
-    </androidx.constraintlayout.widget.ConstraintLayout>
+    </LinearLayout>
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/ic_all_divider"
+        android:layout_marginTop="24dp"
         android:gravity="end"
         android:minHeight="52dp"
         android:orientation="horizontal">
 
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/errorDialogReport"
-            style="@style/Widget.MaterialComponents.Button.TextButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_marginStart="8dp"
-            android:layout_marginEnd="8dp"
-            android:text="@string/about_feedback" />
-
-        <Space
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1" />
-
         <com.google.android.material.button.MaterialButton
             android:id="@+id/errorDialogCancel"
             style="@style/Widget.MaterialComponents.Button.TextButton"
@@ -87,6 +50,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginEnd="8dp"
+            android:layout_marginRight="8dp"
             android:text="@android:string/cancel" />
 
         <com.google.android.material.button.MaterialButton
@@ -96,6 +60,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginEnd="8dp"
+            android:layout_marginRight="8dp"
             android:text="@android:string/copy" />
     </LinearLayout>
-</LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_homework.xml b/app/src/main/res/layout/dialog_homework.xml
index 7c149d4b0..7ed9b795b 100644
--- a/app/src/main/res/layout/dialog_homework.xml
+++ b/app/src/main/res/layout/dialog_homework.xml
@@ -1,47 +1,109 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/parent"
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:layout_height="match_parent">
 
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/homeworkDialogRecycler"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:minWidth="300dp"
-        tools:itemCount="1"
-        tools:listitem="@layout/item_homework_dialog_details" />
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
+    <LinearLayout
+        android:layout_width="300dp"
         android:layout_height="wrap_content"
-        android:background="@drawable/ic_all_divider"
-        android:paddingHorizontal="10dp"
-        android:paddingVertical="5dp">
+        android:orientation="vertical"
+        android:padding="20dp">
 
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/homeworkDialogRead"
-            style="@style/Widget.MaterialComponents.Button.TextButton"
+        <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentStart="true"
-            android:layout_alignParentBottom="true"
-            android:text="@string/homework_mark_as_done"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
+            android:layout_marginTop="20dp"
+            android:layout_marginBottom="20dp"
+            android:text="@string/all_details"
+            android:textSize="20sp" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/all_subject"
+            android:textSize="17sp" />
+
+        <TextView
+            android:id="@+id/homeworkDialogSubject"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="3dp"
+            android:text="@string/all_no_data"
+            android:textIsSelectable="true"
+            android:textSize="12sp" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:text="@string/all_teacher"
+            android:textSize="17sp" />
+
+        <TextView
+            android:id="@+id/homeworkDialogTeacher"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="3dp"
+            android:text="@string/all_no_data"
+            android:textIsSelectable="true"
+            android:textSize="12sp" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:text="@string/all_date"
+            android:textSize="17sp" />
+
+        <TextView
+            android:id="@+id/homeworkDialogDate"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="3dp"
+            android:text="@string/all_no_data"
+            android:textIsSelectable="true"
+            android:textSize="12sp" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:text="@string/all_entry_date"
+            android:textSize="17sp" />
+
+        <TextView
+            android:id="@+id/homeworkDialogEntryDate"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="3dp"
+            android:text="@string/all_no_data"
+            android:textIsSelectable="true"
+            android:textSize="12sp" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:text="@string/all_content"
+            android:textSize="17sp" />
+
+        <TextView
+            android:id="@+id/homeworkDialogContent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="3dp"
+            android:lineSpacingMultiplier="1.2"
+            android:text="@string/all_no_data"
+            android:textIsSelectable="true"
+            android:textSize="12sp" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/homeworkDialogClose"
             style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
-            android:layout_alignParentBottom="true"
-            android:text="@string/all_close"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</LinearLayout>
+            android:layout_gravity="end"
+            android:layout_marginTop="15dp"
+            android:text="@string/all_close" />
+    </LinearLayout>
+</androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/dialog_note.xml b/app/src/main/res/layout/dialog_note.xml
index 71506b01f..0393e56af 100644
--- a/app/src/main/res/layout/dialog_note.xml
+++ b/app/src/main/res/layout/dialog_note.xml
@@ -64,22 +64,6 @@
             android:textIsSelectable="true"
             android:textSize="12sp" />
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:text="@string/note_points"
-            android:textSize="17sp" />
-
-        <TextView
-            android:id="@+id/noteDialogPoints"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
-            android:text="@string/all_no_data"
-            android:textIsSelectable="true"
-            android:textSize="12sp" />
-
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml
index 6747b7d0c..556bdfd09 100644
--- a/app/src/main/res/layout/fragment_about.xml
+++ b/app/src/main/res/layout/fragment_about.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/aboutRecycler"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        tools:listitem="@layout/item_about" />
+        android:layout_height="match_parent" />
 </FrameLayout>
diff --git a/app/src/main/res/layout/fragment_attendance.xml b/app/src/main/res/layout/fragment_attendance.xml
index 39b00d306..cd8b60364 100644
--- a/app/src/main/res/layout/fragment_attendance.xml
+++ b/app/src/main/res/layout/fragment_attendance.xml
@@ -153,8 +153,8 @@
             android:background="?selectableItemBackgroundBorderless"
             android:fontFamily="sans-serif"
             android:gravity="center"
-            android:textSize="16sp"
-            tools:text="@tools:sample/date/ddmmyy" />
+            android:text="@string/app_name"
+            android:textSize="16sp" />
 
         <ImageButton
             android:id="@+id/attendanceNextButton"
diff --git a/app/src/main/res/layout/fragment_contributor.xml b/app/src/main/res/layout/fragment_creator.xml
similarity index 89%
rename from app/src/main/res/layout/fragment_contributor.xml
rename to app/src/main/res/layout/fragment_creator.xml
index 399ab5999..a0f34cffe 100644
--- a/app/src/main/res/layout/fragment_contributor.xml
+++ b/app/src/main/res/layout/fragment_creator.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <me.zhanghai.android.materialprogressbar.MaterialProgressBar
         android:id="@+id/creatorProgress"
@@ -31,6 +32,6 @@
             android:layout_marginBottom="8dp"
             android:layout_marginLeft="32dp"
             android:layout_marginRight="32dp"
-            android:text="@string/contributor_see_more" />
+            android:text="@string/creator_see_more" />
     </LinearLayout>
 </FrameLayout>
diff --git a/app/src/main/res/layout/fragment_exam.xml b/app/src/main/res/layout/fragment_exam.xml
index ed4094a50..1e1b0c99e 100644
--- a/app/src/main/res/layout/fragment_exam.xml
+++ b/app/src/main/res/layout/fragment_exam.xml
@@ -138,8 +138,8 @@
             android:layout_height="match_parent"
             android:fontFamily="sans-serif"
             android:gravity="center"
-            android:textSize="16sp"
-            tools:text="@tools:sample/date/ddmmyy" />
+            android:text="@string/app_name"
+            android:textSize="16sp" />
 
         <ImageButton
             android:id="@+id/examNextButton"
diff --git a/app/src/main/res/layout/fragment_grade_statistics.xml b/app/src/main/res/layout/fragment_grade_statistics.xml
index b3fcac448..10c8bb195 100644
--- a/app/src/main/res/layout/fragment_grade_statistics.xml
+++ b/app/src/main/res/layout/fragment_grade_statistics.xml
@@ -12,7 +12,7 @@
         android:layout_height="wrap_content"
         android:background="?android:windowBackground"
         android:padding="5dp"
-        android:visibility="gone"
+        android:visibility="invisible"
         tools:ignore="UnusedAttribute"
         tools:listitem="@layout/item_attendance_summary"
         tools:visibility="visible">
@@ -31,13 +31,13 @@
             android:spinnerMode="dialog" />
     </io.github.wulkanowy.ui.widgets.MaterialLinearLayout>
 
+
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/gradeStatisticsSwipe"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
         <androidx.core.widget.NestedScrollView
-            android:id="@+id/gradeStatisticsScroll"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:fillViewport="true">
@@ -59,7 +59,9 @@
                         android:orientation="horizontal"
                         android:paddingStart="16dp"
                         android:paddingTop="5dp"
-                        android:paddingEnd="16dp">
+                        android:paddingEnd="16dp"
+                        android:visibility="invisible"
+                        tools:visibility="visible">
 
                         <com.google.android.material.radiobutton.MaterialRadioButton
                             android:id="@+id/gradeStatisticsTypePartial"
@@ -89,11 +91,25 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent">
 
-                    <androidx.recyclerview.widget.RecyclerView
-                        android:id="@+id/gradeStatisticsRecycler"
+                    <com.github.mikephil.charting.charts.PieChart
+                        android:id="@+id/gradeStatisticsChart"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        tools:listitem="@layout/item_grade_statistics_pie" />
+                        android:layout_margin="10dp"
+                        android:background="?android:windowBackground"
+                        android:minHeight="400dp"
+                        android:visibility="gone"
+                        tools:visibility="visible" />
+
+                    <com.github.mikephil.charting.charts.BarChart
+                        android:id="@+id/gradeStatisticsChartPoints"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_margin="10dp"
+                        android:background="?android:windowBackground"
+                        android:minHeight="400dp"
+                        android:visibility="gone"
+                        tools:visibility="visible" />
 
                     <me.zhanghai.android.materialprogressbar.MaterialProgressBar
                         android:id="@+id/gradeStatisticsProgress"
diff --git a/app/src/main/res/layout/fragment_homework.xml b/app/src/main/res/layout/fragment_homework.xml
index 26381da6a..0fcde9c07 100644
--- a/app/src/main/res/layout/fragment_homework.xml
+++ b/app/src/main/res/layout/fragment_homework.xml
@@ -138,8 +138,8 @@
             android:layout_height="match_parent"
             android:fontFamily="sans-serif"
             android:gravity="center"
-            android:textSize="16sp"
-            tools:text="@tools:sample/date/ddmmyy" />
+            android:text="@string/app_name"
+            android:textSize="16sp" />
 
         <ImageButton
             android:id="@+id/homeworkNextButton"
diff --git a/app/src/main/res/layout/fragment_login_advanced.xml b/app/src/main/res/layout/fragment_login_advanced.xml
index 65af0b543..2174716ab 100644
--- a/app/src/main/res/layout/fragment_login_advanced.xml
+++ b/app/src/main/res/layout/fragment_login_advanced.xml
@@ -52,7 +52,7 @@
                 android:gravity="center"
                 android:orientation="horizontal"
                 android:paddingTop="24dp"
-                app:layout_constraintBottom_toTopOf="@+id/loginFormAdvancedWarningInfo"
+                app:layout_constraintBottom_toTopOf="@+id/loginFormNameLayout"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/loginFormHeader">
@@ -80,24 +80,8 @@
                     android:text="@string/login_type_hybrid" />
             </RadioGroup>
 
-            <TextView
-                android:id="@+id/loginFormAdvancedWarningInfo"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="24dp"
-                android:layout_marginTop="12dp"
-                android:layout_marginRight="24dp"
-                android:gravity="center_horizontal"
-                android:lineSpacingExtra="3sp"
-                android:text="@string/login_advanced_warning_scraper"
-                android:textColor="?colorTimetableChange"
-                app:layout_constraintBottom_toTopOf="@id/loginFormUsernameLayout"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/loginTypeSwitch" />
-
             <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/loginFormUsernameLayout"
+                android:id="@+id/loginFormNameLayout"
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -111,14 +95,13 @@
                 app:layout_constraintBottom_toTopOf="@+id/loginFormPassLayout"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/loginFormAdvancedWarningInfo">
+                app:layout_constraintTop_toBottomOf="@+id/loginTypeSwitch">
 
                 <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/loginFormUsername"
+                    android:id="@+id/loginFormName"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:autofillHints="username|emailAddress"
-                    android:importantForAutofill="yes"
                     android:inputType="textEmailAddress"
                     android:maxLines="1"
                     tools:targetApi="o" />
@@ -142,7 +125,7 @@
                 app:layout_constraintBottom_toTopOf="@+id/loginFormHostLayout"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/loginFormUsernameLayout"
+                app:layout_constraintTop_toBottomOf="@+id/loginFormNameLayout"
                 app:passwordToggleEnabled="true">
 
                 <com.google.android.material.textfield.TextInputEditText
@@ -152,7 +135,6 @@
                     android:autofillHints="password"
                     android:imeActionLabel="@string/login_sign_in"
                     android:imeOptions="actionDone"
-                    android:importantForAutofill="yes"
                     android:inputType="textPassword"
                     android:maxLines="1"
                     app:fontFamily="sans-serif"
diff --git a/app/src/main/res/layout/fragment_login_form.xml b/app/src/main/res/layout/fragment_login_form.xml
index d91d7b037..13880ff70 100644
--- a/app/src/main/res/layout/fragment_login_form.xml
+++ b/app/src/main/res/layout/fragment_login_form.xml
@@ -67,6 +67,7 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginEnd="8dp"
+                        android:layout_marginRight="8dp"
                         android:layout_weight="1"
                         android:text="@string/login_contact_email"
                         app:icon="@drawable/ic_more_messages" />
@@ -77,6 +78,7 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="8dp"
+                        android:layout_marginLeft="8dp"
                         android:layout_weight="1"
                         android:text="@string/about_faq"
                         app:icon="@drawable/ic_about_faq" />
@@ -103,7 +105,7 @@
                 android:text="@string/login_header_default"
                 android:textSize="16sp"
                 app:fontFamily="sans-serif-light"
-                app:layout_constraintBottom_toTopOf="@+id/loginFormUsernameLayout"
+                app:layout_constraintBottom_toTopOf="@+id/loginFormNameLayout"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/loginFormContact"
@@ -111,7 +113,7 @@
 
 
             <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/loginFormUsernameLayout"
+                android:id="@+id/loginFormNameLayout"
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -128,11 +130,10 @@
                 app:layout_constraintTop_toBottomOf="@+id/loginFormHeader">
 
                 <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/loginFormUsername"
+                    android:id="@+id/loginFormName"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:autofillHints="username|emailAddress"
-                    android:importantForAutofill="yes"
                     android:inputType="textEmailAddress"
                     android:maxLines="1"
                     tools:targetApi="o" />
@@ -153,10 +154,10 @@
                 android:hint="@string/login_password_hint"
                 app:errorEnabled="true"
                 app:errorIconDrawable="@null"
-                app:layout_constraintBottom_toTopOf="@+id/loginFormRecoverLink"
+                app:layout_constraintBottom_toTopOf="@+id/loginFormHostLayout"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/loginFormUsernameLayout"
+                app:layout_constraintTop_toBottomOf="@+id/loginFormNameLayout"
                 app:passwordToggleEnabled="true">
 
                 <com.google.android.material.textfield.TextInputEditText
@@ -166,7 +167,6 @@
                     android:autofillHints="password"
                     android:imeActionLabel="@string/login_sign_in"
                     android:imeOptions="actionDone"
-                    android:importantForAutofill="yes"
                     android:inputType="textPassword"
                     android:maxLines="1"
                     app:fontFamily="sans-serif"
@@ -174,21 +174,6 @@
 
             </com.google.android.material.textfield.TextInputLayout>
 
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/loginFormRecoverLink"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="24dp"
-                android:text="@string/login_recover_button"
-                android:textAppearance="?android:textAppearance"
-                app:backgroundTint="?android:windowBackground"
-                app:fontFamily="sans-serif-medium"
-                app:layout_constraintBottom_toTopOf="@id/loginFormHostLayout"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/loginFormPassLayout"
-                tools:visibility="visible" />
-
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/loginFormHostLayout"
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
@@ -196,15 +181,15 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="24dp"
                 android:layout_marginLeft="24dp"
-                android:layout_marginTop="8dp"
+                android:layout_marginTop="16dp"
                 android:layout_marginEnd="24dp"
                 android:layout_marginRight="24dp"
                 android:hint="@string/login_host_hint"
                 android:orientation="vertical"
-                app:layout_constraintBottom_toTopOf="@+id/loginFormAdvancedButton"
+                app:layout_constraintBottom_toTopOf="@+id/loginFormSignIn"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/loginFormRecoverLink">
+                app:layout_constraintTop_toBottomOf="@+id/loginFormPassLayout">
 
                 <AutoCompleteTextView
                     android:id="@+id/loginFormHost"
@@ -220,9 +205,10 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="16dp"
+                android:layout_marginRight="16dp"
                 android:text="@string/login_advanced"
                 android:textAppearance="?android:textAppearance"
-                android:visibility="gone"
+                android:textColor="@color/colorPrimary"
                 app:backgroundTint="?android:windowBackground"
                 app:fontFamily="sans-serif-medium"
                 app:layout_constraintBottom_toBottomOf="@id/loginFormSignIn"
@@ -238,6 +224,7 @@
                 android:layout_gravity="center_vertical"
                 android:layout_marginTop="48dp"
                 android:layout_marginEnd="24dp"
+                android:layout_marginRight="24dp"
                 android:layout_marginBottom="16dp"
                 android:text="@string/login_sign_in"
                 app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/fragment_login_recover.xml b/app/src/main/res/layout/fragment_login_recover.xml
deleted file mode 100644
index 205a4bea3..000000000
--- a/app/src/main/res/layout/fragment_login_recover.xml
+++ /dev/null
@@ -1,259 +0,0 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".ui.modules.login.recover.LoginRecoverFragment">
-
-    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
-        android:id="@+id/loginRecoverProgress"
-        style="@style/Widget.MaterialProgressBar.ProgressBar"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:indeterminate="true"
-        android:visibility="gone" />
-
-    <androidx.core.widget.NestedScrollView
-        android:id="@+id/nestedScrollView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:fillViewport="true"
-        android:scrollbars="none"
-        tools:visibility="visible">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/loginRecoverFormContainer"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingBottom="16dp"
-            android:visibility="visible">
-
-            <TextView
-                android:id="@+id/loginFormHeader"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="32dp"
-                android:layout_marginLeft="32dp"
-                android:layout_marginTop="48dp"
-                android:layout_marginEnd="32dp"
-                android:layout_marginRight="32dp"
-                android:gravity="center_horizontal"
-                android:text="@string/login_recover_title"
-                android:textSize="16sp"
-                app:fontFamily="sans-serif-light"
-                app:layout_constraintBottom_toTopOf="@+id/loginRecoverInfoMessage"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintVertical_chainStyle="packed" />
-
-            <TextView
-                android:id="@+id/loginRecoverInfoMessage"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="32dp"
-                android:layout_marginTop="24dp"
-                android:layout_marginEnd="32dp"
-                android:gravity="center_horizontal"
-                android:text="@string/login_recover_warning"
-                android:textColor="?colorTimetableChange"
-                app:layout_constraintBottom_toTopOf="@id/loginRecoverNameLayout"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/loginFormHeader" />
-
-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/loginRecoverNameLayout"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="24dp"
-                android:layout_marginLeft="24dp"
-                android:layout_marginTop="24dp"
-                android:layout_marginEnd="24dp"
-                android:layout_marginRight="24dp"
-                android:hint="@string/login_email_hint"
-                app:errorEnabled="true"
-                app:layout_constraintBottom_toTopOf="@+id/loginRecoverHostLayout"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/loginRecoverInfoMessage">
-
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/loginRecoverName"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:autofillHints="emailAddress"
-                    android:inputType="textEmailAddress"
-                    android:maxLines="1"
-                    android:imeOptions="actionDone"
-                    tools:targetApi="o" />
-
-                <requestFocus />
-            </com.google.android.material.textfield.TextInputLayout>
-
-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/loginRecoverHostLayout"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="24dp"
-                android:layout_marginLeft="24dp"
-                android:layout_marginTop="16dp"
-                android:layout_marginEnd="24dp"
-                android:layout_marginRight="24dp"
-                android:hint="@string/login_host_hint"
-                android:orientation="vertical"
-                app:layout_constraintBottom_toTopOf="@+id/loginRecoverButton"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/loginRecoverNameLayout">
-
-                <AutoCompleteTextView
-                    android:id="@+id/loginRecoverHost"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:editable="false"
-                    tools:ignore="Deprecated,LabelFor" />
-            </com.google.android.material.textfield.TextInputLayout>
-
-            <Button
-                android:id="@+id/loginRecoverButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="24dp"
-                android:layout_marginEnd="24dp"
-                android:layout_marginRight="24dp"
-                android:text="@string/login_recover"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/loginRecoverHostLayout" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-    </androidx.core.widget.NestedScrollView>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/loginRecoverCaptchaContainer"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:visibility="gone">
-
-        <WebView
-            android:id="@+id/loginRecoverWebView"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-    <LinearLayout
-        android:id="@+id/loginRecoverError"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:orientation="vertical"
-        android:visibility="invisible"
-        tools:ignore="UseCompoundDrawables"
-        tools:visibility="invisible">
-
-        <ImageView
-            android:layout_width="100dp"
-            android:layout_height="100dp"
-            app:srcCompat="@drawable/ic_error"
-            app:tint="?colorOnBackground"
-            tools:ignore="contentDescription" />
-
-        <TextView
-            android:id="@+id/loginRecoverErrorMessage"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:gravity="center"
-            android:padding="8dp"
-            android:text="@string/error_unknown"
-            android:textSize="20sp" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/loginRecoverErrorDetails"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="8dp"
-                android:layout_marginRight="8dp"
-                android:text="@string/all_details" />
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/loginRecoverErrorRetry"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/all_retry" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <androidx.core.widget.NestedScrollView
-        android:id="@+id/loginRecoverSuccess"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:fillViewport="true"
-        android:scrollbars="none"
-        android:visibility="invisible"
-        tools:visibility="invisible">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:gravity="center"
-            android:orientation="vertical"
-            tools:ignore="UseCompoundDrawables">
-
-            <ImageView
-                android:layout_width="100dp"
-                android:layout_height="100dp"
-                app:srcCompat="@drawable/ic_all_done"
-                app:tint="?colorOnBackground"
-                tools:ignore="contentDescription" />
-
-            <TextView
-                android:id="@+id/loginRecoverSuccessTitle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="35dp"
-                android:layout_marginTop="20dp"
-                android:layout_marginEnd="35dp"
-                android:gravity="center"
-                android:textSize="20sp"
-                tools:text="Pomyślnie wysłano email!" />
-
-            <TextView
-                android:id="@+id/loginRecoverSuccessMessage"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="35dp"
-                android:lineSpacingMultiplier="1.5"
-                android:scrollbars="vertical"
-                android:text="@string/login_recover"
-                android:textSize="14sp"
-                tools:text="@tools:sample/lorem/random" />
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/loginRecoverLogin"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end"
-                android:layout_marginEnd="30dp"
-                android:layout_marginBottom="30dp"
-                android:text="@android:string/ok" />
-        </LinearLayout>
-
-    </androidx.core.widget.NestedScrollView>
-</FrameLayout>
diff --git a/app/src/main/res/layout/fragment_login_student_select.xml b/app/src/main/res/layout/fragment_login_student_select.xml
index f9c6c1572..64e06cbd5 100644
--- a/app/src/main/res/layout/fragment_login_student_select.xml
+++ b/app/src/main/res/layout/fragment_login_student_select.xml
@@ -24,10 +24,10 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:visibility="gone"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
+            android:visibility="gone"
             tools:visibility="visible">
 
             <View
@@ -42,9 +42,9 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="32dp"
                 android:layout_marginLeft="32dp"
-                android:layout_marginTop="16dp"
                 android:layout_marginEnd="32dp"
                 android:layout_marginRight="32dp"
+                android:layout_marginTop="16dp"
                 android:layout_marginBottom="16dp"
                 android:gravity="center_horizontal"
                 android:text="@string/login_contact_header"
@@ -55,29 +55,28 @@
                 android:id="@+id/loginStudentSelectContactButtons"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:orientation="horizontal"
                 android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp"
-                android:orientation="horizontal">
-
+                android:layout_marginRight="16dp">
                 <com.google.android.material.button.MaterialButton
-                    android:id="@+id/loginStudentSelectContactEmail"
                     style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                    android:id="@+id/loginStudentSelectContactEmail"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginEnd="8dp"
-                    android:layout_marginRight="8dp"
                     android:layout_weight="1"
+                    android:layout_marginRight="8dp"
+                    android:layout_marginEnd="8dp"
                     android:text="@string/login_contact_email"
                     app:icon="@drawable/ic_more_messages" />
 
                 <com.google.android.material.button.MaterialButton
-                    android:id="@+id/loginStudentSelectContactDiscord"
                     style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                    android:id="@+id/loginStudentSelectContactDiscord"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginLeft="8dp"
                     android:layout_weight="1"
+                    android:layout_marginLeft="8dp"
+                    android:layout_marginStart="8dp"
                     android:text="@string/login_contact_discord"
                     app:icon="@drawable/ic_about_discord" />
             </LinearLayout>
@@ -96,9 +95,9 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="32dp"
             android:layout_marginLeft="32dp"
-            android:layout_marginTop="32dp"
             android:layout_marginEnd="32dp"
             android:layout_marginRight="32dp"
+            android:layout_marginTop="32dp"
             android:layout_marginBottom="32dp"
             android:gravity="center_horizontal"
             android:text="@string/login_select_student"
@@ -130,8 +129,8 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="32dp"
             android:layout_marginEnd="24dp"
+            android:layout_marginRight="24dp"
             android:layout_marginBottom="32dp"
-            android:enabled="false"
             android:text="@string/login_sign_in"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/fragment_login_symbol.xml b/app/src/main/res/layout/fragment_login_symbol.xml
index 77f44d213..56b4a32e5 100644
--- a/app/src/main/res/layout/fragment_login_symbol.xml
+++ b/app/src/main/res/layout/fragment_login_symbol.xml
@@ -108,41 +108,31 @@
                 android:text="@string/login_header_symbol"
                 android:textSize="16sp"
                 app:fontFamily="sans-serif-light"
-                app:layout_constraintBottom_toTopOf="@+id/loginSymbolHelper"
+                app:layout_constraintBottom_toTopOf="@+id/loginSymbolNameLayout"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintHorizontal_bias="0.5"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/loginSymbolContact"
                 app:layout_constraintVertical_chainStyle="packed" />
 
-            <TextView
-                android:id="@+id/loginSymbolHelper"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="32dp"
-                android:layout_marginTop="32dp"
-                android:layout_marginEnd="32dp"
-                android:gravity="center_horizontal"
-                android:text="@string/login_symbol_helper"
-                app:fontFamily="sans-serif-light"
-                app:layout_constraintBottom_toTopOf="@id/loginSymbolNameLayout"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/loginSymbolHeader"
-                app:layout_constraintVertical_chainStyle="packed" />
-
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/loginSymbolNameLayout"
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="24dp"
+                android:layout_marginStart="24dp"
+                android:layout_marginLeft="24dp"
+                android:layout_marginTop="48dp"
+                android:layout_marginEnd="24dp"
+                android:layout_marginRight="24dp"
                 android:hint="@string/login_symbol_hint"
+                app:helperText="@string/login_symbol_helper"
+                app:helperTextEnabled="true"
                 app:layout_constraintBottom_toTopOf="@+id/loginSymbolSignIn"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintHorizontal_bias="0.5"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/loginSymbolHelper">
+                app:layout_constraintTop_toBottomOf="@+id/loginSymbolHeader">
 
                 <AutoCompleteTextView
                     android:id="@+id/loginSymbolName"
diff --git a/app/src/main/res/layout/fragment_logviewer.xml b/app/src/main/res/layout/fragment_logviewer.xml
deleted file mode 100644
index 64f9125fb..000000000
--- a/app/src/main/res/layout/fragment_logviewer.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    tools:context=".ui.modules.about.logviewer.LogViewerFragment">
-
-    <HorizontalScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:padding="3dp">
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/logViewerRecycler"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:scrollbars="vertical" />
-    </HorizontalScrollView>
-
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/logViewRefreshButton"
-        style="@style/Widget.MaterialComponents.FloatingActionButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
-        android:layout_margin="16dp"
-        android:clickable="true"
-        android:focusable="true"
-        android:text="@string/logviewer_refresh"
-        android:tint="?colorOnSecondary"
-        app:srcCompat="@drawable/ic_refresh" />
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_message_preview.xml b/app/src/main/res/layout/fragment_message_preview.xml
index 0931990f6..4a6f7e9a7 100644
--- a/app/src/main/res/layout/fragment_message_preview.xml
+++ b/app/src/main/res/layout/fragment_message_preview.xml
@@ -5,12 +5,55 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/messagePreviewRecycler"
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        tools:itemCount="1"
-        tools:listitem="@layout/item_message_preview" />
+        android:layout_height="match_parent">
+
+        <LinearLayout
+            android:id="@+id/messagePreviewContentContainer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:padding="16dp">
+
+            <TextView
+                android:id="@+id/messagePreviewSubject"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="15dp"
+                android:lineSpacingMultiplier="1.2"
+                android:textSize="22sp"
+                tools:text="@tools:sample/lorem" />
+
+            <TextView
+                android:id="@+id/messagePreviewAuthor"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="4dp"
+                android:textColor="?android:textColorSecondary"
+                android:textSize="15sp"
+                tools:text="@tools:sample/full_names" />
+
+            <TextView
+                android:id="@+id/messagePreviewDate"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="15dp"
+                android:textColor="?android:textColorSecondary"
+                android:textSize="15sp"
+                tools:text="@tools:sample/date/ddmmyy" />
+
+            <TextView
+                android:id="@+id/messagePreviewContent"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:autoLink="web"
+                android:lineSpacingMultiplier="1.2"
+                android:textIsSelectable="true"
+                tools:text="@tools:sample/lorem" />
+        </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
+
 
     <LinearLayout
         android:id="@+id/messagePreviewError"
@@ -52,6 +95,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"
+                android:layout_marginRight="8dp"
                 android:text="@string/all_details" />
 
             <com.google.android.material.button.MaterialButton
diff --git a/app/src/main/res/layout/fragment_timetable.xml b/app/src/main/res/layout/fragment_timetable.xml
index 533af2fa1..98ccabbff 100644
--- a/app/src/main/res/layout/fragment_timetable.xml
+++ b/app/src/main/res/layout/fragment_timetable.xml
@@ -139,8 +139,8 @@
             android:background="?selectableItemBackgroundBorderless"
             android:fontFamily="sans-serif"
             android:gravity="center"
-            android:textSize="16sp"
-            tools:text="@tools:sample/date/ddmmyy" />
+            android:text="@string/app_name"
+            android:textSize="16sp" />
 
         <ImageButton
             android:id="@+id/timetableNextButton"
diff --git a/app/src/main/res/layout/fragment_timetable_completed.xml b/app/src/main/res/layout/fragment_timetable_completed.xml
index 4934327c5..110670449 100644
--- a/app/src/main/res/layout/fragment_timetable_completed.xml
+++ b/app/src/main/res/layout/fragment_timetable_completed.xml
@@ -115,8 +115,8 @@
         android:layout_width="match_parent"
         android:layout_height="48dp"
         android:layout_gravity="bottom"
-        android:gravity="center"
         android:orientation="horizontal"
+        android:gravity="center"
         tools:ignore="UnusedAttribute">
 
         <ImageButton
@@ -125,24 +125,24 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:background="?attr/selectableItemBackgroundBorderless"
-            android:contentDescription="@string/all_prev"
             android:paddingLeft="12dp"
             android:paddingTop="8dp"
             android:paddingRight="12dp"
             android:paddingBottom="8dp"
             android:scaleType="fitStart"
             android:tint="?colorPrimary"
-            app:srcCompat="@drawable/ic_chevron_left" />
+            app:srcCompat="@drawable/ic_chevron_left"
+            android:contentDescription="@string/all_prev"/>
 
         <TextView
             android:id="@+id/completedLessonsNavDate"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:background="?selectableItemBackgroundBorderless"
             android:fontFamily="sans-serif"
+            android:background="?selectableItemBackgroundBorderless"
             android:gravity="center"
-            android:textSize="16sp"
-            tools:text="@tools:sample/date/ddmmyy" />
+            android:text="@string/app_name"
+            android:textSize="16sp" />
 
         <ImageButton
             android:id="@+id/completedLessonsNextButton"
@@ -150,13 +150,13 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:background="?attr/selectableItemBackgroundBorderless"
-            android:contentDescription="@string/all_next"
             android:paddingLeft="12dp"
             android:paddingTop="8dp"
             android:paddingRight="12dp"
             android:paddingBottom="8dp"
             android:scaleType="fitEnd"
             android:tint="?colorPrimary"
-            app:srcCompat="@drawable/ic_chevron_right" />
+            app:srcCompat="@drawable/ic_chevron_right"
+            android:contentDescription="@string/all_next" />
     </io.github.wulkanowy.ui.widgets.MaterialLinearLayout>
 </FrameLayout>
diff --git a/app/src/main/res/layout/header_exam.xml b/app/src/main/res/layout/header_exam.xml
index 43f089f73..3a2e38c59 100644
--- a/app/src/main/res/layout/header_exam.xml
+++ b/app/src/main/res/layout/header_exam.xml
@@ -10,7 +10,7 @@
     android:paddingTop="10dp"
     android:paddingRight="20dp"
     android:paddingBottom="10dp"
-    tools:context=".ui.modules.exam.ExamAdapter">
+    tools:context=".ui.modules.exam.ExamHeader">
 
     <TextView
         android:id="@+id/examHeaderDay"
@@ -25,6 +25,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="10dp"
+        android:layout_marginLeft="10dp"
         android:gravity="end"
         android:textSize="13sp"
         tools:text="25.01.2020" />
diff --git a/app/src/main/res/layout/header_grade_details.xml b/app/src/main/res/layout/header_grade_details.xml
index f2ba9a8c9..75e01745f 100644
--- a/app/src/main/res/layout/header_grade_details.xml
+++ b/app/src/main/res/layout/header_grade_details.xml
@@ -1,93 +1,81 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/gradeHeaderContainer"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?android:windowBackground">
+    android:background="?selectableItemBackground"
+    android:paddingStart="16dp"
+    android:paddingLeft="16dp"
+    android:paddingTop="10dp"
+    android:paddingEnd="12dp"
+    android:paddingRight="14dp"
+    android:paddingBottom="10dp"
+    tools:context=".ui.modules.grade.details.GradeDetailsHeader">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/gradeHeaderContainer"
+    <TextView
+        android:id="@+id/gradeHeaderSubject"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?selectableItemBackground"
-        tools:context=".ui.modules.grade.details.GradeDetailsAdapter">
+        android:layout_marginEnd="20dp"
+        android:layout_marginRight="20dp"
+        android:layout_toStartOf="@id/gradeHeaderNote"
+        android:layout_toLeftOf="@id/gradeHeaderNote"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textSize="15sp"
+        tools:text="Fizyka" />
 
-        <View
-            android:id="@+id/gradeHeaderDivider"
-            android:layout_width="0dp"
-            android:layout_height="1dp"
-            android:background="?android:attr/listDivider"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+    <TextView
+        android:id="@+id/gradeHeaderAverage"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/gradeHeaderSubject"
+        android:layout_marginTop="5dp"
+        android:textColor="?android:textColorSecondary"
+        android:textSize="12sp"
+        tools:text="Average: 6,00" />
 
-        <TextView
-            android:id="@+id/gradeHeaderSubject"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="10dp"
-            android:layout_marginEnd="20dp"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:textSize="15sp"
-            app:layout_constraintEnd_toStartOf="@id/gradeHeaderNote"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:text="@tools:sample/lorem/random" />
+    <TextView
+        android:id="@+id/gradeHeaderPointsSum"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/gradeHeaderSubject"
+        android:layout_marginStart="10dp"
+        android:layout_marginLeft="10dp"
+        android:layout_marginTop="5dp"
+        android:layout_toEndOf="@+id/gradeHeaderAverage"
+        android:layout_toRightOf="@+id/gradeHeaderAverage"
+        android:textColor="?android:textColorSecondary"
+        android:textSize="12sp"
+        tools:text="Points: 123/200 (61,5%)" />
 
-        <TextView
-            android:id="@+id/gradeHeaderAverage"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="5dp"
-            android:layout_marginBottom="10dp"
-            android:textColor="?android:textColorSecondary"
-            android:textSize="12sp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="@id/gradeHeaderSubject"
-            app:layout_constraintTop_toBottomOf="@+id/gradeHeaderSubject"
-            tools:text="Average: 6,00" />
+    <TextView
+        android:id="@+id/gradeHeaderNumber"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/gradeHeaderSubject"
+        android:layout_marginStart="10dp"
+        android:layout_marginLeft="10dp"
+        android:layout_marginTop="5dp"
+        android:layout_toEndOf="@+id/gradeHeaderPointsSum"
+        android:layout_toRightOf="@+id/gradeHeaderPointsSum"
+        android:textColor="?android:textColorSecondary"
+        android:textSize="12sp"
+        tools:text="12 grades" />
 
-        <TextView
-            android:id="@+id/gradeHeaderPointsSum"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:layout_marginTop="5dp"
-            android:textColor="?android:textColorSecondary"
-            android:textSize="12sp"
-            app:layout_constraintStart_toEndOf="@+id/gradeHeaderAverage"
-            app:layout_constraintTop_toBottomOf="@+id/gradeHeaderSubject"
-            tools:text="Points: 123/200 (61,5%)" />
-
-        <TextView
-            android:id="@+id/gradeHeaderNumber"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:layout_marginTop="5dp"
-            android:textColor="?android:textColorSecondary"
-            android:textSize="12sp"
-            app:layout_constraintStart_toEndOf="@+id/gradeHeaderPointsSum"
-            app:layout_constraintTop_toBottomOf="@id/gradeHeaderSubject"
-            tools:text="12 grades" />
-
-        <TextView
-            android:id="@+id/gradeHeaderNote"
-            android:layout_width="wrap_content"
-            android:layout_height="20dp"
-            android:layout_marginEnd="12dp"
-            android:background="@drawable/background_header_note"
-            android:gravity="center"
-            android:minWidth="20dp"
-            android:paddingLeft="5dp"
-            android:paddingRight="5dp"
-            android:textColor="?colorOnPrimary"
-            android:textSize="14sp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:text="255" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</LinearLayout>
+    <TextView
+        android:id="@+id/gradeHeaderNote"
+        android:layout_width="wrap_content"
+        android:layout_height="20dp"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:layout_marginTop="10dp"
+        android:background="@drawable/background_header_note"
+        android:gravity="center"
+        android:minWidth="20dp"
+        android:paddingLeft="5dp"
+        android:paddingRight="5dp"
+        android:textColor="?colorOnPrimary"
+        android:textSize="14sp"
+        tools:text="255" />
+</RelativeLayout>
diff --git a/app/src/main/res/layout/header_homework.xml b/app/src/main/res/layout/header_homework.xml
index e1c6608f4..207fcdb40 100644
--- a/app/src/main/res/layout/header_homework.xml
+++ b/app/src/main/res/layout/header_homework.xml
@@ -10,7 +10,7 @@
     android:paddingTop="10dp"
     android:paddingRight="20dp"
     android:paddingBottom="10dp"
-    tools:context=".ui.modules.homework.HomeworkAdapter">
+    tools:context=".ui.modules.homework.HomeworkHeader">
 
     <TextView
         android:id="@+id/homeworkHeaderDay"
@@ -25,6 +25,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="10dp"
+        android:layout_marginLeft="10dp"
         android:gravity="end"
         android:textSize="13sp"
         tools:text="22.02.2022" />
diff --git a/app/src/main/res/layout/item_about.xml b/app/src/main/res/layout/item_about.xml
index f988c47ba..b5dc3758c 100644
--- a/app/src/main/res/layout/item_about.xml
+++ b/app/src/main/res/layout/item_about.xml
@@ -4,16 +4,17 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="72dp"
-    android:background="?selectableItemBackground"
-    tools:context=".ui.modules.about.AboutAdapter">
+    android:background="?selectableItemBackground">
 
     <ImageView
         android:id="@+id/aboutItemImage"
         android:layout_width="24dp"
         android:layout_height="24dp"
         android:layout_marginStart="16dp"
+        android:layout_marginLeft="16dp"
         android:layout_marginTop="16dp"
         android:layout_marginEnd="32dp"
+        android:layout_marginRight="32dp"
         app:tint="?colorOnBackground"
         tools:ignore="ContentDescription"
         tools:src="@drawable/ic_all_about" />
@@ -23,7 +24,9 @@
         android:layout_width="wrap_content"
         android:layout_height="32dp"
         android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
         android:layout_toEndOf="@id/aboutItemImage"
+        android:layout_toRightOf="@id/aboutItemImage"
         android:ellipsize="end"
         android:gravity="bottom"
         android:maxLines="1"
@@ -36,11 +39,13 @@
         android:layout_height="20dp"
         android:layout_below="@id/aboutItemTitle"
         android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
         android:layout_toEndOf="@id/aboutItemImage"
+        android:layout_toRightOf="@id/aboutItemImage"
         android:ellipsize="end"
         android:gravity="bottom"
         android:maxLines="1"
         android:textColor="?android:textColorSecondary"
         android:textSize="14sp"
         tools:text="@tools:sample/lorem" />
-</RelativeLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_account.xml b/app/src/main/res/layout/item_account.xml
index 614e4d2df..309be8121 100644
--- a/app/src/main/res/layout/item_account.xml
+++ b/app/src/main/res/layout/item_account.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -10,44 +10,44 @@
     android:paddingLeft="24dp"
     android:paddingEnd="24dp"
     android:paddingRight="24dp"
-    tools:context=".ui.modules.account.AccountAdapter">
+    tools:context=".ui.modules.account.AccountItem">
 
     <ImageView
         android:id="@+id/accountItemImage"
         android:layout_width="40dp"
         android:layout_height="40dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
+        android:layout_centerVertical="true"
         app:srcCompat="@drawable/ic_all_account"
         tools:ignore="ContentDescription"
         tools:tint="@color/colorPrimary" />
 
     <TextView
         android:id="@+id/accountItemName"
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_alignTop="@+id/accountItemImage"
         android:layout_marginStart="20dp"
+        android:layout_marginLeft="20dp"
+        android:layout_toEndOf="@id/accountItemImage"
+        android:layout_toRightOf="@id/accountItemImage"
         android:ellipsize="end"
         android:maxLines="1"
         android:textSize="16sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/accountItemImage"
-        app:layout_constraintTop_toTopOf="@+id/accountItemImage"
         tools:text="@tools:sample/full_names" />
 
     <TextView
         android:id="@+id/accountItemSchool"
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_below="@id/accountItemName"
         android:layout_marginStart="20dp"
+        android:layout_marginLeft="20dp"
         android:layout_marginTop="3dp"
+        android:layout_toEndOf="@id/accountItemImage"
+        android:layout_toRightOf="@id/accountItemImage"
         android:ellipsize="end"
         android:maxLines="1"
         android:textColor="?android:textColorSecondary"
         android:textSize="12sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/accountItemImage"
-        app:layout_constraintTop_toBottomOf="@id/accountItemName"
         tools:text="@tools:sample/lorem/random" />
-</androidx.constraintlayout.widget.ConstraintLayout>
+</RelativeLayout>
diff --git a/app/src/main/res/layout/item_attendance.xml b/app/src/main/res/layout/item_attendance.xml
index 6917c6ce0..56bcab440 100644
--- a/app/src/main/res/layout/item_attendance.xml
+++ b/app/src/main/res/layout/item_attendance.xml
@@ -11,7 +11,7 @@
     android:paddingEnd="12dp"
     android:paddingRight="12dp"
     android:paddingBottom="7dp"
-    tools:context=".ui.modules.attendance.AttendanceAdapter">
+    tools:context=".ui.modules.attendance.AttendanceItem">
 
     <LinearLayout
         android:id="@+id/attendanceItemNumberContainer"
@@ -29,8 +29,8 @@
             android:maxLength="2"
             android:textSize="32sp"
             android:visibility="gone"
-            tools:text="5"
-            tools:visibility="visible" />
+            tools:visibility="visible"
+            tools:text="5" />
 
         <com.google.android.material.checkbox.MaterialCheckBox
             android:id="@+id/attendanceItemExcuseCheckbox"
@@ -54,9 +54,13 @@
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
         android:layout_marginStart="10dp"
+        android:layout_marginLeft="10dp"
         android:layout_marginEnd="40dp"
+        android:layout_marginRight="40dp"
         android:layout_toStartOf="@id/attendanceItemAlert"
+        android:layout_toLeftOf="@id/attendanceItemAlert"
         android:layout_toEndOf="@+id/attendanceItemNumberContainer"
+        android:layout_toRightOf="@+id/attendanceItemNumberContainer"
         android:ellipsize="end"
         android:maxLines="1"
         android:textSize="17sp"
@@ -67,6 +71,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignStart="@id/attendanceItemSubject"
+        android:layout_alignLeft="@id/attendanceItemSubject"
         android:layout_alignBottom="@+id/attendanceItemNumberContainer"
         android:maxLines="1"
         android:textColor="?android:textColorSecondary"
@@ -78,6 +83,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
         android:layout_marginTop="10dp"
         app:srcCompat="@drawable/ic_all_mark"
         app:tint="?colorPrimary"
diff --git a/app/src/main/res/layout/item_attendance_summary.xml b/app/src/main/res/layout/item_attendance_summary.xml
index 155526299..b49461955 100644
--- a/app/src/main/res/layout/item_attendance_summary.xml
+++ b/app/src/main/res/layout/item_attendance_summary.xml
@@ -3,8 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical"
-    tools:context=".ui.modules.attendance.summary.AttendanceSummaryAdapter">
+    android:orientation="vertical">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -21,6 +20,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginEnd="40dp"
+            android:layout_marginRight="40dp"
             android:layout_weight="1"
             android:textSize="17sp"
             tools:text="January" />
@@ -46,6 +46,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="20dp"
+            android:layout_marginLeft="20dp"
             android:layout_weight="1"
             android:text="@string/attendance_present"
             android:textSize="14sp" />
@@ -56,7 +57,9 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="10dp"
+            android:layout_marginLeft="10dp"
             android:layout_marginEnd="25dp"
+            android:layout_marginRight="25dp"
             android:gravity="end"
             android:textSize="12sp"
             tools:text="50" />
@@ -74,6 +77,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="20dp"
+            android:layout_marginLeft="20dp"
             android:layout_weight="1"
             android:text="@string/attendance_absence_unexcused"
             android:textSize="14sp" />
@@ -84,7 +88,9 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="10dp"
+            android:layout_marginLeft="10dp"
             android:layout_marginEnd="25dp"
+            android:layout_marginRight="25dp"
             android:gravity="end"
             android:textSize="12sp"
             tools:text="0" />
@@ -102,6 +108,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="20dp"
+            android:layout_marginLeft="20dp"
             android:layout_weight="1"
             android:text="@string/attendance_absence_excused"
             android:textSize="14sp" />
@@ -112,7 +119,9 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="10dp"
+            android:layout_marginLeft="10dp"
             android:layout_marginEnd="25dp"
+            android:layout_marginRight="25dp"
             android:gravity="end"
             android:textSize="12sp"
             tools:text="25" />
@@ -130,6 +139,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="20dp"
+            android:layout_marginLeft="20dp"
             android:layout_weight="1"
             android:text="@string/attendance_absence_school"
             android:textSize="14sp" />
@@ -140,7 +150,9 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="10dp"
+            android:layout_marginLeft="10dp"
             android:layout_marginEnd="25dp"
+            android:layout_marginRight="25dp"
             android:gravity="end"
             android:textSize="12sp"
             tools:text="0" />
@@ -158,6 +170,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="20dp"
+            android:layout_marginLeft="20dp"
             android:layout_weight="1"
             android:text="@string/attendance_exemption"
             android:textSize="14sp" />
@@ -168,7 +181,9 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="10dp"
+            android:layout_marginLeft="10dp"
             android:layout_marginEnd="25dp"
+            android:layout_marginRight="25dp"
             android:gravity="end"
             android:textSize="12sp"
             tools:text="6" />
@@ -186,6 +201,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="20dp"
+            android:layout_marginLeft="20dp"
             android:layout_weight="1"
             android:text="@string/attendance_unexcused_lateness"
             android:textSize="14sp" />
@@ -196,7 +212,9 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="10dp"
+            android:layout_marginLeft="10dp"
             android:layout_marginEnd="25dp"
+            android:layout_marginRight="25dp"
             android:gravity="end"
             android:textSize="12sp"
             tools:text="0" />
@@ -214,6 +232,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="20dp"
+            android:layout_marginLeft="20dp"
             android:layout_weight="1"
             android:text="@string/attendance_excused_lateness"
             android:textSize="14sp" />
@@ -224,7 +243,9 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="10dp"
+            android:layout_marginLeft="10dp"
             android:layout_marginEnd="25dp"
+            android:layout_marginRight="25dp"
             android:gravity="end"
             android:textSize="12sp"
             tools:text="0" />
diff --git a/app/src/main/res/layout/item_completed_lesson.xml b/app/src/main/res/layout/item_completed_lesson.xml
index b9beec804..8b49ba765 100644
--- a/app/src/main/res/layout/item_completed_lesson.xml
+++ b/app/src/main/res/layout/item_completed_lesson.xml
@@ -3,12 +3,16 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?selectableItemBackground"
+    android:background="@drawable/ic_all_divider"
+    android:foreground="?selectableItemBackground"
     android:paddingStart="8dp"
+    android:paddingLeft="8dp"
     android:paddingTop="6dp"
     android:paddingEnd="12dp"
+    android:paddingRight="12dp"
     android:paddingBottom="6dp"
-    tools:context=".ui.modules.timetable.completed.CompletedLessonsAdapter">
+    tools:context=".ui.modules.timetable.completed.CompletedLessonItem"
+    tools:ignore="UnusedAttribute">
 
     <TextView
         android:id="@+id/completedLessonItemNumber"
@@ -28,9 +32,13 @@
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
         android:layout_marginStart="8dp"
+        android:layout_marginLeft="8dp"
         android:layout_marginEnd="40dp"
+        android:layout_marginRight="40dp"
         android:layout_toStartOf="@id/completedLessonItemAlert"
+        android:layout_toLeftOf="@id/completedLessonItemAlert"
         android:layout_toEndOf="@+id/completedLessonItemNumber"
+        android:layout_toRightOf="@+id/completedLessonItemNumber"
         android:ellipsize="end"
         android:maxLines="1"
         android:textSize="17sp"
@@ -41,9 +49,12 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignStart="@id/completedLessonItemSubject"
+        android:layout_alignLeft="@id/completedLessonItemSubject"
         android:layout_alignEnd="@+id/completedLessonItemAlert"
+        android:layout_alignRight="@+id/completedLessonItemAlert"
         android:layout_alignBottom="@+id/completedLessonItemNumber"
         android:layout_marginEnd="40dp"
+        android:layout_marginRight="40dp"
         android:ellipsize="end"
         android:maxLines="1"
         android:textColor="?android:textColorSecondary"
@@ -55,6 +66,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
         android:tint="?colorTimetableChange"
         app:srcCompat="@drawable/ic_timetable_swap"
diff --git a/app/src/main/res/layout/item_contributor.xml b/app/src/main/res/layout/item_creator.xml
similarity index 74%
rename from app/src/main/res/layout/item_contributor.xml
rename to app/src/main/res/layout/item_creator.xml
index 36eb64ecc..1a8d0285e 100644
--- a/app/src/main/res/layout/item_contributor.xml
+++ b/app/src/main/res/layout/item_creator.xml
@@ -3,31 +3,32 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?selectableItemBackground"
     android:minHeight="56dp"
-    android:orientation="vertical"
-    tools:context=".ui.modules.about.contributor.ContributorAdapter">
+    android:background="?selectableItemBackground"
+    android:orientation="vertical">
 
     <ImageView
         android:id="@+id/creatorItemAvatar"
         android:layout_width="40dp"
         android:layout_height="40dp"
+        android:contentDescription="@string/creator_avatar_description"
+        android:layout_marginLeft="16dp"
         android:layout_marginStart="16dp"
         android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
-        android:contentDescription="@string/contributor_avatar_description" />
+        android:layout_marginBottom="8dp"/>
 
     <TextView
         android:id="@+id/creatorItemName"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
-        android:layout_marginStart="16dp"
-        android:layout_marginLeft="16dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp"
-        android:layout_toEndOf="@id/creatorItemAvatar"
         android:gravity="bottom"
         android:textSize="16sp"
-        tools:text="@tools:sample/lorem" />
+        tools:text="@tools:sample/lorem"
+        android:layout_centerVertical="true"
+        android:layout_toEndOf="@id/creatorItemAvatar"
+        android:layout_toRightOf="@id/creatorItemAvatar"
+        android:layout_marginLeft="16dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_marginEnd="16dp" />
 </RelativeLayout>
diff --git a/app/src/main/res/layout/item_exam.xml b/app/src/main/res/layout/item_exam.xml
index bd1d47312..459a7ecb3 100644
--- a/app/src/main/res/layout/item_exam.xml
+++ b/app/src/main/res/layout/item_exam.xml
@@ -4,13 +4,14 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?selectableItemBackground"
-    tools:context=".ui.modules.exam.ExamAdapter">
+    tools:context=".ui.modules.exam.ExamItem">
 
     <TextView
         android:id="@+id/examItemSubject"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="20dp"
+        android:layout_marginLeft="20dp"
         android:layout_marginTop="10dp"
         android:textSize="15sp"
         tools:text="@tools:sample/lorem" />
@@ -21,6 +22,7 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/examItemSubject"
         android:layout_alignStart="@id/examItemSubject"
+        android:layout_alignLeft="@id/examItemSubject"
         android:layout_marginTop="5dp"
         android:layout_marginBottom="5dp"
         android:textSize="13sp"
@@ -32,11 +34,15 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/examItemSubject"
         android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
         android:layout_marginStart="10dp"
+        android:layout_marginLeft="10dp"
         android:layout_marginTop="5dp"
         android:layout_marginEnd="20dp"
+        android:layout_marginRight="20dp"
         android:layout_marginBottom="10dp"
         android:layout_toEndOf="@id/examItemType"
+        android:layout_toRightOf="@id/examItemType"
         android:gravity="end"
         android:textSize="13sp"
         tools:text="@tools:sample/lorem" />
diff --git a/app/src/main/res/layout/item_grade_details.xml b/app/src/main/res/layout/item_grade_details.xml
index ccc968c08..d6d99d9b8 100644
--- a/app/src/main/res/layout/item_grade_details.xml
+++ b/app/src/main/res/layout/item_grade_details.xml
@@ -1,82 +1,82 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/grade_subitem_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?android:windowBackground">
+    android:background="?selectableItemBackground"
+    android:paddingStart="12dp"
+    android:paddingLeft="12dp"
+    android:paddingTop="7dp"
+    android:paddingEnd="12dp"
+    android:paddingRight="12dp"
+    android:paddingBottom="7dp"
+    tools:context=".ui.modules.grade.details.GradeDetailsItem">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/gradeSubItemContainer"
-        android:layout_width="match_parent"
+    <TextView
+        android:id="@+id/gradeItemValue"
+        android:layout_width="45dp"
+        android:layout_height="40dp"
+        android:layout_centerVertical="true"
+        android:background="@color/grade_material_default"
+        android:gravity="center"
+        android:maxLength="5"
+        android:textColor="@android:color/white"
+        android:textSize="16sp"
+        tools:text="6" />
+
+    <TextView
+        android:id="@+id/gradeItemDescription"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:background="?selectableItemBackground"
-        android:paddingStart="12dp"
-        android:paddingTop="7dp"
-        android:paddingEnd="12dp"
-        android:paddingBottom="7dp"
-        tools:context=".ui.modules.grade.details.GradeDetailsAdapter">
+        android:layout_alignParentTop="true"
+        android:layout_marginStart="10dp"
+        android:layout_marginLeft="10dp"
+        android:layout_marginEnd="20dp"
+        android:layout_marginRight="20dp"
+        android:layout_toStartOf="@id/gradeItemNote"
+        android:layout_toLeftOf="@id/gradeItemNote"
+        android:layout_toEndOf="@+id/gradeItemValue"
+        android:layout_toRightOf="@+id/gradeItemValue"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textSize="14sp"
+        tools:text="@tools:sample/lorem" />
 
-        <TextView
-            android:id="@+id/gradeItemValue"
-            android:layout_width="45dp"
-            android:layout_height="40dp"
-            android:background="@color/grade_material_default"
-            android:gravity="center"
-            android:maxLength="5"
-            android:textColor="@android:color/white"
-            android:textSize="16sp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:text="6" />
+    <TextView
+        android:id="@+id/gradeItemDate"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignStart="@+id/gradeItemDescription"
+        android:layout_alignLeft="@+id/gradeItemDescription"
+        android:layout_alignBottom="@+id/gradeItemValue"
+        android:textSize="12sp"
+        tools:text="@tools:sample/lorem" />
 
-        <TextView
-            android:id="@+id/gradeItemDescription"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:layout_marginEnd="20dp"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:textSize="14sp"
-            app:layout_constraintEnd_toStartOf="@id/gradeItemNote"
-            app:layout_constraintStart_toEndOf="@+id/gradeItemValue"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:text="@tools:sample/lorem" />
+    <TextView
+        android:id="@+id/gradeItemWeight"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBottom="@+id/gradeItemValue"
+        android:layout_marginStart="10dp"
+        android:layout_marginLeft="10dp"
+        android:layout_marginEnd="20dp"
+        android:layout_marginRight="20dp"
+        android:layout_toStartOf="@id/gradeItemNote"
+        android:layout_toLeftOf="@id/gradeItemNote"
+        android:layout_toEndOf="@+id/gradeItemDate"
+        android:layout_toRightOf="@+id/gradeItemDate"
+        android:textSize="12sp"
+        tools:text="@tools:sample/lorem" />
 
-        <TextView
-            android:id="@+id/gradeItemDate"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:maxLines="1"
-            android:textSize="12sp"
-            app:layout_constraintBottom_toBottomOf="@+id/gradeItemValue"
-            app:layout_constraintStart_toStartOf="@+id/gradeItemDescription"
-            tools:text="@tools:sample/date/ddmmyy" />
-
-        <TextView
-            android:id="@+id/gradeItemWeight"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:layout_marginEnd="20dp"
-            android:maxLines="1"
-            android:textSize="12sp"
-            app:layout_constraintBottom_toBottomOf="@+id/gradeItemValue"
-            app:layout_constraintEnd_toStartOf="@id/gradeItemNote"
-            app:layout_constraintStart_toEndOf="@+id/gradeItemDate"
-            tools:text="@tools:sample/lorem" />
-
-        <ImageView
-            android:id="@+id/gradeItemNote"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/ic_all_round_mark"
-            app:tint="?colorPrimary"
-            tools:ignore="contentDescription" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</LinearLayout>
+    <ImageView
+        android:id="@+id/gradeItemNote"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:layout_marginTop="10dp"
+        app:srcCompat="@drawable/ic_all_round_mark"
+        app:tint="?colorPrimary"
+        tools:ignore="contentDescription" />
+</RelativeLayout>
diff --git a/app/src/main/res/layout/item_grade_statistics_bar.xml b/app/src/main/res/layout/item_grade_statistics_bar.xml
deleted file mode 100644
index 4557412f5..000000000
--- a/app/src/main/res/layout/item_grade_statistics_bar.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <TextView
-        android:id="@+id/gradeStatisticsBarTitle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="?colorControlHighlight"
-        android:paddingLeft="20dp"
-        android:paddingTop="10dp"
-        android:paddingRight="20dp"
-        android:paddingBottom="10dp"
-        android:textSize="18sp"
-        tools:text="Matematyka" />
-
-    <com.github.mikephil.charting.charts.BarChart
-        android:id="@+id/gradeStatisticsBar"
-        android:layout_width="match_parent"
-        android:layout_height="400dp"
-        android:layout_margin="10dp"
-        android:background="?android:windowBackground"
-        tools:context=".ui.modules.grade.statistics.GradeStatisticsAdapter" />
-
-</LinearLayout>
diff --git a/app/src/main/res/layout/item_grade_statistics_pie.xml b/app/src/main/res/layout/item_grade_statistics_pie.xml
deleted file mode 100644
index 15992a37e..000000000
--- a/app/src/main/res/layout/item_grade_statistics_pie.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <TextView
-        android:id="@+id/gradeStatisticsPieTitle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="?colorControlHighlight"
-        android:paddingLeft="20dp"
-        android:paddingTop="10dp"
-        android:paddingRight="20dp"
-        android:paddingBottom="10dp"
-        android:textSize="18sp"
-        tools:text="Matematyka" />
-
-    <com.github.mikephil.charting.charts.PieChart
-        android:id="@+id/gradeStatisticsPie"
-        android:layout_width="match_parent"
-        android:layout_height="400dp"
-        android:layout_margin="10dp"
-        android:background="?android:windowBackground"
-        tools:context=".ui.modules.grade.statistics.GradeStatisticsAdapter" />
-
-</LinearLayout>
diff --git a/app/src/main/res/layout/item_grade_summary.xml b/app/src/main/res/layout/item_grade_summary.xml
index 85a78571e..a3a49ab62 100644
--- a/app/src/main/res/layout/item_grade_summary.xml
+++ b/app/src/main/res/layout/item_grade_summary.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    tools:context=".ui.modules.grade.summary.GradeSummaryAdapter">
+    tools:context=".ui.modules.grade.summary.GradeSummaryItem">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -21,6 +21,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginEnd="40dp"
+            android:layout_marginRight="40dp"
             android:layout_weight="1"
             android:textSize="17sp"
             tools:text="@tools:sample/lorem" />
@@ -47,6 +48,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="20dp"
+            android:layout_marginLeft="20dp"
             android:layout_weight="1"
             android:text="@string/grade_summary_points"
             android:textSize="14sp" />
@@ -57,7 +59,9 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="10dp"
+            android:layout_marginLeft="10dp"
             android:layout_marginEnd="25dp"
+            android:layout_marginRight="25dp"
             android:gravity="end"
             android:textSize="12sp"
             tools:text="123/150" />
@@ -75,6 +79,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="20dp"
+            android:layout_marginLeft="20dp"
             android:layout_weight="1"
             android:text="@string/grade_summary_predicted_grade"
             android:textSize="14sp" />
@@ -85,7 +90,9 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="10dp"
+            android:layout_marginLeft="10dp"
             android:layout_marginEnd="25dp"
+            android:layout_marginRight="25dp"
             android:gravity="end"
             android:textSize="12sp"
             tools:text="5" />
@@ -103,6 +110,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="20dp"
+            android:layout_marginLeft="20dp"
             android:layout_weight="1"
             android:text="@string/grade_summary_final_grade"
             android:textSize="14sp" />
@@ -113,7 +121,9 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="10dp"
+            android:layout_marginLeft="10dp"
             android:layout_marginEnd="25dp"
+            android:layout_marginRight="25dp"
             android:gravity="end"
             android:textSize="12sp"
             tools:text="5" />
diff --git a/app/src/main/res/layout/item_homework.xml b/app/src/main/res/layout/item_homework.xml
index 89c3c6885..68169039d 100644
--- a/app/src/main/res/layout/item_homework.xml
+++ b/app/src/main/res/layout/item_homework.xml
@@ -1,83 +1,50 @@
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/homework_subitem_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?selectableItemBackground"
-    tools:context=".ui.modules.homework.HomeworkAdapter">
+    tools:context=".ui.modules.homework.HomeworkItem">
 
     <TextView
         android:id="@+id/homeworkItemSubject"
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="15dp"
+        android:layout_marginLeft="15dp"
         android:layout_marginTop="10dp"
         android:layout_marginBottom="5dp"
-        android:ellipsize="end"
-        android:singleLine="true"
-        android:textSize="16sp"
-        app:layout_constraintEnd_toStartOf="@+id/homeworkItemTeacher"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="@tools:sample/lorem/random" />
+        android:textSize="17sp"
+        tools:text="@tools:sample/lorem" />
 
     <TextView
         android:id="@+id/homeworkItemTeacher"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
         android:layout_marginStart="10dp"
+        android:layout_marginLeft="10dp"
         android:layout_marginTop="10dp"
         android:layout_marginEnd="15dp"
-        android:ellipsize="end"
+        android:layout_marginRight="15dp"
+        android:layout_toEndOf="@id/homeworkItemSubject"
+        android:layout_toRightOf="@id/homeworkItemSubject"
         android:gravity="end"
-        android:maxWidth="200dp"
-        android:minWidth="80dp"
-        android:singleLine="true"
         android:textSize="13sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/homeworkItemSubject"
-        app:layout_constraintTop_toTopOf="parent"
         tools:text="@tools:sample/full_names" />
 
     <TextView
         android:id="@+id/homeworkItemContent"
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="5dp"
-        android:layout_marginEnd="50dp"
+        android:layout_below="@id/homeworkItemSubject"
+        android:layout_alignStart="@id/homeworkItemSubject"
+        android:layout_alignLeft="@id/homeworkItemSubject"
+        android:layout_marginEnd="15dp"
+        android:layout_marginRight="15dp"
         android:layout_marginBottom="15dp"
-        android:ellipsize="end"
         android:lineSpacingMultiplier="1.2"
-        android:maxLines="2"
         android:textSize="14sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="@id/homeworkItemSubject"
-        app:layout_constraintTop_toBottomOf="@id/homeworkItemSubject"
-        tools:text="@tools:sample/lorem/random" />
-
-    <ImageView
-        android:id="@+id/homeworkItemCheckImage"
-        android:layout_width="32dp"
-        android:layout_height="32dp"
-        android:layout_marginTop="8dp"
-        app:layout_constraintEnd_toEndOf="@id/homeworkItemTeacher"
-        app:layout_constraintTop_toBottomOf="@id/homeworkItemTeacher"
-        app:srcCompat="@drawable/ic_check"
-        app:tint="?android:textColorSecondary"
-        tools:ignore="ContentDescription"
-        tools:visibility="gone" />
-
-    <ImageView
-        android:id="@+id/homeworkItemAttachmentImage"
-        android:layout_width="32dp"
-        android:layout_height="32dp"
-        android:layout_marginTop="8dp"
-        app:layout_constraintEnd_toEndOf="@id/homeworkItemTeacher"
-        app:layout_constraintTop_toBottomOf="@id/homeworkItemTeacher"
-        app:srcCompat="@drawable/ic_attachment"
-        app:tint="?android:textColorSecondary"
-        tools:ignore="ContentDescription"
-        tools:visibility="visible" />
-</androidx.constraintlayout.widget.ConstraintLayout>
+        tools:text="@tools:sample/lorem" />
+</RelativeLayout>
diff --git a/app/src/main/res/layout/item_homework_dialog_attachment.xml b/app/src/main/res/layout/item_homework_dialog_attachment.xml
deleted file mode 100644
index ec0b37f2f..000000000
--- a/app/src/main/res/layout/item_homework_dialog_attachment.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?selectableItemBackground"
-    android:paddingStart="20dp"
-    android:paddingTop="3dp"
-    android:paddingEnd="10dp"
-    android:paddingBottom="3dp">
-
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/homeworkDialogAttachment"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:drawablePadding="10dp"
-        android:textSize="12sp"
-        app:drawableStartCompat="@drawable/ic_attachment"
-        app:drawableTint="?colorOnBackground"
-        tools:text="@tools:sample/lorem" />
-</LinearLayout>
diff --git a/app/src/main/res/layout/item_homework_dialog_attachments_header.xml b/app/src/main/res/layout/item_homework_dialog_attachments_header.xml
deleted file mode 100644
index 383cbeaf7..000000000
--- a/app/src/main/res/layout/item_homework_dialog_attachments_header.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingStart="20dp"
-    android:paddingEnd="20dp">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        android:layout_marginBottom="3dp"
-        android:text="@string/homework_attachments"
-        android:textSize="17sp" />
-</LinearLayout>
diff --git a/app/src/main/res/layout/item_homework_dialog_details.xml b/app/src/main/res/layout/item_homework_dialog_details.xml
deleted file mode 100644
index 3b5705bf8..000000000
--- a/app/src/main/res/layout/item_homework_dialog_details.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:paddingStart="20dp"
-    android:paddingTop="20dp"
-    android:paddingEnd="20dp">
-
-    <ImageButton
-        android:id="@+id/homework_dialog_full_screen"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="end"
-        android:background="?selectableItemBackgroundBorderless"
-        android:padding="5dp"
-        app:srcCompat="@drawable/ic_fullscreen"
-        app:tint="?colorOnBackground"
-        tools:ignore="ContentDescription" />
-
-    <ImageButton
-        android:id="@+id/homework_dialog_full_screen_exit"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="end"
-        android:background="?selectableItemBackgroundBorderless"
-        android:padding="5dp"
-        android:visibility="gone"
-        app:srcCompat="@drawable/ic_fullscreen_exit"
-        app:tint="?colorOnBackground"
-        tools:ignore="ContentDescription" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="20dp"
-        android:text="@string/all_details"
-        android:textSize="20sp" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/all_subject"
-        android:textSize="17sp" />
-
-    <TextView
-        android:id="@+id/homeworkDialogSubject"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="3dp"
-        android:text="@string/all_no_data"
-        android:textIsSelectable="true"
-        android:textSize="12sp" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        android:text="@string/all_teacher"
-        android:textSize="17sp" />
-
-    <TextView
-        android:id="@+id/homeworkDialogTeacher"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="3dp"
-        android:text="@string/all_no_data"
-        android:textIsSelectable="true"
-        android:textSize="12sp" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        android:text="@string/all_date"
-        android:textSize="17sp" />
-
-    <TextView
-        android:id="@+id/homeworkDialogDate"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="3dp"
-        android:text="@string/all_no_data"
-        android:textIsSelectable="true"
-        android:textSize="12sp" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        android:text="@string/all_entry_date"
-        android:textSize="17sp" />
-
-    <TextView
-        android:id="@+id/homeworkDialogEntryDate"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="3dp"
-        android:text="@string/all_no_data"
-        android:textIsSelectable="true"
-        android:textSize="12sp" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        android:text="@string/all_content"
-        android:textSize="17sp" />
-
-    <TextView
-        android:id="@+id/homeworkDialogContent"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="3dp"
-        android:layout_marginBottom="10dp"
-        android:autoLink="web"
-        android:lineSpacingMultiplier="1.2"
-        android:text="@string/all_no_data"
-        android:textIsSelectable="true"
-        android:textSize="12sp"
-        tools:text="@tools:sample/lorem/random" />
-
-</LinearLayout>
diff --git a/app/src/main/res/layout/item_license.xml b/app/src/main/res/layout/item_license.xml
index aaa7cd349..6a864433a 100644
--- a/app/src/main/res/layout/item_license.xml
+++ b/app/src/main/res/layout/item_license.xml
@@ -8,18 +8,15 @@
     android:paddingStart="16dp"
     android:paddingLeft="16dp"
     android:paddingEnd="16dp"
-    android:paddingRight="16dp"
-    tools:context=".ui.modules.about.license.LicenseAdapter">
+    android:paddingRight="16dp">
 
     <TextView
         android:id="@+id/licenseItemName"
         android:layout_width="match_parent"
         android:layout_height="28dp"
-        android:ellipsize="end"
         android:gravity="bottom"
-        android:singleLine="true"
         android:textSize="16sp"
-        tools:text="@tools:sample/lorem/random" />
+        tools:text="@tools:sample/lorem" />
 
     <TextView
         android:id="@+id/licenseItemSummary"
diff --git a/app/src/main/res/layout/item_login_student_select.xml b/app/src/main/res/layout/item_login_student_select.xml
index 04858196c..254bff60f 100644
--- a/app/src/main/res/layout/item_login_student_select.xml
+++ b/app/src/main/res/layout/item_login_student_select.xml
@@ -2,29 +2,29 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/loginItemContainer"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?selectableItemBackground"
-    android:minHeight="72dp"
-    android:paddingTop="8dp"
-    android:paddingBottom="8dp"
-    tools:context=".ui.modules.login.studentselect.LoginStudentSelectAdapter">
+    android:layout_height="72dp"
+    android:background="?selectableItemBackground">
 
     <com.google.android.material.checkbox.MaterialCheckBox
         android:id="@+id/loginItemCheck"
         android:layout_width="32dp"
         android:layout_height="24dp"
-        android:layout_centerVertical="true"
         android:layout_marginStart="12dp"
+        android:layout_marginLeft="12dp"
+        android:layout_marginTop="24dp"
         android:layout_marginEnd="28dp"
+        android:layout_marginRight="28dp"
         android:background="@android:color/transparent"
         tools:text=" " />
 
     <TextView
         android:id="@+id/loginItemName"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="32dp"
         android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
         android:layout_toEndOf="@id/loginItemCheck"
+        android:layout_toRightOf="@id/loginItemCheck"
         android:ellipsize="end"
         android:gravity="bottom"
         android:maxLines="1"
@@ -34,31 +34,16 @@
     <TextView
         android:id="@+id/loginItemSchool"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="20dp"
         android:layout_below="@id/loginItemName"
         android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
         android:layout_toEndOf="@id/loginItemCheck"
+        android:layout_toRightOf="@id/loginItemCheck"
         android:ellipsize="end"
         android:gravity="bottom"
-        android:maxLines="2"
+        android:maxLines="1"
         android:textColor="?android:textColorSecondary"
         android:textSize="14sp"
         tools:text="@tools:sample/lorem/random" />
-
-    <TextView
-        android:id="@+id/loginItemSignedIn"
-        android:layout_width="wrap_content"
-        android:layout_height="20dp"
-        android:layout_below="@id/loginItemSchool"
-        android:layout_marginEnd="16dp"
-        android:layout_toEndOf="@id/loginItemCheck"
-        android:ellipsize="end"
-        android:enabled="false"
-        android:gravity="bottom"
-        android:maxLines="1"
-        android:text="@string/login_signed_in"
-        android:textColor="?android:textColorSecondary"
-        android:textSize="14sp"
-        android:visibility="gone"
-        tools:visibility="visible" />
 </RelativeLayout>
diff --git a/app/src/main/res/layout/item_message.xml b/app/src/main/res/layout/item_message.xml
index 111de88c9..ad914130a 100644
--- a/app/src/main/res/layout/item_message.xml
+++ b/app/src/main/res/layout/item_message.xml
@@ -1,7 +1,5 @@
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/relativeLayout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?selectableItemBackground"
@@ -9,56 +7,45 @@
     android:paddingTop="10dp"
     android:paddingRight="16dp"
     android:paddingBottom="10dp"
-    tools:context=".ui.modules.message.tab.MessageTabAdapter">
+    tools:context=".ui.modules.message.MessageItem">
 
     <TextView
         android:id="@+id/messageItemAuthor"
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="10dp"
+        android:layout_alignParentTop="true"
+        android:layout_marginEnd="40dp"
+        android:layout_marginRight="40dp"
         android:ellipsize="end"
-        android:singleLine="true"
+        android:maxLines="1"
         android:textSize="15sp"
-        app:layout_constraintEnd_toStartOf="@+id/messageItemDate"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="@tools:sample/lorem/random" />
+        tools:text="@tools:sample/full_names" />
 
     <TextView
         android:id="@+id/messageItemDate"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:layout_marginStart="10dp"
+        android:layout_marginLeft="10dp"
+        android:layout_toEndOf="@id/messageItemAuthor"
+        android:layout_toRightOf="@id/messageItemAuthor"
         android:gravity="end"
         android:textSize="13sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
         tools:text="@tools:sample/date/ddmmyy" />
 
     <TextView
         android:id="@+id/messageItemSubject"
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_below="@+id/messageItemAuthor"
+        android:layout_alignStart="@id/messageItemAuthor"
+        android:layout_alignLeft="@id/messageItemAuthor"
         android:layout_marginTop="5dp"
-        android:layout_marginEnd="10dp"
         android:ellipsize="end"
-        android:singleLine="true"
+        android:maxLines="1"
         android:textColor="?android:textColorSecondary"
         android:textSize="12sp"
-        app:layout_constraintEnd_toStartOf="@id/messageItemAttachmentIcon"
-        app:layout_constraintStart_toStartOf="@id/messageItemAuthor"
-        app:layout_constraintTop_toBottomOf="@+id/messageItemAuthor"
-        app:layout_goneMarginEnd="0dp"
         tools:text="@tools:sample/lorem/random" />
-
-    <ImageView
-        android:id="@+id/messageItemAttachmentIcon"
-        android:layout_width="16dp"
-        android:layout_height="16dp"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="@id/messageItemSubject"
-        app:layout_constraintEnd_toEndOf="@id/messageItemDate"
-        app:srcCompat="@drawable/ic_attachment"
-        app:tint="?colorOnBackground"
-        tools:ignore="ContentDescription"
-        tools:visibility="visible" />
-</androidx.constraintlayout.widget.ConstraintLayout>
+</RelativeLayout>
diff --git a/app/src/main/res/layout/item_message_attachment.xml b/app/src/main/res/layout/item_message_attachment.xml
deleted file mode 100644
index fa30e9af2..000000000
--- a/app/src/main/res/layout/item_message_attachment.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?selectableItemBackground"
-    android:paddingStart="16dp"
-    android:paddingTop="10dp"
-    android:paddingEnd="16dp"
-    android:paddingBottom="10dp">
-
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/messagePreviewAttachment"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:drawablePadding="10dp"
-        android:visibility="gone"
-        app:drawableStartCompat="@drawable/ic_attachment"
-        app:drawableTint="?colorOnBackground"
-        tools:text="@tools:sample/lorem"
-        tools:visibility="visible" />
-</LinearLayout>
diff --git a/app/src/main/res/layout/item_message_divider.xml b/app/src/main/res/layout/item_message_divider.xml
deleted file mode 100644
index 2f4ad3e67..000000000
--- a/app/src/main/res/layout/item_message_divider.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="2dp"
-    android:layout_marginTop="20dp"
-    android:layout_marginBottom="10dp"
-    android:background="?android:attr/listDivider" />
diff --git a/app/src/main/res/layout/item_message_preview.xml b/app/src/main/res/layout/item_message_preview.xml
deleted file mode 100644
index 6c130909d..000000000
--- a/app/src/main/res/layout/item_message_preview.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/messagePreviewContentContainer"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:padding="16dp">
-
-    <TextView
-        android:id="@+id/messagePreviewSubject"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="15dp"
-        android:lineSpacingMultiplier="1.2"
-        android:textSize="22sp"
-        tools:text="@tools:sample/lorem" />
-
-    <TextView
-        android:id="@+id/messagePreviewAuthor"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="4dp"
-        android:textColor="?android:textColorSecondary"
-        android:textSize="15sp"
-        tools:text="@tools:sample/full_names" />
-
-    <TextView
-        android:id="@+id/messagePreviewDate"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="15dp"
-        android:textColor="?android:textColorSecondary"
-        android:textSize="15sp"
-        tools:text="@tools:sample/date/ddmmyy" />
-
-    <TextView
-        android:id="@+id/messagePreviewContent"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:autoLink="web"
-        android:lineSpacingMultiplier="1.2"
-        android:textIsSelectable="true"
-        tools:text="@tools:sample/lorem/random" />
-</LinearLayout>
diff --git a/app/src/main/res/layout/item_mobile_device.xml b/app/src/main/res/layout/item_mobile_device.xml
index 3f3d0a751..95159d9bd 100644
--- a/app/src/main/res/layout/item_mobile_device.xml
+++ b/app/src/main/res/layout/item_mobile_device.xml
@@ -4,14 +4,16 @@
     android:id="@+id/mobileDevice_subitem_container"
     android:layout_width="match_parent"
     android:layout_height="64dp"
-    tools:context=".ui.modules.mobiledevice.MobileDeviceAdapter">
+    tools:context=".ui.modules.mobiledevice.MobileDeviceItem">
 
     <TextView
         android:id="@+id/mobileDeviceItemName"
         android:layout_width="match_parent"
         android:layout_height="32dp"
         android:layout_marginStart="16dp"
+        android:layout_marginLeft="16dp"
         android:layout_toStartOf="@id/mobileDeviceItemUnregister"
+        android:layout_toLeftOf="@id/mobileDeviceItemUnregister"
         android:ellipsize="end"
         android:gravity="bottom"
         android:maxLines="1"
@@ -24,7 +26,9 @@
         android:layout_height="20dp"
         android:layout_below="@id/mobileDeviceItemName"
         android:layout_marginStart="16dp"
+        android:layout_marginLeft="16dp"
         android:layout_toStartOf="@id/mobileDeviceItemUnregister"
+        android:layout_toLeftOf="@id/mobileDeviceItemUnregister"
         android:gravity="bottom"
         android:textColor="?android:textColorSecondary"
         android:textSize="14sp"
@@ -35,6 +39,7 @@
         android:layout_width="48dp"
         android:layout_height="48dp"
         android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
         android:layout_marginStart="4dp"
         android:layout_marginLeft="4dp"
diff --git a/app/src/main/res/layout/item_more.xml b/app/src/main/res/layout/item_more.xml
index c9063ccfe..6a941b96d 100644
--- a/app/src/main/res/layout/item_more.xml
+++ b/app/src/main/res/layout/item_more.xml
@@ -10,7 +10,7 @@
     android:paddingTop="8dp"
     android:paddingRight="16dp"
     android:paddingBottom="8dp"
-    tools:context=".ui.modules.more.MoreAdapter">
+    tools:context=".ui.modules.more.MoreItem">
 
     <ImageView
         android:id="@+id/moreItemImage"
@@ -27,6 +27,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:layout_marginStart="32dp"
+        android:layout_marginLeft="32dp"
         android:textSize="16sp"
         tools:text="@tools:sample/lorem" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/item_note.xml b/app/src/main/res/layout/item_note.xml
index 660f32e00..a5d3e3623 100644
--- a/app/src/main/res/layout/item_note.xml
+++ b/app/src/main/res/layout/item_note.xml
@@ -1,84 +1,61 @@
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/note_subitem_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?selectableItemBackground"
-    tools:context=".ui.modules.note.NoteAdapter">
+    tools:context=".ui.modules.note.NoteItem">
 
     <TextView
         android:id="@+id/noteItemDate"
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="15dp"
+        android:layout_marginLeft="15dp"
         android:layout_marginTop="10dp"
-        android:textColor="?android:textColorSecondary"
         android:textSize="15sp"
-        app:layout_constraintRight_toLeftOf="@+id/noteItemTeacher"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
         tools:text="@tools:sample/date/ddmmyy" />
 
     <TextView
         android:id="@+id/noteItemTeacher"
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
         android:layout_marginStart="10dp"
+        android:layout_marginLeft="10dp"
         android:layout_marginTop="10dp"
         android:layout_marginEnd="15dp"
-        android:ellipsize="end"
+        android:layout_marginRight="15dp"
+        android:layout_toEndOf="@id/noteItemDate"
+        android:layout_toRightOf="@id/noteItemDate"
         android:gravity="end"
-        android:singleLine="true"
         android:textSize="13sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/noteItemDate"
-        app:layout_constraintTop_toTopOf="parent"
         tools:text="@tools:sample/full_names" />
 
     <TextView
         android:id="@+id/noteItemType"
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_below="@id/noteItemDate"
+        android:layout_alignStart="@id/noteItemDate"
+        android:layout_alignLeft="@id/noteItemDate"
         android:layout_marginTop="5dp"
-        android:layout_marginEnd="10dp"
         android:layout_marginBottom="5dp"
-        android:ellipsize="end"
-        android:maxLines="2"
-        android:textSize="16sp"
-        app:layout_constraintLeft_toLeftOf="@id/noteItemDate"
-        app:layout_constraintRight_toLeftOf="@id/noteItemPoints"
-        app:layout_constraintTop_toBottomOf="@id/noteItemDate"
-        app:layout_goneMarginEnd="0dp"
+        android:textSize="13sp"
         tools:text="@tools:sample/lorem" />
 
-    <TextView
-        android:id="@+id/noteItemPoints"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:textSize="16sp"
-        android:textStyle="bold"
-        android:visibility="gone"
-        app:layout_constraintRight_toRightOf="@id/noteItemTeacher"
-        app:layout_constraintTop_toBottomOf="@id/noteItemTeacher"
-        tools:text="-5"
-        tools:textColor="@color/note_positive"
-        tools:visibility="visible" />
-
     <TextView
         android:id="@+id/noteItemContent"
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="5dp"
+        android:layout_below="@id/noteItemType"
+        android:layout_alignStart="@id/noteItemDate"
+        android:layout_alignLeft="@id/noteItemDate"
+        android:layout_marginEnd="15dp"
+        android:layout_marginRight="15dp"
         android:layout_marginBottom="15dp"
-        android:ellipsize="end"
         android:lineSpacingMultiplier="1.2"
-        android:maxLines="2"
         android:textSize="14sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="@id/noteItemDate"
-        app:layout_constraintRight_toRightOf="@+id/noteItemTeacher"
-        app:layout_constraintTop_toBottomOf="@id/noteItemType"
         tools:text="@tools:sample/lorem/random" />
-</androidx.constraintlayout.widget.ConstraintLayout>
+</RelativeLayout>
diff --git a/app/src/main/res/layout/item_teacher.xml b/app/src/main/res/layout/item_teacher.xml
index a30eb560b..3bac0573c 100644
--- a/app/src/main/res/layout/item_teacher.xml
+++ b/app/src/main/res/layout/item_teacher.xml
@@ -9,7 +9,7 @@
     android:paddingEnd="12dp"
     android:paddingRight="12dp"
     android:paddingBottom="7dp"
-    tools:context=".ui.modules.schoolandteachers.teacher.TeacherAdapter">
+    tools:context=".ui.modules.schoolandteachers.teacher.TeacherItem">
 
     <TextView
         android:id="@+id/teacherItemName"
@@ -17,6 +17,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
         android:layout_marginStart="10dp"
+        android:layout_marginLeft="10dp"
         android:ellipsize="end"
         android:maxLines="1"
         android:textSize="17sp"
@@ -27,8 +28,11 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="4dp"
+        android:layout_marginLeft="4dp"
         android:layout_marginEnd="40dp"
+        android:layout_marginRight="40dp"
         android:layout_toEndOf="@+id/teacherItemName"
+        android:layout_toRightOf="@+id/teacherItemName"
         android:maxLines="1"
         android:textColor="?android:textColorSecondary"
         android:textSize="17sp"
@@ -40,6 +44,7 @@
         android:layout_height="wrap_content"
         android:layout_below="@+id/teacherItemName"
         android:layout_alignStart="@id/teacherItemName"
+        android:layout_alignLeft="@id/teacherItemName"
         android:maxLines="1"
         android:textColor="?android:textColorSecondary"
         android:textSize="12sp"
diff --git a/app/src/main/res/layout/item_timetable.xml b/app/src/main/res/layout/item_timetable.xml
index 4e278261a..fcdae2e0a 100644
--- a/app/src/main/res/layout/item_timetable.xml
+++ b/app/src/main/res/layout/item_timetable.xml
@@ -1,15 +1,15 @@
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/relativeLayout2"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?selectableItemBackground"
     android:paddingStart="8dp"
+    android:paddingLeft="8dp"
     android:paddingTop="6dp"
     android:paddingEnd="12dp"
+    android:paddingRight="12dp"
     android:paddingBottom="6dp"
-    tools:context=".ui.modules.timetable.TimetableAdapter">
+    tools:context=".ui.modules.timetable.TimetableItem">
 
     <TextView
         android:id="@+id/timetableItemNumber"
@@ -18,61 +18,67 @@
         android:gravity="center"
         android:includeFontPadding="false"
         android:maxLength="2"
-        android:textColor="?android:textColorPrimary"
         android:textSize="32sp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
+        android:textColor="?android:textColorPrimary"
         tools:text="5" />
 
     <TextView
         android:id="@+id/timetableItemSubject"
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
         android:layout_marginStart="10dp"
-        android:layout_marginEnd="16dp"
+        android:layout_marginLeft="10dp"
+        android:layout_marginEnd="40dp"
+        android:layout_marginRight="40dp"
+        android:layout_toEndOf="@+id/timetableItemTimeStart"
+        android:layout_toRightOf="@+id/timetableItemTimeStart"
         android:ellipsize="end"
         android:maxLines="1"
-        android:textColor="?android:textColorPrimary"
         android:textSize="15sp"
-        app:layout_constraintEnd_toStartOf="@id/timetableItemTimeBarrier"
-        app:layout_constraintStart_toEndOf="@+id/timetableItemTimeStart"
-        app:layout_constraintTop_toTopOf="parent"
+        android:textColor="?android:textColorPrimary"
         tools:text="@tools:sample/lorem" />
 
     <TextView
         android:id="@+id/timetableItemTimeStart"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_toEndOf="@id/timetableItemNumber"
+        android:layout_toRightOf="@id/timetableItemNumber"
+        android:layout_marginLeft="8dp"
         android:layout_marginStart="8dp"
+        android:layout_alignTop="@id/timetableItemNumber"
         android:maxLines="1"
         android:textColor="?android:textColorSecondary"
         android:textSize="13sp"
-        app:layout_constraintStart_toEndOf="@id/timetableItemNumber"
-        app:layout_constraintTop_toTopOf="@id/timetableItemNumber"
         tools:text="11:11" />
 
     <TextView
         android:id="@+id/timetableItemTimeFinish"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_toEndOf="@id/timetableItemNumber"
+        android:layout_toRightOf="@id/timetableItemNumber"
+        android:layout_marginLeft="8dp"
         android:layout_marginStart="8dp"
+        android:layout_alignBottom="@+id/timetableItemNumber"
         android:maxLines="1"
         android:textColor="?android:textColorSecondary"
         android:textSize="13sp"
-        app:layout_constraintBottom_toBottomOf="@+id/timetableItemNumber"
-        app:layout_constraintStart_toEndOf="@id/timetableItemNumber"
         tools:text="12:00" />
 
     <TextView
         android:id="@+id/timetableItemRoom"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_alignBottom="@+id/timetableItemNumber"
         android:layout_marginStart="10dp"
+        android:layout_marginLeft="10dp"
+        android:layout_toEndOf="@+id/timetableItemTimeStart"
+        android:layout_toRightOf="@+id/timetableItemTimeStart"
         android:maxLines="1"
         android:textColor="?android:textColorSecondary"
         android:textSize="13sp"
-        app:layout_constraintBottom_toBottomOf="@+id/timetableItemNumber"
-        app:layout_constraintStart_toEndOf="@+id/timetableItemTimeStart"
         tools:text="22"
         tools:visibility="gone" />
 
@@ -80,78 +86,35 @@
         android:id="@+id/timetableItemTeacher"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_alignBottom="@+id/timetableItemNumber"
         android:layout_marginStart="10dp"
+        android:layout_marginLeft="10dp"
         android:layout_marginEnd="16dp"
-        android:ellipsize="end"
+        android:layout_marginRight="16dp"
+        android:layout_toEndOf="@id/timetableItemRoom"
+        android:layout_toRightOf="@id/timetableItemRoom"
         android:maxLines="1"
+        android:ellipsize="end"
         android:textColor="?android:textColorSecondary"
         android:textSize="13sp"
-        app:layout_constraintBottom_toBottomOf="@+id/timetableItemNumber"
-        app:layout_constraintStart_toEndOf="@id/timetableItemRoom"
         tools:text="Agata Kowalska - Błaszczyk"
         tools:visibility="gone" />
 
     <TextView
         android:id="@+id/timetableItemDescription"
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_alignTop="@+id/timetableItemTimeFinish"
         android:layout_marginStart="10dp"
+        android:layout_marginLeft="10dp"
         android:layout_marginTop="0dp"
         android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_toEndOf="@+id/timetableItemTimeStart"
+        android:layout_toRightOf="@+id/timetableItemTimeStart"
         android:textColor="?colorTimetableChange"
         android:textSize="13sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/timetableItemTimeStart"
-        app:layout_constraintTop_toTopOf="@+id/timetableItemTimeFinish"
         tools:text="Lekcja odwołana: uczniowie zwolnieni do domu"
         tools:visibility="visible" />
 
-    <androidx.constraintlayout.widget.Barrier
-        android:id="@+id/timetableItemTimeBarrier"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:barrierDirection="start"
-        app:constraint_referenced_ids="timetableItemTimeUntil,timetableItemTimeLeft" />
-
-    <TextView
-        android:id="@+id/timetableItemTimeUntil"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="4dp"
-        android:ellipsize="end"
-        android:gravity="center"
-        android:maxLines="1"
-        android:paddingLeft="4dp"
-        android:paddingRight="4dp"
-        android:textColor="?colorPrimary"
-        android:textSize="13sp"
-        android:visibility="gone"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="za 15 min"
-        tools:visibility="gone" />
-
-    <TextView
-        android:id="@+id/timetableItemTimeLeft"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:layout_marginStart="4dp"
-        android:background="@drawable/background_timetable_time_left"
-        android:ellipsize="end"
-        android:gravity="center"
-        android:includeFontPadding="false"
-        android:maxLines="1"
-        android:paddingLeft="7dp"
-        android:paddingTop="2dp"
-        android:paddingRight="7dp"
-        android:paddingBottom="2dp"
-        android:textColor="?colorOnPrimary"
-        android:textSize="13sp"
-        android:visibility="gone"
-        app:backgroundTint="?colorPrimary"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="jeszcze 15 min"
-        tools:visibility="visible" />
-</androidx.constraintlayout.widget.ConstraintLayout>
+</RelativeLayout>
diff --git a/app/src/main/res/layout/item_timetable_small.xml b/app/src/main/res/layout/item_timetable_small.xml
index 98a213ec3..39e84ae07 100644
--- a/app/src/main/res/layout/item_timetable_small.xml
+++ b/app/src/main/res/layout/item_timetable_small.xml
@@ -3,13 +3,14 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?selectableItemBackground"
-    tools:context=".ui.modules.timetable.TimetableAdapter">
+    tools:context=".ui.modules.timetable.TimetableItem">
 
     <TextView
         android:id="@+id/timetableSmallItemNumber"
         android:layout_width="40dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
+        android:layout_marginLeft="8dp"
         android:gravity="center"
         android:maxLength="2"
         android:textColor="?android:textColorPrimary"
@@ -22,10 +23,12 @@
         android:layout_height="wrap_content"
         android:layout_alignTop="@id/timetableSmallItemNumber"
         android:layout_marginStart="8dp"
-        android:layout_marginTop="1dp"
+        android:layout_marginLeft="8dp"
         android:layout_toEndOf="@id/timetableSmallItemNumber"
+        android:layout_toRightOf="@id/timetableSmallItemNumber"
+        android:maxLines="1"
         android:textColor="?android:textColorSecondary"
-        android:textSize="13sp"
+        android:textSize="15sp"
         tools:text="11:11" />
 
     <TextView
@@ -34,23 +37,29 @@
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
         android:layout_marginStart="10dp"
+        android:layout_marginLeft="10dp"
+        android:layout_marginEnd="10dp"
+        android:layout_marginRight="10dp"
         android:layout_toEndOf="@+id/timetableSmallItemTimeStart"
+        android:layout_toRightOf="@+id/timetableSmallItemTimeStart"
         android:ellipsize="end"
         android:maxLines="1"
         android:textColor="?android:textColorPrimary"
         android:textSize="15sp"
         tools:text="Sieci komputerowe" />
 
+
     <TextView
         android:id="@+id/timetableSmallItemRoom"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="10dp"
-        android:layout_marginTop="1dp"
+        android:layout_marginLeft="10dp"
         android:layout_toEndOf="@+id/timetableSmallItemSubject"
+        android:layout_toRightOf="@+id/timetableSmallItemSubject"
         android:maxLines="1"
         android:textColor="?android:textColorSecondary"
-        android:textSize="13sp"
+        android:textSize="15sp"
         tools:text="22" />
 
     <TextView
@@ -58,26 +67,15 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="10dp"
-        android:layout_marginTop="1dp"
+        android:layout_marginLeft="10dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
         android:layout_toEndOf="@id/timetableSmallItemRoom"
+        android:layout_toRightOf="@id/timetableSmallItemRoom"
         android:ellipsize="end"
         android:maxLines="1"
         android:textColor="?android:textColorSecondary"
-        android:textSize="13sp"
-        tools:text="Agata" />
-
-    <TextView
-        android:id="@+id/timetableSmallItemDescription"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="10dp"
-        android:layout_marginTop="1dp"
-        android:layout_marginEnd="16dp"
-        android:layout_toEndOf="@id/timetableSmallItemTeacher"
-        android:ellipsize="end"
-        android:singleLine="true"
-        android:textColor="?android:textColorSecondary"
-        android:textSize="13sp"
-        tools:text="zastępstwo jakieś tam gdzieś tam" />
+        android:textSize="15sp"
+        tools:text="Agata Kowalska - Błaszczyk" />
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/item_widget_timetable.xml b/app/src/main/res/layout/item_widget_timetable.xml
index 33f686dac..c69bade8a 100644
--- a/app/src/main/res/layout/item_widget_timetable.xml
+++ b/app/src/main/res/layout/item_widget_timetable.xml
@@ -12,12 +12,12 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@android:color/white"
-        android:paddingStart="6dp"
-        android:paddingLeft="6dp"
         android:paddingTop="6dp"
+        android:paddingBottom="6dp"
+        android:paddingLeft="6dp"
+        android:paddingStart="6dp"
         android:paddingEnd="12dp"
-        android:paddingRight="12dp"
-        android:paddingBottom="6dp">
+        android:paddingRight="12dp">
 
         <TextView
             android:id="@+id/timetableWidgetItemNumber"
@@ -26,8 +26,8 @@
             android:gravity="center"
             android:includeFontPadding="false"
             android:maxLength="2"
-            android:textColor="?android:textColorPrimary"
             android:textSize="28sp"
+            android:textColor="@android:color/black"
             tools:text="5" />
 
         <TextView
@@ -43,19 +43,19 @@
             android:layout_toRightOf="@+id/timetableWidgetItemTimeStart"
             android:ellipsize="end"
             android:maxLines="1"
-            android:textColor="@android:color/black"
             android:textSize="15sp"
+            android:textColor="@android:color/black"
             tools:text="@tools:sample/lorem" />
 
         <TextView
             android:id="@+id/timetableWidgetItemTimeStart"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignTop="@id/timetableWidgetItemNumber"
-            android:layout_marginStart="6dp"
-            android:layout_marginLeft="6dp"
             android:layout_toEndOf="@id/timetableWidgetItemNumber"
             android:layout_toRightOf="@id/timetableWidgetItemNumber"
+            android:layout_marginLeft="6dp"
+            android:layout_marginStart="6dp"
+            android:layout_alignTop="@id/timetableWidgetItemNumber"
             android:maxLines="1"
             android:textColor="@android:color/black"
             android:textSize="13sp"
@@ -116,15 +116,15 @@
             android:layout_alignTop="@+id/timetableWidgetItemTimeFinish"
             android:layout_marginStart="10dp"
             android:layout_marginLeft="10dp"
-            android:layout_marginTop="0dp"
             android:layout_marginEnd="16dp"
             android:layout_marginRight="16dp"
+            android:layout_marginTop="0dp"
             android:layout_toEndOf="@+id/timetableWidgetItemTimeStart"
             android:layout_toRightOf="@+id/timetableWidgetItemTimeStart"
             android:textColor="@color/timetable_change_dark"
             android:textSize="13sp"
             tools:text="Lekcja odwołana: uczniowie zwolnieni do domu"
-            tools:visibility="gone" />
+            tools:visibility="gone"/>
     </RelativeLayout>
 
     <FrameLayout
diff --git a/app/src/main/res/layout/item_widget_timetable_dark.xml b/app/src/main/res/layout/item_widget_timetable_dark.xml
index 3dfc3f548..3a143f747 100644
--- a/app/src/main/res/layout/item_widget_timetable_dark.xml
+++ b/app/src/main/res/layout/item_widget_timetable_dark.xml
@@ -12,10 +12,12 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@color/colorWidgetBackground"
-        android:paddingStart="6dp"
         android:paddingTop="6dp"
+        android:paddingBottom="6dp"
+        android:paddingLeft="6dp"
+        android:paddingStart="6dp"
         android:paddingEnd="12dp"
-        android:paddingBottom="6dp">
+        android:paddingRight="12dp">
 
         <TextView
             android:id="@+id/timetableWidgetItemNumber"
@@ -24,8 +26,8 @@
             android:gravity="center"
             android:includeFontPadding="false"
             android:maxLength="2"
-            android:textColor="@android:color/white"
             android:textSize="28sp"
+            android:textColor="@android:color/white"
             tools:text="5" />
 
         <TextView
@@ -34,21 +36,26 @@
             android:layout_height="wrap_content"
             android:layout_alignTop="@id/timetableWidgetItemNumber"
             android:layout_marginStart="10dp"
+            android:layout_marginLeft="10dp"
             android:layout_marginEnd="40dp"
+            android:layout_marginRight="40dp"
             android:layout_toEndOf="@+id/timetableWidgetItemTimeStart"
+            android:layout_toRightOf="@+id/timetableWidgetItemTimeStart"
             android:ellipsize="end"
             android:maxLines="1"
-            android:textColor="@android:color/white"
             android:textSize="15sp"
+            android:textColor="@android:color/white"
             tools:text="@tools:sample/lorem" />
 
         <TextView
             android:id="@+id/timetableWidgetItemTimeStart"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignTop="@id/timetableWidgetItemNumber"
-            android:layout_marginStart="6dp"
             android:layout_toEndOf="@id/timetableWidgetItemNumber"
+            android:layout_toRightOf="@id/timetableWidgetItemNumber"
+            android:layout_marginLeft="6dp"
+            android:layout_marginStart="6dp"
+            android:layout_alignTop="@id/timetableWidgetItemNumber"
             android:maxLines="1"
             android:textColor="@android:color/white"
             android:textSize="13sp"
@@ -60,7 +67,9 @@
             android:layout_height="wrap_content"
             android:layout_alignBottom="@+id/timetableWidgetItemNumber"
             android:layout_marginStart="6dp"
+            android:layout_marginLeft="6dp"
             android:layout_toEndOf="@id/timetableWidgetItemNumber"
+            android:layout_toRightOf="@id/timetableWidgetItemNumber"
             android:maxLines="1"
             android:textColor="@android:color/white"
             android:textSize="13sp"
@@ -72,7 +81,9 @@
             android:layout_height="wrap_content"
             android:layout_alignBottom="@+id/timetableWidgetItemNumber"
             android:layout_marginStart="10dp"
+            android:layout_marginLeft="10dp"
             android:layout_toEndOf="@+id/timetableWidgetItemTimeStart"
+            android:layout_toRightOf="@+id/timetableWidgetItemTimeStart"
             android:maxLines="1"
             android:textColor="@android:color/white"
             android:textSize="13sp"
@@ -85,8 +96,11 @@
             android:layout_height="wrap_content"
             android:layout_alignBottom="@+id/timetableWidgetItemNumber"
             android:layout_marginStart="8dp"
+            android:layout_marginLeft="8dp"
             android:layout_marginEnd="16dp"
+            android:layout_marginRight="16dp"
             android:layout_toEndOf="@id/timetableWidgetItemRoom"
+            android:layout_toRightOf="@id/timetableWidgetItemRoom"
             android:ellipsize="end"
             android:maxLines="1"
             android:textColor="@color/timetable_change_light"
@@ -101,13 +115,16 @@
             android:layout_height="wrap_content"
             android:layout_alignTop="@+id/timetableWidgetItemTimeFinish"
             android:layout_marginStart="10dp"
-            android:layout_marginTop="0dp"
+            android:layout_marginLeft="10dp"
             android:layout_marginEnd="16dp"
+            android:layout_marginRight="16dp"
+            android:layout_marginTop="0dp"
             android:layout_toEndOf="@+id/timetableWidgetItemTimeStart"
+            android:layout_toRightOf="@+id/timetableWidgetItemTimeStart"
             android:textColor="@color/timetable_change_light"
             android:textSize="13sp"
             tools:text="Lekcja odwołana: uczniowie zwolnieni do domu"
-            tools:visibility="gone" />
+            tools:visibility="gone"/>
     </RelativeLayout>
 
     <FrameLayout
diff --git a/app/src/main/res/layout/item_widget_timetable_small.xml b/app/src/main/res/layout/item_widget_timetable_small.xml
deleted file mode 100644
index 3a3a2d658..000000000
--- a/app/src/main/res/layout/item_widget_timetable_small.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@android:color/white"
-    android:orientation="vertical"
-    android:paddingStart="6dp"
-    android:paddingLeft="6dp"
-    android:paddingEnd="6dp"
-    android:paddingRight="6dp"
-    tools:context=".ui.modules.timetablewidget.TimetableWidgetFactory">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <TextView
-            android:id="@+id/timetableWidgetItemNumber"
-            android:layout_width="40dp"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:maxLength="2"
-            android:textColor="@android:color/black"
-            android:textSize="15sp"
-            tools:text="5" />
-
-        <TextView
-            android:id="@+id/timetableWidgetItemTimeStart"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:maxLines="1"
-            android:textColor="@android:color/black"
-            android:textSize="13sp"
-            tools:text="11:11" />
-
-        <TextView
-            android:id="@+id/timetableWidgetItemTimeFinish"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:visibility="gone" />
-
-        <TextView
-            android:id="@+id/timetableWidgetItemSubject"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:textColor="@android:color/black"
-            android:textSize="15sp"
-            tools:text="Sieci komputerowe" />
-
-
-        <TextView
-            android:id="@+id/timetableWidgetItemRoom"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:maxLines="1"
-            android:textColor="@android:color/black"
-            android:textSize="15sp"
-            tools:text="22" />
-
-        <TextView
-            android:id="@+id/timetableWidgetItemTeacher"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:textColor="@android:color/black"
-            android:textSize="15sp"
-            tools:text="Agata" />
-
-        <TextView
-            android:id="@+id/timetableWidgetItemDescription"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:layout_marginLeft="10dp"
-            android:layout_marginEnd="10dp"
-            android:layout_marginRight="10dp"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:singleLine="true"
-            android:textColor="@android:color/black"
-            android:textSize="15sp"
-            android:visibility="visible"
-            tools:text="@tools:sample/lorem/random" />
-    </LinearLayout>
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="@color/colorDivider" />
-</LinearLayout>
diff --git a/app/src/main/res/layout/item_widget_timetable_small_dark.xml b/app/src/main/res/layout/item_widget_timetable_small_dark.xml
deleted file mode 100644
index 0cc297091..000000000
--- a/app/src/main/res/layout/item_widget_timetable_small_dark.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@color/colorWidgetBackground"
-    android:orientation="vertical"
-    android:paddingStart="6dp"
-    android:paddingLeft="6dp"
-    android:paddingEnd="6dp"
-    android:paddingRight="6dp"
-    tools:context=".ui.modules.timetablewidget.TimetableWidgetFactory">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <TextView
-            android:id="@+id/timetableWidgetItemNumber"
-            android:layout_width="40dp"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:maxLength="2"
-            android:textColor="@android:color/white"
-            android:textSize="15sp"
-            tools:text="5" />
-
-        <TextView
-            android:id="@+id/timetableWidgetItemTimeStart"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:layout_marginLeft="6dp"
-            android:maxLines="1"
-            android:textColor="@android:color/white"
-            android:textSize="13sp"
-            tools:text="11:11" />
-
-        <TextView
-            android:id="@+id/timetableWidgetItemTimeFinish"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:visibility="gone" />
-
-        <TextView
-            android:id="@+id/timetableWidgetItemSubject"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:layout_marginLeft="10dp"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:textColor="@android:color/white"
-            android:textSize="15sp"
-            tools:text="Sieci komputerowe" />
-
-        <TextView
-            android:id="@+id/timetableWidgetItemRoom"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:layout_marginLeft="10dp"
-            android:maxLines="1"
-            android:textColor="@android:color/white"
-            android:textSize="15sp"
-            tools:text="22" />
-
-        <TextView
-            android:id="@+id/timetableWidgetItemTeacher"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:layout_marginLeft="10dp"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:textColor="@android:color/white"
-            android:textSize="15sp"
-            tools:text="Agata" />
-
-        <TextView
-            android:id="@+id/timetableWidgetItemDescription"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:layout_marginLeft="10dp"
-            android:layout_marginEnd="10dp"
-            android:layout_marginRight="10dp"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:singleLine="true"
-            android:textColor="@android:color/white"
-            android:textSize="15sp"
-            android:visibility="visible"
-            tools:text="@tools:sample/lorem/random" />
-    </LinearLayout>
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="@color/colorDividerInverse" />
-</LinearLayout>
diff --git a/app/src/main/res/layout/scrollable_header_about.xml b/app/src/main/res/layout/scrollable_header_about.xml
index 72186bf79..9b7bb7324 100644
--- a/app/src/main/res/layout/scrollable_header_about.xml
+++ b/app/src/main/res/layout/scrollable_header_about.xml
@@ -4,14 +4,14 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="104dp"
-    android:orientation="vertical"
-    tools:context=".ui.modules.about.AboutAdapter">
+    android:orientation="vertical">
 
     <ImageView
         android:id="@+id/aboutScrollableHeaderIcon"
         android:layout_width="40dp"
         android:layout_height="40dp"
         android:layout_marginEnd="24dp"
+        android:layout_marginRight="24dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintHorizontal_chainStyle="packed"
         app:layout_constraintLeft_toLeftOf="parent"
diff --git a/app/src/main/res/layout/scrollable_header_attendance_summary.xml b/app/src/main/res/layout/scrollable_header_attendance_summary.xml
index 4593a5b6a..94de11076 100644
--- a/app/src/main/res/layout/scrollable_header_attendance_summary.xml
+++ b/app/src/main/res/layout/scrollable_header_attendance_summary.xml
@@ -6,8 +6,7 @@
     android:layout_marginTop="20dp"
     android:layout_marginBottom="20dp"
     android:gravity="center_horizontal"
-    android:orientation="vertical"
-    tools:context=".ui.modules.attendance.summary.AttendanceSummaryAdapter">
+    android:orientation="vertical">
 
     <TextView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/scrollable_header_grade_summary.xml b/app/src/main/res/layout/scrollable_header_grade_summary.xml
index 2eea20f42..ec069f8cf 100644
--- a/app/src/main/res/layout/scrollable_header_grade_summary.xml
+++ b/app/src/main/res/layout/scrollable_header_grade_summary.xml
@@ -5,14 +5,14 @@
     android:layout_height="wrap_content"
     android:layout_marginBottom="20dp"
     android:gravity="center_horizontal"
-    android:orientation="horizontal"
-    tools:context=".ui.modules.grade.summary.GradeSummaryAdapter">
+    android:orientation="horizontal">
 
     <LinearLayout
         android:layout_width="150dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="20dp"
         android:layout_marginEnd="5dp"
+        android:layout_marginRight="5dp"
         android:orientation="vertical">
 
         <TextView
@@ -54,4 +54,4 @@
             android:textSize="21sp"
             tools:text="6,00" />
     </LinearLayout>
-</LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/widget_timetable.xml b/app/src/main/res/layout/widget_timetable.xml
index 8a08b5d24..aa2269ad0 100644
--- a/app/src/main/res/layout/widget_timetable.xml
+++ b/app/src/main/res/layout/widget_timetable.xml
@@ -16,7 +16,9 @@
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:layout_toStartOf="@id/timetableWidgetAccount"
+            android:layout_toLeftOf="@id/timetableWidgetAccount"
             android:layout_toEndOf="@id/timetableWidgetNext"
+            android:layout_toRightOf="@id/timetableWidgetNext"
             android:orientation="vertical">
 
             <TextView
@@ -24,6 +26,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="10dp"
+                android:layout_marginLeft="10dp"
                 android:maxLines="1"
                 android:textColor="@android:color/white"
                 android:textSize="15sp"
@@ -34,6 +37,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="10dp"
+                android:layout_marginLeft="10dp"
                 android:maxLines="1"
                 android:textColor="@android:color/white"
                 android:textSize="13sp"
@@ -45,6 +49,7 @@
             android:layout_width="50dp"
             android:layout_height="match_parent"
             android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
             android:background="?android:selectableItemBackground"
             android:contentDescription="@string/account_title"
             android:src="@drawable/ic_widget_account" />
@@ -55,6 +60,7 @@
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:layout_marginStart="10dp"
+            android:layout_marginLeft="10dp"
             android:backgroundTint="@color/colorPrimaryDark"
             android:contentDescription="@string/all_prev"
             android:src="@drawable/ic_widget_chevron"
@@ -66,6 +72,7 @@
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:layout_toEndOf="@id/timetableWidgetPrev"
+            android:layout_toRightOf="@id/timetableWidgetPrev"
             android:backgroundTint="@color/colorPrimaryDark"
             android:contentDescription="@string/all_next"
             android:rotation="180"
diff --git a/app/src/main/res/layout/widget_timetable_dark.xml b/app/src/main/res/layout/widget_timetable_dark.xml
index 5533eaeee..3a301eb94 100644
--- a/app/src/main/res/layout/widget_timetable_dark.xml
+++ b/app/src/main/res/layout/widget_timetable_dark.xml
@@ -16,7 +16,9 @@
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:layout_toStartOf="@id/timetableWidgetAccount"
+            android:layout_toLeftOf="@id/timetableWidgetAccount"
             android:layout_toEndOf="@id/timetableWidgetNext"
+            android:layout_toRightOf="@id/timetableWidgetNext"
             android:orientation="vertical">
 
             <TextView
@@ -24,6 +26,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="10dp"
+                android:layout_marginLeft="10dp"
                 android:maxLines="1"
                 android:textColor="@android:color/white"
                 android:textSize="15sp"
@@ -34,6 +37,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="10dp"
+                android:layout_marginLeft="10dp"
                 android:maxLines="1"
                 android:textColor="@android:color/white"
                 android:textSize="13sp"
@@ -45,6 +49,7 @@
             android:layout_width="50dp"
             android:layout_height="match_parent"
             android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
             android:background="?android:selectableItemBackground"
             android:contentDescription="@string/account_title"
             android:src="@drawable/ic_widget_account" />
@@ -55,6 +60,7 @@
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:layout_marginStart="10dp"
+            android:layout_marginLeft="10dp"
             android:backgroundTint="@color/colorWidgetNavButton"
             android:contentDescription="@string/all_prev"
             android:src="@drawable/ic_widget_chevron"
@@ -66,6 +72,7 @@
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:layout_toEndOf="@id/timetableWidgetPrev"
+            android:layout_toRightOf="@id/timetableWidgetPrev"
             android:backgroundTint="@color/colorWidgetNavButton"
             android:contentDescription="@string/all_next"
             android:rotation="180"
diff --git a/app/src/main/res/menu/action_menu_logviewer.xml b/app/src/main/res/menu/action_menu_logviewer.xml
deleted file mode 100644
index 84b076b15..000000000
--- a/app/src/main/res/menu/action_menu_logviewer.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <item
-        android:id="@+id/logViewerMenuShare"
-        android:icon="@drawable/ic_share"
-        android:orderInCategory="1"
-        android:title="@string/logviewer_share"
-        app:iconTint="@color/material_on_surface_emphasis_medium"
-        app:showAsAction="ifRoom" />
-</menu>
diff --git a/app/src/main/res/menu/action_menu_message_tab.xml b/app/src/main/res/menu/action_menu_message_tab.xml
deleted file mode 100644
index 18d348757..000000000
--- a/app/src/main/res/menu/action_menu_message_tab.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item
-        android:id="@+id/action_search"
-        android:icon="@drawable/ic_search"
-        android:title="@string/all_search"
-        app:actionViewClass="androidx.appcompat.widget.SearchView"
-        app:iconTint="@color/material_on_surface_emphasis_medium"
-        app:showAsAction="collapseActionView|ifRoom" />
-</menu>
diff --git a/app/src/main/res/raw/custom_license_mappings.prop b/app/src/main/res/raw/custom_license_mappings.prop
deleted file mode 100644
index f4ab55163..000000000
--- a/app/src/main/res/raw/custom_license_mappings.prop
+++ /dev/null
@@ -1 +0,0 @@
-io_github_wulkanowy__sdk:apache_2_0
diff --git a/app/src/main/res/raw/custom_license_year_mappings.prop b/app/src/main/res/raw/custom_license_year_mappings.prop
deleted file mode 100644
index 9605dada6..000000000
--- a/app/src/main/res/raw/custom_license_year_mappings.prop
+++ /dev/null
@@ -1,3 +0,0 @@
-com_github_wulkanowy__material_chips_input:2019
-io_github_wulkanowy__uonet_request_signer:2019
-io_github_wulkanowy__sdk:2020
diff --git a/app/src/main/res/raw/custom_name_mappings.prop b/app/src/main/res/raw/custom_name_mappings.prop
deleted file mode 100644
index 05e896805..000000000
--- a/app/src/main/res/raw/custom_name_mappings.prop
+++ /dev/null
@@ -1,3 +0,0 @@
-com_github_wulkanowy__material_chips_input:Material Chips Input
-io_github_wulkanowy__uonet_request_signer:UONET+ Request Signer
-io_github_wulkanowy__sdk:VULCAN UONET+ SDK
diff --git a/app/src/main/res/values-de-v29/preferences_values.xml b/app/src/main/res/values-de-v29/preferences_values.xml
deleted file mode 100644
index c07650d6b..000000000
--- a/app/src/main/res/values-de-v29/preferences_values.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <string-array name="app_theme_entries" tools:ignore="InconsistentArrays">
-        <item>System Thema</item>
-        <item>Licht</item>
-        <item>Dunkel</item>
-        <item>Schwarz (AMOLED)</item>
-    </string-array>
-</resources>
diff --git a/app/src/main/res/values-de/preferences_values.xml b/app/src/main/res/values-de/preferences_values.xml
deleted file mode 100644
index 28ad08bc2..000000000
--- a/app/src/main/res/values-de/preferences_values.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <string-array name="app_theme_entries" tools:ignore="InconsistentArrays">
-        <item>Licht</item>
-        <item>Dunkel</item>
-        <item>Schwarz (AMOLED)</item>
-    </string-array>
-    <string-array name="app_language_entries">
-        <item>System Sprache</item>
-        <item>Polski</item>
-        <item>English</item>
-        <item>Pусский</item>
-        <item>Українська</item>
-        <item>Deutsch</item>
-    </string-array>
-    <string-array name="services_interval_entries">
-        <item>15 Minuten</item>
-        <item>30 Minuten</item>
-        <item>1 Stunde</item>
-        <item>2 Stunden</item>
-        <item>6 Stunden</item>
-        <item>12 Stunden</item>
-        <item>24 Stunden</item>
-    </string-array>
-    <string-array name="grade_modifier_entries">
-        <item>0,0</item>
-        <item>0,25</item>
-        <item>0,33</item>
-        <item>0,5</item>
-        <item>0,75</item>
-    </string-array>
-    <string-array name="grade_color_scheme_entries">
-        <item>Dzienniczek+</item>
-        <item>Wulkanowy</item>
-        <item>Farben der Bewertungen im Logbuch</item>
-    </string-array>
-    <string-array name="grade_average_mode_entries">
-        <item>Durchschnittsnote für das 2. Semester</item>
-        <item>Durchschnitt der Bewertungen für das ganze Jahr</item>
-    </string-array>
-    <string-array name="timetable_show_whole_class_entries">
-        <item>Nicht zeigen</item>
-        <item>Alle zeigen</item>
-        <item>Zeigen die reduzierte</item>
-    </string-array>
-</resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
deleted file mode 100644
index 4b1669371..000000000
--- a/app/src/main/res/values-de/strings.xml
+++ /dev/null
@@ -1,364 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--Activity/Fragment title-->
-    <string name="login_title">Anmelden</string>
-    <string name="main_title">Wulkanowy</string>
-    <string name="grade_title">Noten</string>
-    <string name="attendance_title">Schulbesuch</string>
-    <string name="exam_title">Prüfungen</string>
-    <string name="timetable_title">Zeitplan</string>
-    <string name="settings_title">Einstellungen</string>
-    <string name="more_title">Mehr</string>
-    <string name="about_title">Über die Applikation</string>
-    <string name="logviewer_title">Log Viewer</string>
-    <string name="contributors_title">Mitarbeiter</string>
-    <string name="license_title">Lizenzen</string>
-    <string name="message_title">Nachrichten</string>
-    <string name="send_message_title">neue Nachricht</string>
-    <string name="note_title">Eintragen und Erfolgen</string>
-    <string name="homework_title">Hausaufgaben</string>
-    <string name="account_title">Wählen Sie ein Konto</string>
-    <!--Subtitles-->
-    <string name="grade_subtitle">Semester %d, %d/%d</string>
-    <!--Login-->
-    <string name="login_header_default">Melden Sie sich mit dem Studenten- oder Elternkonto an</string>
-    <string name="login_header_symbol">Geben Sie das Symbol</string>
-    <string name="login_nickname_hint">Benutzername</string>
-    <string name="login_email_hint">Email</string>
-    <string name="login_login_pesel_email_hint">Anmeldung, PESEL oder e-mail</string>
-    <string name="login_password_hint">Passwort</string>
-    <string name="login_host_hint">UONET+ Klassenbuch</string>
-    <string name="login_type_api">Mobile API</string>
-    <string name="login_type_scrapper">Scraper</string>
-    <string name="login_type_hybrid">Hybride</string>
-    <string name="login_token_hint">Token</string>
-    <string name="login_pin_hint">PIN</string>
-    <string name="login_api_key_hint">API Schlüssel</string>
-    <string name="login_symbol_hint">Symbol</string>
-    <string name="login_sign_in">Anmelden</string>
-    <string name="login_invalid_password">Passwort ist zu kurz</string>
-    <string name="login_incorrect_password">Anmeldedaten sind falsch. Stellen Sie sicher, dass das richtige UONET+-Register ausgewählt ist</string>
-    <string name="login_invalid_pin">Ungültige PIN</string>
-    <string name="login_invalid_token">Ungültige token</string>
-    <string name="login_expired_token">Token ist nicht mehr gültig</string>
-    <string name="login_invalid_email">Ungültige email</string>
-    <string name="login_invalid_login">Ungültige login</string>
-    <string name="login_invalid_symbol">Ungültige symbol</string>
-    <string name="login_incorrect_symbol">Student nicht gefunden. Überprüfen Sie das Symbol</string>
-    <string name="login_field_required">Dieses Datenfeld ist erforderlich</string>
-    <string name="login_duplicate_student">Ausgewählter Student ist bereits angemeldet.</string>
-    <string name="login_symbol_helper">Das Symbol finden Sie auf der Registerseite unter&#160;<b>Uczeń</b> →&#160;<b>Dostęp Mobilny</b> →&#160;<b>Zarejestruj urządzenie mobilne</b></string>
-    <string name="login_select_student">Wählen Sie die Studenten aus, die sich bei der Anwendung anmelden sollen.</string>
-    <string name="login_advanced">Andere Optionen</string>
-    <string name="login_advanced_warning_mobile_api">In diesem Modus funktioniert eine Glücknummer, eine Klassenstatistik, eine Zusammenfassung der Anwesenheit, eine Entschuldigung für die Abwesenheit, abgeschlossene Lektionen, Schulinformationen und eine Vorschau der Liste der registrierten Geräte nicht</string>
-    <string name="login_advanced_warning_scraper">In diesem Modus werden dieselben Daten angezeigt, die auf der Klassenbuch-Website angezeigt werden</string>
-    <string name="login_advanced_warning_hybrid">Die Kombination der besten Eigenschaften der beiden anderen Modus. Es arbeitet schneller als Scraper und bietet Funktionen, die im mobilen API-Modus nicht verfügbar sind. Es ist in der experimentellen Phase</string>
-    <string name="login_privacy_policy">Datenschutzerklärung</string>
-    <string name="login_contact_header">Probleme bei der Anmeldung? Kontaktieren Sie uns!</string>
-    <string name="login_contact_email">Email</string>
-    <string name="login_contact_discord">Discord</string>
-    <string name="login_email_intent_title">email senden</string>
-    <string name="login_email_details">Beschreiben Sie die Details des Problems:</string>
-    <string name="login_recover_warning">Stellen Sie sicher, dass das richtige UONET + Klassenbuch ausgewählt ist!</string>
-    <string name="login_recover_button">Ich habe mein Passwort vergessen.</string>
-    <string name="login_recover_title">Ihr Konto wiederherstellen</string>
-    <string name="login_recover">Wiederherstellen</string>
-    <string name="login_signed_in">Student ist bereits angemeldet</string>
-    <!--Main-->
-    <string name="main_account_picker">Kundenbetreuer</string>
-    <string name="main_log_in">Anmelden</string>
-    <string name="main_session_expired">Die Sitzung ist abgelaufen</string>
-    <string name="main_session_relogin">Die Sitzung ist abgelaufen, bitte loggen Sie sich erneut ein</string>
-    <!--Grade-->
-    <string name="grade_header">Note</string>
-    <string name="grade_semester">Semester %d</string>
-    <string name="grade_switch_semester">Semester wechseln</string>
-    <string name="grade_no_items">Keine Noten</string>
-    <string name="grade_weight">Gewichtung</string>
-    <string name="grade_weight_value">Gewichtung: %s</string>
-    <string name="grade_comment">Kommentar</string>
-    <string name="grade_no_new_items">Keine neuen Noten</string>
-    <string name="grade_number_new_items">Anzahl der neuen Bewertungen: %1$d</string>
-    <string name="grade_average">Durchschnitt: %1$.2f</string>
-    <string name="grade_points_sum">Punkte: %s</string>
-    <string name="grade_no_average">Kein Durchschnitt</string>
-    <string name="grade_predicted">Vorausgesagt: %1$s</string>
-    <string name="grade_final">Finale: %1$s</string>
-    <string name="grade_summary_points">Gesamtpunkte</string>
-    <string name="grade_summary_final_grade">Finaler Note</string>
-    <string name="grade_summary_predicted_grade">Vorhergesagte Note</string>
-    <string name="grade_summary_calculated_average">Berechnender Durchschnitt</string>
-    <string name="grade_summary_final_average">Finaler Durchschnitt</string>
-    <string name="grade_menu_summary">Zusammenfassung</string>
-    <string name="grade_menu_statistics">Klasse</string>
-    <string name="grade_menu_read">Als gelesen markieren</string>
-    <string name="grade_statistics_partial">Partiell</string>
-    <string name="grade_statistics_semester">Semester</string>
-    <string name="grade_statistics_points">Punkte</string>
-    <plurals name="grade_number_item">
-        <item quantity="one">%d Note</item>
-        <item quantity="other">%d Noten</item>
-    </plurals>
-    <plurals name="grade_new_items">
-        <item quantity="one">Neue Note</item>
-        <item quantity="other">Neue Noten</item>
-    </plurals>
-    <plurals name="grade_notify_new_items">
-        <item quantity="one">Du hast %1$d Note bekommen</item>
-        <item quantity="other">Du hast %1$d Noten bekommen</item>
-    </plurals>
-    <!--Timetable-->
-    <string name="timetable_lesson">Lektion</string>
-    <string name="timetable_room">Klassenzimmer</string>
-    <string name="timetable_group">Gruppe</string>
-    <string name="timetable_time">Stunden</string>
-    <string name="timetable_changes">Änderungen</string>
-    <string name="timetable_no_items">Kein Unterricht an diesem Tag</string>
-    <string name="timetable_minutes">%s min</string>
-    <string name="timetable_seconds">%s sek</string>
-    <string name="timetable_time_left">noch %1$s</string>
-    <string name="timetable_time_until">in %1$s</string>
-    <string name="timetable_finished">Fertig</string>
-    <string name="timetable_now">Jetzt: %s</string>
-    <string name="timetable_next">In einem Moment: %s</string>
-    <string name="timetable_later">Später: %s</string>
-    <!--Completed lessons-->
-    <string name="completed_lessons_title">Beendete Lektionen</string>
-    <string name="completed_lessons_button">Beendete Lektionen anzeigen</string>
-    <string name="completed_lessons_no_items">Keine Informationen über beendete Lektionen</string>
-    <string name="completed_lessons_topic">Thema</string>
-    <string name="completed_lessons_absence">Abwesenheit</string>
-    <string name="completed_lessons_resources">Ressourcen</string>
-    <!--Attendance-->
-    <string name="attendance_summary_button">Übersicht über die Schulbesuch</string>
-    <string name="attendance_absence_school">Aus schulischen Gründen abwesend</string>
-    <string name="attendance_absence_excused">Entschuldigte Abwesenheit</string>
-    <string name="attendance_absence_unexcused">Unentschuldigtes Abwesenheit</string>
-    <string name="attendance_exemption">Befreiung</string>
-    <string name="attendance_excused_lateness">Entschuldigte Verspätung</string>
-    <string name="attendance_unexcused_lateness">Unentschuldigte Verspätung</string>
-    <string name="attendance_present">Anwesend</string>
-    <string name="attendance_number">Lektion Nummer</string>
-    <string name="attendance_no_items">Keine Einträgen</string>
-    <plurals name="attendance_number_absences">
-        <item quantity="one">%1$d abwesenheit</item>
-        <item quantity="other">%1$d Abwesenheiten</item>
-    </plurals>
-    <string name="attendance_excuse_dialog_reason">Abwesenheitsgrund (optional)</string>
-    <string name="attendance_excuse_dialog_submit">Senden</string>
-    <string name="attendance_excuse_success">Abwesenheit erfolgreich entschuldigt!</string>
-    <string name="attendance_excuse_no_selection">Sie müssen mindestens eine Abwesenheit auswählen!</string>
-    <string name="attendance_excuse_title">Verzeihung</string>
-    <!--Attendance summary-->
-    <string name="attendance_summary_final">Schulbesuch</string>
-    <string name="attendance_summary_total">Gesamt</string>
-    <!--Exam-->
-    <string name="exam_no_items">Diese Woche keine Prüfungen</string>
-    <string name="exam_type">Form</string>
-    <string name="exam_entry_date">Eintrittsdatum</string>
-    <!--Message-->
-    <string name="message_inbox">Posteingang</string>
-    <string name="message_sent">Gesendet</string>
-    <string name="message_trash">Korb</string>
-    <string name="message_no_subject">(kein Thema)</string>
-    <string name="message_no_items">Keine Nachrichten</string>
-    <string name="message_preview_error">Beim Herunterladen des Nachrichteninhalts ist ein Fehler aufgetreten</string>
-    <string name="message_from">Von:</string>
-    <string name="message_to">An:</string>
-    <string name="message_date">Datum: %s</string>
-    <string name="message_reply">Antwort</string>
-    <string name="message_forward">Weiterleiten</string>
-    <string name="message_delete">Löschen</string>
-    <string name="message_move_to_bin">In den Korb wandern</string>
-    <string name="message_delete_forever">Dauerhaft löschen</string>
-    <string name="message_delete_success">Nachricht erfolgreich gelöscht</string>
-    <string name="message_subject">Thema</string>
-    <string name="message_content">Inhalt</string>
-    <string name="message_send_successful">Nachricht erfolgreich gesendet</string>
-    <string name="message_required_recipients">Sie müssen mindestens 1 Empfänger auswählen.</string>
-    <string name="message_content_min_length">Der Inhalt der Nachricht muss mindestens 3 Zeichen lang sein.</string>
-    <plurals name="message_number_item">
-        <item quantity="one">%d nachricht</item>
-        <item quantity="other">%d nachrichten</item>
-    </plurals>
-    <plurals name="message_new_items">
-        <item quantity="one">Neu nachricht</item>
-        <item quantity="other">Neue nachrichten</item>
-    </plurals>
-    <plurals name="message_notify_new_items">
-        <item quantity="one">Du hast %1$d nachricht bekommen</item>
-        <item quantity="other">Du hast %1$d nachrichten bekommen</item>
-    </plurals>
-    <!--Note-->
-    <string name="note_no_items">Keine Informationen über Eintragen</string>
-    <string name="note_points">Punkte</string>
-    <plurals name="note_number_item">
-        <item quantity="one">%d Eintrag</item>
-        <item quantity="other">%d Eintragen</item>
-    </plurals>
-    <plurals name="note_new_items">
-        <item quantity="one">Neu Eintrag</item>
-        <item quantity="other">Neue Eintragen</item>
-    </plurals>
-    <plurals name="note_notify_new_items">
-        <item quantity="one">Du hast %1$d Eintrag bekommen</item>
-        <item quantity="other">Du hast %1$d Eintragen bekommen</item>
-    </plurals>
-    <!--Homework-->
-    <string name="homework_no_items">Keine Informationen über Hausaufgaben</string>
-    <string name="homework_mark_as_done">Gemacht</string>
-    <string name="homework_mark_as_undone">Unvollständig</string>
-    <string name="homework_attachments">Anhänge</string>
-    <!--Lucky number-->
-    <string name="lucky_number_title">Glückliche Nummer</string>
-    <string name="lucky_number_header">Die heutige Glücksnummer ist </string>
-    <string name="lucky_number_empty">Keine Information über die Glücksnummer.</string>
-    <string name="lucky_number_notify_new_item_title">Glücksnummer für heute</string>
-    <string name="lucky_number_notify_new_item">Die heutige Glücksnummer ist: </string>
-    <!--Mobile devices-->
-    <string name="mobile_devices_title">Mobile Geräte</string>
-    <string name="mobile_devices_no_items">Keine Geräte</string>
-    <string name="mobile_devices_unregister">Abmelden</string>
-    <string name="mobile_device_removed">Gerät entfernt</string>
-    <string name="mobile_device_qr">QR Code</string>
-    <string name="mobile_device_token">Token</string>
-    <string name="mobile_device_symbol">Symbol</string>
-    <string name="mobile_device_pin">PIN</string>
-    <!--School and teachers-->
-    <string name="schoolandteachers_title">Schule und Lehrer</string>
-    <!--School-->
-    <string name="school_title">Schule</string>
-    <string name="school_no_info">Keine Informationen über die Schule</string>
-    <string name="school_name">Name der Schule</string>
-    <string name="school_address">Adresse der Schule</string>
-    <string name="school_telephone">Telefon</string>
-    <string name="school_headmaster">Name des Schulleiters</string>
-    <string name="school_pedagogue">Name des Pädagogen</string>
-    <string name="school_address_button">Auf Karte anzeigen</string>
-    <string name="school_telephone_button">Rufen Sie an</string>
-    <!--Teacher-->
-    <string name="teachers_title">Lehrerinnen und Lehrer</string>
-    <string name="teacher_no_items">Keine Informationen über Lehrer</string>
-    <string name="teacher_no_subject">Kein Thema</string>
-    <!--Account-->
-    <string name="account_add_new">Konto hinzufügen</string>
-    <string name="account_logout">Abmelden</string>
-    <string name="account_confirm">Wollen Sie sich von einem aktiven Studenten abmelden?</string>
-    <string name="account_logout_student">Abmeldung von Student</string>
-    <!--About-->
-    <string name="about_version">Version der App</string>
-    <string name="about_contributor">Mitarbeiter</string>
-    <string name="about_contributor_summary">Liste der Wulkanowy-Entwickler</string>
-    <string name="about_feedback">Melden Sie einen Fehler</string>
-    <string name="about_feedback_summary">Senden Sie einen Fehlerbericht per E-Mail</string>
-    <string name="about_faq">FAQ</string>
-    <string name="about_faq_summary">Lesen Sie Häufig gestellte Fragen</string>
-    <string name="about_discord">Discord server</string>
-    <string name="about_discord_summary">Treten Sie der Wulkanowy-Gemeinschaft bei</string>
-    <string name="about_privacy">Datenschutzerklärung</string>
-    <string name="about_privacy_summary">Regeln für die Sammlung persönlicher Daten</string>
-    <string name="about_homepage">Startseite</string>
-    <string name="about_homepage_summary">Besuchen Sie die Website und helfen Sie bei der Entwicklung der Anwendung</string>
-    <string name="about_licenses">Lizenzen</string>
-    <string name="about_licenses_summary">Lizenzen der in der Anwendung verwendeten Bibliotheken</string>
-    <!--Licenses-->
-    <string name="license_dialog_title">Lizenz</string>
-    <!--Contributor-->
-    <string name="contributor_avatar_description">Benutzerbild</string>
-    <string name="contributor_see_more">Sehen Sie mehr auf GitHub</string>
-    <!--Log viewer-->
-    <string name="logviewer_share">Logs teilen</string>
-    <string name="logviewer_refresh">Aktualisieren</string>
-    <!--Error dialog-->
-    <string name="dialog_error_check_update">Check for updates</string>
-    <string name="dialog_error_check_update_message">Before reporting a bug, check first if an update with the bug fix is available</string>
-    <!--Generic-->
-    <string name="all_content">Inhalt</string>
-    <string name="all_retry">Wiederhol</string>
-    <string name="all_description">Beschreibung</string>
-    <string name="all_no_description">Keine Beschreibung</string>
-    <string name="all_teacher">Lehrer</string>
-    <string name="all_date">Datum</string>
-    <string name="all_entry_date">Eintrittsdatum</string>
-    <string name="all_color">Farbe</string>
-    <string name="all_details">Einzelheiten</string>
-    <string name="all_category">Kategorie</string>
-    <string name="all_close">Schließ</string>
-    <string name="all_no_data">Keine Daten</string>
-    <string name="all_subject">Thema</string>
-    <string name="all_prev">Zurück</string>
-    <string name="all_next">Nächste</string>
-    <string name="all_search">Suchen</string>
-    <string name="all_search_hint">Suchen...</string>
-    <!--Timetable Widget-->
-    <string name="widget_timetable_no_items">Keine Lektionen</string>
-    <string name="widget_timetable_theme_title">Thema wählen</string>
-    <string name="widget_timetable_theme_light">Licht</string>
-    <string name="widget_timetable_theme_dark">Dunkel</string>
-    <string name="widget_timetable_theme_system">Systemthema</string>
-    <!--Preferences-->
-    <string name="pref_view_header">Erscheinungsbild</string>
-    <string name="pref_view_list">Standard Ansicht</string>
-    <string name="pref_view_grade_average_mode">Berechnung des Jahresenddurchschnitts</string>
-    <string name="pref_view_grade_average_force_calc">Mittelwertberechnung durch App erzwingen</string>
-    <string name="pref_view_present">Anwesenheit in Schulbesuch zeigen</string>
-    <string name="pref_view_app_theme">Thema der Anwendung</string>
-    <string name="pref_view_expand_grade">Noten erweitern</string>
-    <string name="pref_view_timetable_show_timers">Aktuelle Lektion im Stundenplan markieren</string>
-    <string name="pref_view_grade_statistics_list">Liste der Diagramme in Klassenbewertungen anzeigen</string>
-    <string name="pref_view_timetable_show_whole_class">Unterricht der ganzen Klasse anzeigen</string>
-    <string name="pref_view_grade_color_scheme">Farbschema der Noten</string>
-    <string name="pref_view_app_language">App Sprache</string>
-    <string name="pref_notify_header">Benachrichtigungen</string>
-    <string name="pref_notify_switch">Benachrichtigungen anzeigen</string>
-    <string name="pref_notify_upcoming_lessons_switch">Benachrichtigungen über bevorstehende Lektionen anzeigen</string>
-    <string name="pref_notify_fix_sync_issues">Synchronisierungs- und Benachrichtigungsprobleme reparieren</string>
-    <string name="pref_notify_fix_sync_issues_message">Ihr Gerät hat möglicherweise Probleme mit der Datensynchronisierung und Benachrichtigungen.\n\nUm diese zu reparieren, fügen Sie Wulkanowy zum Autostart hinzu und deaktivieren Sie die Batterieoptimierung in den Systemeinstellungen des Geräts.</string>
-    <string name="pref_notify_fix_sync_issues_settings_button">Gehe zu den Einstellungen</string>
-    <string name="pref_notify_debug_switch">Debug-Benachrichtigungen anzeigen</string>
-    <string name="pref_services_header">Synchronisierung</string>
-    <string name="pref_services_switch">Automatische Aktualisierung</string>
-    <string name="pref_services_suspended">An Feiertagen suspendiert</string>
-    <string name="pref_services_interval">Aktualisierungsintervall</string>
-    <string name="pref_services_wifi">Nur Wi-Fi</string>
-    <string name="pref_services_force_sync">Jetzt synchronisieren</string>
-    <string name="pref_services_message_sync_success">Synchronisiert!</string>
-    <string name="pref_services_message_sync_failed">Synchronisierung fehlgeschlagen</string>
-    <string name="pref_services_sync_in_progress">Synchronisierung läuft</string>
-    <string name="pref_services_dialog_force_sync_title">Synchronisation</string>
-    <string name="pref_services_dialog_force_sync_summary">        Die manuelle Synchronisierung aktualisiert die App-Ansichten nicht.
-        \nUm die synchronisierten Daten anzuzeigen, starten Sie die App nach der Synchronisierung neu.
-    </string>
-    <string name="pref_other_header">Andere</string>
-    <string name="pref_other_grade_modifier_plus">Wert des Plus</string>
-    <string name="pref_other_grade_modifier_minus">Wert des Minus</string>
-    <string name="pref_other_fill_message_content">Antwort mit Nachrichtenhistorie</string>
-    <!--Notification Channels-->
-    <string name="channel_new_entries">Neue Einträge im Klassenbuch</string>
-    <string name="channel_new_grades">Neue Noten</string>
-    <string name="channel_lucky_number">Glückliche Nummer</string>
-    <string name="channel_new_message">Neue Nachrichten</string>
-    <string name="channel_new_notes">Neue Eintragen</string>
-    <string name="channel_push">Push-Benachrichtigungen</string>
-    <string name="channel_upcoming_lessons">Bevorstehende Lektionen</string>
-    <string name="channel_debug">Debuggen</string>
-    <!--Colors-->
-    <string name="all_black">Schwarz</string>
-    <string name="all_red">Rot</string>
-    <string name="all_blue">Blau</string>
-    <string name="all_green">Grün</string>
-    <string name="all_purple">Violett</string>
-    <string name="all_empty_color">Keine Farbe</string>
-    <!--Others-->
-    <string name="all_copied">Kopiert</string>
-    <string name="all_undo">lösen</string>
-    <!--Errors-->
-    <string name="error_no_internet">Keine Internetverbindung</string>
-    <string name="error_timeout">Das Zeitlimit für die Verbindung zum Klassenbuch ist abgelaufen</string>
-    <string name="error_login_failed">Anmeldung fehlgeschlagen. Versuchen Sie es noch einmal oder starten Sie die Anwendung neu.</string>
-    <string name="error_password_change_required">Passwortänderung erforderlich</string>
-    <string name="error_service_unavailable">Wartung im Gange UONET + Klassenbuch. Versuchen Sie es später noch einmal</string>
-    <string name="error_unknown">Ein unerwarteter Fehler ist aufgetreten</string>
-    <string name="error_feature_disabled">Funktion, die von Ihrer Schule deaktiviert wurde</string>
-    <string name="error_feature_not_available">Feature in diesem Modus nicht verfügbar</string>
-</resources>
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
index a06a46f00..492645381 100644
--- a/app/src/main/res/values-night/styles.xml
+++ b/app/src/main/res/values-night/styles.xml
@@ -8,8 +8,6 @@
         <item name="colorDivider">@color/colorDividerInverse</item>
         <item name="android:windowBackground">?colorSurface</item>
         <item name="android:textColor">?android:textColorPrimary</item>
-        <item name="android:navigationBarColor" tools:targetApi="lollipop">@android:color/black
-        </item>
         <item name="android:statusBarColor" tools:targetApi="lollipop">@android:color/black</item>
         <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">false</item>
         <item name="mdtp_theme_dark">true</item>
diff --git a/app/src/main/res/values-pl/preferences_values.xml b/app/src/main/res/values-pl/preferences_values.xml
index 475f7327f..c3fcc9803 100644
--- a/app/src/main/res/values-pl/preferences_values.xml
+++ b/app/src/main/res/values-pl/preferences_values.xml
@@ -1,18 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <string-array name="app_theme_entries" tools:ignore="InconsistentArrays">
-        <item>Jasny</item>
-        <item>Ciemny</item>
-        <item>Czarny (AMOLED)</item>
-    </string-array>
-    <string-array name="app_language_entries">
-        <item>Język systemu</item>
-        <item>Polski</item>
-        <item>English</item>
-        <item>Pусский</item>
-        <item>Українська</item>
-        <item>Deutsch</item>
-    </string-array>
     <string-array name="services_interval_entries">
         <item>15 minut</item>
         <item>30 minut</item>
@@ -22,6 +9,20 @@
         <item>12 godzin</item>
         <item>24 godziny</item>
     </string-array>
+
+    <string-array name="app_theme_entries" tools:ignore="InconsistentArrays">
+        <item>Jasny</item>
+        <item>Ciemny</item>
+        <item>Czarny (AMOLED)</item>
+    </string-array>
+
+    <string-array name="app_language_entries">
+        <item>Język systemu</item>
+        <item>Polski</item>
+        <item>English</item>
+        <item>Pусский</item>
+    </string-array>
+
     <string-array name="grade_modifier_entries">
         <item>0,0</item>
         <item>0,25</item>
@@ -29,15 +30,18 @@
         <item>0,5</item>
         <item>0,75</item>
     </string-array>
+
     <string-array name="grade_color_scheme_entries">
         <item>Dzienniczek+</item>
         <item>Wulkanowy</item>
         <item>Kolory ocen w dzienniku</item>
     </string-array>
+
     <string-array name="grade_average_mode_entries">
         <item>Średnia ocen z 2 semestru</item>
         <item>Średnia ocen z całego roku</item>
     </string-array>
+
     <string-array name="timetable_show_whole_class_entries">
         <item>Nie pokazuj</item>
         <item>Pokazuj wszystkie</item>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 7f25d8a67..5a1ac4704 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -1,5 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="app_name">Wulkanowy</string>
+
+
     <!--Activity/Fragment title-->
     <string name="login_title">Logowanie</string>
     <string name="main_title">Wulkanowy</string>
@@ -10,65 +12,55 @@
     <string name="settings_title">Ustawienia</string>
     <string name="more_title">Więcej</string>
     <string name="about_title">O aplikacji</string>
-    <string name="logviewer_title">Przeglądarka logów</string>
-    <string name="contributors_title">Twórcy</string>
+    <string name="creators_title">Twórcy</string>
     <string name="license_title">Licencje</string>
     <string name="message_title">Wiadomości</string>
     <string name="send_message_title">Nowa wiadomość</string>
     <string name="note_title">Uwagi i osiągnięcia</string>
     <string name="homework_title">Zadania domowe</string>
     <string name="account_title">Wybierz konto</string>
-    <!--Subtitles-->
-    <string name="grade_subtitle">Semestr %d, %d/%d</string>
+
+
     <!--Login-->
     <string name="login_header_default">Zaloguj się za pomocą konta ucznia lub rodzica</string>
     <string name="login_header_symbol">Podaj symbol</string>
-    <string name="login_nickname_hint">Nazwa użytkownika</string>
-    <string name="login_email_hint">Email</string>
-    <string name="login_login_pesel_email_hint">Login, PESEL lub e-mail</string>
+    <string name="login_nickname_hint">Email lub nick</string>
     <string name="login_password_hint">Hasło</string>
-    <string name="login_host_hint">Dziennik UONET+</string>
+    <string name="login_host_hint">Dziennik</string>
+    <string name="login_symbol_hint">Symbol</string>
     <string name="login_type_api">Mobilne API</string>
     <string name="login_type_scrapper">Scraper</string>
     <string name="login_type_hybrid">Hybrydowe</string>
     <string name="login_token_hint">Token</string>
     <string name="login_pin_hint">PIN</string>
     <string name="login_api_key_hint">Klucz API</string>
-    <string name="login_symbol_hint">Symbol</string>
     <string name="login_sign_in">Zaloguj</string>
     <string name="login_invalid_password">To hasło jest za krótkie</string>
-    <string name="login_incorrect_password">Dane logowania są niepoprawne. Upewnij się, że został wybrany odpowiedni dziennik UONET+ w polu poniżej</string>
+    <string name="login_incorrect_password">Dane logowania są niepoprawne</string>
     <string name="login_invalid_pin">Nieprawidłowy PIN</string>
     <string name="login_invalid_token">Nieprawidłowy token</string>
     <string name="login_expired_token">Token stracił ważność</string>
-    <string name="login_invalid_email">Niepoprawny adres email</string>
-    <string name="login_invalid_login">Niepoprawny login</string>
     <string name="login_invalid_symbol">Niepoprawny symbol</string>
     <string name="login_incorrect_symbol">Nie znaleziono ucznia. Sprawdź symbol</string>
     <string name="login_field_required">To pole jest wymagane</string>
     <string name="login_duplicate_student">Wybrany uczeń jest już zalogowany</string>
-    <string name="login_symbol_helper">Symbol znajdziesz na stronie dziennika w&#160;<b>Uczeń</b> →&#160;<b>Dostęp Mobilny</b> →&#160;<b>Zarejestruj urządzenie mobilne</b>.\n\nUpewnij się, że w polu <b>Dziennik UONET+</b> na poprzednim ekranie został ustawiony odpowiedni dziennik</string>
+    <string name="login_symbol_helper">Symbol znajdziesz na stronie dziennika w Uczeń -> Dostęp Mobilny -> Zarejestruj urządzenie mobilne</string>
     <string name="login_select_student">Wybierz uczniów do zalogowania w aplikacji</string>
     <string name="login_advanced">Inne opcje</string>
-    <string name="login_advanced_warning_mobile_api">W tym trybie nie działa szczęśliwy numerek, uczeń na tle klasy, podsumowanie frekwencji, usprawiedliwianie nieobecności, lekcje zrealizowane, informacje o szkole i podgląd listy zarejestrowanych urządzeń</string>
-    <string name="login_advanced_warning_scraper">Tryb ten wyświetla te same dane, które widoczne są na stronie internetowej dziennika</string>
-    <string name="login_advanced_warning_hybrid">Połączenie najlepszych cech dwóch pozostałych trybów. Działa szybciej niż scraper i zapewnia funkcje niedostępne w trybie Mobilne API. Jest w fazie eksperymentalnej</string>
     <string name="login_privacy_policy">Polityka prywatności</string>
     <string name="login_contact_header">Problemy z logowaniem? Napisz do nas!</string>
     <string name="login_contact_email">Email</string>
     <string name="login_contact_discord">Discord</string>
     <string name="login_email_intent_title">Wyślij email</string>
-    <string name="login_email_details">Opisz problem:</string>
-    <string name="login_recover_warning">Upewnij się, że został wybrany odpowiedni dziennik UONET+!</string>
-    <string name="login_recover_button">Nie pamiętam hasła</string>
-    <string name="login_recover_title">Przywróć swoje konto</string>
-    <string name="login_recover">Przywróć</string>
-    <string name="login_signed_in">Uczeń jest już zalogowany</string>
+
+
     <!--Main-->
     <string name="main_account_picker">Menadżer kont</string>
     <string name="main_log_in">Zaloguj się</string>
     <string name="main_session_expired">Sesja wygasła</string>
     <string name="main_session_relogin">Sesja wygasła, zaloguj się ponownie</string>
+
+
     <!--Grade-->
     <string name="grade_header">Ocena</string>
     <string name="grade_semester">Semestr %d</string>
@@ -108,11 +100,13 @@
         <item quantity="other">Nowe oceny</item>
     </plurals>
     <plurals name="grade_notify_new_items">
-        <item quantity="one">Masz %1$d nową ocenę</item>
-        <item quantity="few">Masz %1$d nowe oceny</item>
-        <item quantity="many">Masz %1$d nowych ocen</item>
-        <item quantity="other">Masz %1$d nowych ocen</item>
+        <item quantity="one">Dostałeś %1$d ocenę</item>
+        <item quantity="few">"Dostałeś %1$d oceny</item>
+        <item quantity="many">Dostałeś %1$d ocen</item>
+        <item quantity="other">Dostałeś %1$d ocen</item>
     </plurals>
+
+
     <!--Timetable-->
     <string name="timetable_lesson">Lekcja</string>
     <string name="timetable_room">Sala</string>
@@ -120,30 +114,26 @@
     <string name="timetable_time">Godziny</string>
     <string name="timetable_changes">Zmiany</string>
     <string name="timetable_no_items">Brak lekcji w tym dniu</string>
-    <string name="timetable_minutes">%s min</string>
-    <string name="timetable_seconds">%s sek</string>
-    <string name="timetable_time_left">jeszcze %1$s</string>
-    <string name="timetable_time_until">za %1$s</string>
-    <string name="timetable_finished">Zakończona</string>
-    <string name="timetable_now">Teraz: %s</string>
-    <string name="timetable_next">Za chwilę: %s</string>
-    <string name="timetable_later">Później: %s</string>
-    <!--Completed lessons-->
+
+
+    <!--CompletedLesson-->
     <string name="completed_lessons_title">Lekcje zrealizowane</string>
     <string name="completed_lessons_button">Zobacz lekcje zrealizowane</string>
     <string name="completed_lessons_no_items">Brak informacji o lekcjach zrealizowanych</string>
     <string name="completed_lessons_topic">Temat</string>
     <string name="completed_lessons_absence">Nieobecność</string>
     <string name="completed_lessons_resources">Zasoby</string>
+
+
     <!--Attendance-->
     <string name="attendance_summary_button">Podsumowanie frekwencji</string>
-    <string name="attendance_absence_school">Nieobecność z przyczyn szkolnych</string>
+    <string name="attendance_absence_school">Nieobecny z przyczyn szkolnych</string>
     <string name="attendance_absence_excused">Nieobecność usprawiedliwiona</string>
     <string name="attendance_absence_unexcused">Nieobecność nieusprawiedliwiona</string>
-    <string name="attendance_exemption">Zwolnienie</string>
+    <string name="attendance_exemption">Zwolniony</string>
     <string name="attendance_excused_lateness">Spóźnienie usprawiedliwione</string>
     <string name="attendance_unexcused_lateness">Spóźnienie nieusprawiedliwione</string>
-    <string name="attendance_present">Obecność</string>
+    <string name="attendance_present">Obecny</string>
     <string name="attendance_number">Numer lekcji</string>
     <string name="attendance_no_items">Brak wpisów</string>
     <plurals name="attendance_number_absences">
@@ -157,13 +147,18 @@
     <string name="attendance_excuse_success">Usprawiedliwiono pomyślnie!</string>
     <string name="attendance_excuse_no_selection">Musisz wybrać co najmniej jedną nieobecność!</string>
     <string name="attendance_excuse_title">Usprawiedliw</string>
+
+
     <!--Attendance summary-->
     <string name="attendance_summary_final">Frekwencja</string>
-    <string name="attendance_summary_total">Razem</string>
+
+
     <!--Exam-->
     <string name="exam_no_items">Brak sprawdzianów w tym tygodniu</string>
     <string name="exam_type">Typ</string>
     <string name="exam_entry_date">Data wpisu</string>
+
+
     <!--Message-->
     <string name="message_inbox">Odebrane</string>
     <string name="message_sent">Wysłane</string>
@@ -198,14 +193,15 @@
         <item quantity="other">Nowe wiadomości</item>
     </plurals>
     <plurals name="message_notify_new_items">
-        <item quantity="one">Masz %1$d nową wiadomość</item>
-        <item quantity="few">Masz %1$d nowe wiadomości</item>
-        <item quantity="many">Masz %1$d nowych wiadomości</item>
-        <item quantity="other">Masz %1$d nowych wiadomości</item>
+        <item quantity="one">Dostałeś %1$d wiadomość</item>
+        <item quantity="few">"Dostałeś %1$d wiadomości</item>
+        <item quantity="many">Dostałeś %1$d wiadomości</item>
+        <item quantity="other">Dostałeś %1$d wiadomości</item>
     </plurals>
+
+
     <!--Note-->
     <string name="note_no_items">Brak informacji o uwagach</string>
-    <string name="note_points">Punkty</string>
     <plurals name="note_number_item">
         <item quantity="one">%d uwaga</item>
         <item quantity="few">%d uwagi</item>
@@ -219,22 +215,25 @@
         <item quantity="other">Nowe uwagi</item>
     </plurals>
     <plurals name="note_notify_new_items">
-        <item quantity="one">Masz %1$d nową uwagę</item>
-        <item quantity="few">Masz %1$d nowe uwagi</item>
-        <item quantity="many">Masz %1$d nowych uwag</item>
-        <item quantity="other">Masz %1$d nowych uwag</item>
+        <item quantity="one">Dostałeś %1$d uwagę</item>
+        <item quantity="few">"Dostałeś %1$d uwagi</item>
+        <item quantity="many">Dostałeś %1$d uwag</item>
+        <item quantity="other">Dostałeś %1$d uwag</item>
     </plurals>
+
+
     <!--Homework-->
     <string name="homework_no_items">Brak zadań domowych</string>
-    <string name="homework_mark_as_done">Wykonane</string>
-    <string name="homework_mark_as_undone">Niewykonane</string>
-    <string name="homework_attachments">Załączniki</string>
+
+
     <!--Lucky number-->
     <string name="lucky_number_title">Szczęśliwy numerek</string>
     <string name="lucky_number_header">Dzisiejszym szczęśliwym numerkiem jest</string>
     <string name="lucky_number_empty">Brak informacji o szczęśliwym numerku</string>
     <string name="lucky_number_notify_new_item_title">Szczęśliwy numerek na dzisiaj</string>
     <string name="lucky_number_notify_new_item">Dziś szczęśliwym numerkiem jest: %d</string>
+
+
     <!--Mobile devices-->
     <string name="mobile_devices_title">Dostęp mobilny</string>
     <string name="mobile_devices_no_items">Brak urządzeń</string>
@@ -244,8 +243,12 @@
     <string name="mobile_device_token">Token</string>
     <string name="mobile_device_symbol">Symbol</string>
     <string name="mobile_device_pin">PIN</string>
+
+
     <!--School and teachers-->
     <string name="schoolandteachers_title">Szkoła i nauczyciele</string>
+
+
     <!--School-->
     <string name="school_title">Szkoła</string>
     <string name="school_no_info">Brak informacji o szkole</string>
@@ -254,21 +257,27 @@
     <string name="school_telephone">Telefon</string>
     <string name="school_headmaster">Imię i nazwisko dyrektora</string>
     <string name="school_pedagogue">Imię i nazwisko pedagoga</string>
-    <string name="school_address_button">Pokaż na mapie</string>
+    <string name="school_address_button">Pokaż na mpaie</string>
     <string name="school_telephone_button">Zadzwoń</string>
+
+
     <!--Teacher-->
     <string name="teachers_title">Nauczyciele</string>
     <string name="teacher_no_items">Brak informacji o nauczycielach</string>
     <string name="teacher_no_subject">Brak przedmiotu</string>
+
+
     <!--Account-->
     <string name="account_add_new">Dodaj konto</string>
     <string name="account_logout">Wyloguj</string>
     <string name="account_confirm">Czy chcesz wylogować aktualnego ucznia?</string>
     <string name="account_logout_student">Wylogowanie ucznia</string>
+
+
     <!--About-->
     <string name="about_version">Wersja aplikacji</string>
-    <string name="about_contributor">Twórcy</string>
-    <string name="about_contributor_summary">Lista programistów Wulkanowego</string>
+    <string name="about_creator">Twórcy</string>
+    <string name="about_creator_summary">Lista programistów Wulkanowego</string>
     <string name="about_feedback">Zgłoś błąd</string>
     <string name="about_feedback_summary">Wyślij zgłoszenie o błędzie poprzez e-maila</string>
     <string name="about_faq">FAQ</string>
@@ -281,17 +290,17 @@
     <string name="about_homepage_summary">Odwiedź stronę i pomóż rozwijać aplikację</string>
     <string name="about_licenses">Licencje</string>
     <string name="about_licenses_summary">Licencje użytych bibliotek w aplikacji</string>
+
+
     <!--Licenses-->
     <string name="license_dialog_title">Licencja</string>
-    <!--Contributor-->
-    <string name="contributor_avatar_description">Awatar</string>
-    <string name="contributor_see_more">Zobacz więcej na GitHub</string>
-    <!--Log viewer-->
-    <string name="logviewer_share">Udostępnij logi</string>
-    <string name="logviewer_refresh">Odśwież</string>
-    <!--Error dialog-->
-    <string name="dialog_error_check_update">Sprawdź dostępność aktualizacji</string>
-    <string name="dialog_error_check_update_message">Przed zgłoszeniem błędu sprawdź wcześniej, czy dostępna jest już aktualizacja z poprawką błędu</string>
+
+
+    <!--Creators-->
+    <string name="creator_avatar_description">Awatar</string>
+    <string name="creator_see_more">Zobacz więcej na GitHub</string>
+
+
     <!--Generic-->
     <string name="all_content">Treść</string>
     <string name="all_retry">Ponów</string>
@@ -308,14 +317,15 @@
     <string name="all_subject">Przedmiot</string>
     <string name="all_prev">Poprzedni</string>
     <string name="all_next">Następny</string>
-    <string name="all_search">Szukaj</string>
-    <string name="all_search_hint">Szukaj...</string>
+
+
     <!--Timetable Widget-->
     <string name="widget_timetable_no_items">Brak lekcji</string>
     <string name="widget_timetable_theme_title">Wybierz motyw</string>
     <string name="widget_timetable_theme_light">Jasny</string>
     <string name="widget_timetable_theme_dark">Ciemny</string>
-    <string name="widget_timetable_theme_system">Motyw systemu</string>
+
+
     <!--Preferences-->
     <string name="pref_view_header">Wygląd</string>
     <string name="pref_view_list">Domyślny widok</string>
@@ -324,44 +334,30 @@
     <string name="pref_view_present">Pokazuj obecność we frekwencji</string>
     <string name="pref_view_app_theme">Motyw aplikacji</string>
     <string name="pref_view_expand_grade">Rozwiń oceny</string>
-    <string name="pref_view_timetable_show_timers">Oznaczaj bieżącą lekcję na planie</string>
-    <string name="pref_view_grade_statistics_list">Pokazuj listę wykresów w ocenach klasy</string>
-    <string name="pref_view_timetable_show_whole_class">Pokazuj lekcje całej klasy</string>
     <string name="pref_view_grade_color_scheme">Schemat kolorów ocen</string>
     <string name="pref_view_app_language">Język aplikacji</string>
+
     <string name="pref_notify_header">Powiadomienia</string>
     <string name="pref_notify_switch">Pokazuj powiadomienia</string>
-    <string name="pref_notify_upcoming_lessons_switch">Pokazuj powiadomienia o nadchodzących lekcjach</string>
-    <string name="pref_notify_fix_sync_issues">Napraw problemy z synchronizacją i powiadomieniami</string>
-    <string name="pref_notify_fix_sync_issues_message">Na twoim urządzeniu mogą występować problemy z synchronizacją danych i powiadomieniami.\n\nBy je naprawić, dodaj Wulkanowego do autostartu i wyłącz optymalizację/oszczędzanie baterii w ustawieniach systemowych telefonu.</string>
-    <string name="pref_notify_fix_sync_issues_settings_button">Przejdź do ustawień</string>
     <string name="pref_notify_debug_switch">Pokazuj powiadomienia debugowania</string>
+
     <string name="pref_services_header">Synchronizacja</string>
     <string name="pref_services_switch">Automatyczna aktualizacja</string>
     <string name="pref_services_suspended">Zawieszona na wakacjach</string>
     <string name="pref_services_interval">Interwał aktualizacji</string>
     <string name="pref_services_wifi">Tylko WiFi</string>
-    <string name="pref_services_force_sync">Synchronizuj teraz</string>
-    <string name="pref_services_message_sync_success">Zsynchronizowano!</string>
-    <string name="pref_services_message_sync_failed">Synchronizacja nie powiodła się</string>
-    <string name="pref_services_sync_in_progress">Synchronizacja w trakcie</string>
-    <string name="pref_services_dialog_force_sync_title">Synchronizacja</string>
-    <string name="pref_services_dialog_force_sync_summary">        Ręczna synchronizacja nie odświeża widoków w aplikacji.
-        \nAby zobaczyć zsynchronizowane informacje uruchom ponownie aplikację po zsynchronizowaniu.
-    </string>
+
     <string name="pref_other_header">Inne</string>
     <string name="pref_other_grade_modifier_plus">Wartość plusa</string>
     <string name="pref_other_grade_modifier_minus">Wartość minusa</string>
     <string name="pref_other_fill_message_content">Odpowiadaj z historią wiadomości</string>
+
+
     <!--Notification Channels-->
     <string name="channel_new_entries">Nowe wpisy w dzienniku</string>
-    <string name="channel_new_grades">Nowe oceny</string>
-    <string name="channel_lucky_number">Szczęśliwy numerek</string>
-    <string name="channel_new_message">Nowe wiadomości</string>
-    <string name="channel_new_notes">Nowe uwagi</string>
-    <string name="channel_push">Powiadomienia push</string>
-    <string name="channel_upcoming_lessons">Nadchodzące lekcje</string>
     <string name="channel_debug">Debugowanie</string>
+
+
     <!--Colors-->
     <string name="all_black">Czarny</string>
     <string name="all_red">Czerwony</string>
@@ -369,16 +365,20 @@
     <string name="all_green">Zielony</string>
     <string name="all_purple">Fioletowy</string>
     <string name="all_empty_color">Brak koloru</string>
+
+
     <!--Others-->
     <string name="all_copied">Skopiowano</string>
     <string name="all_undo">Cofnij</string>
+
+
     <!--Errors-->
     <string name="error_no_internet">Brak połączenia z internetem</string>
     <string name="error_timeout">Upłynął limit czasu na połączenie z dziennikiem</string>
     <string name="error_login_failed">Logowanie nie powiodło się. Spróbuj ponownie lub zrestartuj aplikację</string>
-    <string name="error_password_change_required">Wymagana zmiana hasła</string>
     <string name="error_service_unavailable">Trwa przerwa techniczna dziennika UONET+. Spróbuj ponownie później</string>
     <string name="error_unknown">Wystąpił nieoczekiwany błąd</string>
     <string name="error_feature_disabled">Funkcja wyłączona przez szkołę</string>
-    <string name="error_feature_not_available">Funkcja niedostępna. Zaloguj się w trybie innym niż Mobilne API</string>
+    <string name="error_feature_not_available">Funkcja niedostępna w tym trybie</string>
+    <string name="pref_view_timetable_show_whole_class">Pokazuj lekcje całej klasy</string>
 </resources>
diff --git a/app/src/main/res/values-ru/preferences_values.xml b/app/src/main/res/values-ru/preferences_values.xml
index 6c1522682..0e82c2801 100644
--- a/app/src/main/res/values-ru/preferences_values.xml
+++ b/app/src/main/res/values-ru/preferences_values.xml
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
+    <string-array name="services_interval_entries">
+        <item>15 минут</item>
+        <item>30 минут</item>
+        <item>1 час</item>
+        <item>2 часа</item>
+        <item>6 часов</item>
+        <item>12 часов</item>
+        <item>24 часа</item>
+    </string-array>
     <string-array name="app_theme_entries" tools:ignore="InconsistentArrays">
         <item>Светлая</item>
         <item>Тёмная</item>
@@ -10,17 +19,6 @@
         <item>Polski</item>
         <item>English</item>
         <item>Pусский</item>
-        <item>Українська</item>
-        <item>Deutsch</item>
-    </string-array>
-    <string-array name="services_interval_entries">
-        <item>15 минут</item>
-        <item>30 минут</item>
-        <item>1 час</item>
-        <item>2 часа</item>
-        <item>6 часов</item>
-        <item>12 часов</item>
-        <item>24 часа</item>
     </string-array>
     <string-array name="grade_modifier_entries">
         <item>0,0</item>
@@ -38,6 +36,7 @@
         <item>Средняя оценка со 2 семестра</item>
         <item>Средняя оценка с целого года</item>
     </string-array>
+
     <string-array name="timetable_show_whole_class_entries">
         <item>Не показывать</item>
         <item>Показать все</item>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 6eb8f7741..5698b35a2 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+    <string name="app_name">Wulkanowy</string>
+
+
     <!--Activity/Fragment title-->
     <string name="login_title">Авторизация</string>
     <string name="main_title">Wulkanowy</string>
@@ -8,93 +12,81 @@
     <string name="exam_title">Тесты</string>
     <string name="timetable_title">Расписание</string>
     <string name="settings_title">Настройки</string>
-    <string name="more_title">Другое</string>
+    <string name="more_title">Ещё</string>
     <string name="about_title">О приложении</string>
-    <string name="logviewer_title">Просмотр журнала</string>
-    <string name="contributors_title">Разработчики</string>
     <string name="license_title">Лицензии</string>
     <string name="message_title">Сообщения</string>
     <string name="send_message_title">Новое сообщение</string>
     <string name="note_title">Предупреждения и свершения</string>
     <string name="homework_title">Домашние задания</string>
     <string name="account_title">Выберите аккаунт</string>
-    <!--Subtitles-->
-    <string name="grade_subtitle">%d семестр, %d/%d</string>
+
+
     <!--Login-->
     <string name="login_header_default">Авторизируйтесь при помощи аккаунта ученика или родителя</string>
     <string name="login_header_symbol">Впишите \"symbol\"</string>
-    <string name="login_nickname_hint">Имя пользователя</string>
-    <string name="login_email_hint">Электронная почта</string>
-    <string name="login_login_pesel_email_hint">Логин, PESEL или электронная почта</string>
+    <string name="login_nickname_hint">Электронная почта или имя пользователя</string>
     <string name="login_password_hint">Пароль</string>
-    <string name="login_host_hint">Дневник UONET+</string>
-    <string name="login_type_api">Mobile API</string>
+    <string name="login_host_hint">Дневник</string>
+    <string name="login_type_api">Мобильный API</string>
     <string name="login_type_scrapper">Scraper</string>
-    <string name="login_type_hybrid">Hybrid</string>
+    <string name="login_type_hybrid">Гибрид</string>
     <string name="login_token_hint">Token</string>
     <string name="login_pin_hint">PIN</string>
-    <string name="login_api_key_hint">Ключ API</string>
+    <string name="login_api_key_hint">клавиша API</string>
     <string name="login_symbol_hint">Symbol</string>
     <string name="login_sign_in">Войти</string>
     <string name="login_invalid_password">Слишком короткий пароль</string>
-    <string name="login_incorrect_password">Указаны неверные данные. Убедитесь, что вы выбрали нужный дневник</string>
-    <string name="login_invalid_pin">Неправильный PIN</string>
-    <string name="login_invalid_token">Неправильный token</string>
+    <string name="login_incorrect_password">Указаны неверные данные</string>
+    <string name="login_invalid_pin">Недействительный PIN</string>
+    <string name="login_invalid_token">Недействительный token</string>
     <string name="login_expired_token">Токен просрочен</string>
-    <string name="login_invalid_email">Неверный адрес электронной почты</string>
-    <string name="login_invalid_login">Неправильный логин</string>
-    <string name="login_invalid_symbol">Неправильный symbol</string>
-    <string name="login_incorrect_symbol">Не удалось найти ученика. Проверьте \"symbol\"</string>
-    <string name="login_field_required">Обязательное поле</string>
+    <string name="login_invalid_symbol">Недействительный symbol</string>
+    <string name="login_incorrect_symbol">Не удалось найти ученика. Пожалуйста, проверьте \"symbol\"</string>
+    <string name="login_field_required">Это поле обязательно</string>
     <string name="login_duplicate_student">Данный ученик уже авторизован</string>
-    <string name="login_symbol_helper">Вы можете найти \"symbol\" на странице VULCAN по пути <b>Uczeń</b> →&#160;<b>Dostęp Mobilny</b> →&#160;<b>Zarejestruj urządzenie mobilne</b></string>
+    <string name="login_symbol_helper">Вы можете найти \"symbol\" в Uczeń -&gt; Dostęp Mobilny -&gt; Zarejestruj urządzenie mobilne</string>
     <string name="login_select_student">Выберите учеников для авторизации в приложении</string>
     <string name="login_advanced">Другие варианты</string>
-    <string name="login_advanced_warning_mobile_api">В этом режиме не работают: счастливый номер, статистика класса по оценкам, статистика посещаемости и уроков, информация о школе и список зарегистрированных устройств</string>
-    <string name="login_advanced_warning_scraper">Scraper - режим, который показывает данные так же, как и сайт дневника</string>
-    <string name="login_advanced_warning_hybrid">Hybrid - это комбинация лучших функций остальных двух режимов. Он работает быстрее, чем Scraper, и вводит функции, которых нет в режиме Mobile API. Находится в экспериментальной стадии</string>
     <string name="login_privacy_policy">Политика приватности</string>
     <string name="login_contact_header">Проблемы с авторизацией? Свяжитесь с нами!</string>
     <string name="login_contact_email">Электронная почта</string>
     <string name="login_contact_discord">Discord</string>
     <string name="login_email_intent_title">Отправить письмо</string>
-    <string name="login_email_details">Опишите детали проблемы:</string>
-    <string name="login_recover_warning">Убедитесь, что выбран нужный дневник!</string>
-    <string name="login_recover_button">Забыли пароль?</string>
-    <string name="login_recover_title">Восстановите свой аккаунт</string>
-    <string name="login_recover">Восстановить</string>
-    <string name="login_signed_in">Студент уже вошел в систему</string>
+
+
     <!--Main-->
     <string name="main_account_picker">Менеджер аккаунтов</string>
     <string name="main_log_in">Войти</string>
     <string name="main_session_expired">Сеанс истёк</string>
     <string name="main_session_relogin">Сеанс истёк, пожалуйста, авторизируйтесь ещё раз</string>
+
+
     <!--Grade-->
     <string name="grade_header">Оценка</string>
     <string name="grade_semester">Семестр %d</string>
     <string name="grade_switch_semester">Сменить семестр</string>
     <string name="grade_no_items">Оценки отсутствуют</string>
-    <string name="grade_weight">Стоимость</string>
-    <string name="grade_weight_value">Стоимость: %s</string>
+    <string name="grade_weight">Вес</string>
     <string name="grade_comment">Комментарий</string>
     <string name="grade_no_new_items">Новые оценки отсутствуют</string>
     <string name="grade_number_new_items">Количество новых оценок: %1$d</string>
     <string name="grade_average">Средняя оценка: %1$.2f</string>
-    <string name="grade_points_sum">Баллы: %s</string>
+    <string name="grade_points_sum">точек: %s</string>
     <string name="grade_no_average">Средняя оценка отсутствует</string>
     <string name="grade_predicted">Ожидаемая оценка: %1$s</string>
     <string name="grade_final">Итоговая оценка: %1$s</string>
-    <string name="grade_summary_points">Сумма баллов</string>
+    <string name="grade_summary_points">Сумма очков</string>
     <string name="grade_summary_final_grade">Итоговая оценка</string>
     <string name="grade_summary_predicted_grade">Ожидаемая оценка</string>
     <string name="grade_summary_calculated_average">Рассчитанная средняя оценка</string>
     <string name="grade_summary_final_average">Итоговая средняя оценка</string>
     <string name="grade_menu_summary">Итоги</string>
     <string name="grade_menu_statistics">Класс</string>
-    <string name="grade_menu_read">Пометить как \"прочитанное\"</string>
+    <string name="grade_menu_read">Пометить как \"прочитанное*</string>
     <string name="grade_statistics_partial">Частичные</string>
-    <string name="grade_statistics_semester">За семестр</string>
-    <string name="grade_statistics_points">Баллы</string>
+    <string name="grade_statistics_semester">Семестровые</string>
+    <string name="grade_statistics_points">Очки</string>
     <plurals name="grade_number_item">
         <item quantity="one">%d оценка</item>
         <item quantity="few">%d оценки</item>
@@ -102,7 +94,7 @@
         <item quantity="other">%d оценок</item>
     </plurals>
     <plurals name="grade_new_items">
-        <item quantity="one">Новая оценка</item>
+        <item quantity="one" tools:ignore="ImpliedQuantity">Новая оценка</item>
         <item quantity="few">Новые оценки</item>
         <item quantity="many">Новые оценки</item>
         <item quantity="other">Новые оценки</item>
@@ -113,36 +105,34 @@
         <item quantity="many">Вы получили %1$d оценок</item>
         <item quantity="other">Вы получили %1$d оценок</item>
     </plurals>
+
+
     <!--Timetable-->
     <string name="timetable_lesson">Урок</string>
     <string name="timetable_room">Аудитория</string>
     <string name="timetable_group">Группа</string>
     <string name="timetable_time">Часы</string>
     <string name="timetable_changes">Изменения</string>
-    <string name="timetable_no_items">Нет уроков в данный день</string>
-    <string name="timetable_minutes">%s мин</string>
-    <string name="timetable_seconds">%s сек</string>
-    <string name="timetable_time_left">%1$s осталось</string>
-    <string name="timetable_time_until">через %1$s</string>
-    <string name="timetable_finished">Окончен</string>
-    <string name="timetable_now">Сейчас: %s</string>
-    <string name="timetable_next">Следующий: %s</string>
-    <string name="timetable_later">Позже: %s</string>
-    <!--Completed lessons-->
+    <string name="timetable_no_items">Нету уроков в данный день</string>
+
+
+    <!--CompletedLesson-->
     <string name="completed_lessons_title">Проведённые уроки</string>
     <string name="completed_lessons_button">Просмотреть проведённые уроки</string>
     <string name="completed_lessons_no_items">Нет информации о проведённых уроках</string>
     <string name="completed_lessons_topic">Тема</string>
     <string name="completed_lessons_absence">Отсутствие</string>
     <string name="completed_lessons_resources">Ресурсы</string>
+
+
     <!--Attendance-->
     <string name="attendance_summary_button">Итоговая посещаемость</string>
     <string name="attendance_absence_school">Отсутствие по школьным причинам</string>
-    <string name="attendance_absence_excused">Отсутствие по уважительной причине</string>
-    <string name="attendance_absence_unexcused">Отсутствие по неуважительной причине</string>
+    <string name="attendance_absence_excused">Оправданное отсутствие</string>
+    <string name="attendance_absence_unexcused">Неоправданное отсутствие</string>
     <string name="attendance_exemption">Освобождение</string>
-    <string name="attendance_excused_lateness">Опоздание по уважительным причинам</string>
-    <string name="attendance_unexcused_lateness">Опоздание по неуважительным причинам</string>
+    <string name="attendance_excused_lateness">Оправданное опоздание</string>
+    <string name="attendance_unexcused_lateness">Неоправданное опоздание</string>
     <string name="attendance_present">Присутствие</string>
     <string name="attendance_number">Урок №</string>
     <string name="attendance_no_items">Данные не найдены</string>
@@ -152,25 +142,25 @@
         <item quantity="many">%1$d отсутствий</item>
         <item quantity="other">%1$d отсутствий</item>
     </plurals>
-    <string name="attendance_excuse_dialog_reason">Причина отсутствия (необязательно)</string>
-    <string name="attendance_excuse_dialog_submit">Послать</string>
-    <string name="attendance_excuse_success">Статус отсутствия изменён</string>
-    <string name="attendance_excuse_no_selection">Выберите хотя-бы одно отсутствие</string>
-    <string name="attendance_excuse_title">Изменить статус</string>
+
+
     <!--Attendance summary-->
     <string name="attendance_summary_final">Посещаемость</string>
-    <string name="attendance_summary_total">Общая</string>
+
+
     <!--Exam-->
-    <string name="exam_no_items">Нет тестов на этой неделе</string>
+    <string name="exam_no_items">Тесты на этой неделе не запланированы</string>
     <string name="exam_type">Тип</string>
     <string name="exam_entry_date">Дата записи</string>
+
+
     <!--Message-->
     <string name="message_inbox">Полученные</string>
     <string name="message_sent">Отправленные</string>
     <string name="message_trash">Корзина</string>
-    <string name="message_no_subject">(нет темы)</string>
+    <string name="message_no_subject">(нету темы)</string>
     <string name="message_no_items">Нет сообщений</string>
-    <string name="message_preview_error">Произошла ошибка во время получения содержания сообщения</string>
+    <string name="message_preview_error">Произошла ошибка во время получения текста сообщения</string>
     <string name="message_from">От:</string>
     <string name="message_to">Кому:</string>
     <string name="message_date">Дата: %s</string>
@@ -192,7 +182,7 @@
         <item quantity="other">%d сообщений</item>
     </plurals>
     <plurals name="message_new_items">
-        <item quantity="one">Новое сообщение</item>
+        <item quantity="one" tools:ignore="ImpliedQuantity">Новое сообщение</item>
         <item quantity="few">Новые сообщения</item>
         <item quantity="many">Новые сообщения</item>
         <item quantity="other">Новые сообщения</item>
@@ -203,9 +193,10 @@
         <item quantity="many">Вы получили %1$d новых сообщений</item>
         <item quantity="other">Вы получили %1$d новых сообщений</item>
     </plurals>
+
+
     <!--Note-->
     <string name="note_no_items">Нет данных о предупреждениях</string>
-    <string name="note_points">Баллы</string>
     <plurals name="note_number_item">
         <item quantity="one">%d предупреждение</item>
         <item quantity="few">%d предупреждения</item>
@@ -213,7 +204,7 @@
         <item quantity="other">%d предупреждений</item>
     </plurals>
     <plurals name="note_new_items">
-        <item quantity="one">Новое предупреждение</item>
+        <item quantity="one" tools:ignore="ImpliedQuantity">Новое предупреждение</item>
         <item quantity="few">Новые предупреждения</item>
         <item quantity="many">Новых предупреждений</item>
         <item quantity="other">Новых предупреждений</item>
@@ -224,17 +215,20 @@
         <item quantity="many">Вы получили %1$d предупреждений</item>
         <item quantity="other">Вы получили %1$d предупреждений</item>
     </plurals>
+
+
     <!--Homework-->
     <string name="homework_no_items">Нет домашних заданий</string>
-    <string name="homework_mark_as_done">сделанный</string>
-    <string name="homework_mark_as_undone">Не сделано</string>
-    <string name="homework_attachments">Вложения</string>
+
+
     <!--Lucky number-->
     <string name="lucky_number_title">Счастливый номер</string>
     <string name="lucky_number_header">Сегодняшний счастливый номер</string>
     <string name="lucky_number_empty">Нет данных о счастливом номере</string>
     <string name="lucky_number_notify_new_item_title">Сегодняшний счастливый номер</string>
     <string name="lucky_number_notify_new_item">Сегодняшний счастливый номер: %d</string>
+
+
     <!--Mobile devices-->
     <string name="mobile_devices_title">Мобильные устройства</string>
     <string name="mobile_devices_no_items">Нет устройств</string>
@@ -244,8 +238,12 @@
     <string name="mobile_device_token">Token</string>
     <string name="mobile_device_symbol">Symbol</string>
     <string name="mobile_device_pin">PIN</string>
+
+
     <!--School and teachers-->
     <string name="schoolandteachers_title">Школа и учителя</string>
+
+
     <!--School-->
     <string name="school_title">Школа</string>
     <string name="school_no_info">Нет информации о школе</string>
@@ -256,45 +254,44 @@
     <string name="school_pedagogue">Педагог</string>
     <string name="school_address_button">Показать на карте</string>
     <string name="school_telephone_button">Позвонить</string>
+
+
     <!--Teacher-->
     <string name="teachers_title">Учителя</string>
     <string name="teacher_no_items">Нет информации о учителях</string>
     <string name="teacher_no_subject">Нет предмета</string>
+
+
     <!--Account-->
     <string name="account_add_new">Добавить аккаунт</string>
     <string name="account_logout">Выйти</string>
     <string name="account_confirm">Вы точно хотите выйти из данного аккаунта?</string>
     <string name="account_logout_student">Выйти</string>
+
+
     <!--About-->
     <string name="about_version">Версия приложения</string>
-    <string name="about_contributor">Разработчики</string>
-    <string name="about_contributor_summary">Список разработчиков \"Wulkanowy\"</string>
-    <string name="about_feedback">Возникла ошибка?</string>
-    <string name="about_feedback_summary">Сообщить о ошибке</string>
+    <string name="about_feedback">Сообщить о ошибке</string>
+    <string name="about_feedback_summary">Отправить сообщение о ошибке через электронную почту</string>
     <string name="about_faq">FAQ</string>
-    <string name="about_faq_summary">Часто задаваемые вопросы</string>
+    <string name="about_faq_summary">Читайте часто задаваемые вопросы</string>
     <string name="about_discord">Сервер Discord</string>
     <string name="about_discord_summary">Присоединиться к сообществу приложения</string>
     <string name="about_privacy">Политика приватности</string>
-    <string name="about_privacy_summary">Правила хранения личных данных</string>
+    <string name="about_privacy_summary">Правила сбора личных данных</string>
     <string name="about_homepage">Домашняя страница</string>
-    <string name="about_homepage_summary">Помочь в развитии приложения</string>
+    <string name="about_homepage_summary">Посетить страницу и помочь в развитии приложения</string>
     <string name="about_licenses">Лицензии</string>
-    <string name="about_licenses_summary">Лицензии использованных библиотек</string>
+    <string name="about_licenses_summary">Лицензии использованных в приложении библиотек</string>
+
+
     <!--Licenses-->
     <string name="license_dialog_title">Лицензия</string>
-    <!--Contributor-->
-    <string name="contributor_avatar_description">Aватар</string>
-    <string name="contributor_see_more">Страница проекта на GitHub</string>
-    <!--Log viewer-->
-    <string name="logviewer_share">Поделиться логами</string>
-    <string name="logviewer_refresh">Обновить</string>
-    <!--Error dialog-->
-    <string name="dialog_error_check_update">Проверить наличие обновлений</string>
-    <string name="dialog_error_check_update_message">Прежде чем сообщать об ошибке, проверьте наличие обновлений</string>
+
+
     <!--Generic-->
     <string name="all_content">Содержание</string>
-    <string name="all_retry">Повторить</string>
+    <string name="all_retry">Снова</string>
     <string name="all_description">Описание</string>
     <string name="all_no_description">Нет описания</string>
     <string name="all_teacher">Учитель</string>
@@ -308,60 +305,44 @@
     <string name="all_subject">Предмет</string>
     <string name="all_prev">Предыдущий</string>
     <string name="all_next">Следующий</string>
-    <string name="all_search">Поиск</string>
-    <string name="all_search_hint">Поиск...</string>
+
+
     <!--Timetable Widget-->
     <string name="widget_timetable_no_items">Нет уроков</string>
     <string name="widget_timetable_theme_title">Выбрать тему</string>
     <string name="widget_timetable_theme_light">Светлая</string>
     <string name="widget_timetable_theme_dark">Тёмная</string>
-    <string name="widget_timetable_theme_system">Тема системы</string>
+
+
     <!--Preferences-->
-    <string name="pref_view_header">Вид</string>
-    <string name="pref_view_list">Окно по умолчанию</string>
-    <string name="pref_view_grade_average_mode">Способ определения средней годовой оценки</string>
+    <string name="pref_view_header">Внешний вид</string>
+    <string name="pref_view_list">При входе открывать</string>
+    <string name="pref_view_grade_average_mode">Рассчитывание средней годовой оценки</string>
     <string name="pref_view_grade_average_force_calc">Принудительно высчитать среднюю оценку через приложение</string>
     <string name="pref_view_present">Показывать присутствия в посещаемости</string>
     <string name="pref_view_app_theme">Тема приложения</string>
     <string name="pref_view_expand_grade">Больше оценок</string>
-    <string name="pref_view_timetable_show_timers">Отмечать текущий урок в расписании</string>
-    <string name="pref_view_grade_statistics_list">Показывать диаграммы в оценках класса</string>
-    <string name="pref_view_timetable_show_whole_class">Показать уроки всего класса</string>
     <string name="pref_view_grade_color_scheme">Схема цветов оценок</string>
     <string name="pref_view_app_language">Язык приложения</string>
     <string name="pref_notify_header">Уведомления</string>
     <string name="pref_notify_switch">Показывать уведомления</string>
-    <string name="pref_notify_upcoming_lessons_switch">Показывать уведомления о будущих уроках</string>
-    <string name="pref_notify_fix_sync_issues">Исправить проблемы с синхронизацией и уведомлениями</string>
-    <string name="pref_notify_fix_sync_issues_message">На вашем устройстве могут быть проблемы с синхронизацией данных и уведомлениями.\n\nЧтобы их исправить, вам необходимо добавить Wulkanowy в авто-старт и выключить оптимизацию/экономию батареи в настройках устройства.</string>
-    <string name="pref_notify_fix_sync_issues_settings_button">Перейти в настройски</string>
     <string name="pref_notify_debug_switch">Показывать дебаг-уведомления</string>
     <string name="pref_services_header">Синхронизация</string>
     <string name="pref_services_switch">Автоматическая синхронизация</string>
     <string name="pref_services_suspended">Приостановить синхронизации во время каникул</string>
     <string name="pref_services_interval">Интервал синхронизации</string>
     <string name="pref_services_wifi">Только через Wi-Fi</string>
-    <string name="pref_services_force_sync">Синхронизировать</string>
-    <string name="pref_services_message_sync_success">Синхронизировано!</string>
-    <string name="pref_services_message_sync_failed">Синхронизация не удалась</string>
-    <string name="pref_services_sync_in_progress">Идёт синхронизация</string>
-    <string name="pref_services_dialog_force_sync_title">Синхронизация</string>
-    <string name="pref_services_dialog_force_sync_summary">Ручная синхронизация не обновляет данные в приложении.
-        \nЧтобы увидеть обновлённые данные, перезапустите приложение.
-    </string>
     <string name="pref_other_header">Другие</string>
-    <string name="pref_other_grade_modifier_plus">Стоимость плюса</string>
-    <string name="pref_other_grade_modifier_minus">Стоимость минуса</string>
-    <string name="pref_other_fill_message_content">Отвечать с историей сообщений</string>
+    <string name="pref_other_grade_modifier_plus">Вес плюса</string>
+    <string name="pref_other_grade_modifier_minus">Вес минуса</string>
+    <string name="pref_other_fill_message_content">Ответить с историей сообщений</string>
+
+
     <!--Notification Channels-->
     <string name="channel_new_entries">Новые данные в дневнике</string>
-    <string name="channel_new_grades">Новые оценки</string>
-    <string name="channel_lucky_number">Счастливый номер</string>
-    <string name="channel_new_message">Новые сообщения</string>
-    <string name="channel_new_notes">Новые заметки</string>
-    <string name="channel_push">Показывать push-уведомления</string>
-    <string name="channel_upcoming_lessons">Будущие уроки</string>
     <string name="channel_debug">Дебаг</string>
+
+
     <!--Colors-->
     <string name="all_black">Чёрный</string>
     <string name="all_red">Красный</string>
@@ -369,16 +350,21 @@
     <string name="all_green">Зелёный</string>
     <string name="all_purple">Фиолетовый</string>
     <string name="all_empty_color">Нет цвета</string>
+
+
     <!--Others-->
     <string name="all_copied">Скопировано</string>
     <string name="all_undo">Отменить</string>
+
+
     <!--Errors-->
     <string name="error_no_internet">Нет интернет-подключения</string>
     <string name="error_timeout">Слишком долгое ожидание соединения с дневником</string>
-    <string name="error_login_failed">Авторизация не удалась. Попробуйте ещё раз или перезапустите дневник</string>
-    <string name="error_password_change_required">Требуется смена пароля</string>
+    <string name="error_login_failed">Авторизация не удалась. Пожалуйста, попробуйте ещё раз или перезапустите дневник</string>
     <string name="error_service_unavailable">Технический перерыв в журнале UONET + продолжается. Попробуйте позже</string>
     <string name="error_unknown">Произошла неожиданная ошибка</string>
     <string name="error_feature_disabled">Функция была выключена школой</string>
     <string name="error_feature_not_available">Функция не доступна в этом режиме</string>
+    <string name="pref_view_timetable_show_whole_class">Показать уроки всего класса</string>
+
 </resources>
diff --git a/app/src/main/res/values-uk-v29/preferences_values.xml b/app/src/main/res/values-uk-v29/preferences_values.xml
deleted file mode 100644
index 52b41b4ef..000000000
--- a/app/src/main/res/values-uk-v29/preferences_values.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <string-array name="app_theme_entries" tools:ignore="InconsistentArrays">
-        <item>Тема системи</item>
-        <item>Світла</item>
-        <item>Темна</item>
-        <item>Темна (AMOLED)</item>
-    </string-array>
-</resources>
diff --git a/app/src/main/res/values-uk/preferences_values.xml b/app/src/main/res/values-uk/preferences_values.xml
deleted file mode 100644
index 3c70c9d09..000000000
--- a/app/src/main/res/values-uk/preferences_values.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <string-array name="app_theme_entries" tools:ignore="InconsistentArrays">
-        <item>Світла</item>
-        <item>Темна</item>
-        <item>Темна (AMOLED)</item>
-    </string-array>
-    <string-array name="app_language_entries">
-        <item>Мова системи</item>
-        <item>Polski</item>
-        <item>English</item>
-        <item>Pусский</item>
-        <item>Українська</item>
-        <item>Deutsch</item>
-    </string-array>
-    <string-array name="services_interval_entries">
-        <item>15 хвилин</item>
-        <item>30 хвилин</item>
-        <item>1 година</item>
-        <item>2 години</item>
-        <item>6 годин</item>
-        <item>12 годин</item>
-        <item>24 години</item>
-    </string-array>
-    <string-array name="grade_modifier_entries">
-        <item>0,0</item>
-        <item>0,25</item>
-        <item>0,33</item>
-        <item>0,5</item>
-        <item>0,75</item>
-    </string-array>
-    <string-array name="grade_color_scheme_entries">
-        <item>Dzienniczek+</item>
-        <item>Wulkanowy</item>
-        <item>Кольори оцінок в щоденнику</item>
-    </string-array>
-    <string-array name="grade_average_mode_entries">
-        <item>Середня оцінка з 2 семестру</item>
-        <item>Середня оцінка за весь рік</item>
-    </string-array>
-    <string-array name="timetable_show_whole_class_entries">
-        <item>Не показувати</item>
-        <item>Показати все</item>
-        <item>Показати менше</item>
-    </string-array>
-</resources>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
deleted file mode 100644
index ec4dbc155..000000000
--- a/app/src/main/res/values-uk/strings.xml
+++ /dev/null
@@ -1,384 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--Activity/Fragment title-->
-    <string name="login_title">Авторизація</string>
-    <string name="main_title">Wulkanowy</string>
-    <string name="grade_title">Оцінки</string>
-    <string name="attendance_title">Відвідуваність</string>
-    <string name="exam_title">Тести</string>
-    <string name="timetable_title">Розклад</string>
-    <string name="settings_title">Налаштування</string>
-    <string name="more_title">Інше</string>
-    <string name="about_title">Про додаток</string>
-    <string name="logviewer_title">Переглядач журналів</string>
-    <string name="contributors_title">Розробники</string>
-    <string name="license_title">Ліцензії</string>
-    <string name="message_title">Повідомлення</string>
-    <string name="send_message_title">Нове повідомлення</string>
-    <string name="note_title">Нотатки та досягнення</string>
-    <string name="homework_title">Домашні завдання</string>
-    <string name="account_title">Оберіть аккаунт</string>
-    <!--Subtitles-->
-    <string name="grade_subtitle">%d семестр, %d/%d</string>
-    <!--Login-->
-    <string name="login_header_default">Авторизуйтеся за допомогою аккаунта учня або батька</string>
-    <string name="login_header_symbol">Впишіть \"symbol\"</string>
-    <string name="login_nickname_hint">Ім\'я користувача</string>
-    <string name="login_email_hint">Електронна пошта</string>
-    <string name="login_login_pesel_email_hint">Логін, PESEL або електронна пошта</string>
-    <string name="login_password_hint">Пароль</string>
-    <string name="login_host_hint">Щоденник</string>
-    <string name="login_type_api">Мobile API</string>
-    <string name="login_type_scrapper">Scraper</string>
-    <string name="login_type_hybrid">Hybrid</string>
-    <string name="login_token_hint">Token</string>
-    <string name="login_pin_hint">PIN</string>
-    <string name="login_api_key_hint">Ключ API</string>
-    <string name="login_symbol_hint">Symbol</string>
-    <string name="login_sign_in">Увійти</string>
-    <string name="login_invalid_password">Занадто короткий пароль</string>
-    <string name="login_incorrect_password">Вказані невірні дані. Впевніться, що ви увібрали потрібний щоденник</string>
-    <string name="login_invalid_pin">Неправильний PIN</string>
-    <string name="login_invalid_token">Неправильний token</string>
-    <string name="login_expired_token">Минув термін дії токену</string>
-    <string name="login_invalid_email">Недійсна адреса електронної пошти</string>
-    <string name="login_invalid_login">Неправильний логін</string>
-    <string name="login_invalid_symbol">Неправильний symbol</string>
-    <string name="login_incorrect_symbol">Не вдалося знайти учня. Будь ласка, перевірте \"symbol\"</string>
-    <string name="login_field_required">Обов\'язкове поле</string>
-    <string name="login_duplicate_student">Даного учня вже авторизовано</string>
-    <string name="login_symbol_helper">Ви можете знайти \"symbol\" на сторінцi VULCAN стежкою <b>Uczeń</b> →&#160;<b>Dostęp Mobilny</b> →&#160;<b>Zarejestruj urządzenie mobilne</b></string>
-    <string name="login_select_student">Виберіть учнів для авторизації в додатку</string>
-    <string name="login_advanced">Інші варіанти</string>
-    <string name="login_advanced_warning_mobile_api">У цьому режимі не працюють: щасливий номер, статистика класу по оцінкам, статистика відвідуваності і уроків, інформація про школу і список зареєстрованних пристроїв</string>
-    <string name="login_advanced_warning_scraper">Scraper - режим, котрий показує дані так само, як і сторінка щоденника</string>
-    <string name="login_advanced_warning_hybrid">Hybrid - це комбінація найкращих функцій інших двох режимів. Він працює швидше, ніж Scraper, и впроваджує функції, котрих нема в режимі Mobile API. Знаходиться в експериментальній стадії</string>
-    <string name="login_privacy_policy">Політика приватності</string>
-    <string name="login_contact_header">Проблеми з авторизацією? Зв\'яжіться з нами!</string>
-    <string name="login_contact_email">Електронна пошта</string>
-    <string name="login_contact_discord">Discord</string>
-    <string name="login_email_intent_title">Відправити лист</string>
-    <string name="login_email_details">Опишіть деталі помилки:</string>
-    <string name="login_recover_warning">Переконайтесь, що обрано потрібний щоденник!</string>
-    <string name="login_recover_button">Забули пароль?</string>
-    <string name="login_recover_title">Відновіть свій аккаунт</string>
-    <string name="login_recover">Відновити</string>
-    <string name="login_signed_in">Учень вже увійшов до системи</string>
-    <!--Main-->
-    <string name="main_account_picker">Менеджер аккаунтів</string>
-    <string name="main_log_in">Увійти</string>
-    <string name="main_session_expired">Минув термін дії сесії</string>
-    <string name="main_session_relogin">Минув термін дії сесії, авторизуйтеся знову</string>
-    <!--Grade-->
-    <string name="grade_header">Оцінка</string>
-    <string name="grade_semester">%d семестр</string>
-    <string name="grade_switch_semester">Змінити семестр</string>
-    <string name="grade_no_items">Брак оцінок</string>
-    <string name="grade_weight">Вартість</string>
-    <string name="grade_weight_value">Вартість: %s</string>
-    <string name="grade_comment">Коментар</string>
-    <string name="grade_no_new_items">Брак нових оцінок</string>
-    <string name="grade_number_new_items">Кількість нових оцінок: %1$d</string>
-    <string name="grade_average">Середня оцінка: %1$.2f</string>
-    <string name="grade_points_sum">точок: %s</string>
-    <string name="grade_no_average">Брак середньої оцінки</string>
-    <string name="grade_predicted">Очікувана оцінка: %1$s</string>
-    <string name="grade_final">Підсумкова оцінка: %1$s</string>
-    <string name="grade_summary_points">Сума балів</string>
-    <string name="grade_summary_final_grade">Підсумкова оцінка</string>
-    <string name="grade_summary_predicted_grade">Очікувана оцінка</string>
-    <string name="grade_summary_calculated_average">Розрахована середня оцінка</string>
-    <string name="grade_summary_final_average">Підсумкова середня оцінка</string>
-    <string name="grade_menu_summary">Підсумок</string>
-    <string name="grade_menu_statistics">Клас</string>
-    <string name="grade_menu_read">Позначити як прочитане</string>
-    <string name="grade_statistics_partial">Поточні</string>
-    <string name="grade_statistics_semester">Семестрові</string>
-    <string name="grade_statistics_points">Бали</string>
-    <plurals name="grade_number_item">
-        <item quantity="one">%d оцінка</item>
-        <item quantity="few">%d оцінки</item>
-        <item quantity="many">%d оцінок</item>
-        <item quantity="other">%d оцінок</item>
-    </plurals>
-    <plurals name="grade_new_items">
-        <item quantity="one">Нова оцінка</item>
-        <item quantity="few">Нові оцінки</item>
-        <item quantity="many">Нові оцінки</item>
-        <item quantity="other">Нові оцінки</item>
-    </plurals>
-    <plurals name="grade_notify_new_items">
-        <item quantity="one">Ви отримали %1$d оцінку</item>
-        <item quantity="few">Ви отримали %1$d оцінки</item>
-        <item quantity="many">Ви отримали %1$d оцінок</item>
-        <item quantity="other">Ви отримали %1$d оцінок</item>
-    </plurals>
-    <!--Timetable-->
-    <string name="timetable_lesson">Урок</string>
-    <string name="timetable_room">Аудиторія</string>
-    <string name="timetable_group">Група</string>
-    <string name="timetable_time">Години</string>
-    <string name="timetable_changes">Зміни</string>
-    <string name="timetable_no_items">Брак уроків у цей день</string>
-    <string name="timetable_minutes">%s хвилин</string>
-    <string name="timetable_seconds">%s сек</string>
-    <string name="timetable_time_left">%1$s лишилося</string>
-    <string name="timetable_time_until">через %1$s</string>
-    <string name="timetable_finished">Завершено</string>
-    <string name="timetable_now">Зараз: %s</string>
-    <string name="timetable_next">Наступний: %s</string>
-    <string name="timetable_later">Пізніше: %s</string>
-    <!--Completed lessons-->
-    <string name="completed_lessons_title">Уроки, що відбулися</string>
-    <string name="completed_lessons_button">Показати уроки, що відбулися</string>
-    <string name="completed_lessons_no_items">Брак інформації о уроках, що відбулися</string>
-    <string name="completed_lessons_topic">Тема</string>
-    <string name="completed_lessons_absence">Відсутність</string>
-    <string name="completed_lessons_resources">Ресурси</string>
-    <!--Attendance-->
-    <string name="attendance_summary_button">Підсумок відвідуваності</string>
-    <string name="attendance_absence_school">Відсутність зі шкільних причин</string>
-    <string name="attendance_absence_excused">Відсутність з поважних причин</string>
-    <string name="attendance_absence_unexcused">Відсутність з не поважних причин</string>
-    <string name="attendance_exemption">Звільнення</string>
-    <string name="attendance_excused_lateness">Спізнення з поважних причин</string>
-    <string name="attendance_unexcused_lateness">Спізнення з не поважних причин</string>
-    <string name="attendance_present">Присутність</string>
-    <string name="attendance_number">Номер уроку</string>
-    <string name="attendance_no_items">Брак записів</string>
-    <plurals name="attendance_number_absences">
-        <item quantity="one">%1$d відсутність</item>
-        <item quantity="few">%1$d відсутності</item>
-        <item quantity="many">%1$d відсутностей</item>
-        <item quantity="other">%1$d відсутностей</item>
-    </plurals>
-    <string name="attendance_excuse_dialog_reason">Причина відсутності (необов’язково)</string>
-    <string name="attendance_excuse_dialog_submit">Надіслати</string>
-    <string name="attendance_excuse_success">Змінено статус відсутності</string>
-    <string name="attendance_excuse_no_selection">Оберіть хоча б одну відсутність</string>
-    <string name="attendance_excuse_title">Змінити статус</string>
-    <!--Attendance summary-->
-    <string name="attendance_summary_final">Відвідуваність</string>
-    <string name="attendance_summary_total">Загальна</string>
-    <!--Exam-->
-    <string name="exam_no_items">Брак тестів у цьому тижні</string>
-    <string name="exam_type">Тип</string>
-    <string name="exam_entry_date">Дата запису</string>
-    <!--Message-->
-    <string name="message_inbox">Отримані</string>
-    <string name="message_sent">Відправлені</string>
-    <string name="message_trash">Кошик</string>
-    <string name="message_no_subject">(брак теми)</string>
-    <string name="message_no_items">Нема повідомлень</string>
-    <string name="message_preview_error">З\'явилася помилка підчас завантаження змісту повідомлення</string>
-    <string name="message_from">Від:</string>
-    <string name="message_to">Кому:</string>
-    <string name="message_date">Дата: %s</string>
-    <string name="message_reply">Відповісти</string>
-    <string name="message_forward">Переслати</string>
-    <string name="message_delete">Видалити</string>
-    <string name="message_move_to_bin">Перемістити у кошик</string>
-    <string name="message_delete_forever">Видалити назавжди</string>
-    <string name="message_delete_success">Повідомлення було успішно видалено</string>
-    <string name="message_subject">Тема</string>
-    <string name="message_content">Зміст</string>
-    <string name="message_send_successful">Повідомлення було успішно відправлено</string>
-    <string name="message_required_recipients">Необхідно обрати принаймні 1 адресата</string>
-    <string name="message_content_min_length">Зміст повідомлення мусить складатися принаймні з 3 знаків</string>
-    <plurals name="message_number_item">
-        <item quantity="one">%d повідомлення</item>
-        <item quantity="few">%d повідомлення</item>
-        <item quantity="many">%d повідомлень</item>
-        <item quantity="other">%d повідомлень</item>
-    </plurals>
-    <plurals name="message_new_items">
-        <item quantity="one">Нове повідомлення</item>
-        <item quantity="few">Нові повідомлення</item>
-        <item quantity="many">Нові повідомлення</item>
-        <item quantity="other">Нові повідомлення</item>
-    </plurals>
-    <plurals name="message_notify_new_items">
-        <item quantity="one">Ви отримали %1$d нове повідомлення</item>
-        <item quantity="few">Ви отримали %1$d нових повідомлення</item>
-        <item quantity="many">Ви отримали %1$d нових повідомлень</item>
-        <item quantity="other">Ви отримали %1$d нових повідомлень</item>
-    </plurals>
-    <!--Note-->
-    <string name="note_no_items">Брак інформації о зауваженнях</string>
-    <string name="note_points">Бали</string>
-    <plurals name="note_number_item">
-        <item quantity="one">%d зауваження</item>
-        <item quantity="few">%d зауваження</item>
-        <item quantity="many">%d зауважень</item>
-        <item quantity="other">%d зауважень</item>
-    </plurals>
-    <plurals name="note_new_items">
-        <item quantity="one">Нова нотатка</item>
-        <item quantity="few">Нові нотатки</item>
-        <item quantity="many">Нових нотаток</item>
-        <item quantity="other">Нових нотаток</item>
-    </plurals>
-    <plurals name="note_notify_new_items">
-        <item quantity="one">%1$d нове зауваження</item>
-        <item quantity="few">%1$d нових зауваження</item>
-        <item quantity="many">%1$d нових зауважень</item>
-        <item quantity="other">%1$d нових зауважень</item>
-    </plurals>
-    <!--Homework-->
-    <string name="homework_no_items">Брак домашніх завдань</string>
-    <string name="homework_mark_as_done">Позначити як зроблене</string>
-    <string name="homework_mark_as_undone">Позначити як не зроблене</string>
-    <string name="homework_attachments">Додатки</string>
-    <!--Lucky number-->
-    <string name="lucky_number_title">Щасливий номер</string>
-    <string name="lucky_number_header">Сьогоднішній щасливий номер</string>
-    <string name="lucky_number_empty">Брак інформації о щасливому номері</string>
-    <string name="lucky_number_notify_new_item_title">Сьогоднішній щасливий номер</string>
-    <string name="lucky_number_notify_new_item">Сьогоднішнім щасливим номером є %d</string>
-    <!--Mobile devices-->
-    <string name="mobile_devices_title">Мобільні пристрої</string>
-    <string name="mobile_devices_no_items">Брак пристроїв</string>
-    <string name="mobile_devices_unregister">Видалити</string>
-    <string name="mobile_device_removed">Пристрій видалено</string>
-    <string name="mobile_device_qr">QR-код</string>
-    <string name="mobile_device_token">Token</string>
-    <string name="mobile_device_symbol">Symbol</string>
-    <string name="mobile_device_pin">PIN</string>
-    <!--School and teachers-->
-    <string name="schoolandteachers_title">Школа та вчителі</string>
-    <!--School-->
-    <string name="school_title">Школа</string>
-    <string name="school_no_info">Брак інформації про школу</string>
-    <string name="school_name">Назва школи</string>
-    <string name="school_address">Адреса школи</string>
-    <string name="school_telephone">Телефон</string>
-    <string name="school_headmaster">Директор</string>
-    <string name="school_pedagogue">Викладач</string>
-    <string name="school_address_button">Показати на мапі</string>
-    <string name="school_telephone_button">Зателефонувати</string>
-    <!--Teacher-->
-    <string name="teachers_title">Вчителі</string>
-    <string name="teacher_no_items">Брак інформації про вчителів</string>
-    <string name="teacher_no_subject">Брак предмету</string>
-    <!--Account-->
-    <string name="account_add_new">Додати аккаунт</string>
-    <string name="account_logout">Вийти</string>
-    <string name="account_confirm">Ви впевнені, що хочете вийти з цього аккаунту?</string>
-    <string name="account_logout_student">Вийти з аккаунту учня</string>
-    <!--About-->
-    <string name="about_version">Версія додатка</string>
-    <string name="about_contributor">Розробники</string>
-    <string name="about_contributor_summary">Список розробників \"Wulkanowy\"</string>
-    <string name="about_feedback">Виникла помилка?</string>
-    <string name="about_feedback_summary">Повідомити о помилці за допомогою e-mail</string>
-    <string name="about_faq">FAQ</string>
-    <string name="about_faq_summary">Запитання, які часто задають</string>
-    <string name="about_discord">Сервер Discord</string>
-    <string name="about_discord_summary">Приєднатися до спільноти додатка</string>
-    <string name="about_privacy">Політика конфіденційності</string>
-    <string name="about_privacy_summary">Правила зберігання особистих даних</string>
-    <string name="about_homepage">Домашня сторінка</string>
-    <string name="about_homepage_summary">Допомогти розвитку додатка</string>
-    <string name="about_licenses">Ліцензії</string>
-    <string name="about_licenses_summary">Ліцензії вжитих бібліотек</string>
-    <!--Licenses-->
-    <string name="license_dialog_title">Ліцензія</string>
-    <!--Contributor-->
-    <string name="contributor_avatar_description">Аватар</string>
-    <string name="contributor_see_more">Сторінка проекту на GitHub</string>
-    <!--Log viewer-->
-    <string name="logviewer_share">Поділитися логами</string>
-    <string name="logviewer_refresh">Оновити</string>
-    <!--Error dialog-->
-    <string name="dialog_error_check_update">Провірити наявність оновлень</string>
-    <string name="dialog_error_check_update_message">Перед тим, як повідомлювати о помілці, перевірте наявність оновлень</string>
-    <!--Generic-->
-    <string name="all_content">Зміст</string>
-    <string name="all_retry">Повторити</string>
-    <string name="all_description">Опис</string>
-    <string name="all_no_description">Брак опису</string>
-    <string name="all_teacher">Вчитель</string>
-    <string name="all_date">Дата</string>
-    <string name="all_entry_date">Дата запису</string>
-    <string name="all_color">Колір</string>
-    <string name="all_details">Деталі</string>
-    <string name="all_category">Категорія</string>
-    <string name="all_close">Закрити</string>
-    <string name="all_no_data">Немає даних</string>
-    <string name="all_subject">Предмет</string>
-    <string name="all_prev">Попередній</string>
-    <string name="all_next">Наступний</string>
-    <string name="all_search">Пошук</string>
-    <string name="all_search_hint">Пошук...</string>
-    <!--Timetable Widget-->
-    <string name="widget_timetable_no_items">Брак уроків</string>
-    <string name="widget_timetable_theme_title">Увібрати тему</string>
-    <string name="widget_timetable_theme_light">Яскрава</string>
-    <string name="widget_timetable_theme_dark">Темна</string>
-    <string name="widget_timetable_theme_system">Тема системи</string>
-    <!--Preferences-->
-    <string name="pref_view_header">Вигляд</string>
-    <string name="pref_view_list">Вікно за замовчуванням</string>
-    <string name="pref_view_grade_average_mode">Спосіб облічування оцінки на кінець року</string>
-    <string name="pref_view_grade_average_force_calc">Примусово розрахувати середню оцінку через додаток</string>
-    <string name="pref_view_present">Показувати присутність у відвідуваності</string>
-    <string name="pref_view_app_theme">Тема додатку</string>
-    <string name="pref_view_expand_grade">Більше оцінок</string>
-    <string name="pref_view_timetable_show_timers">Позначити поточний урок у розкладі</string>
-    <string name="pref_view_grade_statistics_list">Показувати діаграми в оцінках класу</string>
-    <string name="pref_view_timetable_show_whole_class">Показати уроки всього класу</string>
-    <string name="pref_view_grade_color_scheme">Схема кольорів оцінок</string>
-    <string name="pref_view_app_language">Мова додатку</string>
-    <string name="pref_notify_header">Повідомлення</string>
-    <string name="pref_notify_switch">Показувати повідомлення</string>
-    <string name="pref_notify_upcoming_lessons_switch">Показувати повідомлення о наступних уроках</string>
-    <string name="pref_notify_fix_sync_issues">Виправити помилки з синхронізацією і повідомленнями</string>
-    <string name="pref_notify_fix_sync_issues_message">На вашому пристрої можуть бути помилки з синхронізацією і повідомленнями\n\nЩоб виправити іх, вам необхідно додати Wulkanowy в авто-старт и вимкнути оптимізацію/экономію батареї в налаштуваннях пристрою.</string>
-    <string name="pref_notify_fix_sync_issues_settings_button">Перейти до налаштувань</string>
-    <string name="pref_notify_debug_switch">Показувати дебаг-повідомлення</string>
-    <string name="pref_services_header">Синхронізація</string>
-    <string name="pref_services_switch">Автоматична синхронізація</string>
-    <string name="pref_services_suspended">Призупинено на час канікул</string>
-    <string name="pref_services_interval">Інтервал оновлення</string>
-    <string name="pref_services_wifi">Тільки через Wi-Fi</string>
-    <string name="pref_services_force_sync">Синхронізувати</string>
-    <string name="pref_services_message_sync_success">Синхронізовано!</string>
-    <string name="pref_services_message_sync_failed">Синхронізація не вдалася</string>
-    <string name="pref_services_sync_in_progress">Триває синхронізація</string>
-    <string name="pref_services_dialog_force_sync_title">Синхронізація</string>
-    <string name="pref_services_dialog_force_sync_summary">Ручна синхронізація не оновлює дані в додатку.
-        \nЩоб побачити оновлені дані, перезавантажте додаток.
-    </string>
-    <string name="pref_other_header">Інші</string>
-    <string name="pref_other_grade_modifier_plus">Вартість плюсу</string>
-    <string name="pref_other_grade_modifier_minus">Вага мінуса</string>
-    <string name="pref_other_fill_message_content">Відповісти з історією повідомлень</string>
-    <!--Notification Channels-->
-    <string name="channel_new_entries">Нові дані в щоденнику</string>
-    <string name="channel_new_grades">Нові оцінки</string>
-    <string name="channel_lucky_number">Щасливий номер</string>
-    <string name="channel_new_message">Нові повідомлення</string>
-    <string name="channel_new_notes">Нові нотатки</string>
-    <string name="channel_push">Показувати push-повідомлення</string>
-    <string name="channel_upcoming_lessons">Наступні уроки</string>
-    <string name="channel_debug">Дебаг</string>
-    <!--Colors-->
-    <string name="all_black">Чорний</string>
-    <string name="all_red">Червоний</string>
-    <string name="all_blue">Голубий</string>
-    <string name="all_green">Зелений</string>
-    <string name="all_purple">Фіолетовий</string>
-    <string name="all_empty_color">Брак кольору</string>
-    <!--Others-->
-    <string name="all_copied">Скопійовано</string>
-    <string name="all_undo">Відмінити</string>
-    <!--Errors-->
-    <string name="error_no_internet">Брак з\'єднання з інтернетом</string>
-    <string name="error_timeout">Занадто довге очікування з\'єднання з щоденником</string>
-    <string name="error_login_failed">Аутентифікація не вдалася. Спробуйте ще раз або запустіть додаток знову</string>
-    <string name="error_password_change_required">Потрібно змінити пароль</string>
-    <string name="error_service_unavailable">Технічна перерва в журналі UONET + продовжується. Спробуйте пізніше</string>
-    <string name="error_unknown">Відбулася несподівана помилка</string>
-    <string name="error_feature_disabled">Функція вимкнена школою</string>
-    <string name="error_feature_not_available">Функція не доступна в цьому режимі</string>
-</resources>
diff --git a/app/src/main/res/values/api_hosts.xml b/app/src/main/res/values/api_hosts.xml
index f661b88c5..df42f592b 100644
--- a/app/src/main/res/values/api_hosts.xml
+++ b/app/src/main/res/values/api_hosts.xml
@@ -7,54 +7,15 @@
         <item>Lubelski Portal Oświatowy</item>
         <item>EduNet Miasta Tarnowa</item>
         <item>ResMan Rzeszów</item>
-        <item>Rawa Mazowiecka - Platforma vEdukacja</item>
-        <item>Zduńska Wola - e-Urząd</item>
-        <item>Sieradz - Portal oświatowy</item>
-        <item>Łask - Platforma vEdukacja</item>
-        <item>Powiat łaski - Platforma edukacyjna</item>
-        <item>Powiat Krasnostawski - Platforma oświatowa</item>
-        <item>Powiat kętrzyński - Platforma e-Usług</item>
-        <item>Gmina Ulan-Majorat - Platforma oświatowa</item>
-        <item>Gmina Ozorków - Platforma edukacyjna</item>
-        <item>Gmina Łopiennik Górny - Platforma oświatowa</item>
         <item>Fakelog</item>
     </string-array>
     <string-array name="hosts_values">
-        <item>https://vulcan.net.pl/?standard</item>
+        <item>https://vulcan.net.pl</item>
         <item>https://eszkola.opolskie.pl</item>
         <item>https://edu.gdansk.pl</item>
         <item>https://edu.lublin.eu</item>
         <item>https://umt.tarnow.pl</item>
         <item>https://resman.pl</item>
-        <item>https://vulcan.net.pl/</item>
-        <item>https://vulcan.net.pl/</item>
-        <item>https://vulcan.net.pl/</item>
-        <item>https://vulcan.net.pl/</item>
-        <item>https://vulcan.net.pl/</item>
-        <item>https://vulcan.net.pl/</item>
-        <item>https://vulcan.net.pl/</item>
-        <item>https://vulcan.net.pl/</item>
-        <item>https://vulcan.net.pl/</item>
-        <item>https://vulcan.net.pl/</item>
-        <item>http://fakelog.tk/?standard</item>
-    </string-array>
-    <string-array name="hosts_symbols">
-        <item>Default</item>
-        <item>opole</item>
-        <item>gdansk</item>
-        <item>lublin</item>
-        <item>tarnow</item>
-        <item>rzeszow</item>
-        <item>rawamazowiecka</item>
-        <item>zdunskawola</item>
-        <item>sieradz</item>
-        <item>lask</item>
-        <item>powiatlaski</item>
-        <item>powiatkrasnostawski</item>
-        <item>powiatketrzynski</item>
-        <item>gminaulanmajorat</item>
-        <item>gminaozorkow</item>
-        <item>gminalopiennikgorny</item>
-        <item>powiatwulkanowy</item>
+        <item>http://fakelog.cf</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values/api_symbols.xml b/app/src/main/res/values/api_symbols.xml
index 6f9b1739d..d9f89a238 100644
--- a/app/src/main/res/values/api_symbols.xml
+++ b/app/src/main/res/values/api_symbols.xml
@@ -18,8 +18,6 @@
         <item>Bielsko-Biała</item>
         <item>Bierawa</item>
         <item>Bierutów</item>
-        <item>Biskupice</item>
-        <item>Blachownia</item>
         <item>Błaszki</item>
         <item>Błonie</item>
         <item>Bochnia</item>
@@ -59,7 +57,6 @@
         <item>Dąbrowa Tarnowska</item>
         <item>Dębica</item>
         <item>Dobrzeń Wielki</item>
-        <item>Dobrzyń Nad Wisłą</item>
         <item>Dolnośląskie</item>
         <item>Duszniki-Zdrój</item>
         <item>Dynów</item>
@@ -80,53 +77,36 @@
         <item>Gmina Aleksandrów Kujawski</item>
         <item>Gmina Aleksandrów Łódzki</item>
         <item>Gmina Alwernia</item>
-        <item>Gmina Andrzejewo</item>
         <item>Gmina Annopol</item>
-        <item>Gmina Augustów</item>
         <item>Gmina Babice</item>
-        <item>Gmina Bądkowo</item>
         <item>Gmina Bałtów</item>
         <item>Gmina Baranów</item>
-        <item>Gmina Barciany</item>
         <item>Gmina Barcin</item>
         <item>Gmina Baruchowo</item>
         <item>Gmina Będzino</item>
         <item>Gmina Bełchatów</item>
-        <item>Gmina Białaczów</item>
         <item>Gmina Białe Błota</item>
-        <item>Gmina Bielsk Podlaski</item>
         <item>Gmina Bircza</item>
         <item>Gmina Błażowa</item>
         <item>Gmina Błędów</item>
         <item>Gmina Bobolice</item>
-        <item>Gmina Bobowa</item>
         <item>Gmina Bobowo</item>
         <item>Gmina Bobrowniki</item>
-        <item>Gmina Bodzentyn</item>
-        <item>Gmina Bogoria</item>
-        <item>Gmina Bojanów</item>
         <item>Gmina Bojanowo</item>
         <item>Gmina Bojszowy</item>
         <item>Gmina Bolesławiec</item>
         <item>Gmina Bolków</item>
         <item>Gmina Boronów</item>
-        <item>Gmina Borów</item>
         <item>Gmina Borowa</item>
         <item>Gmina Borzęcin</item>
         <item>Gmina Branice</item>
-        <item>Gmina Braniewo</item>
         <item>Gmina Brąszewice</item>
         <item>Gmina Brenna</item>
         <item>Gmina Brzeg Dolny</item>
         <item>Gmina Brzeziny</item>
         <item>Gmina Brzeźnio</item>
-        <item>Gmina Brzostek</item>
         <item>Gmina Brzozów</item>
-        <item>Gmina Brzuze</item>
         <item>Gmina Brzyska</item>
-        <item>Gmina Buczek</item>
-        <item>Gmina Buczkowice</item>
-        <item>Gmina Budzów</item>
         <item>Gmina Budzyń</item>
         <item>Gmina Bukowsko</item>
         <item>Gmina Byczyna</item>
@@ -135,15 +115,15 @@
         <item>Gmina Ceków-Kolonia</item>
         <item>Gmina Celestynów</item>
         <item>Gmina Cewice</item>
-        <item>Gmina Charsznica</item>
         <item>Gmina Chełm</item>
         <item>Gmina Chełmiec</item>
         <item>Gmina Chełmno</item>
         <item>Gmina Chmielnik</item>
-        <item>Gmina Chocz</item>
+        <item>Gmina Chodecz</item>
         <item>Gmina Chodel</item>
         <item>Gmina Chojnice</item>
         <item>Gmina Chojnów</item>
+        <item>Gmina Chorkówka</item>
         <item>Gmina Chrzypsko Wielkie</item>
         <item>Gmina Chybie</item>
         <item>Gmina Ciasna</item>
@@ -155,12 +135,12 @@
         <item>Gmina Czaplinek</item>
         <item>Gmina Czarna</item>
         <item>Gmina Czarnków</item>
+        <item>Gmina Czarny Bór</item>
         <item>Gmina Czarny Dunajec</item>
         <item>Gmina Czechowice-Dziedzice</item>
         <item>Gmina Czernichów</item>
         <item>Gmina Czerniejewo</item>
         <item>Gmina Czerwionka-Leszczyny</item>
-        <item>Gmina Czerwonka</item>
         <item>Gmina Człuchów</item>
         <item>Gmina Czosnów</item>
         <item>Gmina Damasławek</item>
@@ -168,7 +148,6 @@
         <item>Gmina Darłowo</item>
         <item>Gmina Dębe Wielkie</item>
         <item>Gmina Dębica</item>
-        <item>Gmina Dębno</item>
         <item>Gmina Dłutów</item>
         <item>Gmina Dobczyce</item>
         <item>Gmina Dobra</item>
@@ -180,7 +159,6 @@
         <item>Gmina Dominowo</item>
         <item>Gmina Dorohusk</item>
         <item>Gmina Drzewica</item>
-        <item>Gmina Dubiecko</item>
         <item>Gmina Dukla</item>
         <item>Gmina Dwikozy</item>
         <item>Gmina Dynów</item>
@@ -204,7 +182,6 @@
         <item>Gmina Głuszyca</item>
         <item>Gmina Gniew</item>
         <item>Gmina Gniewoszów</item>
-        <item>Gmina Gniezno</item>
         <item>Gmina Goczałkowice-Zdrój</item>
         <item>Gmina Godkowo</item>
         <item>Gmina Godów</item>
@@ -223,7 +200,6 @@
         <item>Gmina Gózd</item>
         <item>Gmina Grabów</item>
         <item>Gmina Grabowiec</item>
-        <item>Gmina Grabów Nad Pilicą</item>
         <item>Gmina Grajewo</item>
         <item>Gmina Granowo</item>
         <item>Gmina Grębocice</item>
@@ -234,7 +210,6 @@
         <item>Gmina Grodziec</item>
         <item>Gmina Grójec</item>
         <item>Gmina Gromadka</item>
-        <item>Gmina Gromnik</item>
         <item>Gmina Gronowo Elbląskie</item>
         <item>Gmina Grudziądz</item>
         <item>Gmina Gruta</item>
@@ -244,17 +219,13 @@
         <item>Gmina Hańsk</item>
         <item>Gmina Harasiuki</item>
         <item>Gmina Hażlach</item>
-        <item>Gmina Herby</item>
         <item>Gmina Hrubieszów</item>
-        <item>Gmina Huszlew</item>
         <item>Gmina Hyżne</item>
         <item>Gmina Imielno</item>
         <item>Gmina Inowrocław</item>
-        <item>Gmina Istebna</item>
         <item>Gmina Iwierzyce</item>
         <item>Gmina Iwonicz-Zdrój</item>
         <item>Gmina Izabelin</item>
-        <item>Gmina Izbica</item>
         <item>Gmina Jadów</item>
         <item>Gmina Jaktorów</item>
         <item>Gmina Janikowo</item>
@@ -266,23 +237,19 @@
         <item>Gmina Jasło</item>
         <item>Gmina Jastków</item>
         <item>Gmina Jastrowie</item>
-        <item>Gmina Jastrząb</item>
         <item>Gmina Jedlicze</item>
         <item>Gmina Jedlińsk</item>
         <item>Gmina Jedlnia-Letnisko</item>
         <item>Gmina Jejkowice</item>
         <item>Gmina Jemielnica</item>
-        <item>Gmina Jemielno</item>
         <item>Gmina Jerzmanowa</item>
         <item>Gmina Jeżewo</item>
         <item>Gmina Jeziora Wielkie</item>
-        <item>Gmina Jeziorzany</item>
         <item>Gmina Jeżowe</item>
         <item>Gmina Jordanów</item>
         <item>Gmina Józefów</item>
         <item>Gmina Józefów Nad Wisłą</item>
         <item>Gmina Jutrosin</item>
-        <item>Gmina Kąkolewnica</item>
         <item>Gmina Kamień</item>
         <item>Gmina Kamienica</item>
         <item>Gmina Kamieniec</item>
@@ -295,11 +262,9 @@
         <item>Gmina Kiełczygłów</item>
         <item>Gmina Kikół</item>
         <item>Gmina Kiszkowo</item>
-        <item>Gmina Kleczew</item>
         <item>Gmina Klembów</item>
         <item>Gmina Kleszczewo</item>
         <item>Gmina Kleszczów</item>
-        <item>Gmina Klimontów</item>
         <item>Gmina Kłobuck</item>
         <item>Gmina Kłoczew</item>
         <item>Gmina Kłomnice</item>
@@ -307,8 +272,6 @@
         <item>Gmina Klucze</item>
         <item>Gmina Kluczewsko</item>
         <item>Gmina Kobiele Wielkie</item>
-        <item>Gmina Kochanowice</item>
-        <item>Gmina Kock</item>
         <item>Gmina Kodrąb</item>
         <item>Gmina Kołaczyce</item>
         <item>Gmina Kołbaskowo</item>
@@ -317,13 +280,9 @@
         <item>Gmina Komańcza</item>
         <item>Gmina Komorniki</item>
         <item>Gmina Komprachcice</item>
-        <item>Gmina Konarzyny</item>
-        <item>Gmina Kondratowice</item>
-        <item>Gmina Koniusza</item>
         <item>Gmina Konopiska</item>
         <item>Gmina Końskowola</item>
-        <item>Gmina Koprzywnica</item>
-        <item>Gmina Korsze</item>
+        <item>Gmina Korczyna</item>
         <item>Gmina Korycin</item>
         <item>Gmina Korzenna</item>
         <item>Gmina Kosakowo</item>
@@ -332,7 +291,6 @@
         <item>Gmina Kościerzyna</item>
         <item>Gmina Kosów Lacki</item>
         <item>Gmina Kostrzyn</item>
-        <item>Gmina Koszyce</item>
         <item>Gmina Kotla</item>
         <item>Gmina Kotuń</item>
         <item>Gmina Kozłów</item>
@@ -344,31 +302,22 @@
         <item>Gmina Krokowa</item>
         <item>Gmina Krośnice</item>
         <item>Gmina Krupski Młyn</item>
-        <item>Gmina Kruszwica</item>
-        <item>Gmina Krynki</item>
         <item>Gmina Krzanowice</item>
         <item>Gmina Krzemieniewo</item>
         <item>Gmina Krzymów</item>
-        <item>Gmina Krzywiń</item>
         <item>Gmina Krzyżanowice</item>
-        <item>Gmina Książ Wielki</item>
         <item>Gmina Kunice</item>
         <item>Gmina Kunów</item>
         <item>Gmina Kurów</item>
-        <item>Gmina Kuryłówka</item>
         <item>Gmina Kwidzyn</item>
         <item>Gmina Kwilcz</item>
-        <item>Gmina Łabowa</item>
         <item>Gmina Łabunie</item>
         <item>Gmina Łambinowice</item>
         <item>Gmina Lanckorona</item>
         <item>Gmina Łapsze Niżne</item>
-        <item>Gmina Łasin</item>
         <item>Gmina Łaskarzew</item>
         <item>Gmina Lasowice Wielkie</item>
         <item>Gmina Łaszczów</item>
-        <item>Gmina Laszki</item>
-        <item>Gmina Latowicz</item>
         <item>Gmina Łazy</item>
         <item>Gmina Łęczyca</item>
         <item>Gmina Łęczyce</item>
@@ -380,20 +329,16 @@
         <item>Gmina Leśna Podlaska</item>
         <item>Gmina Lesznowola</item>
         <item>Gmina Leżajsk</item>
-        <item>Gmina Lichnowy</item>
         <item>Gmina Limanowa</item>
-        <item>Gmina Linia</item>
         <item>Gmina Lipinki</item>
         <item>Gmina Lipnik</item>
         <item>Gmina Lipowa</item>
         <item>Gmina Lisia Góra</item>
         <item>Gmina Liszki</item>
-        <item>Gmina Liw</item>
         <item>Gmina Łobez</item>
         <item>Gmina Łodygowice</item>
         <item>Gmina Łomazy</item>
         <item>Gmina Łopiennik Górny</item>
-        <item>Gmina Łopuszno</item>
         <item>Gmina Lubań</item>
         <item>Gmina Lubartów</item>
         <item>Gmina Lubasz</item>
@@ -403,40 +348,30 @@
         <item>Gmina Lubiewo</item>
         <item>Gmina Lubin</item>
         <item>Gmina Łubniany</item>
-        <item>Gmina Lubochnia</item>
         <item>Gmina Lubomia</item>
         <item>Gmina Luboń</item>
         <item>Gmina Łuków</item>
-        <item>Gmina Łukowica</item>
-        <item>Gmina Lutowiska</item>
         <item>Gmina Luzino</item>
         <item>Gmina Łużna</item>
         <item>Gmina Łysomice</item>
         <item>Gmina Magnuszew</item>
         <item>Gmina Maków Podhalański</item>
-        <item>Gmina Mała Wieś</item>
         <item>Gmina Malbork</item>
         <item>Gmina Małdyty</item>
-        <item>Gmina Małkinia Górna</item>
         <item>Gmina Marcinowice</item>
         <item>Gmina Margonin</item>
         <item>Gmina Marianowo</item>
-        <item>Gmina Markusy</item>
         <item>Gmina Masłów</item>
-        <item>Gmina Medyka</item>
         <item>Gmina Mełgiew</item>
-        <item>Gmina Michałów</item>
         <item>Gmina Michałowo</item>
         <item>Gmina Miedziana Góra</item>
         <item>Gmina Miedźna</item>
         <item>Gmina Miedźno</item>
         <item>Gmina Międzybórz</item>
         <item>Gmina Międzylesie</item>
-        <item>Gmina Międzyrzec Podlaski</item>
         <item>Gmina Międzyzdroje</item>
         <item>Gmina Miejsce Piastowe</item>
         <item>Gmina Mielec</item>
-        <item>Gmina Milanów</item>
         <item>Gmina Milejów</item>
         <item>Gmina Milicz</item>
         <item>Gmina Miłkowice</item>
@@ -450,38 +385,28 @@
         <item>Gmina Mogilany</item>
         <item>Gmina Mordy</item>
         <item>Gmina Moryń</item>
-        <item>Gmina Mrocza</item>
         <item>Gmina Mrozy</item>
         <item>Gmina Mszana</item>
         <item>Gmina Mszana Dolna</item>
         <item>Gmina Murów</item>
         <item>Gmina Mycielin</item>
-        <item>Gmina Mysłakowice</item>
         <item>Gmina Myślibórz</item>
         <item>Gmina Nadarzyn</item>
-        <item>Gmina Namysłów</item>
-        <item>Gmina Nasielsk</item>
         <item>Gmina Nawojowa</item>
-        <item>Gmina Nędza</item>
         <item>Gmina Nekla</item>
         <item>Gmina Niebylec</item>
         <item>Gmina Niechlów</item>
         <item>Gmina Niedrzwica Duża</item>
-        <item>Gmina Niedźwiada</item>
-        <item>Gmina Niedźwiedź</item>
         <item>Gmina Niegosławice</item>
         <item>Gmina Niwiska</item>
         <item>Gmina Nowa Ruda</item>
         <item>Gmina Nowa Wieś Lęborska</item>
         <item>Gmina Nowe Miasto</item>
         <item>Gmina Nowe Miasto Nad Wartą</item>
-        <item>Gmina Nowogród Bobrzański</item>
         <item>Gmina Nowosolna</item>
         <item>Gmina Nowy Kawęczyn</item>
         <item>Gmina Nowy Staw</item>
         <item>Gmina Nowy Targ</item>
-        <item>Gmina Nowy Tomyśl</item>
-        <item>Gmina Nur</item>
         <item>Gmina Obrazów</item>
         <item>Gmina Ochotnica Dolna</item>
         <item>Gmina Ogrodzieniec</item>
@@ -495,45 +420,33 @@
         <item>Gmina Osiek Jasielski</item>
         <item>Gmina Osiek Mały</item>
         <item>Gmina Osielsko</item>
-        <item>Gmina Ostrów</item>
         <item>Gmina Ostrówek</item>
         <item>Gmina Ostrów Lubelski</item>
         <item>Gmina Ostrów Mazowiecka</item>
         <item>Gmina Ostrów Wielkopolski</item>
         <item>Gmina Otyń</item>
         <item>Gmina Ożarów</item>
-        <item>Gmina Ożarowice</item>
         <item>Gmina Ozimek</item>
         <item>Gmina Ozorków</item>
         <item>Gmina Pabianice</item>
         <item>Gmina Pacanów</item>
-        <item>Gmina Paczków</item>
         <item>Gmina Padew Narodowa</item>
-        <item>Gmina Pajęczno</item>
         <item>Gmina Pakosław</item>
         <item>Gmina Pakosławice</item>
-        <item>Gmina Pałecznica</item>
         <item>Gmina Panki</item>
         <item>Gmina Parchowo</item>
         <item>Gmina Parczew</item>
         <item>Gmina Pawłosiów</item>
         <item>Gmina Pawłowice</item>
-        <item>Gmina Pawłowiczki</item>
-        <item>Gmina Pęcław</item>
         <item>Gmina Pelplin</item>
         <item>Gmina Piaski</item>
         <item>Gmina Piątnica</item>
-        <item>Gmina Piecki</item>
-        <item>Gmina Piekoszów</item>
         <item>Gmina Pilchowice</item>
         <item>Gmina Pionki</item>
-        <item>Gmina Piotrków Trybunalski</item>
         <item>Gmina Pleśna</item>
         <item>Gmina Pleszew</item>
         <item>Gmina Płońsk</item>
-        <item>Gmina Płośnica</item>
         <item>Gmina Poczesna</item>
-        <item>Gmina Podedwórze</item>
         <item>Gmina Podegrodzie</item>
         <item>Gmina Pokój</item>
         <item>Gmina Połajewo</item>
@@ -543,7 +456,6 @@
         <item>Gmina Police</item>
         <item>Gmina Polkowice</item>
         <item>Gmina Pomiechówek</item>
-        <item>Gmina Popielów</item>
         <item>Gmina Popów</item>
         <item>Gmina Poraj</item>
         <item>Gmina Potęgowo</item>
@@ -570,27 +482,23 @@
         <item>Gmina Puszcza Mariańska</item>
         <item>Gmina Pysznica</item>
         <item>Gmina Pyzdry</item>
-        <item>Gmina Rachanie</item>
         <item>Gmina Raciechowice</item>
         <item>Gmina Racławice</item>
         <item>Gmina Radecznica</item>
         <item>Gmina Radków</item>
         <item>Gmina Radłów</item>
         <item>Gmina Radomin</item>
-        <item>Gmina Radomsko</item>
         <item>Gmina Radomyśl Nad Sanem</item>
         <item>Gmina Radoszyce</item>
         <item>Gmina Radwanice</item>
         <item>Gmina Radziłów</item>
         <item>Gmina Rawa Mazowiecka</item>
         <item>Gmina Reńska Wieś</item>
-        <item>Gmina Rossosz</item>
         <item>Gmina Rozprza</item>
         <item>Gmina Ruciane-Nida</item>
         <item>Gmina Ruda-Huta</item>
         <item>Gmina Rudna</item>
         <item>Gmina Rudniki</item>
-        <item>Gmina Rusiec</item>
         <item>Gmina Rychliki</item>
         <item>Gmina Rychtal</item>
         <item>Gmina Ryczywół</item>
@@ -601,33 +509,27 @@
         <item>Gmina Rząśnia</item>
         <item>Gmina Rzeczyca</item>
         <item>Gmina Rzepiennik Strzyżewski</item>
-        <item>Gmina Rzepin</item>
+        <item>Gmina Rzezawa</item>
         <item>Gmina Rzgów</item>
         <item>Gmina Sadki</item>
         <item>Gmina Sadowne</item>
         <item>Gmina Samborzec</item>
-        <item>Gmina Sanok</item>
         <item>Gmina Ścinawa</item>
         <item>Gmina Sędziejowice</item>
         <item>Gmina Sępopol</item>
         <item>Gmina Serokomla</item>
-        <item>Gmina Sianów</item>
         <item>Gmina Sicienko</item>
         <item>Gmina Sieciechów</item>
         <item>Gmina Siedlce</item>
-        <item>Gmina Siemiatycze</item>
         <item>Gmina Siemyśl</item>
         <item>Gmina Siennica</item>
         <item>Gmina Siennica Różana</item>
         <item>Gmina Sienno</item>
         <item>Gmina Siepraw</item>
-        <item>Gmina Sieradz</item>
         <item>Gmina Sierakowice</item>
         <item>Gmina Siewierz</item>
-        <item>Gmina Sitno</item>
         <item>Gmina Skarżysko Kościelne</item>
         <item>Gmina Skępe</item>
-        <item>Gmina Skierniewice</item>
         <item>Gmina Skoczów</item>
         <item>Gmina Skoki</item>
         <item>Gmina Skołyszyn</item>
@@ -637,10 +539,8 @@
         <item>Gmina Słopnice</item>
         <item>Gmina Słupca</item>
         <item>Gmina Słupia</item>
-        <item>Gmina Sobienie-Jeziory</item>
         <item>Gmina Sobótka</item>
         <item>Gmina Sokółka</item>
-        <item>Gmina Sokoły</item>
         <item>Gmina Solina</item>
         <item>Gmina Sośnicowice</item>
         <item>Gmina Sośnie</item>
@@ -658,15 +558,12 @@
         <item>Gmina Stawiszyn</item>
         <item>Gmina Stoczek Łukowski</item>
         <item>Gmina Stopnica</item>
-        <item>Gmina Strawczyn</item>
         <item>Gmina Stryków</item>
         <item>Gmina Stryszów</item>
         <item>Gmina Strzałkowo</item>
         <item>Gmina Strzelce Opolskie</item>
         <item>Gmina Strzelin</item>
-        <item>Gmina Strzelno</item>
         <item>Gmina Strzyżewice</item>
-        <item>Gmina Stupsk</item>
         <item>Gmina Subkowy</item>
         <item>Gmina Suchedniów</item>
         <item>Gmina Suchożebry</item>
@@ -683,18 +580,14 @@
         <item>Gmina Świlcza</item>
         <item>Gmina Szadek</item>
         <item>Gmina Szaflary</item>
-        <item>Gmina Szastarka</item>
         <item>Gmina Szczebrzeszyn</item>
         <item>Gmina Szczekociny</item>
         <item>Gmina Szczerców</item>
         <item>Gmina Szczutowo</item>
         <item>Gmina Szczytna</item>
         <item>Gmina Szczytniki</item>
-        <item>Gmina Szemud</item>
         <item>Gmina Szerzyny</item>
         <item>Gmina Szlichtyngowa</item>
-        <item>Gmina Szydłów</item>
-        <item>Gmina Tarłów</item>
         <item>Gmina Tarnów</item>
         <item>Gmina Tarnowiec</item>
         <item>Gmina Tarnów Opolski</item>
@@ -714,19 +607,16 @@
         <item>Gmina Trzyciąż</item>
         <item>Gmina Tuchów</item>
         <item>Gmina Turośń Kościelna</item>
-        <item>Gmina Tuszów Narodowy</item>
         <item>Gmina Tyczyn</item>
         <item>Gmina Tymbark</item>
         <item>Gmina Tyrawa Wołoska</item>
         <item>Gmina Uchanie</item>
         <item>Gmina Ujazd</item>
-        <item>Gmina Ulan-Majorat</item>
-        <item>Gmina Ulanów</item>
         <item>Gmina Ułęż</item>
         <item>Gmina Urszulin</item>
         <item>Gmina Urzędów</item>
-        <item>Gmina Uścimów</item>
         <item>Gmina Wąchock</item>
+        <item>Gmina Wadowice Górne</item>
         <item>Gmina Wągrowiec</item>
         <item>Gmina Wąpielsk</item>
         <item>Gmina Wasilków</item>
@@ -744,9 +634,7 @@
         <item>Gmina Wieniawa</item>
         <item>Gmina Wieprz</item>
         <item>Gmina Wieruszów</item>
-        <item>Gmina Wierzbno</item>
         <item>Gmina Wierzchosławice</item>
-        <item>Gmina Wietrzychowice</item>
         <item>Gmina Wijewo</item>
         <item>Gmina Wilczyn</item>
         <item>Gmina Wilków</item>
@@ -777,25 +665,17 @@
         <item>Gmina Wyrzysk</item>
         <item>Gmina Zabierzów</item>
         <item>Gmina Żabno</item>
-        <item>Gmina Żagań</item>
-        <item>Gmina Zagórz</item>
         <item>Gmina Zaklików</item>
         <item>Gmina Zakroczym</item>
         <item>Gmina Zakrzówek</item>
         <item>Gmina Zaleszany</item>
         <item>Gmina Zamość</item>
-        <item>Gmina Żarnowiec</item>
-        <item>Gmina Żarów</item>
         <item>Gmina Zarszyn</item>
         <item>Gmina Zator</item>
-        <item>Gmina Zawadzkie</item>
-        <item>Gmina Zawichost</item>
         <item>Gmina Zawonia</item>
         <item>Gmina Zbąszyń</item>
-        <item>Gmina Zbójno</item>
         <item>Gmina Zbrosławice</item>
         <item>Gmina Zduńska Wola</item>
-        <item>Gmina Zduny</item>
         <item>Gmina Zdzieszowice</item>
         <item>Gmina Zebrzydowice</item>
         <item>Gmina Żelazków</item>
@@ -806,7 +686,6 @@
         <item>Gmina Zławieś Wielka</item>
         <item>Gmina Żmudź</item>
         <item>Gmina Żnin</item>
-        <item>Gmina Żółkiewka</item>
         <item>Gmina Żołynia</item>
         <item>Gmina Żukowice</item>
         <item>Gmina Żyrzyn</item>
@@ -822,14 +701,12 @@
         <item>Gostynin</item>
         <item>Grajewo</item>
         <item>Grodzisk Mazowiecki</item>
-        <item>Gronowo Elbląskie</item>
         <item>Grudziądz</item>
         <item>Gryfino</item>
         <item>Gryfów Śląski</item>
         <item>Hel</item>
         <item>Hrubieszów</item>
         <item>Inowrocław</item>
-        <item>Iwanowice</item>
         <item>Izbica Kujawska</item>
         <item>Jabłonowo Pomorskie</item>
         <item>Janowiec Wielkopolski</item>
@@ -848,7 +725,6 @@
         <item>Kalety</item>
         <item>Kalisz</item>
         <item>Kalwaria Zebrzydowska</item>
-        <item>Kamień Krajeński</item>
         <item>Kańczuga</item>
         <item>Karczew</item>
         <item>Kartuzy</item>
@@ -860,7 +736,6 @@
         <item>Kępno</item>
         <item>Kętrzyn</item>
         <item>Kielce</item>
-        <item>Kiełczygłów</item>
         <item>Kłodawa</item>
         <item>Kłodzko</item>
         <item>Knurów</item>
@@ -876,7 +751,6 @@
         <item>Kościerzyna</item>
         <item>Kostrzyn Nad Odrą</item>
         <item>Koszalin</item>
-        <item>Kowal</item>
         <item>Kowalewo Pomorskie</item>
         <item>Kowary</item>
         <item>Kozienice</item>
@@ -892,9 +766,7 @@
         <item>Krzeszowice</item>
         <item>Krzyż Wielkopolski</item>
         <item>Książ Wielkopolski</item>
-        <item>Kudowa-Zdrój</item>
         <item>Kujawsko-Pomorskie</item>
-        <item>Kuźnia Raciborska</item>
         <item>Łabiszyn</item>
         <item>Lądek-Zdrój</item>
         <item>Łapy</item>
@@ -909,7 +781,6 @@
         <item>Leszno</item>
         <item>Lewin Brzeski</item>
         <item>Leżajsk</item>
-        <item>Limanowa</item>
         <item>Lipno</item>
         <item>Lipsko</item>
         <item>Łódź</item>
@@ -925,16 +796,12 @@
         <item>Lubuskie</item>
         <item>Łuków</item>
         <item>Lwówecki</item>
-        <item>Lwówek Śląski</item>
         <item>Malbork</item>
         <item>Małopolskie</item>
-        <item>Marciszów</item>
         <item>Marki</item>
-        <item>Masłowice</item>
         <item>Mazowieckie</item>
         <item>Miastko</item>
         <item>Michałowice</item>
-        <item>Miechów</item>
         <item>Międzyrzec Podlaski</item>
         <item>Miejska Górka</item>
         <item>Mielec</item>
@@ -949,18 +816,13 @@
         <item>Mysłowice</item>
         <item>Myszków</item>
         <item>Nakło Nad Notecią</item>
-        <item>Nasielsk</item>
-        <item>Niemodlin</item>
-        <item>Niepołomice</item>
         <item>Nisko</item>
         <item>Nowa Dęba</item>
         <item>Nowa Sarzyna</item>
         <item>Nowe Miasteczko</item>
         <item>Nowe Skalmierzyce</item>
         <item>Nowogard</item>
-        <item>Nowogród Bobrzański</item>
         <item>Nowogrodziec</item>
-        <item>Nowosolna</item>
         <item>Nowy Dwór Mazowiecki</item>
         <item>Nowy Sącz</item>
         <item>Nowy Targ</item>
@@ -1001,7 +863,6 @@
         <item>Połczyn-Zdrój</item>
         <item>Pomorskie</item>
         <item>Poniec</item>
-        <item>Poręba</item>
         <item>Powiat aleksandrowski</item>
         <item>Powiat augustowski</item>
         <item>Powiat będziński</item>
@@ -1016,7 +877,6 @@
         <item>Powiat braniewski</item>
         <item>Powiat brodnicki</item>
         <item>Powiat brzeski</item>
-        <item>Powiat brzeziński</item>
         <item>Powiat brzozowski</item>
         <item>Powiat buski</item>
         <item>Powiat bydgoski</item>
@@ -1037,7 +897,6 @@
         <item>Powiat elbląski</item>
         <item>Powiat ełcki</item>
         <item>Powiat garwoliński</item>
-        <item>Powiat gdański</item>
         <item>Powiat giżycki</item>
         <item>Powiat gliwicki</item>
         <item>Powiat głogowski</item>
@@ -1096,7 +955,6 @@
         <item>Powiat leski</item>
         <item>Powiat leszczyński</item>
         <item>Powiat leżajski</item>
-        <item>Powiat lidzbarski</item>
         <item>Powiat limanowski</item>
         <item>Powiat lipnowski</item>
         <item>Powiat lipski</item>
@@ -1122,7 +980,6 @@
         <item>Powiat myślenicki</item>
         <item>Powiat myszkowski</item>
         <item>Powiat nakielski</item>
-        <item>Powiat nidzicki</item>
         <item>Powiat niżański</item>
         <item>Powiat nowodworski</item>
         <item>Powiat nowosądecki</item>
@@ -1158,20 +1015,15 @@
         <item>Powiat polkowicki</item>
         <item>Powiat poznański</item>
         <item>Powiat proszowicki</item>
-        <item>Powiat prudnicki</item>
         <item>Powiat pruszkowski</item>
         <item>Powiat przasnyski</item>
         <item>Powiat przemyski</item>
         <item>Powiat przeworski</item>
-        <item>Powiat przysuski</item>
         <item>Powiat pszczyński</item>
-        <item>Powiat pucki</item>
         <item>Powiat puławski</item>
         <item>Powiat pułtuski</item>
-        <item>Powiat pyrzycki</item>
         <item>Powiat raciborski</item>
         <item>Powiat radomski</item>
-        <item>Powiat radomszczański</item>
         <item>Powiat radziejowski</item>
         <item>Powiat radzyński</item>
         <item>Powiat rawicki</item>
@@ -1202,7 +1054,6 @@
         <item>Powiat starachowicki</item>
         <item>Powiat stargardzki</item>
         <item>Powiat starogardzki</item>
-        <item>Powiat staszowski</item>
         <item>Powiat strzelecki</item>
         <item>Powiat strzeliński</item>
         <item>Powiat strzyżowski</item>
@@ -1245,7 +1096,6 @@
         <item>Powiat wschowski</item>
         <item>Powiat wysokomazowiecki</item>
         <item>Powiat wyszkowski</item>
-        <item>Powiat ząbkowicki</item>
         <item>Powiat żagański</item>
         <item>Powiat zambrowski</item>
         <item>Powiat zamojski</item>
@@ -1262,30 +1112,25 @@
         <item>Powiat żyrardowski</item>
         <item>Powiat żywiecki</item>
         <item>Poznań</item>
-        <item>Prostki</item>
         <item>Proszowice</item>
         <item>Prudnik</item>
         <item>Pruszków</item>
-        <item>Przasnysz</item>
         <item>Przemyśl</item>
         <item>Przeworsk</item>
         <item>Przysucha</item>
         <item>Pszczyna</item>
-        <item>Pszów</item>
         <item>Puck</item>
         <item>Puławy</item>
         <item>Pyskowice</item>
         <item>Rabka-Zdrój</item>
         <item>Raciąż</item>
         <item>Racibórz</item>
-        <item>Raciechowice</item>
         <item>Radom</item>
         <item>Radomsko</item>
         <item>Radymno</item>
         <item>Radziejów</item>
         <item>Radzionków</item>
         <item>Radzyń Podlaski</item>
-        <item>Raków</item>
         <item>Rawa Mazowiecka</item>
         <item>Rawicz</item>
         <item>Reda</item>
@@ -1302,7 +1147,6 @@
         <item>Sandomierz</item>
         <item>Sanok</item>
         <item>Sędziszów Małopolski</item>
-        <item>Sejny</item>
         <item>Siedlce</item>
         <item>Siemianowice Śląskie</item>
         <item>Siemiatycze</item>
@@ -1311,7 +1155,7 @@
         <item>Skarżysko-Kamienna</item>
         <item>Skawina</item>
         <item>Skierniewice</item>
-        <item>Skoroszyce</item>
+        <item>Skórcz</item>
         <item>Śląskie</item>
         <item>Sławno</item>
         <item>Słomniki</item>
@@ -1321,21 +1165,16 @@
         <item>Sokołów Podlaski</item>
         <item>Sopot</item>
         <item>Sosnowiec</item>
-        <item>Śrem</item>
         <item>Środa Śląska</item>
         <item>Środa Wielkopolska</item>
         <item>Starachowice</item>
         <item>Starogard Gdański</item>
         <item>Stary Sącz</item>
         <item>Staszów</item>
-        <item>Stronie Śląskie</item>
         <item>Strzegom</item>
-        <item>Strzyżów</item>
-        <item>Suchy Las</item>
         <item>Sulejówek</item>
         <item>Sułkowice</item>
         <item>Sulmierzyce</item>
-        <item>Suwalski</item>
         <item>Swarzędz</item>
         <item>Świdnica</item>
         <item>Świdnik</item>
@@ -1381,11 +1220,9 @@
         <item>Więcbork</item>
         <item>Wieliczka</item>
         <item>Wielkopolskie</item>
-        <item>Wizna</item>
         <item>Władysławowo</item>
         <item>Włocławek</item>
         <item>Włodawa</item>
-        <item>Woźniki</item>
         <item>Wrocław</item>
         <item>Września</item>
         <item>Wschowa</item>
@@ -1403,7 +1240,6 @@
         <item>Żary</item>
         <item>Zawidów</item>
         <item>Zduńska Wola</item>
-        <item>Zduny</item>
         <item>Żelechów</item>
         <item>Zgierz</item>
         <item>Zgorzelec</item>
@@ -1413,6 +1249,7 @@
         <item>Żory</item>
         <item>Zwoleń</item>
         <item>Żyrardów</item>
+        <item>Żywiec</item>
     </string-array>
     <string-array name="symbols_values">
         <item>andrychow</item>
@@ -1432,8 +1269,6 @@
         <item>bielskobiala</item>
         <item>bierawa</item>
         <item>bierutow</item>
-        <item>biskupice</item>
-        <item>blachownia</item>
         <item>blaszki</item>
         <item>blonie</item>
         <item>bochnia</item>
@@ -1473,7 +1308,6 @@
         <item>dabrowatarnowska</item>
         <item>debica</item>
         <item>dobrzenwielki</item>
-        <item>dobrzynnadwisla</item>
         <item>dolnoslaskie</item>
         <item>dusznikizdroj</item>
         <item>dynow</item>
@@ -1494,53 +1328,36 @@
         <item>gminaaleksandrowkujawski</item>
         <item>gminaaleksandrowlodzki</item>
         <item>gminaalwernia</item>
-        <item>gminaandrzejewo</item>
         <item>gminaannopol</item>
-        <item>gminaaugustow</item>
         <item>gminababice</item>
-        <item>gminabadkowo</item>
         <item>gminabaltow</item>
         <item>gminabaranow</item>
-        <item>gminabarciany</item>
         <item>gminabarcin</item>
         <item>gminabaruchowo</item>
         <item>gminabedzino</item>
         <item>gminabelchatow</item>
-        <item>gminabialaczow</item>
         <item>gminabialeblota</item>
-        <item>gminabielskpodlaski</item>
         <item>gminabircza</item>
         <item>gminablazowa</item>
         <item>gminabledow</item>
         <item>gminabobolice</item>
-        <item>gminabobowa</item>
         <item>gminabobowo</item>
         <item>gminabobrowniki</item>
-        <item>gminabodzentyn</item>
-        <item>gminabogoria</item>
-        <item>gminabojanow</item>
         <item>gminabojanowo</item>
         <item>gminabojszowy</item>
         <item>gminaboleslawiec</item>
         <item>gminabolkow</item>
         <item>gminaboronow</item>
-        <item>gminaborow</item>
         <item>gminaborowa</item>
         <item>gminaborzecin</item>
         <item>gminabranice</item>
-        <item>gminabraniewo</item>
         <item>gminabraszewice</item>
         <item>gminabrenna</item>
         <item>gminabrzegdolny</item>
         <item>gminabrzeziny</item>
         <item>gminabrzeznio</item>
-        <item>gminabrzostek</item>
         <item>gminabrzozow</item>
-        <item>gminabrzuze</item>
         <item>gminabrzyska</item>
-        <item>gminabuczek</item>
-        <item>gminabuczkowice</item>
-        <item>gminabudzow</item>
         <item>gminabudzyn</item>
         <item>gminabukowsko</item>
         <item>gminabyczyna</item>
@@ -1549,15 +1366,15 @@
         <item>gminacekowkolonia</item>
         <item>gminacelestynow</item>
         <item>gminacewice</item>
-        <item>gminacharsznica</item>
         <item>gminachelm</item>
         <item>gminachelmiec</item>
         <item>gminachelmno</item>
         <item>gminachmielnik</item>
-        <item>gminachocz</item>
+        <item>gminachodecz</item>
         <item>gminachodel</item>
         <item>gminachojnice</item>
         <item>gminachojnow</item>
+        <item>gminachorkowka</item>
         <item>gminachrzypskowielkie</item>
         <item>gminachybie</item>
         <item>gminaciasna</item>
@@ -1569,12 +1386,12 @@
         <item>gminaczaplinek</item>
         <item>gminaczarna</item>
         <item>gminaczarnkow</item>
+        <item>gminaczarnybor</item>
         <item>gminaczarnydunajec</item>
         <item>gminaczechowicedziedzice</item>
         <item>gminaczernichow</item>
         <item>gminaczerniejewo</item>
         <item>gminaczerwionkaleszczyny</item>
-        <item>gminaczerwonka</item>
         <item>gminaczluchow</item>
         <item>gminaczosnow</item>
         <item>gminadamaslawek</item>
@@ -1582,7 +1399,6 @@
         <item>gminadarlowo</item>
         <item>gminadebewielkie</item>
         <item>gminadebica</item>
-        <item>gminadebno</item>
         <item>gminadlutow</item>
         <item>gminadobczyce</item>
         <item>gminadobra</item>
@@ -1594,7 +1410,6 @@
         <item>gminadominowo</item>
         <item>gminadorohusk</item>
         <item>gminadrzewica</item>
-        <item>gminadubiecko</item>
         <item>gminadukla</item>
         <item>gminadwikozy</item>
         <item>gminadynow</item>
@@ -1618,7 +1433,6 @@
         <item>gminagluszyca</item>
         <item>gminagniew</item>
         <item>gminagniewoszow</item>
-        <item>gminagniezno</item>
         <item>gminagoczalkowicezdroj</item>
         <item>gminagodkowo</item>
         <item>gminagodow</item>
@@ -1637,7 +1451,6 @@
         <item>gminagozd</item>
         <item>gminagrabow</item>
         <item>gminagrabowiec</item>
-        <item>gminagrabownadpilica</item>
         <item>gminagrajewo</item>
         <item>gminagranowo</item>
         <item>gminagrebocice</item>
@@ -1648,7 +1461,6 @@
         <item>gminagrodziec</item>
         <item>gminagrojec</item>
         <item>gminagromadka</item>
-        <item>gminagromnik</item>
         <item>gminagronowoelblaskie</item>
         <item>gminagrudziadz</item>
         <item>gminagruta</item>
@@ -1658,17 +1470,13 @@
         <item>gminahansk</item>
         <item>gminaharasiuki</item>
         <item>gminahazlach</item>
-        <item>gminaherby</item>
         <item>gminahrubieszow</item>
-        <item>gminahuszlew</item>
         <item>gminahyzne</item>
         <item>gminaimielno</item>
         <item>gminainowroclaw</item>
-        <item>gminaistebna</item>
         <item>gminaiwierzyce</item>
         <item>gminaiwoniczzdroj</item>
         <item>gminaizabelin</item>
-        <item>gminaizbica</item>
         <item>gminajadow</item>
         <item>gminajaktorow</item>
         <item>gminajanikowo</item>
@@ -1680,23 +1488,19 @@
         <item>gminajaslo</item>
         <item>gminajastkow</item>
         <item>gminajastrowie</item>
-        <item>gminajastrzab</item>
         <item>gminajedlicze</item>
         <item>gminajedlinsk</item>
         <item>gminajedlnialetnisko</item>
         <item>gminajejkowice</item>
         <item>gminajemielnica</item>
-        <item>gminajemielno</item>
         <item>gminajerzmanowa</item>
         <item>gminajezewo</item>
         <item>gminajeziorawielkie</item>
-        <item>gminajeziorzany</item>
         <item>gminajezowe</item>
         <item>gminajordanow</item>
         <item>gminajozefow</item>
         <item>gminajozefownadwisla</item>
         <item>gminajutrosin</item>
-        <item>gminakakolewnica</item>
         <item>gminakamien</item>
         <item>gminakamienica</item>
         <item>gminakamieniec</item>
@@ -1709,11 +1513,9 @@
         <item>gminakielczyglow</item>
         <item>gminakikol</item>
         <item>gminakiszkowo</item>
-        <item>gminakleczew</item>
         <item>gminaklembow</item>
         <item>gminakleszczewo</item>
         <item>gminakleszczow</item>
-        <item>gminaklimontow</item>
         <item>gminaklobuck</item>
         <item>gminakloczew</item>
         <item>gminaklomnice</item>
@@ -1721,8 +1523,6 @@
         <item>gminaklucze</item>
         <item>gminakluczewsko</item>
         <item>gminakobielewielkie</item>
-        <item>gminakochanowice</item>
-        <item>gminakock</item>
         <item>gminakodrab</item>
         <item>gminakolaczyce</item>
         <item>gminakolbaskowo</item>
@@ -1731,13 +1531,9 @@
         <item>gminakomancza</item>
         <item>gminakomorniki</item>
         <item>gminakomprachcice</item>
-        <item>gminakonarzyny</item>
-        <item>gminakondratowice</item>
-        <item>gminakoniusza</item>
         <item>gminakonopiska</item>
         <item>gminakonskowola</item>
-        <item>gminakoprzywnica</item>
-        <item>gminakorsze</item>
+        <item>gminakorczyna</item>
         <item>gminakorycin</item>
         <item>gminakorzenna</item>
         <item>gminakosakowo</item>
@@ -1746,7 +1542,6 @@
         <item>gminakoscierzyna</item>
         <item>gminakosowlacki</item>
         <item>gminakostrzyn</item>
-        <item>gminakoszyce</item>
         <item>gminakotla</item>
         <item>gminakotun</item>
         <item>gminakozlow</item>
@@ -1758,31 +1553,22 @@
         <item>gminakrokowa</item>
         <item>gminakrosnice</item>
         <item>gminakrupskimlyn</item>
-        <item>gminakruszwica</item>
-        <item>gminakrynki</item>
         <item>gminakrzanowice</item>
         <item>gminakrzemieniewo</item>
         <item>gminakrzymow</item>
-        <item>gminakrzywin</item>
         <item>gminakrzyzanowice</item>
-        <item>gminaksiazwielki</item>
         <item>gminakunice</item>
         <item>gminakunow</item>
         <item>gminakurow</item>
-        <item>gminakurylowka</item>
         <item>gminakwidzyn</item>
         <item>gminakwilcz</item>
-        <item>gminalabowa</item>
         <item>gminalabunie</item>
         <item>gminalambinowice</item>
         <item>gminalanckorona</item>
         <item>gminalapszenizne</item>
-        <item>gminalasin</item>
         <item>gminalaskarzew</item>
         <item>gminalasowicewielkie</item>
         <item>gminalaszczow</item>
-        <item>gminalaszki</item>
-        <item>gminalatowicz</item>
         <item>gminalazy</item>
         <item>gminaleczyca</item>
         <item>gminaleczyce</item>
@@ -1794,20 +1580,16 @@
         <item>gminalesnapodlaska</item>
         <item>gminalesznowola</item>
         <item>gminalezajsk</item>
-        <item>gminalichnowy</item>
         <item>gminalimanowa</item>
-        <item>gminalinia</item>
         <item>gminalipinki</item>
         <item>gminalipnik</item>
         <item>gminalipowa</item>
         <item>gminalisiagora</item>
         <item>gminaliszki</item>
-        <item>gminaliw</item>
         <item>gminalobez</item>
         <item>gminalodygowice</item>
         <item>gminalomazy</item>
         <item>gminalopiennikgorny</item>
-        <item>gminalopuszno</item>
         <item>gminaluban</item>
         <item>gminalubartow</item>
         <item>gminalubasz</item>
@@ -1817,40 +1599,30 @@
         <item>gminalubiewo</item>
         <item>gminalubin</item>
         <item>gminalubniany</item>
-        <item>gminalubochnia</item>
         <item>gminalubomia</item>
         <item>gminalubon</item>
         <item>gminalukow</item>
-        <item>gminalukowica</item>
-        <item>gminalutowiska</item>
         <item>gminaluzino</item>
         <item>gminaluzna</item>
         <item>gminalysomice</item>
         <item>gminamagnuszew</item>
         <item>gminamakowpodhalanski</item>
-        <item>gminamalawies</item>
         <item>gminamalbork</item>
         <item>gminamaldyty</item>
-        <item>gminamalkiniagorna</item>
         <item>gminamarcinowice</item>
         <item>gminamargonin</item>
         <item>gminamarianowo</item>
-        <item>gminamarkusy</item>
         <item>gminamaslow</item>
-        <item>gminamedyka</item>
         <item>gminamelgiew</item>
-        <item>gminamichalow</item>
         <item>gminamichalowo</item>
         <item>gminamiedzianagora</item>
         <item>gminamiedzna</item>
         <item>gminamiedzno</item>
         <item>gminamiedzyborz</item>
         <item>gminamiedzylesie</item>
-        <item>gminamiedzyrzecpodlaski</item>
         <item>gminamiedzyzdroje</item>
         <item>gminamiejscepiastowe</item>
         <item>gminamielec</item>
-        <item>gminamilanow</item>
         <item>gminamilejow</item>
         <item>gminamilicz</item>
         <item>gminamilkowice</item>
@@ -1864,38 +1636,28 @@
         <item>gminamogilany</item>
         <item>gminamordy</item>
         <item>gminamoryn</item>
-        <item>gminamrocza</item>
         <item>gminamrozy</item>
         <item>gminamszana</item>
         <item>gminamszanadolna</item>
         <item>gminamurow</item>
         <item>gminamycielin</item>
-        <item>gminamyslakowice</item>
         <item>gminamysliborz</item>
         <item>gminanadarzyn</item>
-        <item>gminanamyslow</item>
-        <item>gminanasielsk</item>
         <item>gminanawojowa</item>
-        <item>gminanedza</item>
         <item>gminanekla</item>
         <item>gminaniebylec</item>
         <item>gminaniechlow</item>
         <item>gminaniedrzwicaduza</item>
-        <item>gminaniedzwiada</item>
-        <item>gminaniedzwiedz</item>
         <item>gminaniegoslawice</item>
         <item>gminaniwiska</item>
         <item>gminanowaruda</item>
         <item>gminanowawiesleborska</item>
         <item>gminanowemiasto</item>
         <item>gminanowemiastonadwarta</item>
-        <item>gminanowogrodbobrzanski</item>
         <item>gminanowosolna</item>
         <item>gminanowykaweczyn</item>
         <item>gminanowystaw</item>
         <item>gminanowytarg</item>
-        <item>gminanowytomysl</item>
-        <item>gminanur</item>
         <item>gminaobrazow</item>
         <item>gminaochotnicadolna</item>
         <item>gminaogrodzieniec</item>
@@ -1909,45 +1671,33 @@
         <item>gminaosiekjasielski</item>
         <item>gminaosiekmaly</item>
         <item>gminaosielsko</item>
-        <item>gminaostrow</item>
         <item>gminaostrowek</item>
         <item>gminaostrowlubelski</item>
         <item>gminaostrowmazowiecka</item>
         <item>gminaostrowwielkopolski</item>
         <item>gminaotyn</item>
         <item>gminaozarow</item>
-        <item>gminaozarowice</item>
         <item>gminaozimek</item>
         <item>gminaozorkow</item>
         <item>gminapabianice</item>
         <item>gminapacanow</item>
-        <item>gminapaczkow</item>
         <item>gminapadewnarodowa</item>
-        <item>gminapajeczno</item>
         <item>gminapakoslaw</item>
         <item>gminapakoslawice</item>
-        <item>gminapalecznica</item>
         <item>gminapanki</item>
         <item>gminaparchowo</item>
         <item>gminaparczew</item>
         <item>gminapawlosiow</item>
         <item>gminapawlowice</item>
-        <item>gminapawlowiczki</item>
-        <item>gminapeclaw</item>
         <item>gminapelplin</item>
         <item>gminapiaski</item>
         <item>gminapiatnica</item>
-        <item>gminapiecki</item>
-        <item>gminapiekoszow</item>
         <item>gminapilchowice</item>
         <item>gminapionki</item>
-        <item>gminapiotrkowtrybunalski</item>
         <item>gminaplesna</item>
         <item>gminapleszew</item>
         <item>gminaplonsk</item>
-        <item>gminaplosnica</item>
         <item>gminapoczesna</item>
-        <item>gminapodedworze</item>
         <item>gminapodegrodzie</item>
         <item>gminapokoj</item>
         <item>gminapolajewo</item>
@@ -1957,7 +1707,6 @@
         <item>gminapolice</item>
         <item>gminapolkowice</item>
         <item>gminapomiechowek</item>
-        <item>gminapopielow</item>
         <item>gminapopow</item>
         <item>gminaporaj</item>
         <item>gminapotegowo</item>
@@ -1984,27 +1733,23 @@
         <item>gminapuszczamarianska</item>
         <item>gminapysznica</item>
         <item>gminapyzdry</item>
-        <item>gminarachanie</item>
         <item>gminaraciechowice</item>
         <item>gminaraclawice</item>
         <item>gminaradecznica</item>
         <item>gminaradkow</item>
         <item>gminaradlow</item>
         <item>gminaradomin</item>
-        <item>gminaradomsko</item>
         <item>gminaradomyslnadsanem</item>
         <item>gminaradoszyce</item>
         <item>gminaradwanice</item>
         <item>gminaradzilow</item>
         <item>gminarawamazowiecka</item>
         <item>gminarenskawies</item>
-        <item>gminarossosz</item>
         <item>gminarozprza</item>
         <item>gminarucianenida</item>
         <item>gminarudahuta</item>
         <item>gminarudna</item>
         <item>gminarudniki</item>
-        <item>gminarusiec</item>
         <item>gminarychliki</item>
         <item>gminarychtal</item>
         <item>gminaryczywol</item>
@@ -2015,33 +1760,27 @@
         <item>gminarzasnia</item>
         <item>gminarzeczyca</item>
         <item>gminarzepiennikstrzyzewski</item>
-        <item>gminarzepin</item>
+        <item>gminarzezawa</item>
         <item>gminarzgow</item>
         <item>gminasadki</item>
         <item>gminasadowne</item>
         <item>gminasamborzec</item>
-        <item>gminasanok</item>
         <item>gminascinawa</item>
         <item>gminasedziejowice</item>
         <item>gminasepopol</item>
         <item>gminaserokomla</item>
-        <item>gminasianow</item>
         <item>gminasicienko</item>
         <item>gminasieciechow</item>
         <item>gminasiedlce</item>
-        <item>gminasiemiatycze</item>
         <item>gminasiemysl</item>
         <item>gminasiennica</item>
         <item>gminasiennicarozana</item>
         <item>gminasienno</item>
         <item>gminasiepraw</item>
-        <item>gminasieradz</item>
         <item>gminasierakowice</item>
         <item>gminasiewierz</item>
-        <item>gminasitno</item>
         <item>gminaskarzyskokoscielne</item>
         <item>gminaskepe</item>
-        <item>gminaskierniewice</item>
         <item>gminaskoczow</item>
         <item>gminaskoki</item>
         <item>gminaskolyszyn</item>
@@ -2051,10 +1790,8 @@
         <item>gminaslopnice</item>
         <item>gminaslupca</item>
         <item>gminaslupia</item>
-        <item>gminasobieniejeziory</item>
         <item>gminasobotka</item>
         <item>gminasokolka</item>
-        <item>gminasokoly</item>
         <item>gminasolina</item>
         <item>gminasosnicowice</item>
         <item>gminasosnie</item>
@@ -2072,15 +1809,12 @@
         <item>gminastawiszyn</item>
         <item>gminastoczeklukowski</item>
         <item>gminastopnica</item>
-        <item>gminastrawczyn</item>
         <item>gminastrykow</item>
         <item>gminastryszow</item>
         <item>gminastrzalkowo</item>
         <item>gminastrzelceopolskie</item>
         <item>gminastrzelin</item>
-        <item>gminastrzelno</item>
         <item>gminastrzyzewice</item>
-        <item>gminastupsk</item>
         <item>gminasubkowy</item>
         <item>gminasuchedniow</item>
         <item>gminasuchozebry</item>
@@ -2097,18 +1831,14 @@
         <item>gminaswilcza</item>
         <item>gminaszadek</item>
         <item>gminaszaflary</item>
-        <item>gminaszastarka</item>
         <item>gminaszczebrzeszyn</item>
         <item>gminaszczekociny</item>
         <item>gminaszczercow</item>
         <item>gminaszczutowo</item>
         <item>gminaszczytna</item>
         <item>gminaszczytniki</item>
-        <item>gminaszemud</item>
         <item>gminaszerzyny</item>
         <item>gminaszlichtyngowa</item>
-        <item>gminaszydlow</item>
-        <item>gminatarlow</item>
         <item>gminatarnow</item>
         <item>gminatarnowiec</item>
         <item>gminatarnowopolski</item>
@@ -2128,19 +1858,16 @@
         <item>gminatrzyciaz</item>
         <item>gminatuchow</item>
         <item>gminaturosnkoscielna</item>
-        <item>gminatuszownarodowy</item>
         <item>gminatyczyn</item>
         <item>gminatymbark</item>
         <item>gminatyrawawoloska</item>
         <item>gminauchanie</item>
         <item>gminaujazd</item>
-        <item>gminaulanmajorat</item>
-        <item>gminaulanow</item>
         <item>gminaulez</item>
         <item>gminaurszulin</item>
         <item>gminaurzedow</item>
-        <item>gminauscimow</item>
         <item>gminawachock</item>
+        <item>gminawadowicegorne</item>
         <item>gminawagrowiec</item>
         <item>gminawapielsk</item>
         <item>gminawasilkow</item>
@@ -2158,9 +1885,7 @@
         <item>gminawieniawa</item>
         <item>gminawieprz</item>
         <item>gminawieruszow</item>
-        <item>gminawierzbno</item>
         <item>gminawierzchoslawice</item>
-        <item>gminawietrzychowice</item>
         <item>gminawijewo</item>
         <item>gminawilczyn</item>
         <item>gminawilkow</item>
@@ -2191,25 +1916,17 @@
         <item>gminawyrzysk</item>
         <item>gminazabierzow</item>
         <item>gminazabno</item>
-        <item>gminazagan</item>
-        <item>gminazagorz</item>
         <item>gminazaklikow</item>
         <item>gminazakroczym</item>
         <item>gminazakrzowek</item>
         <item>gminazaleszany</item>
         <item>gminazamosc</item>
-        <item>gminazarnowiec</item>
-        <item>gminazarow</item>
         <item>gminazarszyn</item>
         <item>gminazator</item>
-        <item>gminazawadzkie</item>
-        <item>gminazawichost</item>
         <item>gminazawonia</item>
         <item>gminazbaszyn</item>
-        <item>gminazbojno</item>
         <item>gminazbroslawice</item>
         <item>gminazdunskawola</item>
-        <item>gminazduny</item>
         <item>gminazdzieszowice</item>
         <item>gminazebrzydowice</item>
         <item>gminazelazkow</item>
@@ -2220,7 +1937,6 @@
         <item>gminazlawieswielka</item>
         <item>gminazmudz</item>
         <item>gminaznin</item>
-        <item>gminazolkiewka</item>
         <item>gminazolynia</item>
         <item>gminazukowice</item>
         <item>gminazyrzyn</item>
@@ -2236,14 +1952,12 @@
         <item>gostynin</item>
         <item>grajewo</item>
         <item>grodziskmazowiecki</item>
-        <item>gronowoelblaskie</item>
         <item>grudziadz</item>
         <item>gryfino</item>
         <item>gryfowslaski</item>
         <item>hel</item>
         <item>hrubieszow</item>
         <item>inowroclaw</item>
-        <item>iwanowice</item>
         <item>izbicakujawska</item>
         <item>jablonowopomorskie</item>
         <item>janowiecwielkopolski</item>
@@ -2262,7 +1976,6 @@
         <item>kalety</item>
         <item>kalisz</item>
         <item>kalwariazebrzydowska</item>
-        <item>kamienkrajenski</item>
         <item>kanczuga</item>
         <item>karczew</item>
         <item>kartuzy</item>
@@ -2274,7 +1987,6 @@
         <item>kepno</item>
         <item>ketrzyn</item>
         <item>kielce</item>
-        <item>kielczyglow</item>
         <item>klodawa</item>
         <item>klodzko</item>
         <item>knurow</item>
@@ -2290,7 +2002,6 @@
         <item>koscierzyna</item>
         <item>kostrzynnadodra</item>
         <item>koszalin</item>
-        <item>kowal</item>
         <item>kowalewopomorskie</item>
         <item>kowary</item>
         <item>kozienice</item>
@@ -2306,9 +2017,7 @@
         <item>krzeszowice</item>
         <item>krzyzwielkopolski</item>
         <item>ksiazwielkopolski</item>
-        <item>kudowazdroj</item>
         <item>kujawskopomorskie</item>
-        <item>kuzniaraciborska</item>
         <item>labiszyn</item>
         <item>ladekzdroj</item>
         <item>lapy</item>
@@ -2323,7 +2032,6 @@
         <item>leszno</item>
         <item>lewinbrzeski</item>
         <item>lezajsk</item>
-        <item>limanowa</item>
         <item>lipno</item>
         <item>lipsko</item>
         <item>lodz</item>
@@ -2339,16 +2047,12 @@
         <item>lubuskie</item>
         <item>lukow</item>
         <item>lwowecki</item>
-        <item>lwowekslaski</item>
         <item>malbork</item>
         <item>malopolskie</item>
-        <item>marciszow</item>
         <item>marki</item>
-        <item>maslowice</item>
         <item>mazowieckie</item>
         <item>miastko</item>
         <item>michalowice</item>
-        <item>miechow</item>
         <item>miedzyrzecpodlaski</item>
         <item>miejskagorka</item>
         <item>mielec</item>
@@ -2363,18 +2067,13 @@
         <item>myslowice</item>
         <item>myszkow</item>
         <item>naklonadnotecia</item>
-        <item>nasielsk</item>
-        <item>niemodlin</item>
-        <item>niepolomice</item>
         <item>nisko</item>
         <item>nowadeba</item>
         <item>nowasarzyna</item>
         <item>nowemiasteczko</item>
         <item>noweskalmierzyce</item>
         <item>nowogard</item>
-        <item>nowogrodbobrzanski</item>
         <item>nowogrodziec</item>
-        <item>nowosolna</item>
         <item>nowydwormazowiecki</item>
         <item>nowysacz</item>
         <item>nowytarg</item>
@@ -2415,7 +2114,6 @@
         <item>polczynzdroj</item>
         <item>pomorskie</item>
         <item>poniec</item>
-        <item>poreba</item>
         <item>powiataleksandrowski</item>
         <item>powiataugustowski</item>
         <item>powiatbedzinski</item>
@@ -2430,7 +2128,6 @@
         <item>powiatbraniewski</item>
         <item>powiatbrodnicki</item>
         <item>powiatbrzeski</item>
-        <item>powiatbrzezinski</item>
         <item>powiatbrzozowski</item>
         <item>powiatbuski</item>
         <item>powiatbydgoski</item>
@@ -2451,7 +2148,6 @@
         <item>powiatelblaski</item>
         <item>powiatelcki</item>
         <item>powiatgarwolinski</item>
-        <item>powiatgdanski</item>
         <item>powiatgizycki</item>
         <item>powiatgliwicki</item>
         <item>powiatglogowski</item>
@@ -2510,7 +2206,6 @@
         <item>powiatleski</item>
         <item>powiatleszczynski</item>
         <item>powiatlezajski</item>
-        <item>powiatlidzbarski</item>
         <item>powiatlimanowski</item>
         <item>powiatlipnowski</item>
         <item>powiatlipski</item>
@@ -2536,7 +2231,6 @@
         <item>powiatmyslenicki</item>
         <item>powiatmyszkowski</item>
         <item>powiatnakielski</item>
-        <item>powiatnidzicki</item>
         <item>powiatnizanski</item>
         <item>powiatnowodworski</item>
         <item>powiatnowosadecki</item>
@@ -2572,20 +2266,15 @@
         <item>powiatpolkowicki</item>
         <item>powiatpoznanski</item>
         <item>powiatproszowicki</item>
-        <item>powiatprudnicki</item>
         <item>powiatpruszkowski</item>
         <item>powiatprzasnyski</item>
         <item>powiatprzemyski</item>
         <item>powiatprzeworski</item>
-        <item>powiatprzysuski</item>
         <item>powiatpszczynski</item>
-        <item>powiatpucki</item>
         <item>powiatpulawski</item>
         <item>powiatpultuski</item>
-        <item>powiatpyrzycki</item>
         <item>powiatraciborski</item>
         <item>powiatradomski</item>
-        <item>powiatradomszczanski</item>
         <item>powiatradziejowski</item>
         <item>powiatradzynski</item>
         <item>powiatrawicki</item>
@@ -2616,7 +2305,6 @@
         <item>powiatstarachowicki</item>
         <item>powiatstargardzki</item>
         <item>powiatstarogardzki</item>
-        <item>powiatstaszowski</item>
         <item>powiatstrzelecki</item>
         <item>powiatstrzelinski</item>
         <item>powiatstrzyzowski</item>
@@ -2659,7 +2347,6 @@
         <item>powiatwschowski</item>
         <item>powiatwysokomazowiecki</item>
         <item>powiatwyszkowski</item>
-        <item>powiatzabkowicki</item>
         <item>powiatzaganski</item>
         <item>powiatzambrowski</item>
         <item>powiatzamojski</item>
@@ -2676,30 +2363,25 @@
         <item>powiatzyrardowski</item>
         <item>powiatzywiecki</item>
         <item>poznan</item>
-        <item>prostki</item>
         <item>proszowice</item>
         <item>prudnik</item>
         <item>pruszkow</item>
-        <item>przasnysz</item>
         <item>przemysl</item>
         <item>przeworsk</item>
         <item>przysucha</item>
         <item>pszczyna</item>
-        <item>pszow</item>
         <item>puck</item>
         <item>pulawy</item>
         <item>pyskowice</item>
         <item>rabkazdroj</item>
         <item>raciaz</item>
         <item>raciborz</item>
-        <item>raciechowice</item>
         <item>radom</item>
         <item>radomsko</item>
         <item>radymno</item>
         <item>radziejow</item>
         <item>radzionkow</item>
         <item>radzynpodlaski</item>
-        <item>rakow</item>
         <item>rawamazowiecka</item>
         <item>rawicz</item>
         <item>reda</item>
@@ -2716,7 +2398,6 @@
         <item>sandomierz</item>
         <item>sanok</item>
         <item>sedziszowmalopolski</item>
-        <item>sejny</item>
         <item>siedlce</item>
         <item>siemianowiceslaskie</item>
         <item>siemiatycze</item>
@@ -2725,7 +2406,7 @@
         <item>skarzyskokamienna</item>
         <item>skawina</item>
         <item>skierniewice</item>
-        <item>skoroszyce</item>
+        <item>skorcz</item>
         <item>slaskie</item>
         <item>slawno</item>
         <item>slomniki</item>
@@ -2735,21 +2416,16 @@
         <item>sokolowpodlaski</item>
         <item>sopot</item>
         <item>sosnowiec</item>
-        <item>srem</item>
         <item>srodaslaska</item>
         <item>srodawielkopolska</item>
         <item>starachowice</item>
         <item>starogardgdanski</item>
         <item>starysacz</item>
         <item>staszow</item>
-        <item>stronieslaskie</item>
         <item>strzegom</item>
-        <item>strzyzow</item>
-        <item>suchylas</item>
         <item>sulejowek</item>
         <item>sulkowice</item>
         <item>sulmierzyce</item>
-        <item>suwalski</item>
         <item>swarzedz</item>
         <item>swidnica</item>
         <item>swidnik</item>
@@ -2795,11 +2471,9 @@
         <item>wiecbork</item>
         <item>wieliczka</item>
         <item>wielkopolskie</item>
-        <item>wizna</item>
         <item>wladyslawowo</item>
         <item>wloclawek</item>
         <item>wlodawa</item>
-        <item>wozniki</item>
         <item>wroclaw</item>
         <item>wrzesnia</item>
         <item>wschowa</item>
@@ -2817,7 +2491,6 @@
         <item>zary</item>
         <item>zawidow</item>
         <item>zdunskawola</item>
-        <item>zduny</item>
         <item>zelechow</item>
         <item>zgierz</item>
         <item>zgorzelec</item>
@@ -2827,5 +2500,6 @@
         <item>zory</item>
         <item>zwolen</item>
         <item>zyrardow</item>
+        <item>zywiec</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 36dee1812..6221ef99b 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -12,9 +12,6 @@
     <color name="colorDivider">#1f000000</color>
     <color name="colorDividerInverse">#1fffffff</color>
 
-    <color name="note_positive">#a0c431</color>
-    <color name="note_negative">#d43f3f</color>
-
     <color name="grade_black">#424242</color>
     <color name="grade_red">#d43f3f</color>
     <color name="grade_blue">#49a6f2</color>
diff --git a/app/src/main/res/values/library_wulkanowy_api.xml b/app/src/main/res/values/library_wulkanowy_api.xml
new file mode 100644
index 000000000..d16bf86bd
--- /dev/null
+++ b/app/src/main/res/values/library_wulkanowy_api.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="define_WulkanowyApi" translatable="false" />
+
+    <string name="library_WulkanowyApi_author" translatable="false">Wulkanowy</string>
+    <string name="library_WulkanowyApi_authorWebsite" translatable="false">https://github.com/wulkanowy</string>
+
+    <string name="library_WulkanowyApi_libraryName" translatable="false">UONET+ Scraping API</string>
+    <string name="library_WulkanowyApi_libraryDescription" translatable="false">The  UONET+ client using web scraping</string>
+    <string name="library_WulkanowyApi_libraryWebsite" translatable="false">https://github.com/wulkanowy/api</string>
+    <string name="library_WulkanowyApi_libraryVersion" translatable="false">Development</string>
+
+    <string name="library_WulkanowyApi_isOpenSource" translatable="false">true</string>
+    <string name="library_WulkanowyApi_repositoryLink" translatable="false">https://github.com/wulkanowy/api</string>
+
+    <string name="library_WulkanowyApi_licenseId" translatable="false">apache_2_0</string>
+</resources>
diff --git a/app/src/main/res/values/preferences_defaults.xml b/app/src/main/res/values/preferences_defaults.xml
index a82b14eb7..be31b440f 100644
--- a/app/src/main/res/values/preferences_defaults.xml
+++ b/app/src/main/res/values/preferences_defaults.xml
@@ -5,7 +5,6 @@
     <string name="pref_default_grade_average_mode">only_one_semester</string>
     <bool name="pref_default_grade_average_force_calc">false</bool>
     <bool name="pref_default_expand_grade">false</bool>
-    <bool name="pref_default_grade_statistics_list">false</bool>
     <string name="pref_default_app_theme">light</string>
     <string name="pref_default_grade_color_scheme">vulcan</string>
     <string name="pref_default_app_language">system</string>
@@ -13,11 +12,9 @@
     <string name="pref_default_services_interval">60</string>
     <bool name="pref_default_services_wifi_only">false</bool>
     <bool name="pref_default_notifications_enable">true</bool>
-    <bool name="pref_default_notification_upcoming_lessons_enable">false</bool>
     <bool name="pref_default_notification_debug">false</bool>
     <string name="pref_default_grade_modifier_plus">0.33</string>
     <string name="pref_default_grade_modifier_minus">0.33</string>
     <bool name="pref_default_fill_message_content">true</bool>
     <string name="pref_default_timetable_show_whole_class">no</string>
-    <bool name="pref_default_timetable_show_timers">false</bool>
 </resources>
diff --git a/app/src/main/res/values/preferences_keys.xml b/app/src/main/res/values/preferences_keys.xml
index 6cb877ec2..49601b550 100644
--- a/app/src/main/res/values/preferences_keys.xml
+++ b/app/src/main/res/values/preferences_keys.xml
@@ -7,19 +7,14 @@
     <string name="pref_key_expand_grade">expand_grade</string>
     <string name="pref_key_grade_average_mode">grade_average_mode</string>
     <string name="pref_key_grade_average_force_calc">grade_average_always_calc</string>
-    <string name="pref_key_grade_statistics_list">grade_statistics_list</string>
     <string name="pref_key_app_language">app_language</string>
     <string name="pref_key_services_enable">services_enable</string>
     <string name="pref_key_services_interval">services_interval</string>
     <string name="pref_key_services_wifi_only">services_disable_wifi_only</string>
-    <string name="pref_key_services_force_sync">services_force_sync</string>
-    <string name="pref_key_notifications_fix_issues">notifications_fix_issues</string>
     <string name="pref_key_notifications_enable">notifications_enable</string>
-    <string name="pref_key_notifications_upcoming_lessons_enable">notifications_upcoming_lessons_enable</string>
     <string name="pref_key_notification_debug">notification_debug</string>
     <string name="pref_key_grade_modifier_plus">grade_modifier_plus</string>
     <string name="pref_key_grade_modifier_minus">grade_modifier_minus</string>
     <string name="pref_key_fill_message_content">fill_message_content</string>
     <string name="pref_key_timetable_show_whole_class">show_whole_class_plan</string>
-    <string name="pref_key_timetable_show_timers">timetable_show_timers</string>
 </resources>
diff --git a/app/src/main/res/values/preferences_values.xml b/app/src/main/res/values/preferences_values.xml
index 76427a487..3b1fde65d 100644
--- a/app/src/main/res/values/preferences_values.xml
+++ b/app/src/main/res/values/preferences_values.xml
@@ -29,16 +29,12 @@
         <item>Polski</item>
         <item>English</item>
         <item>Pусский</item>
-        <item>Українська</item>
-        <item>Deutsch</item>
     </string-array>
     <string-array name="app_language_values" translatable="false">
         <item>system</item>
         <item>pl</item>
         <item>en</item>
         <item>ru</item>
-        <item>uk</item>
-        <item>de</item>
     </string-array>
 
     <string-array name="services_interval_entries">
@@ -96,7 +92,7 @@
     </string-array>
 
     <string-array name="timetable_show_whole_class_entries">
-        <item>Don\'t show</item>
+        <item>No show</item>
         <item>Show all</item>
         <item>Show smaller</item>
     </string-array>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7793cd9c2..3fa133c9f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="app_name">Wulkanowy</string>
+
+
     <!--Activity/Fragment title-->
     <string name="login_title">Login</string>
     <string name="main_title">Wulkanowy</string>
@@ -10,8 +12,7 @@
     <string name="settings_title">Settings</string>
     <string name="more_title">More</string>
     <string name="about_title">About</string>
-    <string name="logviewer_title">Log viewer</string>
-    <string name="contributors_title">Contributors</string>
+    <string name="creators_title">Creators</string>
     <string name="license_title">Licenses</string>
     <string name="message_title">Messages</string>
     <string name="send_message_title">New message</string>
@@ -20,18 +21,12 @@
     <string name="account_title">Choose account</string>
 
 
-    <!--Subtitles-->
-    <string name="grade_subtitle">Semester %d, %d/%d</string>
-
-
     <!--Login-->
     <string name="login_header_default">Sign in with the student or parent account</string>
     <string name="login_header_symbol">Enter the symbol</string>
-    <string name="login_nickname_hint">Username</string>
-    <string name="login_email_hint">Email</string>
-    <string name="login_login_pesel_email_hint">Login, PESEL or e-mail</string>
+    <string name="login_nickname_hint">Email or nick</string>
     <string name="login_password_hint">Password</string>
-    <string name="login_host_hint">UONET+ Register</string>
+    <string name="login_host_hint">Register</string>
     <string name="login_type_api">Mobile API</string>
     <string name="login_type_scrapper">Scraper</string>
     <string name="login_type_hybrid">Hybrid</string>
@@ -41,35 +36,24 @@
     <string name="login_symbol_hint">Symbol</string>
     <string name="login_sign_in">Sign in</string>
     <string name="login_invalid_password">Password too short</string>
-    <string name="login_incorrect_password">Login details are incorrect. Make sure the correct UONET+ register is selected</string>
+    <string name="login_incorrect_password">Login details are incorrect</string>
     <string name="login_invalid_pin">Invalid PIN</string>
     <string name="login_invalid_token">Invalid token</string>
     <string name="login_expired_token">Token expired</string>
-    <string name="login_invalid_email">Invalid email</string>
-    <string name="login_invalid_login">Invalid login</string>
     <string name="login_invalid_symbol">Invalid symbol</string>
     <string name="login_incorrect_symbol">Student not found. Check the symbol</string>
     <string name="login_field_required">This field is required</string>
     <string name="login_duplicate_student">Selected student is already logged in</string>
-    <string name="login_symbol_helper">The symbol can be found on the register page in&#160;<b>Uczeń</b> →&#160;<b>Dostęp Mobilny</b> →&#160;<b>Zarejestruj urządzenie mobilne</b></string>
+    <string name="login_symbol_helper">The symbol can be found on the register page in Uczeń -> Dostęp Mobilny -> Zarejestruj urządzenie mobilne</string>
     <string name="login_select_student">Select students to log in to the application</string>
     <string name="login_advanced">Other options</string>
-    <string name="login_advanced_warning_mobile_api">In this mode, a lucky number does not work, a class grade stats, summary of attendance, excuse for absence, completed lessons, school information and preview of the list of registered devices</string>
-    <string name="login_advanced_warning_scraper">This mode displays the same data as it appears on the register website</string>
-    <string name="login_advanced_warning_hybrid">The combination of the best features of the other two modes. It works faster than scraper and provides features not available in the Mobile API mode. It is in the experimental phase</string>
     <string name="login_privacy_policy">Privacy policy</string>
     <string name="login_contact_header">Trouble signing in? Contact us!</string>
     <string name="login_contact_email">Email</string>
     <string name="login_contact_discord">Discord</string>
     <string name="login_email_intent_title">Send email</string>
-    <string name="login_email_details">Describe details of problem:</string>
     <string name="login_email_subject" translatable="false">Zgłoszenie: Problemy z logowaniem</string>
-    <string name="login_email_text" translatable="false">Informacje o aplikacji:\n\nUrządzenie: %1$s\nWersja SDK: %2$s\nWersja aplikacji: %3$s\nDodatkowe informacje: %4$s\nOstatni błąd: %5$s\n\nOpis problemu: </string>
-    <string name="login_recover_warning">Make sure the correct UONET+ register is selected!</string>
-    <string name="login_recover_button">I forgot my password</string>
-    <string name="login_recover_title">Recover your account</string>
-    <string name="login_recover">Recover</string>
-    <string name="login_signed_in">Student is already signed in</string>
+    <string name="login_email_text" translatable="false">Informacje o aplikacji:\n\nUrządzenie: %1$s\nWersja SDK: %2$s\nWersja aplikacji: %3$s\n\nOpis problemu:</string>
 
 
     <!--Main-->
@@ -126,14 +110,6 @@
     <string name="timetable_time">Hours</string>
     <string name="timetable_changes">Changes</string>
     <string name="timetable_no_items">No lessons this day</string>
-    <string name="timetable_minutes">%s min</string>
-    <string name="timetable_seconds">%s sec</string>
-    <string name="timetable_time_left">%1$s left</string>
-    <string name="timetable_time_until">in %1$s</string>
-    <string name="timetable_finished">Finished</string>
-    <string name="timetable_now">Now: %s</string>
-    <string name="timetable_next">Next: %s</string>
-    <string name="timetable_later">Later: %s</string>
 
 
     <!--Completed lessons-->
@@ -169,7 +145,6 @@
 
     <!--Attendance summary-->
     <string name="attendance_summary_final">Attendance</string>
-    <string name="attendance_summary_total">Total</string>
 
 
     <!--Exam-->
@@ -215,7 +190,6 @@
 
     <!--Note-->
     <string name="note_no_items">No info about notes</string>
-    <string name="note_points">Points</string>
     <plurals name="note_number_item">
         <item quantity="one">%d note</item>
         <item quantity="other">%d notes</item>
@@ -232,9 +206,6 @@
 
     <!--Homework-->
     <string name="homework_no_items">No info about homework</string>
-    <string name="homework_mark_as_done">Mark as done</string>
-    <string name="homework_mark_as_undone">Mark as undone</string>
-    <string name="homework_attachments">Attachments</string>
 
 
     <!--Lucky number-->
@@ -286,8 +257,8 @@
 
     <!--About-->
     <string name="about_version">App version</string>
-    <string name="about_contributor">Contributors</string>
-    <string name="about_contributor_summary">List of Wulkanowy developers</string>
+    <string name="about_creator">Creators</string>
+    <string name="about_creator_summary">List of Wulkanowy developers</string>
     <string name="about_feedback">Report a bug</string>
     <string name="about_feedback_summary">Send a bug report via e-mail</string>
     <string name="about_faq">FAQ</string>
@@ -300,26 +271,15 @@
     <string name="about_homepage_summary">Visit the website and help develop the application</string>
     <string name="about_licenses">Licenses</string>
     <string name="about_licenses_summary">Licenses of libraries used in the application</string>
-    <string name="about_feedback_template" translatable="false">Informacje o aplikacji:\n\nUrządzenie: %1$s\nWersja SDK: %2$s\nWersja aplikacji: %3$s\n\nTreść zgłoszenia:</string>
 
 
     <!--Licenses-->
     <string name="license_dialog_title">License</string>
 
 
-    <!--Contributor-->
-    <string name="contributor_avatar_description">Avatar</string>
-    <string name="contributor_see_more">See more on GitHub</string>
-
-
-    <!--Log viewer-->
-    <string name="logviewer_share">Share logs</string>
-    <string name="logviewer_refresh">Refresh</string>
-
-
-    <!--Error dialog-->
-    <string name="dialog_error_check_update">Check for updates</string>
-    <string name="dialog_error_check_update_message">Before reporting a bug, check first if an update with the bug fix is available</string>
+    <!--Creators-->
+    <string name="creator_avatar_description">Avatar</string>
+    <string name="creator_see_more">See more on GitHub</string>
 
 
     <!--Generic-->
@@ -338,8 +298,6 @@
     <string name="all_subject">Subject</string>
     <string name="all_prev">Prev</string>
     <string name="all_next">Next</string>
-    <string name="all_search">Search</string>
-    <string name="all_search_hint">Search...</string>
 
 
     <!--Timetable Widget-->
@@ -347,7 +305,6 @@
     <string name="widget_timetable_theme_title">Choose theme</string>
     <string name="widget_timetable_theme_light">Light</string>
     <string name="widget_timetable_theme_dark">Dark</string>
-    <string name="widget_timetable_theme_system">System Theme</string>
 
 
     <!--Preferences-->
@@ -358,18 +315,12 @@
     <string name="pref_view_present">Show presence in attendance</string>
     <string name="pref_view_app_theme">Application theme</string>
     <string name="pref_view_expand_grade">Expand grades</string>
-    <string name="pref_view_timetable_show_timers">Mark current lesson in timetable</string>
-    <string name="pref_view_grade_statistics_list">Show chart list in class grades</string>
     <string name="pref_view_timetable_show_whole_class">Show whole class lessons</string>
     <string name="pref_view_grade_color_scheme">Grades color scheme</string>
     <string name="pref_view_app_language">App language</string>
 
     <string name="pref_notify_header">Notifications</string>
     <string name="pref_notify_switch">Show notifications</string>
-    <string name="pref_notify_upcoming_lessons_switch">Show upcoming lesson notifications</string>
-    <string name="pref_notify_fix_sync_issues">Fix synchronization &amp; notifications issues</string>
-    <string name="pref_notify_fix_sync_issues_message">Your device may have data synchronization issues and with notifications.\n\nTo fix them, you need to add Wulkanowy to the autostart and turn off battery optimization/saving in the phone settings.</string>
-    <string name="pref_notify_fix_sync_issues_settings_button">Go to settings</string>
     <string name="pref_notify_debug_switch">Show debug notifications</string>
 
     <string name="pref_services_header">Synchronization</string>
@@ -377,15 +328,6 @@
     <string name="pref_services_suspended">Suspended on holidays</string>
     <string name="pref_services_interval">Updates interval</string>
     <string name="pref_services_wifi">Wi-Fi only</string>
-    <string name="pref_services_force_sync">Sync now</string>
-    <string name="pref_services_message_sync_success">Synced!</string>
-    <string name="pref_services_message_sync_failed">Sync failed</string>
-    <string name="pref_services_sync_in_progress">Sync in progress</string>
-    <string name="pref_services_dialog_force_sync_title">Synchronization</string>
-    <string name="pref_services_dialog_force_sync_summary">
-        Manual sync doesn\'t refresh app views.
-        \nTo see the synced data relaunch the app after syncing.
-    </string>
 
     <string name="pref_other_header">Other</string>
     <string name="pref_other_grade_modifier_plus">Value of the plus</string>
@@ -395,12 +337,6 @@
 
     <!--Notification Channels-->
     <string name="channel_new_entries">New entries in register</string>
-    <string name="channel_new_grades">New grades</string>
-    <string name="channel_lucky_number">Lucky number</string>
-    <string name="channel_new_message">New messages</string>
-    <string name="channel_new_notes">New notes</string>
-    <string name="channel_push">Push notifications</string>
-    <string name="channel_upcoming_lessons">Upcoming lessons</string>
     <string name="channel_debug">Debug</string>
 
 
@@ -422,9 +358,9 @@
     <string name="error_no_internet">No internet connection</string>
     <string name="error_timeout">Connection to the register timed out</string>
     <string name="error_login_failed">Login failed. Try again or restart the app</string>
-    <string name="error_password_change_required">Password change required</string>
     <string name="error_service_unavailable">Maintenance underway UONET + register. Try again later</string>
     <string name="error_unknown">An unexpected error occurred</string>
     <string name="error_feature_disabled">Feature disabled by your school</string>
-    <string name="error_feature_not_available">Feature not available. Login in a mode other than Mobile API</string>
+    <string name="error_feature_not_available">Feature not available in this mode</string>
+
 </resources>
diff --git a/app/src/main/res/xml/provider_paths.xml b/app/src/main/res/xml/provider_paths.xml
deleted file mode 100644
index f0da4709a..000000000
--- a/app/src/main/res/xml/provider_paths.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<paths>
-    <files-path
-        name="files"
-        path="." />
-</paths>
diff --git a/app/src/main/res/xml/scheme_preferences.xml b/app/src/main/res/xml/scheme_preferences.xml
index 4cdb989c7..e92aca63f 100644
--- a/app/src/main/res/xml/scheme_preferences.xml
+++ b/app/src/main/res/xml/scheme_preferences.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--suppress AndroidElementNotAllowed -->
 <PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
     <PreferenceCategory
         app:iconSpaceReserved="false"
@@ -29,17 +29,6 @@
             app:iconSpaceReserved="false"
             app:key="@string/pref_key_expand_grade"
             app:title="@string/pref_view_expand_grade" />
-        <SwitchPreferenceCompat
-            app:defaultValue="@bool/pref_default_timetable_show_timers"
-            app:iconSpaceReserved="false"
-            app:key="@string/pref_key_timetable_show_timers"
-            app:title="@string/pref_view_timetable_show_timers" />
-        <SwitchPreferenceCompat
-            app:defaultValue="@bool/pref_default_grade_statistics_list"
-            app:iconSpaceReserved="false"
-            app:key="@string/pref_key_grade_statistics_list"
-            app:singleLineTitle="false"
-            app:title="@string/pref_view_grade_statistics_list" />
         <ListPreference
             app:defaultValue="@string/pref_default_timetable_show_whole_class"
             app:entries="@array/timetable_show_whole_class_entries"
@@ -88,35 +77,20 @@
             app:iconSpaceReserved="false"
             app:key="@string/pref_key_services_wifi_only"
             app:title="@string/pref_services_wifi" />
-        <Preference
-            app:iconSpaceReserved="false"
-            app:key="@string/pref_key_services_force_sync"
-            app:title="@string/pref_services_force_sync" />
     </PreferenceCategory>
     <PreferenceCategory
         app:iconSpaceReserved="false"
         app:title="@string/pref_notify_header">
-        <Preference
-            app:iconSpaceReserved="false"
-            app:key="@string/pref_key_notifications_fix_issues"
-            app:title="@string/pref_notify_fix_sync_issues" />
         <SwitchPreferenceCompat
             app:defaultValue="@bool/pref_default_notifications_enable"
             app:dependency="services_enable"
             app:iconSpaceReserved="false"
             app:key="@string/pref_key_notifications_enable"
             app:title="@string/pref_notify_switch" />
-        <SwitchPreferenceCompat
-            app:defaultValue="@bool/pref_default_notification_upcoming_lessons_enable"
-            app:iconSpaceReserved="false"
-            app:key="@string/pref_key_notifications_upcoming_lessons_enable"
-            app:singleLineTitle="false"
-            app:title="@string/pref_notify_upcoming_lessons_switch" />
         <SwitchPreferenceCompat
             app:defaultValue="@bool/pref_default_notification_debug"
             app:iconSpaceReserved="false"
             app:key="@string/pref_key_notification_debug"
-            app:singleLineTitle="false"
             app:title="@string/pref_notify_debug_switch" />
     </PreferenceCategory>
     <PreferenceCategory
@@ -150,13 +124,11 @@
             app:defaultValue="@bool/pref_default_grade_average_force_calc"
             app:iconSpaceReserved="false"
             app:key="@string/pref_key_grade_average_force_calc"
-            app:singleLineTitle="false"
             app:title="@string/pref_view_grade_average_force_calc" />
         <SwitchPreferenceCompat
             app:defaultValue="@bool/pref_default_fill_message_content"
             app:iconSpaceReserved="false"
             app:key="@string/pref_key_fill_message_content"
-            app:singleLineTitle="false"
             app:title="@string/pref_other_fill_message_content" />
     </PreferenceCategory>
 </PreferenceScreen>
diff --git a/app/src/play/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt b/app/src/play/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt
index e87177c1d..4f76ef837 100644
--- a/app/src/play/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt
+++ b/app/src/play/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt
@@ -1,48 +1,31 @@
 package io.github.wulkanowy.utils
 
-import android.util.Log
-import com.google.firebase.crashlytics.FirebaseCrashlytics
-import fr.bipi.tressence.base.FormatterPriorityTree
-import fr.bipi.tressence.common.StackTraceRecorder
-import io.github.wulkanowy.sdk.exception.FeatureDisabledException
-import io.github.wulkanowy.sdk.exception.FeatureNotAvailableException
-import java.io.InterruptedIOException
-import java.net.SocketTimeoutException
-import java.net.UnknownHostException
+import android.content.Context
+import com.crashlytics.android.Crashlytics
+import com.crashlytics.android.core.CrashlyticsCore
+import io.fabric.sdk.android.Fabric
+import timber.log.Timber
 
-class CrashlyticsTree : FormatterPriorityTree(Log.VERBOSE) {
-
-    private val crashlytics by lazy { FirebaseCrashlytics.getInstance() }
-
-    override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {
-        if (skipLog(priority, tag, message, t)) return
-
-        crashlytics.log(format(priority, tag, message))
-    }
+fun initCrashlytics(context: Context, appInfo: AppInfo) {
+    Fabric.with(Fabric.Builder(context)
+        .kits(
+            Crashlytics.Builder()
+                .core(CrashlyticsCore.Builder()
+                    .disabled(!appInfo.isCrashlyticsEnabled)
+                    .build())
+                .build()
+        )
+        .debuggable(appInfo.isDebug)
+        .build())
 }
 
-class CrashlyticsExceptionTree : FormatterPriorityTree(Log.ERROR) {
-
-    private val crashlytics by lazy { FirebaseCrashlytics.getInstance() }
-
-    override fun skipLog(priority: Int, tag: String?, message: String, t: Throwable?): Boolean {
-        if (t is FeatureDisabledException || t is FeatureNotAvailableException || t is UnknownHostException || t is SocketTimeoutException || t is InterruptedIOException) {
-            return true
-        }
-
-        return super.skipLog(priority, tag, message, t)
-    }
+class CrashlyticsTree : Timber.Tree() {
 
     override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {
-        if (skipLog(priority, tag, message, t)) return
+        Crashlytics.setInt("priority", priority)
+        Crashlytics.setString("tag", tag)
 
-        crashlytics.setCustomKey("priority", priority)
-        crashlytics.setCustomKey("tag", tag.orEmpty())
-        crashlytics.setCustomKey("message", message)
-        if (t != null) {
-            crashlytics.recordException(t)
-        } else {
-            crashlytics.recordException(StackTraceRecorder(format(priority, tag, message)))
-        }
+        if (t == null) Crashlytics.log(message)
+        else Crashlytics.logException(t)
     }
 }
diff --git a/app/src/play/java/io/github/wulkanowy/utils/FirebaseAnalyticsHelper.kt b/app/src/play/java/io/github/wulkanowy/utils/FirebaseAnalyticsHelper.kt
index b0b2fda4d..6810e66ac 100644
--- a/app/src/play/java/io/github/wulkanowy/utils/FirebaseAnalyticsHelper.kt
+++ b/app/src/play/java/io/github/wulkanowy/utils/FirebaseAnalyticsHelper.kt
@@ -1,6 +1,5 @@
 package io.github.wulkanowy.utils
 
-import android.app.Activity
 import android.content.Context
 import android.os.Bundle
 import com.google.firebase.analytics.FirebaseAnalytics
@@ -25,8 +24,4 @@ class FirebaseAnalyticsHelper @Inject constructor(private val context: Context)
             analytics.logEvent(name, this)
         }
     }
-
-    fun setCurrentScreen(activity: Activity, name: String?) {
-        analytics.setCurrentScreen(activity, name, null)
-    }
 }
diff --git a/app/src/test/java/io/github/wulkanowy/TestEnityCreator.kt b/app/src/test/java/io/github/wulkanowy/TestEnityCreator.kt
deleted file mode 100644
index 5d003f273..000000000
--- a/app/src/test/java/io/github/wulkanowy/TestEnityCreator.kt
+++ /dev/null
@@ -1,74 +0,0 @@
-package io.github.wulkanowy
-
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.db.entities.Timetable
-import io.github.wulkanowy.sdk.Sdk
-import org.threeten.bp.LocalDate
-import org.threeten.bp.LocalDateTime
-import org.threeten.bp.LocalDateTime.now
-
-fun createSemesterEntity(diaryId: Int, semesterId: Int, start: LocalDate, end: LocalDate, semesterName: Int = 1): Semester {
-    return Semester(
-        studentId = 1,
-        diaryId = diaryId,
-        semesterId = semesterId,
-        diaryName = "$semesterId",
-        schoolYear = 1970,
-        classId = 0,
-        semesterName = semesterName,
-        unitId = 1,
-        start = start,
-        end = end
-    )
-}
-
-fun getStudentEntity(mode: Sdk.Mode = Sdk.Mode.API): Student {
-    return Student(
-        scrapperBaseUrl = "http://fakelog.cf",
-        email = "jan@fakelog.cf",
-        certificateKey = "",
-        classId = 0,
-        className = "",
-        isCurrent = false,
-        isParent = false,
-        loginMode = mode.name,
-        loginType = "STANDARD",
-        mobileBaseUrl = "",
-        password = "",
-        privateKey = "",
-        registrationDate = now(),
-        schoolName = "",
-        schoolShortName = "test",
-        schoolSymbol = "",
-        studentId = 0,
-        studentName = "",
-        symbol = "",
-        userLoginId = 0
-    )
-}
-
-fun getTimetableEntity(
-    isStudentPlan: Boolean = false,
-    canceled: Boolean = false,
-    start: LocalDateTime = now(),
-    end: LocalDateTime = now()
-) = Timetable(
-    studentId = 0,
-    subject = "",
-    number = 0,
-    diaryId = 0,
-    canceled = canceled,
-    changes = false,
-    date = LocalDate.now(),
-    end = end,
-    group = "",
-    info = "",
-    isStudentPlan = isStudentPlan,
-    room = "",
-    roomOld = "",
-    start = start,
-    subjectOld = "",
-    teacher = "",
-    teacherOld = ""
-)
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/UnitTestInternetObservingStrategy.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/UnitTestInternetObservingStrategy.kt
index 954c191ce..28abbb993 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/UnitTestInternetObservingStrategy.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/UnitTestInternetObservingStrategy.kt
@@ -5,14 +5,14 @@ import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.error
 import io.reactivex.Observable
 import io.reactivex.Single
 
-class UnitTestInternetObservingStrategy(var isInternetConnection: Boolean = true) : InternetObservingStrategy {
+class UnitTestInternetObservingStrategy : InternetObservingStrategy {
 
     override fun checkInternetConnectivity(host: String?, port: Int, timeoutInMs: Int, httpResponse: Int, errorHandler: ErrorHandler?): Single<Boolean> {
-        return Single.just(isInternetConnection)
+        return Single.just(true)
     }
 
     override fun observeInternetConnectivity(initialIntervalInMs: Int, intervalInMs: Int, host: String?, port: Int, timeoutInMs: Int, httpResponse: Int, errorHandler: ErrorHandler?): Observable<Boolean> {
-        return Observable.just(isInternetConnection)
+        return Observable.just(true)
     }
 
     override fun getDefaultPingHost() = "localhost"
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRemoteTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRemoteTest.kt
index a5b79cfdd..b471dc520 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRemoteTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRemoteTest.kt
@@ -1,14 +1,11 @@
 package io.github.wulkanowy.data.repositories.attendance
 
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.getStudentEntity
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.sdk.pojo.Attendance
-import io.github.wulkanowy.utils.init
 import io.mockk.MockKAnnotations
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
-import io.mockk.impl.annotations.SpyK
 import io.reactivex.Single
 import org.junit.Assert.assertEquals
 import org.junit.Before
@@ -18,14 +15,12 @@ import org.threeten.bp.LocalDate.of
 
 class AttendanceRemoteTest {
 
-    @SpyK
-    private var mockSdk = Sdk()
+    @MockK
+    private lateinit var mockSdk: Sdk
 
     @MockK
     private lateinit var semesterMock: Semester
 
-    private var student = getStudentEntity()
-
     @Before
     fun initApi() {
         MockKAnnotations.init(this)
@@ -33,7 +28,6 @@ class AttendanceRemoteTest {
 
     @Test
     fun getAttendanceTest() {
-        every { mockSdk.init(student) } returns mockSdk
         every {
             mockSdk.getAttendance(
                 of(2018, 9, 10),
@@ -51,7 +45,7 @@ class AttendanceRemoteTest {
         every { semesterMock.semesterId } returns 1
         every { mockSdk.switchDiary(any(), any()) } returns mockSdk
 
-        val attendance = AttendanceRemote(mockSdk).getAttendance(student, semesterMock,
+        val attendance = AttendanceRemote(mockSdk).getAttendance(semesterMock,
             of(2018, 9, 10),
             of(2018, 9, 15)
         ).blockingGet()
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRemoteTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRemoteTest.kt
index 10307feee..7570164fd 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRemoteTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRemoteTest.kt
@@ -1,14 +1,11 @@
 package io.github.wulkanowy.data.repositories.completedlessons
 
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.getStudentEntity
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.sdk.pojo.CompletedLesson
-import io.github.wulkanowy.utils.init
 import io.mockk.MockKAnnotations
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
-import io.mockk.impl.annotations.SpyK
 import io.reactivex.Single
 import org.junit.Assert
 import org.junit.Before
@@ -18,14 +15,12 @@ import org.threeten.bp.LocalDate.of
 
 class CompletedLessonsRemoteTest {
 
-    @SpyK
-    private var mockSdk = Sdk()
+    @MockK
+    private lateinit var mockSdk: Sdk
 
     @MockK
     private lateinit var semesterMock: Semester
 
-    private val student = getStudentEntity()
-
     @Before
     fun initApi() {
         MockKAnnotations.init(this)
@@ -33,7 +28,6 @@ class CompletedLessonsRemoteTest {
 
     @Test
     fun getCompletedLessonsTest() {
-        every { mockSdk.init(student) } returns mockSdk
         every {
             mockSdk.getCompletedLessons(
                 of(2018, 9, 10),
@@ -50,7 +44,7 @@ class CompletedLessonsRemoteTest {
         every { semesterMock.semesterId } returns 1
         every { mockSdk.switchDiary(any(), any()) } returns mockSdk
 
-        val completed = CompletedLessonsRemote(mockSdk).getCompletedLessons(student, semesterMock,
+        val completed = CompletedLessonsRemote(mockSdk).getCompletedLessons(semesterMock,
             of(2018, 9, 10),
             of(2018, 9, 15)
         ).blockingGet()
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/exam/ExamRemoteTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/exam/ExamRemoteTest.kt
index aecef4728..c17ec21eb 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/exam/ExamRemoteTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/exam/ExamRemoteTest.kt
@@ -1,14 +1,11 @@
 package io.github.wulkanowy.data.repositories.exam
 
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.getStudentEntity
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.sdk.pojo.Exam
-import io.github.wulkanowy.utils.init
 import io.mockk.MockKAnnotations
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
-import io.mockk.impl.annotations.SpyK
 import io.reactivex.Single
 import org.junit.Assert.assertEquals
 import org.junit.Before
@@ -18,24 +15,19 @@ import org.threeten.bp.LocalDate.of
 
 class ExamRemoteTest {
 
-    @SpyK
-    private var mockSdk = Sdk()
+    @MockK
+    private lateinit var mockSdk: Sdk
 
     @MockK
     private lateinit var semesterMock: Semester
 
-    private val student = getStudentEntity()
-
     @Before
-    fun setUp() {
+    fun initApi() {
         MockKAnnotations.init(this)
     }
 
     @Test
     fun getExamsTest() {
-        every { mockSdk.init(student) } returns mockSdk
-        every { mockSdk.switchDiary(1, 2019) } returns mockSdk
-
         every {
             mockSdk.getExams(
                 of(2018, 9, 10),
@@ -51,11 +43,13 @@ class ExamRemoteTest {
         every { semesterMock.diaryId } returns 1
         every { semesterMock.schoolYear } returns 2019
         every { semesterMock.semesterId } returns 1
+        every { mockSdk.switchDiary(any(), any()) } returns mockSdk
 
-        val exams = ExamRemote(mockSdk).getExams(student, semesterMock,
-            of(2018, 9, 10),
-            of(2018, 9, 15)
-        ).blockingGet()
+        val exams = ExamRemote(mockSdk)
+            .getExams(semesterMock,
+                of(2018, 9, 10),
+                of(2018, 9, 15)
+            ).blockingGet()
         assertEquals(2, exams.size)
     }
 
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRemoteTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRemoteTest.kt
index 77c87025d..ee08454f1 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRemoteTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRemoteTest.kt
@@ -1,15 +1,12 @@
 package io.github.wulkanowy.data.repositories.gradestatistics
 
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.getStudentEntity
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.sdk.pojo.GradePointsStatistics
 import io.github.wulkanowy.sdk.pojo.GradeStatistics
-import io.github.wulkanowy.utils.init
 import io.mockk.MockKAnnotations
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
-import io.mockk.impl.annotations.SpyK
 import io.reactivex.Single
 import org.junit.Assert.assertEquals
 import org.junit.Before
@@ -17,18 +14,15 @@ import org.junit.Test
 
 class GradeStatisticsRemoteTest {
 
-    @SpyK
-    private var mockSdk = Sdk()
+    @MockK
+    private lateinit var mockSdk: Sdk
 
     @MockK
     private lateinit var semesterMock: Semester
 
-    private val student = getStudentEntity()
-
     @Before
     fun initApi() {
         MockKAnnotations.init(this)
-        every { mockSdk.init(student) } returns mockSdk
     }
 
     @Test
@@ -44,7 +38,7 @@ class GradeStatisticsRemoteTest {
         every { semesterMock.semesterId } returns 1
         every { mockSdk.switchDiary(any(), any()) } returns mockSdk
 
-        val stats = GradeStatisticsRemote(mockSdk).getGradeStatistics(student, semesterMock, false).blockingGet()
+        val stats = GradeStatisticsRemote(mockSdk).getGradeStatistics(semesterMock, false).blockingGet()
         assertEquals(2, stats.size)
     }
 
@@ -61,7 +55,7 @@ class GradeStatisticsRemoteTest {
         every { semesterMock.semesterId } returns 1
         every { mockSdk.switchDiary(any(), any()) } returns mockSdk
 
-        val stats = GradeStatisticsRemote(mockSdk).getGradePointsStatistics(student, semesterMock).blockingGet()
+        val stats = GradeStatisticsRemote(mockSdk).getGradePointsStatistics(semesterMock).blockingGet()
         assertEquals(2, stats.size)
     }
 
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRemoteTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRemoteTest.kt
index cbdf34fa8..e8699f1ee 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRemoteTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRemoteTest.kt
@@ -1,10 +1,10 @@
 package io.github.wulkanowy.data.repositories.luckynumber
 
-import io.github.wulkanowy.getStudentEntity
+import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.init
 import io.mockk.MockKAnnotations
 import io.mockk.every
+import io.mockk.impl.annotations.MockK
 import io.mockk.impl.annotations.SpyK
 import io.reactivex.Maybe
 import org.junit.Assert.assertEquals
@@ -17,26 +17,28 @@ class LuckyNumberRemoteTest {
     @SpyK
     private var mockSdk = Sdk()
 
-    private val student = getStudentEntity(Sdk.Mode.SCRAPPER)
+    @MockK
+    private lateinit var semesterMock: Semester
 
     @Before
-    fun setUp() {
+    fun initApi() {
         MockKAnnotations.init(this)
     }
 
     @Test
     fun getLuckyNumberTest() {
-        every { mockSdk.init(student) } returns mockSdk
-        every { mockSdk.getLuckyNumber("test") } returns Maybe.just(14)
+        every { mockSdk.getLuckyNumber() } returns Maybe.just(14)
 
         every { mockSdk.diaryId } returns 1
+        every { semesterMock.studentId } returns 1
+        every { semesterMock.diaryId } returns 1
 
         val luckyNumber = LuckyNumberRemote(mockSdk)
-            .getLuckyNumber(student)
+            .getLuckyNumber(semesterMock)
             .blockingGet()
 
         assertEquals(14, luckyNumber.luckyNumber)
         assertEquals(LocalDate.now(), luckyNumber.date)
-        assertEquals(student.studentId, luckyNumber.studentId)
+        assertEquals(semesterMock.studentId, luckyNumber.studentId)
     }
 }
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/message/MessageRepositoryTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/message/MessageRepositoryTest.kt
deleted file mode 100644
index b7963d430..000000000
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/message/MessageRepositoryTest.kt
+++ /dev/null
@@ -1,114 +0,0 @@
-package io.github.wulkanowy.data.repositories.message
-
-import androidx.room.EmptyResultSetException
-import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
-import io.github.wulkanowy.data.db.entities.Message
-import io.github.wulkanowy.data.db.entities.MessageWithAttachment
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.repositories.UnitTestInternetObservingStrategy
-import io.reactivex.Single
-import io.reactivex.observers.TestObserver
-import org.junit.Assert.assertEquals
-import org.junit.Before
-import org.junit.Test
-import org.mockito.Mock
-import org.mockito.Mockito.`when`
-import org.mockito.Mockito.verify
-import org.mockito.MockitoAnnotations
-import org.threeten.bp.LocalDateTime.now
-import java.net.UnknownHostException
-
-class MessageRepositoryTest {
-
-    @Mock
-    lateinit var local: MessageLocal
-
-    @Mock
-    lateinit var remote: MessageRemote
-
-    @Mock
-    lateinit var student: Student
-
-    private val testObservingStrategy = UnitTestInternetObservingStrategy()
-
-    private lateinit var repo: MessageRepository
-
-    @Before
-    fun setUp() {
-        MockitoAnnotations.initMocks(this)
-
-        repo = MessageRepository(InternetObservingSettings.builder()
-            .strategy(testObservingStrategy)
-            .build(), local, remote)
-    }
-
-    @Test
-    fun `throw error when message is not in the db`() {
-        val testMessage = Message(1, 1, 1, "", 1, "", "", "", now(), 1, false, 1, 1, false, false)
-        `when`(local.getMessageWithAttachment(student, testMessage)).thenReturn(Single.error(EmptyResultSetException("No message in database")))
-
-        val message = repo.getMessage(student, testMessage)
-        val messageObserver = TestObserver<MessageWithAttachment>()
-        message.subscribe(messageObserver)
-        messageObserver.assertError(EmptyResultSetException::class.java)
-    }
-
-    @Test
-    fun `get message when content already in db`() {
-        val testMessage = Message(1, 1, 123, "", 1, "", "", "Test", now(), 1, false, 1, 1, false, false)
-        val messageWithAttachment = MessageWithAttachment(testMessage, emptyList())
-
-        `when`(local.getMessageWithAttachment(student, testMessage)).thenReturn(Single.just(messageWithAttachment))
-
-        val message = repo.getMessage(student, testMessage).blockingGet()
-
-        assertEquals("Test", message.message.content)
-    }
-
-    @Test
-    fun `get message when content in db is empty`() {
-        val testMessage = Message(1, 1, 123, "", 1, "", "", "", now(), 1, true, 1, 1, false, false)
-        val testMessageWithContent = testMessage.copy(content = "Test")
-
-        val mWa = MessageWithAttachment(testMessage, emptyList())
-        val mWaWithContent = MessageWithAttachment(testMessageWithContent, emptyList())
-
-        `when`(local.getMessageWithAttachment(student, testMessage))
-            .thenReturn(Single.just(mWa))
-            .thenReturn(Single.just(mWaWithContent))
-        `when`(remote.getMessagesContentDetails(student, testMessageWithContent)).thenReturn(Single.just("Test" to emptyList()))
-
-        val message = repo.getMessage(student, testMessage).blockingGet()
-
-        assertEquals("Test", message.message.content)
-        verify(local).updateMessages(listOf(testMessageWithContent))
-    }
-
-    @Test
-    fun `get message when content in db is empty and there is no internet connection`() {
-        val testMessage = Message(1, 1, 123, "", 1, "", "", "", now(), 1, false, 1, 1, false, false)
-        val messageWithAttachment = MessageWithAttachment(testMessage, emptyList())
-
-        testObservingStrategy.isInternetConnection = false
-        `when`(local.getMessageWithAttachment(student, testMessage)).thenReturn(Single.just(messageWithAttachment))
-
-        val message = repo.getMessage(student, testMessage)
-        val messageObserver = TestObserver<MessageWithAttachment>()
-        message.subscribe(messageObserver)
-        messageObserver.assertError(UnknownHostException::class.java)
-    }
-
-    @Test
-    fun `get message when content in db is empty, unread and there is no internet connection`() {
-        val testMessage = Message(1, 1, 123, "", 1, "", "", "", now(), 1, true, 1, 1, false, false)
-        val messageWithAttachment = MessageWithAttachment(testMessage, emptyList())
-
-        testObservingStrategy.isInternetConnection = false
-        `when`(local.getMessageWithAttachment(student, testMessage)).thenReturn(Single.just(messageWithAttachment))
-
-        val message = repo.getMessage(student, testMessage)
-        val messageObserver = TestObserver<MessageWithAttachment>()
-        message.subscribe(messageObserver)
-        messageObserver.assertError(UnknownHostException::class.java)
-    }
-}
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRepositoryTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRepositoryTest.kt
index c586572f6..9c1bb9756 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRepositoryTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRepositoryTest.kt
@@ -4,7 +4,6 @@ import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.Inter
 import io.github.wulkanowy.data.db.entities.MobileDevice
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.repositories.UnitTestInternetObservingStrategy
-import io.github.wulkanowy.getStudentEntity
 import io.reactivex.Maybe
 import io.reactivex.Single
 import org.junit.Before
@@ -26,8 +25,6 @@ class MobileDeviceRepositoryTest {
     @Mock
     private lateinit var mobileDeviceLocal: MobileDeviceLocal
 
-    private val student = getStudentEntity()
-
     private lateinit var mobileDeviceRepository: MobileDeviceRepository
 
     private val settings = InternetObservingSettings.builder()
@@ -48,9 +45,9 @@ class MobileDeviceRepositoryTest {
         )
 
         doReturn(Maybe.empty<MobileDevice>()).`when`(mobileDeviceLocal).getDevices(semester)
-        doReturn(Single.just(devices)).`when`(mobileDeviceRemote).getDevices(student, semester)
+        doReturn(Single.just(devices)).`when`(mobileDeviceRemote).getDevices(semester)
 
-        mobileDeviceRepository.getDevices(student, semester).blockingGet()
+        mobileDeviceRepository.getDevices(semester).blockingGet()
 
         verify(mobileDeviceLocal).deleteDevices(emptyList())
         verify(mobileDeviceLocal).saveDevices(devices)
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/semester/SemesterRepositoryTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/semester/SemesterRepositoryTest.kt
index c00a771cc..808354761 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/semester/SemesterRepositoryTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/semester/SemesterRepositoryTest.kt
@@ -1,21 +1,19 @@
 package io.github.wulkanowy.data.repositories.semester
 
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
+import io.github.wulkanowy.data.SdkHelper
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.UnitTestInternetObservingStrategy
-import io.github.wulkanowy.createSemesterEntity
 import io.reactivex.Maybe
 import io.reactivex.Single
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertNotEquals
 import org.junit.Before
 import org.junit.Test
 import org.mockito.Mock
+import org.mockito.Mockito.doNothing
 import org.mockito.Mockito.doReturn
 import org.mockito.Mockito.verify
 import org.mockito.MockitoAnnotations
-import org.threeten.bp.LocalDate.now
 
 class SemesterRepositoryTest {
 
@@ -25,6 +23,9 @@ class SemesterRepositoryTest {
     @Mock
     private lateinit var semesterLocal: SemesterLocal
 
+    @Mock
+    private lateinit var sdkHelper: SdkHelper
+
     @Mock
     private lateinit var student: Student
 
@@ -37,17 +38,17 @@ class SemesterRepositoryTest {
     @Before
     fun initTest() {
         MockitoAnnotations.initMocks(this)
-        semesterRepository = SemesterRepository(semesterRemote, semesterLocal, settings)
-        doReturn("SCRAPPER").`when`(student).loginMode
+        semesterRepository = SemesterRepository(semesterRemote, semesterLocal, settings, sdkHelper)
     }
 
     @Test
-    fun getSemesters_noSemesters() {
+    fun singleCurrentSemesterTest() {
         val semesters = listOf(
-            createSemesterEntity(1, 1, now().minusMonths(6), now().minusMonths(3)),
-            createSemesterEntity(1, 2, now().minusMonths(3), now())
+            createSemesterEntity(false),
+            createSemesterEntity(true)
         )
 
+        doNothing().`when`(sdkHelper).init(student)
         doReturn(Maybe.empty<Semester>()).`when`(semesterLocal).getSemesters(student)
         doReturn(Single.just(semesters)).`when`(semesterRemote).getSemesters(student)
 
@@ -57,140 +58,17 @@ class SemesterRepositoryTest {
         verify(semesterLocal).saveSemesters(semesters)
     }
 
-    @Test
-    fun getSemesters_invalidDiary_api() {
-        doReturn("API").`when`(student).loginMode
-        val badSemesters = listOf(
-            createSemesterEntity(0, 1, now().minusMonths(6), now().minusMonths(3)),
-            createSemesterEntity(0, 2, now().minusMonths(3), now())
-        )
-
-        doReturn(Maybe.just(badSemesters)).`when`(semesterLocal).getSemesters(student)
-
-        val items = semesterRepository.getSemesters(student).blockingGet()
-        assertEquals(2, items.size)
-        assertEquals(0, items[0].diaryId)
-    }
-
-    @Test
-    fun getSemesters_invalidDiary_scrapper() {
-        doReturn("SCRAPPER").`when`(student).loginMode
-        val badSemesters = listOf(
-            createSemesterEntity(0, 1, now().minusMonths(6), now().minusMonths(3)),
-            createSemesterEntity(0, 2, now().minusMonths(3), now())
-        )
-
-        val goodSemesters = listOf(
-            createSemesterEntity(1, 1, now().minusMonths(6), now().minusMonths(3)),
-            createSemesterEntity(1, 2, now().minusMonths(3), now())
-        )
-
-        doReturn(Maybe.just(badSemesters), Maybe.just(badSemesters), Maybe.just(goodSemesters)).`when`(semesterLocal).getSemesters(student)
-        doReturn(Single.just(goodSemesters)).`when`(semesterRemote).getSemesters(student)
-
-        val items = semesterRepository.getSemesters(student).blockingGet()
-        assertEquals(2, items.size)
-        assertNotEquals(0, items[0].diaryId)
-    }
-
-    @Test
-    fun getSemesters_noCurrent() {
+    @Test(expected = IllegalArgumentException::class)
+    fun twoCurrentSemesterTest() {
         val semesters = listOf(
-            createSemesterEntity(1, 1, now().minusMonths(12), now().minusMonths(6)),
-            createSemesterEntity(1, 2, now().minusMonths(6), now().minusMonths(1))
-        )
-
-        doReturn(Maybe.just(semesters)).`when`(semesterLocal).getSemesters(student)
-
-        val items = semesterRepository.getSemesters(student).blockingGet()
-        assertEquals(2, items.size)
-    }
-
-    @Test
-    fun getSemesters_oneCurrent() {
-        val semesters = listOf(
-            createSemesterEntity(1, 1, now().minusMonths(6), now().minusMonths(3)),
-            createSemesterEntity(1, 2, now().minusMonths(3), now())
-        )
-
-        doReturn(Maybe.just(semesters)).`when`(semesterLocal).getSemesters(student)
-
-        val items = semesterRepository.getSemesters(student).blockingGet()
-        assertEquals(2, items.size)
-    }
-
-    @Test
-    fun getSemesters_doubleCurrent() {
-        val semesters = listOf(
-            createSemesterEntity(1, 1, now(), now()),
-            createSemesterEntity(1, 2, now(), now())
-        )
-
-        doReturn(Maybe.just(semesters)).`when`(semesterLocal).getSemesters(student)
-
-        val items = semesterRepository.getSemesters(student).blockingGet()
-        assertEquals(2, items.size)
-    }
-
-    @Test
-    fun getSemesters_noSemesters_refreshOnNoCurrent() {
-        val semesters = listOf(
-            createSemesterEntity(1, 1, now().minusMonths(6), now().minusMonths(3)),
-            createSemesterEntity(1, 2, now().minusMonths(3), now())
+            createSemesterEntity(true),
+            createSemesterEntity(true)
         )
 
+        doNothing().`when`(sdkHelper).init(student)
         doReturn(Maybe.empty<Semester>()).`when`(semesterLocal).getSemesters(student)
         doReturn(Single.just(semesters)).`when`(semesterRemote).getSemesters(student)
 
-        semesterRepository.getSemesters(student, refreshOnNoCurrent = true).blockingGet()
-
-        verify(semesterLocal).deleteSemesters(emptyList())
-        verify(semesterLocal).saveSemesters(semesters)
-    }
-
-    @Test
-    fun getSemesters_noCurrent_refreshOnNoCurrent() {
-        val semesters = listOf(
-            createSemesterEntity(1, 1, now().minusMonths(12), now().minusMonths(6)),
-            createSemesterEntity(1, 2, now().minusMonths(6), now().minusMonths(1))
-        )
-
-        doReturn(Maybe.just(semesters)).`when`(semesterLocal).getSemesters(student)
-        doReturn(Single.just(semesters)).`when`(semesterRemote).getSemesters(student)
-
-        val items = semesterRepository.getSemesters(student, refreshOnNoCurrent = true).blockingGet()
-        assertEquals(2, items.size)
-    }
-
-    @Test
-    fun getSemesters_doubleCurrent_refreshOnNoCurrent() {
-        val semesters = listOf(
-            createSemesterEntity(1, 1, now(), now()),
-            createSemesterEntity(1, 2, now(), now())
-        )
-
-        doReturn(Maybe.just(semesters)).`when`(semesterLocal).getSemesters(student)
-
-        val items = semesterRepository.getSemesters(student, refreshOnNoCurrent = true).blockingGet()
-        assertEquals(2, items.size)
-    }
-
-    @Test(expected = IllegalArgumentException::class)
-    fun getCurrentSemester_doubleCurrent() {
-        val semesters = listOf(
-            createSemesterEntity(1, 1, now(), now()),
-            createSemesterEntity(1, 1, now(), now())
-        )
-
-        doReturn(Maybe.just(semesters)).`when`(semesterLocal).getSemesters(student)
-
-        semesterRepository.getCurrentSemester(student).blockingGet()
-    }
-
-    @Test(expected = RuntimeException::class)
-    fun getCurrentSemester_emptyList() {
-        doReturn(Maybe.just(emptyList<Semester>())).`when`(semesterLocal).getSemesters(student)
-
-        semesterRepository.getCurrentSemester(student).blockingGet()
+        semesterRepository.getSemesters(student).blockingGet()
     }
 }
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/semester/TestSemesterEnityCreator.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/semester/TestSemesterEnityCreator.kt
new file mode 100644
index 000000000..f628710fc
--- /dev/null
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/semester/TestSemesterEnityCreator.kt
@@ -0,0 +1,20 @@
+package io.github.wulkanowy.data.repositories.semester
+
+import io.github.wulkanowy.data.db.entities.Semester
+import org.threeten.bp.LocalDate.now
+
+fun createSemesterEntity(current: Boolean): Semester {
+    return Semester(
+        studentId = 0,
+        diaryId = 0,
+        semesterId = 0,
+        diaryName = "",
+        schoolYear = 1970,
+        classId = 0,
+        isCurrent = current,
+        semesterName = 0,
+        unitId = 0,
+        start = now(),
+        end = now()
+    )
+}
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/student/StudentRemoteTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/student/StudentRemoteTest.kt
index b6b195c91..f52c01424 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/student/StudentRemoteTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/student/StudentRemoteTest.kt
@@ -1,12 +1,15 @@
 package io.github.wulkanowy.data.repositories.student
 
+import io.github.wulkanowy.data.SdkHelper
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.sdk.pojo.Student
+import io.mockk.impl.annotations.SpyK
 import io.reactivex.Single
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
 import org.mockito.Mock
+import org.mockito.Mockito.anyBoolean
 import org.mockito.Mockito.anyString
 import org.mockito.Mockito.doReturn
 import org.mockito.MockitoAnnotations
@@ -38,7 +41,6 @@ class StudentRemoteTest {
             userLoginId = 0,
             studentName = name,
             schoolSymbol = "",
-            schoolShortName = "",
             schoolName = "",
             className = "",
             classId = 0,
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/timetable/TimetableRemoteTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/timetable/TimetableRemoteTest.kt
index d2b4a6670..100bc0aed 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/timetable/TimetableRemoteTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/timetable/TimetableRemoteTest.kt
@@ -1,13 +1,11 @@
 package io.github.wulkanowy.data.repositories.timetable
 
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.getStudentEntity
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.sdk.pojo.Timetable
 import io.mockk.MockKAnnotations
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
-import io.mockk.impl.annotations.SpyK
 import io.reactivex.Single
 import org.junit.Assert.assertEquals
 import org.junit.Before
@@ -18,14 +16,12 @@ import org.threeten.bp.LocalDateTime.now
 
 class TimetableRemoteTest {
 
-    @SpyK
-    private var mockSdk = Sdk()
+    @MockK
+    private lateinit var mockSdk: Sdk
 
     @MockK
     private lateinit var semesterMock: Semester
 
-    private val student = getStudentEntity()
-
     @Before
     fun initApi() {
         MockKAnnotations.init(this)
@@ -49,7 +45,7 @@ class TimetableRemoteTest {
         every { semesterMock.semesterId } returns 1
         every { mockSdk.switchDiary(any(), any()) } returns mockSdk
 
-        val timetable = TimetableRemote(mockSdk).getTimetable(student, semesterMock,
+        val timetable = TimetableRemote(mockSdk).getTimetable(semesterMock,
             of(2018, 9, 10),
             of(2018, 9, 15)
         ).blockingGet()
diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProviderTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProviderTest.kt
index ee8634ca8..432ca6d99 100644
--- a/app/src/test/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProviderTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProviderTest.kt
@@ -1,22 +1,21 @@
 package io.github.wulkanowy.ui.modules.grade
 
-import io.github.wulkanowy.createSemesterEntity
 import io.github.wulkanowy.data.db.entities.Grade
 import io.github.wulkanowy.data.db.entities.GradeSummary
+import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.grade.GradeRepository
+import io.github.wulkanowy.data.repositories.gradessummary.GradeSummaryRepository
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
-import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.sdk.Sdk
 import io.reactivex.Single
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
 import org.mockito.Mock
-import org.mockito.Mockito.`when`
+import org.mockito.Mockito.doReturn
 import org.mockito.MockitoAnnotations
 import org.threeten.bp.LocalDate.now
-import org.threeten.bp.LocalDate.of
 import org.threeten.bp.LocalDateTime
 
 class GradeAverageProviderTest {
@@ -25,309 +24,181 @@ class GradeAverageProviderTest {
     lateinit var preferencesRepository: PreferencesRepository
 
     @Mock
-    lateinit var semesterRepository: SemesterRepository
+    lateinit var gradeRepository: GradeRepository
 
     @Mock
-    lateinit var gradeRepository: GradeRepository
+    lateinit var gradeSummaryRepository: GradeSummaryRepository
 
     private lateinit var gradeAverageProvider: GradeAverageProvider
 
-    private val student = Student("", "", "", "SCRAPPER", "", "", false, "", "", "", 101, 0, "", "", "", "", "", 1, true, LocalDateTime.now())
+    private val student = Student("", "", "", "SCRAPPER", "", "", false, "", "", "", 101, 0, "", "", "", "", 1, true, LocalDateTime.now())
 
     private val semesters = mutableListOf(
-        createSemesterEntity(10, 21, of(2019, 1, 31), of(2019, 6, 23)),
-        createSemesterEntity(11, 22, of(2019, 9, 1), of(2020, 1, 31)),
-        createSemesterEntity(11, 23, of(2020, 2, 1), now(), semesterName = 2)
+        Semester(101, 10, "", 1, 21, 1, false, now(), now(), 1, 1),
+        Semester(101, 11, "", 1, 22, 1, false, now(), now(), 1, 1),
+        Semester(101, 11, "", 1, 23, 2, true, now(), now(), 1, 1)
     )
 
     private val firstGrades = listOf(
-        // avg: 3.5
         getGrade(22, "Matematyka", 4.0),
         getGrade(22, "Matematyka", 3.0),
-
-        // avg: 3.5
         getGrade(22, "Fizyka", 6.0),
         getGrade(22, "Fizyka", 1.0)
     )
 
-    private val firstSummaries = listOf(
-        getSummary(semesterId = 22, subject = "Matematyka", average = 3.9),
-        getSummary(semesterId = 22, subject = "Fizyka", average = 3.1)
-    )
-
-    private val secondGrades = listOf(
-        // avg: 2.5
+    private val secondGrade = listOf(
         getGrade(23, "Matematyka", 2.0),
         getGrade(23, "Matematyka", 3.0),
-
-        // avg: 3.0
         getGrade(23, "Fizyka", 4.0),
         getGrade(23, "Fizyka", 2.0)
     )
 
-    private val secondSummaries = listOf(
-        getSummary(semesterId = 23, subject = "Matematyka", average = 2.9),
-        getSummary(semesterId = 23, subject = "Fizyka", average = 3.4)
-    )
-
     private val secondGradeWithModifier = listOf(
-        // avg: 3.375
         getGrade(24, "Język polski", 3.0, -0.50),
         getGrade(24, "Język polski", 4.0, 0.25)
     )
 
-    private val secondSummariesWithModifier = listOf(
-        getSummary(24, "Język polski", 3.49)
-    )
-
     @Before
-    fun setUp() {
+    fun initTest() {
         MockitoAnnotations.initMocks(this)
+        gradeAverageProvider = GradeAverageProvider(preferencesRepository, gradeRepository, gradeSummaryRepository)
 
-        `when`(preferencesRepository.gradeAverageForceCalc).thenReturn(false)
-        `when`(semesterRepository.getSemesters(student)).thenReturn(Single.just(semesters))
+        doReturn(.33).`when`(preferencesRepository).gradeMinusModifier
+        doReturn(.33).`when`(preferencesRepository).gradePlusModifier
+        doReturn(false).`when`(preferencesRepository).gradeAverageForceCalc
 
-        gradeAverageProvider = GradeAverageProvider(semesterRepository, gradeRepository, preferencesRepository)
+        doReturn(Single.just(firstGrades)).`when`(gradeRepository).getGrades(student, semesters[1], true)
+        doReturn(Single.just(secondGrade)).`when`(gradeRepository).getGrades(student, semesters[2], true)
     }
 
     @Test
-    fun `force calc current semester average with default modifiers in scraper mode`() {
-        `when`(preferencesRepository.gradeAverageForceCalc).thenReturn(true)
-        `when`(preferencesRepository.gradeAverageMode).thenReturn("only_one_semester")
-        `when`(semesterRepository.getSemesters(student)).thenReturn(Single.just(semesters))
-        `when`(gradeRepository.getGrades(student, semesters[2])).thenReturn(Single.just(secondGradeWithModifier to secondSummariesWithModifier))
+    fun onlyOneSemesterTest() {
+        doReturn("only_one_semester").`when`(preferencesRepository).gradeAverageMode
+        doReturn(Single.just(emptyList<GradeSummary>())).`when`(gradeSummaryRepository).getGradesSummary(semesters[2], true)
 
-        val items = gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId).blockingGet()
+        val averages = gradeAverageProvider.getGradeAverage(student, semesters, semesters[2].semesterId, true)
+            .blockingGet()
 
-        assertEquals(3.5, items.single { it.subject == "Język polski" }.average, .0) // from details and after set custom plus/minus
+        assertEquals(2, averages.size)
+        assertEquals(2.5, averages.single { it.first == "Matematyka" }.second, .0)
+        assertEquals(3.0, averages.single { it.first == "Fizyka" }.second, .0)
     }
 
     @Test
-    fun `force calc current semester average with custom modifiers in scraper mode`() {
-        val student = student.copy(loginMode = Sdk.Mode.SCRAPPER.name)
+    fun onlyOneSemester_gradesWithModifiers_default() {
+        doReturn("only_one_semester").`when`(preferencesRepository).gradeAverageMode
+        doReturn(Single.just(emptyList<GradeSummary>())).`when`(gradeSummaryRepository).getGradesSummary(semesters[2], true)
+        doReturn(Single.just(secondGradeWithModifier)).`when`(gradeRepository).getGrades(student, semesters[2], true)
 
-        `when`(preferencesRepository.gradeAverageForceCalc).thenReturn(true)
-        `when`(preferencesRepository.gradeMinusModifier).thenReturn(.33)
-        `when`(preferencesRepository.gradePlusModifier).thenReturn(.33)
+        val averages = gradeAverageProvider.getGradeAverage(student, semesters, semesters[2].semesterId, true)
+            .blockingGet()
 
-        `when`(preferencesRepository.gradeAverageMode).thenReturn("only_one_semester")
-        `when`(semesterRepository.getSemesters(student)).thenReturn(Single.just(semesters))
-        `when`(gradeRepository.getGrades(student, semesters[2])).thenReturn(Single.just(secondGradeWithModifier to secondSummariesWithModifier))
-
-        val items = gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId).blockingGet()
-
-        assertEquals(3.5, items.single { it.subject == "Język polski" }.average, .0) // from details and after set custom plus/minus
+        assertEquals(3.5, averages.single { it.first == "Język polski" }.second, .0)
     }
 
     @Test
-    fun `force calc current semester average with custom modifiers in api mode`() {
-        val student = student.copy(loginMode = Sdk.Mode.API.name)
+    fun onlyOneSemester_gradesWithModifiers_api() {
+        doReturn("only_one_semester").`when`(preferencesRepository).gradeAverageMode
+        doReturn(Single.just(emptyList<GradeSummary>())).`when`(gradeSummaryRepository).getGradesSummary(semesters[2], true)
+        doReturn(Single.just(secondGradeWithModifier)).`when`(gradeRepository).getGrades(student.copy(loginMode = Sdk.Mode.API.name), semesters[2], true)
 
-        `when`(preferencesRepository.gradeAverageForceCalc).thenReturn(true)
-        `when`(preferencesRepository.gradeMinusModifier).thenReturn(.33) // useless in this mode
-        `when`(preferencesRepository.gradePlusModifier).thenReturn(.33)
+        val averages = gradeAverageProvider.getGradeAverage(student.copy(loginMode = Sdk.Mode.API.name), semesters, semesters[2].semesterId, true)
+            .blockingGet()
 
-        `when`(preferencesRepository.gradeAverageMode).thenReturn("only_one_semester")
-        `when`(semesterRepository.getSemesters(student)).thenReturn(Single.just(semesters))
-        `when`(gradeRepository.getGrades(student, semesters[2])).thenReturn(Single.just(secondGradeWithModifier to secondSummariesWithModifier))
-
-        val items = gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId).blockingGet()
-
-        assertEquals(3.375, items.single { it.subject == "Język polski" }.average, .0) // (from details): 3.375
+        assertEquals(3.375, averages.single { it.first == "Język polski" }.second, .0)
     }
 
     @Test
-    fun `force calc current semester average with custom modifiers in hybrid mode`() {
-        val student = student.copy(loginMode = Sdk.Mode.HYBRID.name)
+    fun onlyOneSemester_gradesWithModifiers_scrapper() {
+        doReturn("only_one_semester").`when`(preferencesRepository).gradeAverageMode
+        doReturn(Single.just(emptyList<GradeSummary>())).`when`(gradeSummaryRepository).getGradesSummary(semesters[2], true)
+        doReturn(Single.just(secondGradeWithModifier)).`when`(gradeRepository).getGrades(student.copy(loginMode = Sdk.Mode.SCRAPPER.name), semesters[2], true)
 
-        `when`(preferencesRepository.gradeAverageForceCalc).thenReturn(true)
-        `when`(preferencesRepository.gradeMinusModifier).thenReturn(.33) // useless in this mode
-        `when`(preferencesRepository.gradePlusModifier).thenReturn(.33)
+        val averages = gradeAverageProvider.getGradeAverage(student.copy(loginMode = Sdk.Mode.SCRAPPER.name), semesters, semesters[2].semesterId, true)
+            .blockingGet()
 
-        `when`(preferencesRepository.gradeAverageMode).thenReturn("only_one_semester")
-        `when`(semesterRepository.getSemesters(student)).thenReturn(Single.just(semesters))
-        `when`(gradeRepository.getGrades(student, semesters[2])).thenReturn(Single.just(secondGradeWithModifier to secondSummariesWithModifier))
-
-        val items = gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId).blockingGet()
-
-        assertEquals(3.375, items.single { it.subject == "Język polski" }.average, .0) // (from details): 3.375
+        assertEquals(3.5, averages.single { it.first == "Język polski" }.second, .0)
     }
 
     @Test
-    fun `calc current semester average`() {
-        `when`(preferencesRepository.gradeAverageForceCalc).thenReturn(false)
-        `when`(preferencesRepository.gradeAverageMode).thenReturn("only_one_semester")
-        `when`(gradeRepository.getGrades(student, semesters[2])).thenReturn(Single.just(secondGrades to secondSummaries))
+    fun onlyOneSemester_gradesWithModifiers_hybrid() {
+        doReturn("only_one_semester").`when`(preferencesRepository).gradeAverageMode
+        doReturn(Single.just(emptyList<GradeSummary>())).`when`(gradeSummaryRepository).getGradesSummary(semesters[2], true)
+        doReturn(Single.just(secondGradeWithModifier)).`when`(gradeRepository).getGrades(student.copy(loginMode = Sdk.Mode.HYBRID.name), semesters[2], true)
 
-        val items = gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId).blockingGet()
+        val averages = gradeAverageProvider.getGradeAverage(student.copy(loginMode = Sdk.Mode.HYBRID.name), semesters, semesters[2].semesterId, true)
+            .blockingGet()
 
-        assertEquals(2, items.size)
-        assertEquals(2.9, items.single { it.subject == "Matematyka" }.average, .0) // from summary: 2,9
-        assertEquals(3.4, items.single { it.subject == "Fizyka" }.average, .0) // from details: 3,4
+        assertEquals(3.375, averages.single { it.first == "Język polski" }.second, .0)
     }
 
     @Test
-    fun `force calc current semester average`() {
-        `when`(preferencesRepository.gradeAverageForceCalc).thenReturn(true)
-        `when`(preferencesRepository.gradeAverageMode).thenReturn("only_one_semester")
-        `when`(gradeRepository.getGrades(student, semesters[2])).thenReturn(Single.just(secondGrades to secondSummaries))
+    fun allYearFirstSemesterTest() {
+        doReturn("all_year").`when`(preferencesRepository).gradeAverageMode
+        doReturn(Single.just(emptyList<GradeSummary>())).`when`(gradeSummaryRepository).getGradesSummary(semesters[1], true)
 
-        val items = gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId).blockingGet()
+        val averages = gradeAverageProvider.getGradeAverage(student, semesters, semesters[1].semesterId, true)
+            .blockingGet()
 
-        assertEquals(2, items.size)
-        assertEquals(2.5, items.single { it.subject == "Matematyka" }.average, .0) // from details: 2,5
-        assertEquals(3.0, items.single { it.subject == "Fizyka" }.average, .0) // from details: 3,0
+        assertEquals(2, averages.size)
+        assertEquals(3.5, averages.single { it.first == "Matematyka" }.second, .0)
+        assertEquals(3.5, averages.single { it.first == "Fizyka" }.second, .0)
     }
 
     @Test
-    fun `force calc full year average when current is first`() {
-        `when`(preferencesRepository.gradeAverageForceCalc).thenReturn(true)
-        `when`(preferencesRepository.gradeAverageMode).thenReturn("all_year")
-        `when`(gradeRepository.getGrades(student, semesters[1])).thenReturn(Single.just(firstGrades to firstSummaries))
+    fun allYearSecondSemesterTest() {
+        doReturn("all_year").`when`(preferencesRepository).gradeAverageMode
+        doReturn(Single.just(firstGrades)).`when`(gradeRepository).getGrades(student, semesters[1], false)
+        doReturn(Single.just(emptyList<GradeSummary>())).`when`(gradeSummaryRepository).getGradesSummary(semesters[2], true)
 
-        val items = gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[1].semesterId).blockingGet()
+        val averages = gradeAverageProvider.getGradeAverage(student, semesters, semesters[2].semesterId, true)
+            .blockingGet()
 
-        assertEquals(2, items.size)
-        assertEquals(3.5, items.single { it.subject == "Matematyka" }.average, .0) // (from summary): 3,5
-        assertEquals(3.5, items.single { it.subject == "Fizyka" }.average, .0) // (from summary): 3,5
+        assertEquals(2, averages.size)
+        assertEquals(3.0, averages.single { it.first == "Matematyka" }.second, .0)
+        assertEquals(3.25, averages.single { it.first == "Fizyka" }.second, .0)
     }
 
     @Test(expected = IllegalArgumentException::class)
-    fun `calc average on invalid mode`() {
-        `when`(preferencesRepository.gradeAverageMode).thenReturn("test_mode")
+    fun incorrectAverageModeTest() {
+        doReturn("test_mode").`when`(preferencesRepository).gradeAverageMode
 
-        gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).blockingGet()
+        gradeAverageProvider.getGradeAverage(student, semesters, semesters[2].semesterId, true).blockingGet()
     }
 
     @Test
-    fun `calc full year average`() {
-        `when`(preferencesRepository.gradeAverageMode).thenReturn("all_year")
-        `when`(preferencesRepository.gradeAverageForceCalc).thenReturn(false)
-        `when`(gradeRepository.getGrades(student, semesters[1])).thenReturn(Single.just(firstGrades to listOf(
-            getSummary(22, "Matematyka", 3.0),
-            getSummary(22, "Fizyka", 3.5)
-        )))
-        `when`(gradeRepository.getGrades(student, semesters[2])).thenReturn(Single.just(secondGrades to listOf(
-            getSummary(22, "Matematyka", 3.5),
-            getSummary(22, "Fizyka", 4.0)
-        )))
+    fun onlyOneSemester_averageFromSummary() {
+        doReturn("all_year").`when`(preferencesRepository).gradeAverageMode
+        doReturn(Single.just(firstGrades)).`when`(gradeRepository).getGrades(student, semesters[1], false)
+        doReturn(Single.just(listOf(
+            getSummary(22, "Matematyka", 3.1),
+            getSummary(22, "Fizyka", 3.26)
+        ))).`when`(gradeSummaryRepository).getGradesSummary(semesters[2], true)
 
-        val items = gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId).blockingGet()
+        val averages = gradeAverageProvider.getGradeAverage(student, semesters, semesters[2].semesterId, true)
+            .blockingGet()
 
-        assertEquals(2, items.size)
-        assertEquals(3.25, items.single { it.subject == "Matematyka" }.average, .0) // (from summaries ↑): 3,0 + 3,5 → 3,25
-        assertEquals(3.75, items.single { it.subject == "Fizyka" }.average, .0) // (from summaries ↑): 3,5 + 4,0 → 3,75
+        assertEquals(2, averages.size)
+        assertEquals(3.1, averages.single { it.first == "Matematyka" }.second, .0)
+        assertEquals(3.26, averages.single { it.first == "Fizyka" }.second, .0)
     }
 
     @Test
-    fun `force calc full year average`() {
-        `when`(preferencesRepository.gradeAverageForceCalc).thenReturn(true)
-        `when`(preferencesRepository.gradeAverageMode).thenReturn("all_year")
-        `when`(gradeRepository.getGrades(student, semesters[1])).thenReturn(Single.just(firstGrades to firstSummaries))
-        `when`(gradeRepository.getGrades(student, semesters[2])).thenReturn(Single.just(secondGrades to listOf(
-            getSummary(22, "Matematyka", 1.1),
-            getSummary(22, "Fizyka", 7.26)
-        )))
+    fun onlyOneSemester_averageFromSummary_forceCalc() {
+        doReturn(true).`when`(preferencesRepository).gradeAverageForceCalc
+        doReturn("all_year").`when`(preferencesRepository).gradeAverageMode
+        doReturn(Single.just(firstGrades)).`when`(gradeRepository).getGrades(student, semesters[1], false)
+        doReturn(Single.just(listOf(
+            getSummary(22, "Matematyka", 3.1),
+            getSummary(22, "Fizyka", 3.26)
+        ))).`when`(gradeSummaryRepository).getGradesSummary(semesters[2], true)
 
-        val items = gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId).blockingGet()
+        val averages = gradeAverageProvider.getGradeAverage(student, semesters, semesters[2].semesterId, true)
+            .blockingGet()
 
-        assertEquals(2, items.size)
-        assertEquals(3.0, items.single { it.subject == "Matematyka" }.average, .0) // (from details): 3,5 + 2,5 → 3,0
-        assertEquals(3.25, items.single { it.subject == "Fizyka" }.average, .0) // (from details): 3,5  + 3,0 → 3,25
-    }
-
-    @Test
-    fun `calc full year average when no summaries`() {
-        `when`(preferencesRepository.gradeAverageForceCalc).thenReturn(false)
-        `when`(preferencesRepository.gradeAverageMode).thenReturn("all_year")
-
-        `when`(gradeRepository.getGrades(student, semesters[1])).thenReturn(Single.just(firstGrades to emptyList()))
-        `when`(gradeRepository.getGrades(student, semesters[2])).thenReturn(Single.just(secondGrades to emptyList()))
-
-        val items = gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId).blockingGet()
-
-        assertEquals(2, items.size)
-        assertEquals(3.0, items.single { it.subject == "Matematyka" }.average, .0) // (from details): 2,5 + 3,5 → 3,0
-        assertEquals(3.25, items.single { it.subject == "Fizyka" }.average, .0) // (from details): 3,5  + 3,0 → 3,25
-    }
-
-    @Test
-    fun `force calc full year average when no summaries`() {
-        `when`(preferencesRepository.gradeAverageForceCalc).thenReturn(true)
-        `when`(preferencesRepository.gradeAverageMode).thenReturn("all_year")
-
-        `when`(gradeRepository.getGrades(student, semesters[1])).thenReturn(Single.just(firstGrades to emptyList()))
-        `when`(gradeRepository.getGrades(student, semesters[2])).thenReturn(Single.just(secondGrades to emptyList()))
-
-        val items = gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId).blockingGet()
-
-        assertEquals(2, items.size)
-        assertEquals(3.0, items.single { it.subject == "Matematyka" }.average, .0) // (from details): 3,5 + 2,5 → 3,0
-        assertEquals(3.25, items.single { it.subject == "Fizyka" }.average, .0) // (from details): 3,5  + 3,0 → 3,25
-    }
-
-    @Test
-    fun `calc full year average when missing summaries in both semesters`() {
-        `when`(preferencesRepository.gradeAverageForceCalc).thenReturn(false)
-        `when`(preferencesRepository.gradeAverageMode).thenReturn("all_year")
-
-        `when`(gradeRepository.getGrades(student, semesters[1])).thenReturn(Single.just(firstGrades to listOf(
-            getSummary(22, "Matematyka", 4.0)
-        )))
-        `when`(gradeRepository.getGrades(student, semesters[2])).thenReturn(Single.just(secondGrades to listOf(
-            getSummary(23, "Matematyka", 3.0)
-        )))
-
-        val items = gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId).blockingGet()
-
-        assertEquals(2, items.size)
-        assertEquals(3.5, items.single { it.subject == "Matematyka" }.average, .0) // (from summaries ↑): 4,0 + 3,0 → 3,5
-        assertEquals(3.25, items.single { it.subject == "Fizyka" }.average, .0) // (from details): 3,5  + 3,0 → 3,25
-    }
-
-    @Test
-    fun `calc full year average when missing summary in second semester`() {
-        `when`(preferencesRepository.gradeAverageForceCalc).thenReturn(false)
-        `when`(preferencesRepository.gradeAverageMode).thenReturn("all_year")
-
-        `when`(gradeRepository.getGrades(student, semesters[1])).thenReturn(Single.just(firstGrades to firstSummaries))
-        `when`(gradeRepository.getGrades(student, semesters[2])).thenReturn(Single.just(secondGrades to secondSummaries.dropLast(1)))
-
-        val items = gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId).blockingGet()
-
-        assertEquals(2, items.size)
-        assertEquals(3.4, items.single { it.subject == "Matematyka" }.average, .0) // (from summaries): 3,9 + 2,9 → 3,4
-        assertEquals(3.05, items.single { it.subject == "Fizyka" }.average, .0) // 3,1 (from summary) + 3,0 (from details) → 3,05
-    }
-
-    @Test
-    fun `calc full year average when missing summary in first semester`() {
-        `when`(preferencesRepository.gradeAverageForceCalc).thenReturn(false)
-        `when`(preferencesRepository.gradeAverageMode).thenReturn("all_year")
-
-        `when`(gradeRepository.getGrades(student, semesters[1])).thenReturn(Single.just(firstGrades to firstSummaries.dropLast(1)))
-        `when`(gradeRepository.getGrades(student, semesters[2])).thenReturn(Single.just(secondGrades to secondSummaries))
-
-        val items = gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId).blockingGet()
-
-        assertEquals(2, items.size)
-        assertEquals(3.4, items.single { it.subject == "Matematyka" }.average, .0) // (from summaries): 3,9 + 2,9 → 3,4
-        assertEquals(3.45, items.single { it.subject == "Fizyka" }.average, .0) // 3,5 (from details) + 3,4 (from summary) → 3,45
-    }
-
-    @Test
-    fun `force calc full year average when missing summary in first semester`() {
-        `when`(preferencesRepository.gradeAverageForceCalc).thenReturn(true)
-        `when`(preferencesRepository.gradeAverageMode).thenReturn("all_year")
-
-        `when`(gradeRepository.getGrades(student, semesters[1])).thenReturn(Single.just(firstGrades to firstSummaries.dropLast(1)))
-        `when`(gradeRepository.getGrades(student, semesters[2])).thenReturn(Single.just(secondGrades to secondSummaries))
-
-        val items = gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId).blockingGet()
-
-        assertEquals(2, items.size)
-        assertEquals(3.0, items.single { it.subject == "Matematyka" }.average, .0) // (from details): 3,5 + 2,5 → 3,0
-        assertEquals(3.25, items.single { it.subject == "Fizyka" }.average, .0) // (from details): 3,5  + 3,0 → 3,25
+        assertEquals(2, averages.size)
+        assertEquals(3.0, averages.single { it.first == "Matematyka" }.second, .0)
+        assertEquals(3.25, averages.single { it.first == "Fizyka" }.second, .0)
     }
 
     private fun getGrade(semesterId: Int, subject: String, value: Double, modifier: Double = 0.0): Grade {
@@ -349,12 +220,12 @@ class GradeAverageProviderTest {
         )
     }
 
-    private fun getSummary(semesterId: Int, subject: String, average: Double): GradeSummary {
+    private fun getSummary(semesterId: Int, subject: String, value: Double): GradeSummary {
         return GradeSummary(
             studentId = 101,
             semesterId = semesterId,
             subject = subject,
-            average = average,
+            average = value,
             pointsSum = "",
             proposedPoints = "",
             finalPoints = "",
diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenterTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenterTest.kt
index 9d226dac9..be99d4d46 100644
--- a/app/src/test/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenterTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenterTest.kt
@@ -4,6 +4,7 @@ import io.github.wulkanowy.TestSchedulersProvider
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.modules.login.LoginErrorHandler
+import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 import io.reactivex.Single
 import org.junit.Before
@@ -33,6 +34,9 @@ class LoginFormPresenterTest {
     @Mock
     lateinit var analytics: FirebaseAnalyticsHelper
 
+    @Mock
+    lateinit var appInfo: AppInfo
+
     private lateinit var presenter: LoginFormPresenter
 
     @Before
@@ -50,49 +54,48 @@ class LoginFormPresenterTest {
 
     @Test
     fun emptyNicknameLoginTest() {
-        `when`(loginFormView.formUsernameValue).thenReturn("")
+        `when`(loginFormView.formNameValue).thenReturn("")
         `when`(loginFormView.formPassValue).thenReturn("test123")
-        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf/?standard")
+        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf")
         presenter.onSignInClick()
 
-        verify(loginFormView).setErrorUsernameRequired()
+        verify(loginFormView).setErrorNameRequired()
         verify(loginFormView, never()).setErrorPassRequired(false)
         verify(loginFormView, never()).setErrorPassInvalid(false)
     }
 
     @Test
     fun emptyPassLoginTest() {
-        `when`(loginFormView.formUsernameValue).thenReturn("@")
+        `when`(loginFormView.formNameValue).thenReturn("@")
         `when`(loginFormView.formPassValue).thenReturn("")
-        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf/?standard")
+        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf")
         presenter.onSignInClick()
 
-        verify(loginFormView, never()).setErrorUsernameRequired()
+        verify(loginFormView, never()).setErrorNameRequired()
         verify(loginFormView).setErrorPassRequired(true)
         verify(loginFormView, never()).setErrorPassInvalid(false)
     }
 
     @Test
     fun invalidPassLoginTest() {
-        `when`(loginFormView.formUsernameValue).thenReturn("@")
+        `when`(loginFormView.formNameValue).thenReturn("@")
         `when`(loginFormView.formPassValue).thenReturn("123")
-        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf/?standard")
+        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf")
         presenter.onSignInClick()
 
-        verify(loginFormView, never()).setErrorUsernameRequired()
+        verify(loginFormView, never()).setErrorNameRequired()
         verify(loginFormView, never()).setErrorPassRequired(true)
         verify(loginFormView).setErrorPassInvalid(true)
     }
 
     @Test
     fun loginTest() {
-        val studentTest = Student(email = "test@", password = "123", scrapperBaseUrl = "https://fakelog.cf/", loginType = "AUTO", studentName = "", schoolSymbol = "", schoolName = "", studentId = 0, classId = 1, isCurrent = false, symbol = "", registrationDate = now(), className = "", mobileBaseUrl = "", privateKey = "", certificateKey = "", loginMode = "", userLoginId = 0, schoolShortName = "", isParent = false)
+        val studentTest = Student(email = "test@", password = "123", scrapperBaseUrl = "https://fakelog.cf", loginType = "AUTO", studentName = "", schoolSymbol = "", schoolName = "", studentId = 0, classId = 1, isCurrent = false, symbol = "", registrationDate = now(), className = "", mobileBaseUrl = "", privateKey = "", certificateKey = "", loginMode = "", userLoginId = 0, isParent = false)
         doReturn(Single.just(listOf(studentTest))).`when`(repository).getStudentsScrapper(anyString(), anyString(), anyString(), anyString())
 
-        `when`(loginFormView.formUsernameValue).thenReturn("@")
+        `when`(loginFormView.formNameValue).thenReturn("@")
         `when`(loginFormView.formPassValue).thenReturn("123456")
-        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf/?standard")
-        `when`(loginFormView.formHostSymbol).thenReturn("Default")
+        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf")
         presenter.onSignInClick()
 
         verify(loginFormView).hideSoftKeyboard()
@@ -106,10 +109,9 @@ class LoginFormPresenterTest {
     fun loginEmptyTest() {
         doReturn(Single.just(emptyList<Student>()))
             .`when`(repository).getStudentsScrapper(anyString(), anyString(), anyString(), anyString())
-        `when`(loginFormView.formUsernameValue).thenReturn("@")
+        `when`(loginFormView.formNameValue).thenReturn("@")
         `when`(loginFormView.formPassValue).thenReturn("123456")
-        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf/?standard")
-        `when`(loginFormView.formHostSymbol).thenReturn("Default")
+        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf")
         presenter.onSignInClick()
 
         verify(loginFormView).hideSoftKeyboard()
@@ -123,10 +125,9 @@ class LoginFormPresenterTest {
     fun loginEmptyTwiceTest() {
         doReturn(Single.just(emptyList<Student>()))
             .`when`(repository).getStudentsScrapper(anyString(), anyString(), anyString(), anyString())
-        `when`(loginFormView.formUsernameValue).thenReturn("@")
+        `when`(loginFormView.formNameValue).thenReturn("@")
         `when`(loginFormView.formPassValue).thenReturn("123456")
-        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf/?standard")
-        `when`(loginFormView.formHostSymbol).thenReturn("Default")
+        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf")
         presenter.onSignInClick()
         presenter.onSignInClick()
 
@@ -141,10 +142,9 @@ class LoginFormPresenterTest {
     fun loginErrorTest() {
         val testException = RuntimeException("test")
         doReturn(Single.error<List<Student>>(testException)).`when`(repository).getStudentsScrapper(anyString(), anyString(), anyString(), anyString())
-        `when`(loginFormView.formUsernameValue).thenReturn("@")
+        `when`(loginFormView.formNameValue).thenReturn("@")
         `when`(loginFormView.formPassValue).thenReturn("123456")
-        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf/?standard")
-        `when`(loginFormView.formHostSymbol).thenReturn("Default")
+        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf")
         presenter.onSignInClick()
 
         verify(loginFormView).hideSoftKeyboard()
diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenterTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenterTest.kt
index 121391dee..2c174fb58 100644
--- a/app/src/test/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenterTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenterTest.kt
@@ -32,7 +32,7 @@ class LoginStudentSelectPresenterTest {
 
     private lateinit var presenter: LoginStudentSelectPresenter
 
-    private val testStudent by lazy { Student(email = "test", password = "test123", scrapperBaseUrl = "https://fakelog.cf", loginType = "AUTO", symbol = "", isCurrent = false, studentId = 0, schoolName = "", schoolSymbol = "", classId = 1, studentName = "", registrationDate = now(), className = "", loginMode = "", certificateKey = "", privateKey = "", mobileBaseUrl = "", schoolShortName = "", userLoginId = 1, isParent = false) }
+    private val testStudent by lazy { Student(email = "test", password = "test123", scrapperBaseUrl = "https://fakelog.cf", loginType = "AUTO", symbol = "", isCurrent = false, studentId = 0, schoolName = "", schoolSymbol = "", classId = 1, studentName = "", registrationDate = now(), className = "", loginMode = "", certificateKey = "", privateKey = "", mobileBaseUrl = "", userLoginId = 1, isParent = false) }
 
     private val testException by lazy { RuntimeException("Problem") }
 
@@ -53,7 +53,7 @@ class LoginStudentSelectPresenterTest {
     fun onSelectedStudentTest() {
         doReturn(Single.just(listOf(1L))).`when`(studentRepository).saveStudents(listOf(testStudent))
         doReturn(Completable.complete()).`when`(studentRepository).switchStudent(testStudent)
-        presenter.onItemSelected(testStudent, false)
+        presenter.onItemSelected(LoginStudentSelectItem(testStudent))
         presenter.onSignIn()
         verify(loginStudentSelectView).showContent(false)
         verify(loginStudentSelectView).showProgress(true)
@@ -64,7 +64,7 @@ class LoginStudentSelectPresenterTest {
     fun onSelectedStudentErrorTest() {
         doReturn(Single.error<Student>(testException)).`when`(studentRepository).saveStudents(listOf(testStudent))
         doReturn(Completable.complete()).`when`(studentRepository).logoutStudent(testStudent)
-        presenter.onItemSelected(testStudent, false)
+        presenter.onItemSelected(LoginStudentSelectItem(testStudent))
         presenter.onSignIn()
         verify(loginStudentSelectView).showContent(false)
         verify(loginStudentSelectView).showProgress(true)
diff --git a/app/src/test/java/io/github/wulkanowy/utils/TimeExtensionTest.kt b/app/src/test/java/io/github/wulkanowy/utils/TimeExtensionTest.kt
index 72d08c411..024b4727b 100644
--- a/app/src/test/java/io/github/wulkanowy/utils/TimeExtensionTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/utils/TimeExtensionTest.kt
@@ -38,12 +38,12 @@ class TimeExtensionTest {
     }
 
     @Test
-    fun sundayTestTest() {
-        assertEquals(of(2018, 10, 7), of(2018, 10, 2).sunday)
-        assertEquals(of(2018, 10, 7), of(2018, 10, 5).sunday)
-        assertEquals(of(2018, 10, 7), of(2018, 10, 6).sunday)
-        assertEquals(of(2018, 10, 7), of(2018, 10, 7).sunday)
-        assertEquals(of(2018, 10, 14), of(2018, 10, 8).sunday)
+    fun fridayTest() {
+        assertEquals(of(2018, 10, 5), of(2018, 10, 2).friday)
+        assertEquals(of(2018, 10, 5), of(2018, 10, 5).friday)
+        assertEquals(of(2018, 10, 5), of(2018, 10, 6).friday)
+        assertEquals(of(2018, 10, 5), of(2018, 10, 7).friday)
+        assertEquals(of(2018, 10, 12), of(2018, 10, 8).friday)
     }
 
     @Test
diff --git a/app/src/test/java/io/github/wulkanowy/utils/TimetableExtensionTest.kt b/app/src/test/java/io/github/wulkanowy/utils/TimetableExtensionTest.kt
deleted file mode 100644
index 33a798502..000000000
--- a/app/src/test/java/io/github/wulkanowy/utils/TimetableExtensionTest.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-package io.github.wulkanowy.utils
-
-import io.github.wulkanowy.getTimetableEntity
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertFalse
-import org.junit.Assert.assertNotEquals
-import org.junit.Assert.assertTrue
-import org.junit.Test
-import org.threeten.bp.LocalDateTime.now
-
-class TimetableExtensionTest {
-
-    @Test
-    fun isShowTimeUntil() {
-        assertFalse(getTimetableEntity().isShowTimeUntil(null))
-        assertFalse(getTimetableEntity(isStudentPlan = false).isShowTimeUntil(null))
-        assertFalse(getTimetableEntity(isStudentPlan = true, canceled = true).isShowTimeUntil(null))
-        assertFalse(getTimetableEntity(isStudentPlan = true, canceled = false, start = now().minusSeconds(1)).isShowTimeUntil(null))
-        assertFalse(getTimetableEntity(isStudentPlan = true, canceled = false, start = now().plusMinutes(5)).isShowTimeUntil(now().plusMinutes(5)))
-        assertFalse(getTimetableEntity(isStudentPlan = true, canceled = false, start = now().plusMinutes(61)).isShowTimeUntil(now().minusMinutes(5)))
-
-        assertTrue(getTimetableEntity(isStudentPlan = true, canceled = false, start = now().plusMinutes(60)).isShowTimeUntil(now().minusMinutes(5)))
-        assertTrue(getTimetableEntity(isStudentPlan = true, canceled = false, start = now().plusMinutes(60)).isShowTimeUntil(null))
-
-        assertFalse(getTimetableEntity(isStudentPlan = true, canceled = false, start = now().minusSeconds(1)).isShowTimeUntil(null))
-    }
-
-    @Test
-    fun getLeft() {
-        assertEquals(null, getTimetableEntity(canceled = true).left)
-        assertEquals(null, getTimetableEntity(start = now().plusMinutes(5), end = now().plusMinutes(50)).left)
-        assertEquals(null, getTimetableEntity(start = now().minusMinutes(1), end = now().plusMinutes(44), isStudentPlan = false).left)
-        assertNotEquals(null, getTimetableEntity(start = now().minusMinutes(1), end = now().plusMinutes(44), isStudentPlan = true).left)
-    }
-
-    @Test
-    fun isJustFinished() {
-        assertFalse(getTimetableEntity(end = now().minusSeconds(16)).isJustFinished)
-        assertTrue(getTimetableEntity(end = now().minusSeconds(14)).isJustFinished)
-        assertTrue(getTimetableEntity(end = now().minusSeconds(1)).isJustFinished)
-        assertFalse(getTimetableEntity(end = now().plusSeconds(1)).isJustFinished)
-    }
-}
diff --git a/build.gradle b/build.gradle
index 7e5759d12..0843a31a3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,21 +1,20 @@
 buildscript {
-    ext.kotlin_version = '1.3.72'
-    ext.about_libraries = '8.1.6'
+    ext.kotlin_version = '1.3.61'
     repositories {
         mavenCentral()
         google()
         jcenter()
         maven { url "https://plugins.gradle.org/m2/" }
+        maven { url 'https://maven.fabric.io/public' }
     }
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.android.tools.build:gradle:4.0.0'
+        classpath 'com.android.tools.build:gradle:3.5.3'
         classpath 'com.google.gms:google-services:4.3.3'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.1.1'
-        classpath "com.github.triplet.gradle:play-publisher:2.7.5"
-        classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.8"
+        classpath "io.fabric.tools:gradle:1.31.2"
+        classpath "com.github.triplet.gradle:play-publisher:2.4.2"
+        classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.8.0.1969"
         classpath "gradle.plugin.com.star-zero.gradle:githook:1.2.0"
-        classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:${about_libraries}"
     }
 }
 
diff --git a/crowdin.yml b/crowdin.yml
deleted file mode 100644
index 2399a56b5..000000000
--- a/crowdin.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-files:
-  - source: /app/src/main/res/values/*.xml
-    ignore:
-      - /app/src/main/res/values/styles.xml
-      - /app/src/main/res/values/api_hosts.xml
-      - /app/src/main/res/values/api_symbols.xml
-      - /app/src/main/res/values/attrs.xml
-      - /app/src/main/res/values/colors.xml
-      - /app/src/main/res/values/dimens.xml
-      - /app/src/main/res/values/preferences_keys.xml
-      - /app/src/main/res/values/preferences_defaults.xml
-    translation: /app/src/main/res/values-%android_code%/%original_file_name%
-    translate_attributes: 0
-    content_segmentation: 0
diff --git a/gradle.properties b/gradle.properties
index 5741ecfc4..113bb1069 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,6 +9,7 @@
 # The setting is particularly useful for tweaking memory settings.
 android.enableJetifier=true
 android.useAndroidX=true
+android.enableR8=true
 org.gradle.jvmargs=-Xmx1536m
 kapt.incremental.apt=true
 
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index f3d88b1c2..5c2d1cf01 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 6623300be..0ebb3108e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 2fe81a7d9..83f2acfdc 100755
--- a/gradlew
+++ b/gradlew
@@ -154,19 +154,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=`expr $i + 1`
+        i=$((i+1))
     done
     case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -175,9 +175,14 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=`save "$@"`
+APP_ARGS=$(save "$@")
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
 exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index 9109989e3..24467a141 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -29,9 +29,6 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"