diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1ae402f53..b07c9638c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -7,11 +7,11 @@ references:
 
   container_config: &container_config
     docker:
-      - image: circleci/android:api-28-alpha
+      - image: circleci/android:api-28
     working_directory: *workspace_root
     environment:
       environment:
-        JVM_OPTS: -Xmx3200m
+        _JAVA_OPTS: -Xmx3072m
 
   attach_workspace: &attach_workspace
     attach_workspace:
@@ -159,7 +159,7 @@ jobs:
             openssl aes-256-cbc -d -in ./app/upload-key-encrypted.jks -k $ENCRYPT_KEY >> ./app/upload-key.jks
       - run:
           name: Publish release
-          command: ./gradlew publishRelease --no-daemon --stacktrace --console=plain -PenableCrashlytics -PdisablePreDex
+          command: ./gradlew publish --no-daemon --stacktrace --console=plain -PenableCrashlytics -PdisablePreDex
 
 workflows:
   version: 2
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index eb4efba71..43e9b544a 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -19,33 +19,8 @@
       <option name="CONTINUATION_INDENT_IN_SUPERTYPE_LISTS" value="false" />
       <option name="CONTINUATION_INDENT_IN_IF_CONDITIONS" value="false" />
       <option name="CONTINUATION_INDENT_IN_ELVIS" value="false" />
-      <option name="WRAP_EXPRESSION_BODY_FUNCTIONS" value="1" />
+      <option name="WRAP_ELVIS_EXPRESSIONS" value="0" />
     </JetCodeStyleSettings>
-    <Objective-C-extensions>
-      <file>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
-      </file>
-      <class>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
-      </class>
-      <extensions>
-        <pair source="cpp" header="h" fileNamingConvention="NONE" />
-        <pair source="c" header="h" fileNamingConvention="NONE" />
-      </extensions>
-    </Objective-C-extensions>
     <XML>
       <option name="XML_KEEP_LINE_BREAKS" value="false" />
       <option name="XML_ALIGN_ATTRIBUTES" value="false" />
diff --git a/.travis.yml b/.travis.yml
index a430c90ef..10824e32f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,11 @@ cache:
     - $HOME/.gradle/caches/
     - $HOME/.gradle/wrapper/
 
+#branches:
+#  only:
+#    - master
+#    - 0.8.x
+
 android:
  licenses:
     - android-sdk-preview-license-.+
@@ -41,7 +46,7 @@ before_script:
     - "curl -H 'Cache-Control: no-cache' https://raw.githubusercontent.com/fossas/fossa-cli/master/install.sh | sudo bash"
 
 script:
-  - ./gradlew build -x test -x lint -x fabricGenerateResourcesRelease -x packageRelease --stacktrace --daemon
+  - ./gradlew dependencies --stacktrace --daemon
   - fossa --no-ansi || true
   - ./gradlew lint -x fabricGenerateResourcesRelease --stacktrace --daemon
   - ./gradlew test -x fabricGenerateResourcesRelease --stacktrace --daemon
@@ -56,7 +61,7 @@ script:
       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 publishRelease -PenableCrashlytics --stacktrace;
+      ./gradlew publish -PenableCrashlytics --stacktrace;
     fi
 
 after_success:
diff --git a/README.md b/README.md
index ccbf14ca5..97a4172c4 100644
--- a/README.md
+++ b/README.md
@@ -6,12 +6,12 @@
 [![Codecov](https://img.shields.io/codecov/c/github/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://codecov.io/gh/wulkanowy/wulkanowy)
 [![BCH compliance](https://bettercodehub.com/edge/badge/wulkanowy/wulkanowy?branch=master)](https://bettercodehub.com/)
 [![Sonarcloud](https://sonarcloud.io/api/project_badges/measure?project=io.github.wulkanowy%3Aapp&metric=sqale_rating)](https://sonarcloud.io/dashboard?id=io.github.wulkanowy%3Aapp)
-[![FOSSA Status](https://app.fossa.io/api/projects/custom%2B5644%2Fgit%40github.com%3Awulkanowy%2Fwulkanowy.git.svg?type=shield)](https://app.fossa.io/projects/custom%2B5644%2Fgit%40github.com%3Awulkanowy%2Fwulkanowy.git?ref=badge_shield)
+[![FOSSA Status](https://app.fossa.com/api/projects/custom%2B5644%2Fgithub.com%2Fwulkanowy%2Fwulkanowy.svg?type=shield)](https://app.fossa.com/projects/custom%2B5644%2Fgithub.com%2Fwulkanowy%2Fwulkanowy?ref=badge_shield)
 [![Discord](https://img.shields.io/discord/390889354199040011.svg?style=flat-square)](https://discord.gg/vccAQBr)
 
 [Pobierz wersję beta z Google Play](https://play.google.com/store/apps/details?id=io.github.wulkanowy&amp;utm_source=vcs)
 
-[Pobierz wersję DEV](https://bitrise-redirector.herokuapp.com/v0.1/apps/daeff1893f3c8128/builds/master/artifacts/0)
+[Pobierz wersję DEV](https://bitrise-redirector.herokuapp.com/v0.1/apps/f841f20d8f8b1dc8/builds/master/artifacts/0)
 [(Więcej wersji DEV)](https://wulkanowy.github.io/dev.html)
 
 Androidowy klient dziennika VULCAN UONET+.
@@ -19,4 +19,4 @@ Androidowy klient dziennika VULCAN UONET+.
 
 ## License
 
-[![FOSSA Status](https://app.fossa.io/api/projects/custom%2B5644%2Fgit%40github.com%3Awulkanowy%2Fwulkanowy.git.svg?type=large)](https://app.fossa.io/projects/custom%2B5644%2Fgit%40github.com%3Awulkanowy%2Fwulkanowy.git?ref=badge_large)
+[![FOSSA Status](https://app.fossa.com/api/projects/custom%2B5644%2Fgithub.com%2Fwulkanowy%2Fwulkanowy.svg?type=large)](https://app.fossa.com/projects/custom%2B5644%2Fgithub.com%2Fwulkanowy%2Fwulkanowy?ref=badge_large)
diff --git a/app/build.gradle b/app/build.gradle
index f60cbb008..3043bc651 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,28 +11,29 @@ android {
     compileSdkVersion 28
     buildToolsVersion '28.0.3'
 
-    playAccountConfigs {
-        defaultAccountConfig {
-            serviceAccountEmail = System.getenv("PLAY_SERVICE_ACCOUNT_EMAIL")
-            pk12File = file('key.p12')
-        }
-    }
-
     defaultConfig {
         applicationId "io.github.wulkanowy"
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 15
         targetSdkVersion 28
-        versionCode 22
-        versionName "0.6.3"
+        versionCode 36
+        versionName "0.8.3"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
-        playAccountConfig = playAccountConfigs.defaultAccountConfig
         manifestPlaceholders = [
-                fabric_api_key: System.getenv("FABRIC_API_KEY") ?: "null",
+                fabric_api_key     : System.getenv("FABRIC_API_KEY") ?: "null",
                 crashlytics_enabled: project.hasProperty("enableCrashlytics")
         ]
+        javaCompileOptions {
+            annotationProcessorOptions {
+                arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]
+            }
+        }
+    }
+
+    sourceSets {
+        androidTest.assets.srcDirs += files("$projectDir/schemas".toString())
     }
 
     signingConfigs {
@@ -48,7 +49,6 @@ android {
         release {
             buildConfigField "boolean", "CRASHLYTICS_ENABLED", "true"
             minifyEnabled true
-            useProguard false
             shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             signingConfig signingConfigs.release
@@ -66,6 +66,11 @@ android {
     lintOptions {
         disable 'HardwareIds'
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 androidExtensions {
@@ -73,65 +78,76 @@ androidExtensions {
 }
 
 play {
+    serviceAccountEmail = System.getenv("PLAY_SERVICE_ACCOUNT_EMAIL") ?: "jan@fakelog.cf"
+    serviceAccountCredentials = file('key.p12')
+    defaultToAppBundles = false
     track = 'alpha'
-    uploadImages = false
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
-    implementation('io.github.wulkanowy:api:0.6.3') { exclude module: "threetenbp" }
+    implementation 'io.github.wulkanowy:api:0.8.3'
 
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation "androidx.legacy:legacy-support-v4:1.0.0"
     implementation "androidx.appcompat:appcompat:1.0.2"
-    implementation "androidx.cardview:cardview:1.0.0"
-    implementation "com.google.android.material:material:1.0.0"
     implementation 'androidx.multidex:multidex:2.0.1'
 
-    implementation 'com.takisoft.preferencex:preferencex:1.0.0'
-    implementation "com.mikepenz:aboutlibraries:6.2.0"
-    implementation "com.firebase:firebase-jobdispatcher:0.8.5"
+    implementation "androidx.cardview:cardview:1.0.0"
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation "com.google.android.material:material:1.1.0-alpha05"
+    implementation 'com.github.wulkanowy:MaterialChipsInput:b72fd0ee6f'
+    implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0'
 
-    implementation "com.google.dagger:dagger-android-support:2.19"
-    kapt "com.google.dagger:dagger-compiler:2.19"
-    kapt "com.google.dagger:dagger-android-processor:2.19"
+    implementation "androidx.work:work-runtime:2.0.1"
+    implementation "androidx.work:work-rxjava2:2.0.1"
 
-    implementation "androidx.room:room-runtime:2.1.0-alpha03"
-    implementation "androidx.room:room-rxjava2:2.1.0-alpha03"
-    kapt "androidx.room:room-compiler:2.1.0-alpha03"
+    implementation "androidx.room:room-runtime:2.1.0-alpha07"
+    implementation "androidx.room:room-rxjava2:2.1.0-alpha07"
+    kapt "androidx.room:room-compiler:2.1.0-alpha07"
+
+    implementation "com.google.dagger:dagger-android-support:2.22.1"
+    kapt "com.google.dagger:dagger-compiler:2.22.1"
+    kapt "com.google.dagger:dagger-android-processor:2.22.1"
+    implementation 'com.squareup.inject:assisted-inject-annotations-dagger2:0.4.0'
+    kapt 'com.squareup.inject:assisted-inject-processor-dagger2:0.4.0'
 
     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.2.0'
 
-    implementation "com.aurelhubert:ahbottomnavigation:2.2.0"
-    implementation 'com.ncapdevi:frag-nav:3.0.0'
-
-    implementation 'com.github.pwittchen:reactivenetwork-rx2:3.0.1'
-    implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
-    implementation "io.reactivex.rxjava2:rxjava:2.2.4"
-
-    implementation "com.jakewharton.threetenabp:threetenabp:1.1.0"
+    implementation 'com.github.pwittchen:reactivenetwork-rx2:3.0.2'
+    implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
+    implementation "io.reactivex.rxjava2:rxjava:2.2.8"
 
+    implementation 'com.google.code.gson:gson:2.8.5'
+    implementation "com.jakewharton.threetenabp:threetenabp:1.2.0"
     implementation "com.jakewharton.timber:timber:4.7.1"
     implementation "at.favre.lib:slf4j-timber:1.0.1"
+    implementation "com.squareup.okhttp3:logging-interceptor:3.12.1"
 
-    implementation 'com.google.firebase:firebase-core:16.0.6'
-    implementation 'com.crashlytics.sdk.android:crashlytics:2.9.8'
+    implementation "com.mikepenz:aboutlibraries:6.2.3"
+    implementation 'com.takisoft.preferencex:preferencex:1.0.0'
 
-    releaseImplementation 'fr.o80.chucker:library-no-op:2.0.3'
-    debugImplementation 'fr.o80.chucker:library:2.0.3'
+    implementation 'com.google.firebase:firebase-core:16.0.8'
+    implementation 'com.crashlytics.sdk.android:crashlytics:2.9.9'
 
-    debugImplementation "com.amitshekhar.android:debug-db:1.0.4"
+    releaseImplementation 'fr.o80.chucker:library-no-op:2.0.4'
+
+    debugImplementation 'fr.o80.chucker:library:2.0.4'
+    debugImplementation "com.amitshekhar.android:debug-db:1.0.6"
 
     testImplementation "junit:junit:4.12"
-    testImplementation "io.mockk:mockk:1.8.13.kotlin13"
-    testImplementation "org.mockito:mockito-inline:2.23.4"
+    testImplementation "io.mockk:mockk:1.9.2"
+    testImplementation "org.mockito:mockito-inline:2.27.0"
     testImplementation 'org.threeten:threetenbp:1.3.8'
 
     androidTestImplementation 'androidx.test:core:1.1.0'
     androidTestImplementation 'androidx.test:runner:1.1.1'
     androidTestImplementation 'androidx.test.ext:junit:1.1.0'
-    androidTestImplementation 'org.mockito:mockito-android:2.23.4'
+    androidTestImplementation "io.mockk:mockk-android:1.9.2"
+    androidTestImplementation 'org.mockito:mockito-android:2.27.0'
+    androidTestImplementation "androidx.room:room-testing:2.1.0-alpha07"
     androidTestImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
 }
 
diff --git a/app/jacoco.gradle b/app/jacoco.gradle
index 4f94ef190..f22c33598 100644
--- a/app/jacoco.gradle
+++ b/app/jacoco.gradle
@@ -1,7 +1,7 @@
 apply plugin: "jacoco"
 
 jacoco {
-    toolVersion "0.8.2"
+    toolVersion "0.8.3"
     reportsDir = file("$buildDir/reports")
 }
 
@@ -31,17 +31,17 @@ task jacocoTestReport(type: JacocoReport) {
                     '**/*_Provide*Factory*.*',
                     '**/*_Factory.*']
 
-    classDirectories = fileTree(
+    classDirectories.setFrom(fileTree(
             dir: "$buildDir/intermediates/classes/debug",
             excludes: excludes
     ) + fileTree(
             dir: "$buildDir/tmp/kotlin-classes/debug",
             excludes: excludes
-    )
+    ))
 
-    sourceDirectories = files("$project.projectDir/src/main/java")
-    executionData = fileTree(
+    sourceDirectories.setFrom(files("$project.projectDir/src/main/java"))
+    executionData.setFrom(fileTree(
             dir: project.projectDir,
             includes: ["**/*.exec", "**/*.ec"]
-    )
+    ))
 }
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index cebd3d94d..15b628384 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -5,6 +5,7 @@
 -dontskipnonpubliclibraryclasses
 -dontskipnonpubliclibraryclassmembers
 -dontpreverify
+-dontobfuscate
 -allowaccessmodification
 -repackageclasses ''
 -verbose
@@ -13,7 +14,6 @@
 #Config for anallitycs
 -keepattributes *Annotation*
 -keepattributes SourceFile,LineNumberTable
--renamesourcefileattribute SourceFile
 -keep class com.crashlytics.** {*;}
 -keep public class * extends java.lang.Exception
 -dontwarn com.crashlytics.**
@@ -32,5 +32,8 @@
 -dontwarn rx.internal.util.**
 -dontwarn sun.misc.Unsafe
 
+#Config for MPAndroidChart
+-keep class com.github.mikephil.charting.** { *; }
+
 #Config for API
 -keep class io.github.wulkanowy.api.** {*;}
diff --git a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/11.json b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/11.json
new file mode 100644
index 000000000..e42a4a719
--- /dev/null
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/11.json
@@ -0,0 +1,1325 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 11,
+    "identityHash": "478af7daed6ac4563e71826fb70cc8c8",
+    "entities": [
+      {
+        "tableName": "Students",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `endpoint` TEXT NOT NULL, `loginType` TEXT NOT NULL, `email` TEXT NOT NULL, `password` TEXT NOT NULL, `symbol` TEXT NOT NULL, `student_id` INTEGER NOT NULL, `student_name` TEXT NOT NULL, `school_id` TEXT NOT NULL, `school_name` TEXT NOT NULL, `is_current` INTEGER NOT NULL, `registration_date` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "endpoint",
+            "columnName": "endpoint",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "loginType",
+            "columnName": "loginType",
+            "affinity": "TEXT",
+            "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": "studentName",
+            "columnName": "student_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolSymbol",
+            "columnName": "school_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolName",
+            "columnName": "school_name",
+            "affinity": "TEXT",
+            "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",
+            "unique": true,
+            "columnNames": [
+              "email",
+              "symbol",
+              "student_id",
+              "school_id"
+            ],
+            "createSql": "CREATE UNIQUE INDEX `index_Students_email_symbol_student_id_school_id` ON `${TABLE_NAME}` (`email`, `symbol`, `student_id`, `school_id`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Semesters",
+        "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, `diary_name` TEXT NOT NULL, `semester_id` INTEGER NOT NULL, `semester_name` INTEGER NOT NULL, `is_current` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `unit_id` 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": "diaryName",
+            "columnName": "diary_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterName",
+            "columnName": "semester_name",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isCurrent",
+            "columnName": "is_current",
+            "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 `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, `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": "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, `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)",
+        "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": "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
+          }
+        ],
+        "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` INTEGER 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": "INTEGER",
+            "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, `subject` TEXT NOT NULL, `predictedGrade` TEXT NOT NULL, `finalGrade` 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": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "predictedGrade",
+            "columnName": "predictedGrade",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "finalGrade",
+            "columnName": "finalGrade",
+            "affinity": "TEXT",
+            "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": "Messages",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL, `content` TEXT, `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, `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": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "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": "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": []
+      }
+    ],
+    "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, \"478af7daed6ac4563e71826fb70cc8c8\")"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/12.json b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/12.json
new file mode 100644
index 000000000..32f943554
--- /dev/null
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/12.json
@@ -0,0 +1,1332 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 12,
+    "identityHash": "972ad26e6488d9a8239f6bd8597af61d",
+    "entities": [
+      {
+        "tableName": "Students",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `endpoint` TEXT NOT NULL, `loginType` TEXT NOT NULL, `email` TEXT NOT NULL, `password` TEXT NOT NULL, `symbol` TEXT NOT NULL, `student_id` INTEGER NOT NULL, `student_name` TEXT NOT NULL, `school_id` TEXT NOT NULL, `school_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": "endpoint",
+            "columnName": "endpoint",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "loginType",
+            "columnName": "loginType",
+            "affinity": "TEXT",
+            "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": "studentName",
+            "columnName": "student_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolSymbol",
+            "columnName": "school_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolName",
+            "columnName": "school_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 `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, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `diary_name` TEXT NOT NULL, `semester_id` INTEGER NOT NULL, `semester_name` INTEGER NOT NULL, `is_current` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `unit_id` 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": "diaryName",
+            "columnName": "diary_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterName",
+            "columnName": "semester_name",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isCurrent",
+            "columnName": "is_current",
+            "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 `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, `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": "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, `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)",
+        "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": "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
+          }
+        ],
+        "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` INTEGER 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": "INTEGER",
+            "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, `subject` TEXT NOT NULL, `predictedGrade` TEXT NOT NULL, `finalGrade` 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": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "predictedGrade",
+            "columnName": "predictedGrade",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "finalGrade",
+            "columnName": "finalGrade",
+            "affinity": "TEXT",
+            "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": "Messages",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL, `content` TEXT, `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, `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": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "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": "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": []
+      }
+    ],
+    "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, \"972ad26e6488d9a8239f6bd8597af61d\")"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/13.json b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/13.json
new file mode 100644
index 000000000..ab554665e
--- /dev/null
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/13.json
@@ -0,0 +1,1356 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 13,
+    "identityHash": "18643bb64804b8268ec9395e3dd55ecb",
+    "entities": [
+      {
+        "tableName": "Students",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `endpoint` TEXT NOT NULL, `loginType` TEXT NOT NULL, `email` TEXT NOT NULL, `password` TEXT NOT NULL, `symbol` TEXT NOT NULL, `student_id` INTEGER NOT NULL, `student_name` TEXT NOT NULL, `school_id` 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": "endpoint",
+            "columnName": "endpoint",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "loginType",
+            "columnName": "loginType",
+            "affinity": "TEXT",
+            "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": "studentName",
+            "columnName": "student_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolSymbol",
+            "columnName": "school_id",
+            "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 `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, `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, `is_current` 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": "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": "isCurrent",
+            "columnName": "is_current",
+            "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 `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, `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": "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, `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)",
+        "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": "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
+          }
+        ],
+        "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` INTEGER 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": "INTEGER",
+            "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, `subject` TEXT NOT NULL, `predictedGrade` TEXT NOT NULL, `finalGrade` 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": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "predictedGrade",
+            "columnName": "predictedGrade",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "finalGrade",
+            "columnName": "finalGrade",
+            "affinity": "TEXT",
+            "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": "Messages",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL, `content` TEXT, `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, `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": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "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": "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": []
+      }
+    ],
+    "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, \"18643bb64804b8268ec9395e3dd55ecb\")"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/AbstractMigrationTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/AbstractMigrationTest.kt
new file mode 100644
index 000000000..507105f6d
--- /dev/null
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/AbstractMigrationTest.kt
@@ -0,0 +1,31 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.Room
+import androidx.room.testing.MigrationTestHelper
+import androidx.sqlite.db.framework.FrameworkSQLiteOpenHelperFactory
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.platform.app.InstrumentationRegistry
+import io.github.wulkanowy.data.db.AppDatabase
+import org.junit.Rule
+
+abstract class AbstractMigrationTest {
+
+    val dbName = "migration-test"
+
+    @get:Rule
+    val helper: MigrationTestHelper = MigrationTestHelper(
+        InstrumentationRegistry.getInstrumentation(),
+        AppDatabase::class.java.canonicalName,
+        FrameworkSQLiteOpenHelperFactory()
+    )
+
+    fun getMigratedRoomDatabase(): AppDatabase {
+        val database = Room.databaseBuilder(ApplicationProvider.getApplicationContext(),
+            AppDatabase::class.java, dbName)
+            .addMigrations(Migration12(), Migration13())
+            .build()
+        // close the database and release any stream resources when the test finishes
+        helper.closeWhenFinished(database)
+        return database
+    }
+}
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/Migration12Test.kt b/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/Migration12Test.kt
new file mode 100644
index 000000000..0bbcc4271
--- /dev/null
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/Migration12Test.kt
@@ -0,0 +1,133 @@
+package io.github.wulkanowy.data.db.migrations
+
+import android.content.ContentValues
+import android.database.sqlite.SQLiteDatabase.CONFLICT_FAIL
+import androidx.sqlite.db.SupportSQLiteDatabase
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Test
+import org.junit.runner.RunWith
+import kotlin.test.assertEquals
+
+@RunWith(AndroidJUnit4::class)
+class Migration12Test : AbstractMigrationTest() {
+
+    @Test
+    fun twoNotRelatedStudents() {
+        helper.createDatabase(dbName, 11).apply {
+            // user 1
+            createStudent(this, 1, true)
+            createSemester(this, 1, false, 5, 1)
+            createSemester(this, 1, true, 5, 2)
+
+            // user 2
+            createStudent(this, 2, true)
+            createSemester(this, 2, false, 6, 1)
+            createSemester(this, 2, true, 6, 2)
+            close()
+        }
+
+        helper.runMigrationsAndValidate(dbName, 12, true, Migration12())
+
+        val db = getMigratedRoomDatabase()
+        val students = db.studentDao.loadAll().blockingGet()
+
+        assertEquals(2, students.size)
+
+        students[0].run {
+            assertEquals(1, studentId)
+            assertEquals(5, classId)
+        }
+
+        students[1].run {
+            assertEquals(2, studentId)
+            assertEquals(6, classId)
+        }
+    }
+
+    @Test
+    fun removeStudentsWithoutClassId() {
+        helper.createDatabase(dbName, 11).apply {
+            // user 1
+            createStudent(this, 1, true)
+            createSemester(this, 1, false, 0, 2)
+            createStudent(this, 2, true)
+            createSemester(this, 2, true, 1, 2)
+            close()
+        }
+
+        helper.runMigrationsAndValidate(dbName, 12, true, Migration12())
+
+        val db = getMigratedRoomDatabase()
+        val students = db.studentDao.loadAll().blockingGet()
+
+        assertEquals(1, students.size)
+
+        students[0].run {
+            assertEquals(2, studentId)
+            assertEquals(1, classId)
+        }
+    }
+
+    @Test
+    fun ensureThereIsOnlyOneCurrentStudent() {
+        helper.createDatabase(dbName, 11).apply {
+            // user 1
+            createStudent(this, 1, true)
+            createSemester(this, 1, true, 5, 2)
+            createStudent(this, 2, true)
+            createSemester(this, 2, true, 6, 2)
+            createStudent(this, 3, true)
+            createSemester(this, 3, false, 7, 2)
+            close()
+        }
+
+        helper.runMigrationsAndValidate(dbName, 12, true, Migration12())
+
+        val db = getMigratedRoomDatabase()
+        val students = db.studentDao.loadAll().blockingGet()
+
+        assertEquals(3, students.size)
+
+        students[0].run {
+            assertEquals(studentId, 1)
+            assertEquals(false, isCurrent)
+        }
+        students[1].run {
+            assertEquals(studentId, 2)
+            assertEquals(false, isCurrent)
+        }
+        students[2].run {
+            assertEquals(studentId, 3)
+            assertEquals(true, isCurrent)
+        }
+    }
+
+    private fun createStudent(db: SupportSQLiteDatabase, studentId: Int, isCurrent: Boolean) {
+        db.insert("Students", CONFLICT_FAIL, ContentValues().apply {
+            put("endpoint", "https://fakelog.cf")
+            put("loginType", "STANDARD")
+            put("email", "jan@fakelog.cf")
+            put("password", "******")
+            put("symbol", "Default")
+            put("student_id", studentId)
+            put("student_name", "Jan Kowalski")
+            put("school_id", "000123")
+            put("school_name", "")
+            put("is_current", isCurrent)
+            put("registration_date", "0")
+        })
+    }
+
+    private fun createSemester(db: SupportSQLiteDatabase, studentId: Int, isCurrent: Boolean, classId: Int, diaryId: Int) {
+        db.insert("Semesters", CONFLICT_FAIL, ContentValues().apply {
+            put("student_id", studentId)
+            put("diary_id", diaryId)
+            put("diary_name", "IA")
+            put("semester_id", diaryId * 5)
+            put("semester_name", "1")
+            put("is_current", isCurrent)
+            put("class_id", classId)
+            put("unit_id", "99")
+        })
+    }
+}
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
new file mode 100644
index 000000000..eb9d02a59
--- /dev/null
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/Migration13Test.kt
@@ -0,0 +1,171 @@
+package io.github.wulkanowy.data.db.migrations
+
+import android.content.ContentValues
+import android.database.sqlite.SQLiteDatabase
+import androidx.sqlite.db.SupportSQLiteDatabase
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Test
+import org.threeten.bp.LocalDate.of
+import kotlin.test.assertTrue
+
+class Migration13Test : AbstractMigrationTest() {
+
+    @Test
+    fun studentsWithSchoolNameWithClassName() {
+        helper.createDatabase(dbName, 12).apply {
+            createStudent(this, 1, "Klasa A - Publiczna szkoła Wulkanowego nr 1 w fakelog.cf", 1, 1)
+            createStudent(this, 2, "Klasa B - Publiczna szkoła Wulkanowego-fejka nr 1 w fakelog.cf", 2, 1)
+            createStudent(this, 2, "Klasa C - Publiczna szkoła Wulkanowego-fejka nr 2 w fakelog.cf", 1, 2)
+            close()
+        }
+
+        helper.runMigrationsAndValidate(dbName, 13, true, Migration13())
+
+        val db = getMigratedRoomDatabase()
+        val students = db.studentDao.loadAll().blockingGet()
+
+        assertEquals(3, students.size)
+
+        students[0].run {
+            assertEquals(1, studentId)
+            assertEquals("A", className)
+            assertEquals("Publiczna szkoła Wulkanowego nr 1 w fakelog.cf", schoolName)
+        }
+
+        students[1].run {
+            assertEquals(2, studentId)
+            assertEquals("B", className)
+            assertEquals("Publiczna szkoła Wulkanowego-fejka nr 1 w fakelog.cf", schoolName)
+        }
+
+        students[2].run {
+            assertEquals(2, studentId)
+            assertEquals("C", className)
+            assertEquals("Publiczna szkoła Wulkanowego-fejka nr 2 w fakelog.cf", schoolName)
+        }
+    }
+
+    @Test
+    fun studentsWithSchoolNameWithoutClassName() {
+        helper.createDatabase(dbName, 12).apply {
+            createStudent(this, 1, "Publiczna szkoła Wulkanowego nr 1 w fakelog.cf", 1)
+            createStudent(this, 2, "Publiczna szkoła Wulkanowego-fejka nr 1 w fakelog.cf", 1)
+            close()
+        }
+
+        helper.runMigrationsAndValidate(dbName, 13, true, Migration13())
+
+        val db = getMigratedRoomDatabase()
+        val students = db.studentDao.loadAll().blockingGet()
+
+        assertEquals(2, students.size)
+
+        students[0].run {
+            assertEquals(1, studentId)
+            assertEquals("", className)
+            assertEquals("Publiczna szkoła Wulkanowego nr 1 w fakelog.cf", schoolName)
+        }
+
+        students[1].run {
+            assertEquals(2, studentId)
+            assertEquals("", className)
+            assertEquals("Publiczna szkoła Wulkanowego-fejka nr 1 w fakelog.cf", schoolName)
+        }
+    }
+
+    @Test
+    fun markAtLeastAndOnlyOneSemesterAtCurrent() {
+        helper.createDatabase(dbName, 12).apply {
+            createStudent(this, 1, "", 5)
+            createSemester(this, 1, 5, 1, 1, false)
+            createSemester(this, 1, 5, 2, 1, false)
+            createSemester(this, 1, 5, 3, 2, false)
+            createSemester(this, 1, 5, 4, 2, false)
+
+            createStudent(this, 2, "", 5)
+            createSemester(this, 2, 5, 5, 5, true)
+            createSemester(this, 2, 5, 6, 5, true)
+            createSemester(this, 2, 5, 7, 55, true)
+            createSemester(this, 2, 5, 8, 55, true)
+
+            createStudent(this, 3, "", 5)
+            createSemester(this, 3, 5, 11, 99, false)
+            createSemester(this, 3, 5, 12, 99, false)
+            createSemester(this, 3, 5, 13, 100, false)
+            createSemester(this, 3, 5, 14, 100, true)
+            close()
+        }
+
+        helper.runMigrationsAndValidate(dbName, 13, true, Migration13())
+
+        val db = getMigratedRoomDatabase()
+
+        val semesters1 = db.semesterDao.loadAll(1, 5).blockingGet()
+        assertTrue { semesters1.single { it.isCurrent }.isCurrent }
+        semesters1[0].run {
+            assertFalse(isCurrent)
+            assertEquals(1, semesterId)
+            assertEquals(1, diaryId)
+        }
+        semesters1[2].run {
+            assertFalse(isCurrent)
+            assertEquals(3, semesterId)
+            assertEquals(2, diaryId)
+        }
+        semesters1[3].run {
+            assertTrue(isCurrent)
+            assertEquals(4, semesterId)
+            assertEquals(2, diaryId)
+        }
+
+        db.semesterDao.loadAll(2, 5).blockingGet().let {
+            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)
+        }
+
+        db.semesterDao.loadAll(2, 5).blockingGet().let {
+            assertTrue { it.single { it.isCurrent }.isCurrent }
+            assertFalse(it[0].isCurrent)
+            assertFalse(it[1].isCurrent)
+            assertFalse(it[2].isCurrent)
+            assertTrue(it[3].isCurrent)
+        }
+    }
+
+    private fun createStudent(db: SupportSQLiteDatabase, studentId: Int, schoolName: String = "", classId: Int = -1, schoolId: Int = 123) {
+        db.insert("Students", SQLiteDatabase.CONFLICT_FAIL, ContentValues().apply {
+            put("endpoint", "https://fakelog.cf")
+            put("loginType", "STANDARD")
+            put("email", "jan@fakelog.cf")
+            put("password", "******")
+            put("symbol", "Default")
+            put("student_id", studentId)
+            put("class_id", classId)
+            put("student_name", "Jan Kowalski")
+            put("school_id", schoolId)
+            put("school_name", schoolName)
+            put("is_current", false)
+            put("registration_date", "0")
+        })
+    }
+
+    private fun createSemester(db: SupportSQLiteDatabase, studentId: Int, classId: Int, semesterId: Int, diaryId: Int, isCurrent: Boolean = false) {
+        db.insert("Semesters", SQLiteDatabase.CONFLICT_FAIL, ContentValues().apply {
+            put("student_id", studentId)
+            put("diary_id", diaryId)
+            put("diary_name", "IA")
+            put("semester_id", semesterId)
+            put("semester_name", "1")
+            put("is_current", isCurrent)
+            put("class_id", classId)
+            put("unit_id", "99")
+        })
+    }
+}
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/TestInternetObservingStrategy.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/TestInternetObservingStrategy.kt
new file mode 100644
index 000000000..7dc93c4a4
--- /dev/null
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/TestInternetObservingStrategy.kt
@@ -0,0 +1,19 @@
+package io.github.wulkanowy.data.repositories
+
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingStrategy
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.error.ErrorHandler
+import io.reactivex.Observable
+import io.reactivex.Single
+
+class TestInternetObservingStrategy : InternetObservingStrategy {
+
+    override fun checkInternetConnectivity(host: String?, port: Int, timeoutInMs: Int, httpResponse: Int, errorHandler: ErrorHandler?): Single<Boolean> {
+        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(true)
+    }
+
+    override fun getDefaultPingHost() = "localhost"
+}
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/AttendanceLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/attendance/AttendanceLocalTest.kt
similarity index 82%
rename from app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/AttendanceLocalTest.kt
rename to app/src/androidTest/java/io/github/wulkanowy/data/repositories/attendance/AttendanceLocalTest.kt
index 8cbd13cd3..69502e742 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/AttendanceLocalTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/attendance/AttendanceLocalTest.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.repositories.local
+package io.github.wulkanowy.data.repositories.attendance
 
 import androidx.room.Room
 import androidx.test.core.app.ApplicationProvider
@@ -11,6 +11,7 @@ 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 kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -34,13 +35,13 @@ class AttendanceLocalTest {
     @Test
     fun saveAndReadTest() {
         attendanceLocal.saveAttendance(listOf(
-                Attendance(1, 2, LocalDate.of(2018, 9, 10), 0, "", ""),
-                Attendance(1, 2, LocalDate.of(2018, 9, 14), 0, "", ""),
-                Attendance(1, 2, LocalDate.of(2018, 9, 17), 0, "", "")
+                Attendance(1, 2, LocalDate.of(2018, 9, 10), 0, "", "", false, false, false, false, false, false),
+                Attendance(1, 2, LocalDate.of(2018, 9, 14), 0, "", "", false, false, false, false, false, false),
+                Attendance(1, 2, LocalDate.of(2018, 9, 17), 0, "", "", false, false, false, false, false, false)
         ))
 
         val attendance = attendanceLocal
-                .getAttendance(Semester(1, 1, 2, "", 3, 1),
+            .getAttendance(Semester(1, 2, "", 1, 3, 2019, true, now(), now(), 1, 1),
                         LocalDate.of(2018, 9, 10),
                         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
new file mode 100644
index 000000000..356073e8e
--- /dev/null
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsLocalTest.kt
@@ -0,0 +1,57 @@
+package io.github.wulkanowy.data.repositories.completedlessons
+
+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.db.entities.CompletedLesson
+import io.github.wulkanowy.data.db.entities.Semester
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.threeten.bp.LocalDate
+import kotlin.test.assertEquals
+
+@RunWith(AndroidJUnit4::class)
+class CompletedLessonsLocalTest {
+
+    private lateinit var completedLessonsLocal: CompletedLessonsLocal
+
+    private lateinit var testDb: AppDatabase
+
+    @Before
+    fun createDb() {
+        testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
+            .build()
+        completedLessonsLocal = CompletedLessonsLocal(testDb.completedLessonsDao)
+    }
+
+    @After
+    fun closeDb() {
+        testDb.close()
+    }
+
+    @Test
+    fun saveAndReadTest() {
+        completedLessonsLocal.saveCompletedLessons(listOf(
+            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, 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, LocalDate.of(2018, 9, 10))
+        assertEquals(completed[1].date, LocalDate.of(2018, 9, 14))
+    }
+
+    private fun getCompletedLesson(date: LocalDate, number: Int): CompletedLesson {
+        return CompletedLesson(1, 2, date, number, "", "", "", "", "", "", "")
+    }
+}
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/ExamLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/exam/ExamLocalTest.kt
similarity index 91%
rename from app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/ExamLocalTest.kt
rename to app/src/androidTest/java/io/github/wulkanowy/data/repositories/exam/ExamLocalTest.kt
index c60348e3a..fb76306d9 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/ExamLocalTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/exam/ExamLocalTest.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.repositories.local
+package io.github.wulkanowy.data.repositories.exam
 
 import androidx.room.Room
 import androidx.test.core.app.ApplicationProvider
@@ -40,7 +40,7 @@ class ExamLocalTest {
         ))
 
         val exams = examLocal
-                .getExams(Semester(1, 1, 2, "", 3, 1),
+            .getExams(Semester(1, 2, "", 1, 3, 2019, true, LocalDate.now(), LocalDate.now(), 1, 1),
                         LocalDate.of(2018, 9, 10),
                         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
new file mode 100644
index 000000000..954d0eea2
--- /dev/null
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeLocalTest.kt
@@ -0,0 +1,53 @@
+package io.github.wulkanowy.data.repositories.grade
+
+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.db.entities.Semester
+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 kotlin.test.assertEquals
+
+@RunWith(AndroidJUnit4::class)
+class GradeLocalTest {
+
+    private lateinit var gradeLocal: GradeLocal
+
+    private lateinit var testDb: AppDatabase
+
+    @Before
+    fun createDb() {
+        testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
+            .build()
+        gradeLocal = GradeLocal(testDb.gradeDao)
+    }
+
+    @After
+    fun closeDb() {
+        testDb.close()
+    }
+
+    @Test
+    fun saveAndReadTest() {
+        gradeLocal.saveGrades(listOf(
+            createGradeLocal(5, 3.0, LocalDate.of(2018, 9, 10), "", 1),
+            createGradeLocal(4, 4.0, LocalDate.of(2019, 2, 27), "", 2),
+            createGradeLocal(3, 5.0, LocalDate.of(2019, 2, 28), "", 2)
+        ))
+
+        val semester = Semester(1, 2, "", 2019, 2, 1, true, now(), now(), 1, 1)
+
+        val grades = gradeLocal
+            .getGrades(semester)
+            .blockingGet()
+
+        assertEquals(2, grades.size)
+        assertEquals(grades[0].date, LocalDate.of(2019, 2, 27))
+        assertEquals(grades[1].date, LocalDate.of(2019, 2, 28))
+    }
+}
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
new file mode 100644
index 000000000..a0acb5a76
--- /dev/null
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeRepositoryTest.kt
@@ -0,0 +1,182 @@
+package io.github.wulkanowy.data.repositories.grade
+
+import android.os.Build.VERSION_CODES.P
+import androidx.room.Room
+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.api.Api
+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.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.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.threeten.bp.LocalDate.of
+import org.threeten.bp.LocalDateTime
+import kotlin.test.assertEquals
+import kotlin.test.assertFalse
+import kotlin.test.assertTrue
+import io.github.wulkanowy.api.grades.Grade as GradeApi
+
+@SdkSuppress(minSdkVersion = P)
+@RunWith(AndroidJUnit4::class)
+class GradeRepositoryTest {
+
+    @SpyK
+    private var mockApi = Api()
+
+    private val settings = InternetObservingSettings.builder()
+        .strategy(TestInternetObservingStrategy())
+        .build()
+
+    @MockK
+    private lateinit var semesterMock: Semester
+
+    @MockK
+    private lateinit var studentMock: Student
+
+    private lateinit var gradeRemote: GradeRemote
+
+    private lateinit var gradeLocal: GradeLocal
+
+    private lateinit var testDb: AppDatabase
+
+    @Before
+    fun initApi() {
+        MockKAnnotations.init(this)
+        testDb = Room.inMemoryDatabaseBuilder(getApplicationContext(), AppDatabase::class.java).build()
+        gradeLocal = GradeLocal(testDb.gradeDao)
+        gradeRemote = GradeRemote(mockApi)
+
+        every { mockApi.diaryId } returns 1
+        every { studentMock.registrationDate } returns LocalDateTime.of(2019, 2, 27, 12, 0)
+        every { semesterMock.studentId } returns 1
+        every { semesterMock.semesterId } returns 1
+        every { semesterMock.diaryId } returns 1
+    }
+
+    @After
+    fun closeDb() {
+        testDb.close()
+    }
+
+    @Test
+    fun markOlderThanRegisterDateAsRead() {
+        every { mockApi.getGrades(1) } returns Single.just(listOf(
+            createGradeApi(5, 4.0, of(2019, 2, 25), "Ocena pojawiła się"),
+            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")
+        ))
+
+        val grades = GradeRepository(settings, gradeLocal, gradeRemote)
+            .getGrades(studentMock, semesterMock, true).blockingGet().sortedByDescending { it.date }
+
+        assertFalse { grades[0].isRead }
+        assertFalse { grades[1].isRead }
+        assertTrue { grades[2].isRead }
+        assertTrue { grades[3].isRead }
+    }
+
+    @Test
+    fun mitigateOldGradesNotifications() {
+        gradeLocal.saveGrades(listOf(
+            createGradeLocal(5, 3.0, of(2019, 2, 25), "Jedna ocena"),
+            createGradeLocal(4, 4.0, of(2019, 2, 26), "Druga"),
+            createGradeLocal(3, 5.0, of(2019, 2, 27), "Trzecia")
+        ))
+
+        every { mockApi.getGrades(1) } returns Single.just(listOf(
+            createGradeApi(5, 2.0, of(2019, 2, 25), "Ocena ma datę, jest inna, ale nie zostanie powiadomiona"),
+            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")
+        ))
+
+        val grades = GradeRepository(settings, gradeLocal, gradeRemote)
+            .getGrades(studentMock, semesterMock, true).blockingGet().sortedByDescending { it.date }
+
+        assertFalse { grades[0].isRead }
+        assertFalse { grades[1].isRead }
+        assertTrue { grades[2].isRead }
+        assertTrue { grades[3].isRead }
+    }
+
+    @Test
+    fun subtractLocaleDuplicateGrades() {
+        gradeLocal.saveGrades(listOf(
+            createGradeLocal(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
+            createGradeLocal(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
+            createGradeLocal(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
+        ))
+
+        every { mockApi.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")
+        ))
+
+        val grades = GradeRepository(settings, gradeLocal, gradeRemote)
+            .getGrades(studentMock, semesterMock, true).blockingGet()
+
+        assertEquals(2, grades.size)
+    }
+
+    @Test
+    fun subtractRemoteDuplicateGrades() {
+        gradeLocal.saveGrades(listOf(
+            createGradeLocal(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
+            createGradeLocal(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
+        ))
+
+        every { mockApi.getGrades(1) } returns Single.just(listOf(
+            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")
+        ))
+
+        val grades = GradeRepository(settings, gradeLocal, gradeRemote)
+            .getGrades(studentMock, semesterMock, true).blockingGet()
+
+        assertEquals(3, grades.size)
+    }
+
+    @Test
+    fun emptyLocal() {
+        gradeLocal.saveGrades(listOf())
+
+        every { mockApi.getGrades(1) } returns Single.just(listOf(
+            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")
+        ))
+
+        val grades = GradeRepository(settings, gradeLocal, gradeRemote)
+            .getGrades(studentMock, semesterMock, true).blockingGet()
+
+        assertEquals(3, grades.size)
+    }
+
+    @Test
+    fun emptyRemote() {
+        gradeLocal.saveGrades(listOf(
+            createGradeLocal(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
+            createGradeLocal(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
+        ))
+
+        every { mockApi.getGrades(1) } returns Single.just(listOf())
+
+        val grades = GradeRepository(settings, gradeLocal, gradeRemote)
+            .getGrades(studentMock, semesterMock, true).blockingGet()
+
+        assertEquals(0, grades.size)
+    }
+}
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/TestGradeEntityCreator.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/TestGradeEntityCreator.kt
new file mode 100644
index 000000000..e0fd05a82
--- /dev/null
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/TestGradeEntityCreator.kt
@@ -0,0 +1,34 @@
+package io.github.wulkanowy.data.repositories.grade
+
+import io.github.wulkanowy.api.toDate
+import org.threeten.bp.LocalDate
+import io.github.wulkanowy.api.grades.Grade as GradeRemote
+import io.github.wulkanowy.data.db.entities.Grade as GradeLocal
+
+fun createGradeLocal(value: Int, weight: Double, date: LocalDate, desc: String, semesterId: Int = 1): GradeLocal {
+    return GradeLocal(
+        semesterId = semesterId,
+        studentId = 1,
+        modifier = .0,
+        teacher = "",
+        subject = "",
+        date = date,
+        color = "",
+        comment = "",
+        description = desc,
+        entry = "",
+        gradeSymbol = "",
+        value = value,
+        weight = "",
+        weightValue = weight
+    )
+}
+
+fun createGradeApi(value: Int, weight: Double, date: LocalDate, desc: String): GradeRemote {
+    return GradeRemote().apply {
+        this.value = value
+        this.weightValue = weight
+        this.date = date.toDate()
+        this.description = desc
+    }
+}
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
new file mode 100644
index 000000000..0057a26e5
--- /dev/null
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsLocalTest.kt
@@ -0,0 +1,69 @@
+package io.github.wulkanowy.data.repositories.gradestatistics
+
+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.db.entities.GradeStatistics
+import io.github.wulkanowy.data.db.entities.Semester
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.threeten.bp.LocalDate
+import kotlin.test.assertEquals
+
+@RunWith(AndroidJUnit4::class)
+class GradeStatisticsLocalTest {
+
+    private lateinit var gradeStatisticsLocal: GradeStatisticsLocal
+
+    private lateinit var testDb: AppDatabase
+
+    @Before
+    fun createDb() {
+        testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
+            .build()
+        gradeStatisticsLocal = GradeStatisticsLocal(testDb.gradeStatistics)
+    }
+
+    @After
+    fun closeDb() {
+        testDb.close()
+    }
+
+    @Test
+    fun saveAndRead_subject() {
+        gradeStatisticsLocal.saveGradesStatistics(listOf(
+            getGradeStatistics("Matematyka", 2, 1),
+            getGradeStatistics("Fizyka", 1, 2)
+        ))
+
+        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")
+    }
+
+    @Test
+    fun saveAndRead_all() {
+        gradeStatisticsLocal.saveGradesStatistics(listOf(
+            getGradeStatistics("Matematyka", 2, 1),
+            getGradeStatistics("Chemia", 2, 1),
+            getGradeStatistics("Fizyka", 1, 2)
+        ))
+
+        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")
+    }
+
+    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
new file mode 100644
index 000000000..77ddafb9c
--- /dev/null
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberLocalTest.kt
@@ -0,0 +1,47 @@
+package io.github.wulkanowy.data.repositories.luckynumber
+
+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.db.entities.LuckyNumber
+import io.github.wulkanowy.data.db.entities.Semester
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.threeten.bp.LocalDate
+import kotlin.test.assertEquals
+
+@RunWith(AndroidJUnit4::class)
+class LuckyNumberLocalTest {
+
+    private lateinit var luckyNumberLocal: LuckyNumberLocal
+
+    private lateinit var testDb: AppDatabase
+
+    @Before
+    fun createDb() {
+        testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
+            .build()
+        luckyNumberLocal = LuckyNumberLocal(testDb.luckyNumberDao)
+    }
+
+    @After
+    fun closeDb() {
+        testDb.close()
+    }
+
+    @Test
+    fun saveAndReadTest() {
+        luckyNumberLocal.saveLuckyNumber(LuckyNumber(1, LocalDate.of(2019, 1, 20), 14))
+
+        val luckyNumber = luckyNumberLocal.getLuckyNumber(Semester(1, 1, "", 1, 3, 2019, true, LocalDate.now(), LocalDate.now(), 1, 1),
+            LocalDate.of(2019, 1, 20)
+        ).blockingGet()
+
+        assertEquals(1, luckyNumber.studentId)
+        assertEquals(LocalDate.of(2019, 1, 20), luckyNumber.date)
+        assertEquals(14, luckyNumber.luckyNumber)
+    }
+}
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
new file mode 100644
index 000000000..6edaccdb4
--- /dev/null
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/recipient/RecipientLocalTest.kt
@@ -0,0 +1,60 @@
+package io.github.wulkanowy.data.repositories.recipient
+
+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.db.entities.Recipient
+import io.github.wulkanowy.data.db.entities.ReportingUnit
+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
+import kotlin.test.assertEquals
+
+@RunWith(AndroidJUnit4::class)
+class RecipientLocalTest {
+
+    private lateinit var recipientLocal: RecipientLocal
+
+    private lateinit var testDb: AppDatabase
+
+    @Before
+    fun createDb() {
+        testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
+            .build()
+        recipientLocal = RecipientLocal(testDb.recipientDao)
+    }
+
+    @After
+    fun closeDb() {
+        testDb.close()
+    }
+
+    @Test
+    fun saveAndReadTest() {
+        recipientLocal.saveRecipients(listOf(
+            Recipient(1, "2rPracownik", "Kowalski Jan", "Kowalski Jan [KJ] - Pracownik (Fake123456)", 3, 4, 2, "hash"),
+            Recipient(1, "3rPracownik", "Kowalska Karolina", "Kowalska Karolina [KK] - Pracownik (Fake123456)", 4, 4, 2, "hash"),
+            Recipient(1, "4rPracownik", "Krupa Stanisław", "Krupa Stanisław [KS] - Uczeń (Fake123456)", 5, 4, 1, "hash")
+        ))
+
+        val recipients = recipientLocal.getRecipients(
+            Student("fakelog.cf", "AUTO", "", "", "", 1, "", "", "", "", 1, true, LocalDateTime.now()),
+            2,
+            ReportingUnit(1, 4, "", 0, "", emptyList())
+        ).blockingGet()
+
+        assertEquals(2, recipients.size)
+        assertEquals(1, recipients[0].studentId)
+        assertEquals("3rPracownik", recipients[1].realId)
+        assertEquals("Kowalski Jan", recipients[0].name)
+        assertEquals("Kowalska Karolina [KK] - Pracownik (Fake123456)", recipients[1].realName)
+        assertEquals(3, recipients[0].loginId)
+        assertEquals(4, recipients[1].unitId)
+        assertEquals(2, recipients[0].role)
+        assertEquals("hash", recipients[1].hash)
+    }
+}
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/StudentLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/student/StudentLocalTest.kt
similarity index 73%
rename from app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/StudentLocalTest.kt
rename to app/src/androidTest/java/io/github/wulkanowy/data/repositories/student/StudentLocalTest.kt
index 732dc5bc4..cecd80992 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/StudentLocalTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/student/StudentLocalTest.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.repositories.local
+package io.github.wulkanowy.data.repositories.student
 
 import android.content.Context
 import androidx.room.Room
@@ -11,6 +11,7 @@ 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)
@@ -28,7 +29,7 @@ class StudentLocalTest {
         testDb = Room.inMemoryDatabaseBuilder(context, AppDatabase::class.java)
             .build()
         sharedHelper = SharedPrefHelper(context.getSharedPreferences("TEST", Context.MODE_PRIVATE))
-        studentLocal = StudentLocal(testDb.studentDao, sharedHelper, context)
+        studentLocal = StudentLocal(testDb.studentDao, context)
     }
 
     @After
@@ -38,9 +39,8 @@ class StudentLocalTest {
 
     @Test
     fun saveAndReadTest() {
-        studentLocal.saveStudent(Student(email = "test", password = "test123", schoolSymbol = "23", endpoint = "fakelog.cf", loginType = "AUTO", isCurrent = true))
+        studentLocal.saveStudents(listOf(Student(email = "test", password = "test123", schoolSymbol = "23", endpoint = "fakelog.cf", loginType = "AUTO", isCurrent = true, studentName = "", schoolName = "", studentId = 0, classId = 1, symbol = "", registrationDate = now(), className = "")))
             .blockingGet()
-        assert(studentLocal.isStudentSaved)
 
         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
new file mode 100644
index 000000000..eea5463d1
--- /dev/null
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TestTimetableEntityCreator.kt
@@ -0,0 +1,45 @@
+package io.github.wulkanowy.data.repositories.timetable
+
+import io.github.wulkanowy.api.toDate
+import io.github.wulkanowy.utils.toDate
+import org.threeten.bp.LocalDateTime
+import org.threeten.bp.LocalDateTime.now
+import io.github.wulkanowy.api.timetable.Timetable as TimetableRemote
+import io.github.wulkanowy.data.db.entities.Timetable as TimetableLocal
+
+fun createTimetableLocal(number: Int, start: LocalDateTime, room: String = "", subject: String = "", teacher: String = ""): TimetableLocal {
+    return TimetableLocal(
+        studentId = 1,
+        diaryId = 2,
+        number = number,
+        start = start,
+        end = now(),
+        date = start.toLocalDate(),
+        subject = subject,
+        subjectOld = "",
+        group = "",
+        room = room,
+        roomOld = "",
+        teacher = teacher,
+        teacherOld = "",
+        info = "",
+        changes = false,
+        canceled = false
+    )
+}
+
+fun createTimetableRemote(number: Int, start: LocalDateTime, room: String, subject: String = "", teacher: String = ""): TimetableRemote {
+    return TimetableRemote(
+        number = number,
+        start = start.toDate(),
+        end = start.plusMinutes(45).toDate(),
+        date = start.toLocalDate().toDate(),
+        subject = subject,
+        group = "",
+        room = room,
+        teacher = teacher,
+        info = "",
+        changes = false,
+        canceled = false
+    )
+}
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/TimetableLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableLocalTest.kt
similarity index 58%
rename from app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/TimetableLocalTest.kt
rename to app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableLocalTest.kt
index df0a79948..fe25e4e96 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/TimetableLocalTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableLocalTest.kt
@@ -1,17 +1,16 @@
-package io.github.wulkanowy.data.repositories.local
+package io.github.wulkanowy.data.repositories.timetable
 
 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.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Timetable
 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
+import org.threeten.bp.LocalDateTime.of
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -23,7 +22,8 @@ class TimetableLocalTest {
 
     @Before
     fun createDb() {
-        testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java).build()
+        testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
+            .build()
         timetableDb = TimetableLocal(testDb.timetableDao)
     }
 
@@ -35,19 +35,17 @@ class TimetableLocalTest {
     @Test
     fun saveAndReadTest() {
         timetableDb.saveTimetable(listOf(
-                Timetable(1, 2, 1, LocalDateTime.now(), LocalDateTime.now(),
-                        LocalDate.of(2018, 9, 10), "", "", "", "", ""),
-                Timetable(1, 2, 1, LocalDateTime.now(), LocalDateTime.now(),
-                        LocalDate.of(2018, 9, 14), "", "", "", "", ""),
-                Timetable(1, 2, 1, LocalDateTime.now(), LocalDateTime.now(),
-                        LocalDate.of(2018, 9, 17), "", "", "", "", "")
+            createTimetableLocal(1, of(2018, 9, 10, 0, 0, 0)),
+            createTimetableLocal(1, of(2018, 9, 14, 0, 0, 0)),
+            createTimetableLocal(1, of(2018, 9, 17, 0, 0, 0))
         ))
 
         val exams = timetableDb.getTimetable(
-                Semester(0, 1, 2, "3", 1, 1),
-                LocalDate.of(2018, 9, 10),
-                LocalDate.of(2018, 9, 14)
+            Semester(1, 2, "", 1, 1, 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, 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/timetable/TimetableRepositoryTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepositoryTest.kt
new file mode 100644
index 000000000..79216d552
--- /dev/null
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepositoryTest.kt
@@ -0,0 +1,89 @@
+package io.github.wulkanowy.data.repositories.timetable
+
+import android.os.Build.VERSION_CODES.P
+import androidx.room.Room
+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.api.Api
+import io.github.wulkanowy.data.db.AppDatabase
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.repositories.TestInternetObservingStrategy
+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.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDateTime.of
+import kotlin.test.assertEquals
+
+@SdkSuppress(minSdkVersion = P)
+@RunWith(AndroidJUnit4::class)
+class TimetableRepositoryTest {
+
+    @SpyK
+    private var mockApi = Api()
+
+    private val settings = InternetObservingSettings.builder()
+        .strategy(TestInternetObservingStrategy())
+        .build()
+
+    @MockK
+    private lateinit var semesterMock: Semester
+
+    private lateinit var timetableRemote: TimetableRemote
+
+    private lateinit var timetableLocal: TimetableLocal
+
+    private lateinit var testDb: AppDatabase
+
+    @Before
+    fun initApi() {
+        MockKAnnotations.init(this)
+        testDb = Room.inMemoryDatabaseBuilder(getApplicationContext(), AppDatabase::class.java).build()
+        timetableLocal = TimetableLocal(testDb.timetableDao)
+        timetableRemote = TimetableRemote(mockApi)
+
+        every { semesterMock.studentId } returns 1
+        every { semesterMock.diaryId } returns 2
+    }
+
+    @After
+    fun closeDb() {
+        testDb.close()
+    }
+
+    @Test
+    fun copyDetailsToCompletedFromPrevious() {
+        timetableLocal.saveTimetable(listOf(
+            createTimetableLocal(1, of(2019, 3, 5, 8, 0), "123", "Przyroda"),
+            createTimetableLocal(2, of(2019, 3, 5, 8, 50), "321", "Religia"),
+            createTimetableLocal(3, of(2019, 3, 5, 9, 40), "213", "W-F"),
+            createTimetableLocal(4, of(2019, 3, 5, 10, 30), "213", "W-F", "Jan Kowalski")
+        ))
+
+        every { mockApi.getTimetable(any(), any()) } returns Single.just(listOf(
+            createTimetableRemote(1, of(2019, 3, 5, 8, 0), "", "Przyroda"),
+            createTimetableRemote(2, of(2019, 3, 5, 8, 50), "", "Religia"),
+            createTimetableRemote(3, of(2019, 3, 5, 9, 40), "", "W-F"),
+            createTimetableRemote(4, of(2019, 3, 5, 10, 30), "", "W-F")
+        ))
+
+        val lessons = TimetableRepository(settings, timetableLocal, timetableRemote)
+            .getTimetable(semesterMock, LocalDate.of(2019, 3, 5), LocalDate.of(2019, 3, 5), true)
+            .blockingGet()
+
+        assertEquals(4, lessons.size)
+        assertEquals("123", lessons[0].room)
+        assertEquals("321", lessons[1].room)
+        assertEquals("213", lessons[2].room)
+
+        assertEquals("", lessons[3].teacher)
+    }
+}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2bc7e0a91..2a214b8b2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -4,7 +4,7 @@
     package="io.github.wulkanowy"
     android:installLocation="internalOnly">
 
-    <uses-sdk tools:overrideLibrary="com.readystatesoftware.chuck"/>
+    <uses-sdk tools:overrideLibrary="com.readystatesoftware.chuck" />
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -20,14 +20,13 @@
         android:supportsRtl="false"
         android:theme="@style/WulkanowyTheme"
         android:usesCleartextTraffic="true"
-        tools:ignore="GoogleAppIndexingWarning">
+        tools:ignore="GoogleAppIndexingWarning,UnusedAttribute">
         <activity
             android:name=".ui.modules.splash.SplashActivity"
             android:screenOrientation="portrait"
             android:theme="@style/WulkanowyTheme.SplashScreen">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
@@ -35,26 +34,44 @@
             android:name=".ui.modules.login.LoginActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/login_title"
+            android:theme="@style/WulkanowyTheme.NoActionBar"
             android:windowSoftInputMode="adjustResize" />
         <activity
             android:name=".ui.modules.main.MainActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/main_title"
             android:theme="@style/WulkanowyTheme.NoActionBar" />
-
-        <service
-            android:name=".services.job.SyncWorker"
-            android:exported="false">
+        <activity
+            android:name=".ui.modules.message.send.SendMessageActivity"
+            android:configChanges="orientation|screenSize"
+            android:label="@string/send_message_title"
+            android:theme="@style/WulkanowyTheme.NoActionBar" />
+        <activity
+            android:name=".ui.modules.timetablewidget.TimetableWidgetConfigureActivity"
+            android:excludeFromRecents="true"
+            android:noHistory="true"
+            android:theme="@style/WulkanowyTheme.WidgetAccountSwitcher">
             <intent-filter>
-                <action android:name="com.firebase.jobdispatcher.ACTION_EXECUTE" />
+                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
             </intent-filter>
-        </service>
+        </activity>
+        <activity
+            android:name=".ui.modules.luckynumberwidget.LuckyNumberWidgetConfigureActivity"
+            android:excludeFromRecents="true"
+            android:noHistory="true"
+            android:theme="@style/WulkanowyTheme.WidgetAccountSwitcher">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
+            </intent-filter>
+        </activity>
+
         <service
             android:name=".services.widgets.TimetableWidgetService"
             android:permission="android.permission.BIND_REMOTEVIEWS" />
 
         <receiver
-            android:name=".ui.widgets.timetable.TimetableWidgetProvider"
+            android:name=".ui.modules.timetablewidget.TimetableWidgetProvider"
+            android:exported="true"
             android:label="@string/timetable_title">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -64,6 +81,23 @@
                 android:resource="@xml/provider_widget_timetable" />
         </receiver>
 
+        <receiver
+            android:name=".ui.modules.luckynumberwidget.LuckyNumberWidgetProvider"
+            android:label="@string/lucky_number_title">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/provider_widget_lucky_number" />
+        </receiver>
+
+        <provider
+            android:name="androidx.work.impl.WorkManagerInitializer"
+            android:authorities="${applicationId}.workmanager-init"
+            android:exported="false"
+            tools:node="remove" />
+
         <meta-data
             android:name="io.fabric.ApiKey"
             android:value="${fabric_api_key}" />
diff --git a/app/src/main/ic_launcher-web.png b/app/src/main/ic_launcher-web.png
deleted file mode 100644
index de216d36b..000000000
Binary files a/app/src/main/ic_launcher-web.png and /dev/null differ
diff --git a/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt b/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt
index 628d6ce6f..a58a9804e 100644
--- a/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt
+++ b/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt
@@ -1,8 +1,9 @@
 package io.github.wulkanowy
 
 import android.content.Context
-import androidx.appcompat.app.AppCompatDelegate
 import androidx.multidex.MultiDex
+import androidx.work.Configuration
+import androidx.work.WorkManager
 import com.crashlytics.android.Crashlytics
 import com.crashlytics.android.core.CrashlyticsCore
 import com.jakewharton.threetenabp.AndroidThreeTen
@@ -11,18 +12,23 @@ import dagger.android.support.DaggerApplication
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.utils.Log
 import io.fabric.sdk.android.Fabric
+import io.github.wulkanowy.BuildConfig.CRASHLYTICS_ENABLED
 import io.github.wulkanowy.BuildConfig.DEBUG
-import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.di.DaggerAppComponent
+import io.github.wulkanowy.services.sync.SyncWorkerFactory
+import io.github.wulkanowy.utils.ActivityLifecycleLogger
 import io.github.wulkanowy.utils.CrashlyticsTree
 import io.github.wulkanowy.utils.DebugLogTree
+import io.reactivex.exceptions.UndeliverableException
+import io.reactivex.plugins.RxJavaPlugins
 import timber.log.Timber
+import java.io.IOException
 import javax.inject.Inject
 
 class WulkanowyApp : DaggerApplication() {
 
     @Inject
-    lateinit var prefRepository: PreferencesRepository
+    lateinit var workerFactory: SyncWorkerFactory
 
     override fun attachBaseContext(base: Context?) {
         super.attachBaseContext(base)
@@ -32,24 +38,36 @@ class WulkanowyApp : DaggerApplication() {
     override fun onCreate() {
         super.onCreate()
         AndroidThreeTen.init(this)
-        initializeFabric()
-        if (DEBUG) enableDebugLog()
-        AppCompatDelegate.setDefaultNightMode(prefRepository.currentTheme)
+        WorkManager.initialize(this, Configuration.Builder().setWorkerFactory(workerFactory).build())
+        RxJavaPlugins.setErrorHandler(::onError)
+
+        initCrashlytics()
+        initLogging()
     }
 
-    private fun enableDebugLog() {
-        Timber.plant(DebugLogTree())
-        FlexibleAdapter.enableLogs(Log.Level.DEBUG)
+    private fun initLogging() {
+        if (DEBUG) {
+            Timber.plant(DebugLogTree())
+            FlexibleAdapter.enableLogs(Log.Level.DEBUG)
+        } else {
+            Timber.plant(CrashlyticsTree())
+        }
+        registerActivityLifecycleCallbacks(ActivityLifecycleLogger())
     }
 
-    private fun initializeFabric() {
+    private fun initCrashlytics() {
         Fabric.with(Fabric.Builder(this).kits(
-            Crashlytics.Builder().core(CrashlyticsCore.Builder().disabled(!BuildConfig.CRASHLYTICS_ENABLED).build()).build()
-        ).debuggable(BuildConfig.DEBUG).build())
-        Timber.plant(CrashlyticsTree())
+            Crashlytics.Builder().core(CrashlyticsCore.Builder().disabled(!CRASHLYTICS_ENABLED).build()).build()
+        ).debuggable(DEBUG).build())
+    }
+
+    private fun onError(error: Throwable) {
+        if (error is UndeliverableException && error.cause is IOException || error.cause is InterruptedException) {
+            Timber.e(error.cause, "An undeliverable error occurred")
+        } else throw error
     }
 
     override fun applicationInjector(): AndroidInjector<out DaggerApplication> {
-        return DaggerAppComponent.builder().create(this)
+        return DaggerAppComponent.factory().create(this)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/ApiHelper.kt b/app/src/main/java/io/github/wulkanowy/data/ApiHelper.kt
index 5b7b1072c..b6eee316b 100644
--- a/app/src/main/java/io/github/wulkanowy/data/ApiHelper.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/ApiHelper.kt
@@ -14,14 +14,22 @@ class ApiHelper @Inject constructor(private val api: Api) {
             symbol = student.symbol
             schoolSymbol = student.schoolSymbol
             studentId = student.studentId
-            useNewStudent = false
+            classId = student.classId
             host = URL(student.endpoint).run { host + ":$port".removeSuffix(":-1") }
             ssl = student.endpoint.startsWith("https")
             loginType = Api.LoginType.valueOf(student.loginType)
+            useNewStudent = true
         }
     }
 
     fun initApi(email: String, password: String, symbol: String, endpoint: String) {
-        initApi(Student(email = email, password = password, symbol = symbol, endpoint = endpoint, loginType = "AUTO"))
+        api.apply {
+            this.email = email
+            this.password = password
+            this.symbol = symbol
+            host = URL(endpoint).run { host + ":$port".removeSuffix(":-1") }
+            ssl = endpoint.startsWith("https")
+            useNewStudent = true
+        }
     }
 }
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 f5bb1b2a4..c832368a5 100644
--- a/app/src/main/java/io/github/wulkanowy/data/RepositoryModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/RepositoryModule.kt
@@ -5,7 +5,7 @@ import android.content.SharedPreferences
 import android.content.res.Resources
 import androidx.preference.PreferenceManager
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
-import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.strategy.SocketInternetObservingStrategy
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.strategy.WalledGardenInternetObservingStrategy
 import com.readystatesoftware.chuck.api.ChuckCollector
 import com.readystatesoftware.chuck.api.ChuckInterceptor
 import com.readystatesoftware.chuck.api.RetentionManager
@@ -13,7 +13,7 @@ import dagger.Module
 import dagger.Provides
 import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.data.db.AppDatabase
-import io.github.wulkanowy.data.repositories.PreferencesRepository
+import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import okhttp3.logging.HttpLoggingInterceptor
 import okhttp3.logging.HttpLoggingInterceptor.Level.BASIC
 import okhttp3.logging.HttpLoggingInterceptor.Level.NONE
@@ -27,8 +27,7 @@ internal class RepositoryModule {
     @Provides
     fun provideInternetObservingSettings(): InternetObservingSettings {
         return InternetObservingSettings.builder()
-            .strategy(SocketInternetObservingStrategy())
-            .host("www.google.com")
+            .strategy(WalledGardenInternetObservingStrategy())
             .build()
     }
 
@@ -50,7 +49,7 @@ internal class RepositoryModule {
     @Provides
     fun provideChuckCollector(context: Context, prefRepository: PreferencesRepository): ChuckCollector {
         return ChuckCollector(context)
-            .showNotification(prefRepository.isShowChuckerNotification)
+            .showNotification(prefRepository.isDebugNotificationEnable)
             .retentionManager(RetentionManager(context, ChuckCollector.Period.ONE_HOUR))
     }
 
@@ -82,6 +81,10 @@ internal class RepositoryModule {
     @Provides
     fun provideGradeSummaryDao(database: AppDatabase) = database.gradeSummaryDao
 
+    @Singleton
+    @Provides
+    fun provideGradeStatisticsDao(database: AppDatabase) = database.gradeStatistics
+
     @Singleton
     @Provides
     fun provideMessagesDao(database: AppDatabase) = database.messagesDao
@@ -113,4 +116,20 @@ internal class RepositoryModule {
     @Singleton
     @Provides
     fun provideSubjectDao(database: AppDatabase) = database.subjectDao
+
+    @Singleton
+    @Provides
+    fun provideLuckyNumberDao(database: AppDatabase) = database.luckyNumberDao
+
+    @Singleton
+    @Provides
+    fun provideCompletedLessonsDao(database: AppDatabase) = database.completedLessonsDao
+
+    @Singleton
+    @Provides
+    fun provideReportingUnitDao(database: AppDatabase) = database.reportingUnitDao
+
+    @Singleton
+    @Provides
+    fun provideRecipientDao(database: AppDatabase) = database.recipientDao
 }
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 30c957b43..d867583e4 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
@@ -8,28 +8,50 @@ import androidx.room.RoomDatabase.JournalMode.TRUNCATE
 import androidx.room.TypeConverters
 import io.github.wulkanowy.data.db.dao.AttendanceDao
 import io.github.wulkanowy.data.db.dao.AttendanceSummaryDao
+import io.github.wulkanowy.data.db.dao.CompletedLessonsDao
 import io.github.wulkanowy.data.db.dao.ExamDao
 import io.github.wulkanowy.data.db.dao.GradeDao
+import io.github.wulkanowy.data.db.dao.GradeStatisticsDao
 import io.github.wulkanowy.data.db.dao.GradeSummaryDao
-import io.github.wulkanowy.data.db.dao.MessagesDao
 import io.github.wulkanowy.data.db.dao.HomeworkDao
+import io.github.wulkanowy.data.db.dao.LuckyNumberDao
+import io.github.wulkanowy.data.db.dao.MessagesDao
 import io.github.wulkanowy.data.db.dao.NoteDao
+import io.github.wulkanowy.data.db.dao.RecipientDao
+import io.github.wulkanowy.data.db.dao.ReportingUnitDao
 import io.github.wulkanowy.data.db.dao.SemesterDao
 import io.github.wulkanowy.data.db.dao.StudentDao
 import io.github.wulkanowy.data.db.dao.SubjectDao
 import io.github.wulkanowy.data.db.dao.TimetableDao
 import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.data.db.entities.AttendanceSummary
+import io.github.wulkanowy.data.db.entities.CompletedLesson
 import io.github.wulkanowy.data.db.entities.Exam
 import io.github.wulkanowy.data.db.entities.Grade
+import io.github.wulkanowy.data.db.entities.GradeStatistics
 import io.github.wulkanowy.data.db.entities.GradeSummary
-import io.github.wulkanowy.data.db.entities.Message
 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.Note
+import io.github.wulkanowy.data.db.entities.Recipient
+import io.github.wulkanowy.data.db.entities.ReportingUnit
 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.data.db.entities.Timetable
+import io.github.wulkanowy.data.db.migrations.Migration10
+import io.github.wulkanowy.data.db.migrations.Migration11
+import io.github.wulkanowy.data.db.migrations.Migration12
+import io.github.wulkanowy.data.db.migrations.Migration13
+import io.github.wulkanowy.data.db.migrations.Migration2
+import io.github.wulkanowy.data.db.migrations.Migration3
+import io.github.wulkanowy.data.db.migrations.Migration4
+import io.github.wulkanowy.data.db.migrations.Migration5
+import io.github.wulkanowy.data.db.migrations.Migration6
+import io.github.wulkanowy.data.db.migrations.Migration7
+import io.github.wulkanowy.data.db.migrations.Migration8
+import io.github.wulkanowy.data.db.migrations.Migration9
 import javax.inject.Singleton
 
 @Singleton
@@ -43,21 +65,44 @@ import javax.inject.Singleton
         AttendanceSummary::class,
         Grade::class,
         GradeSummary::class,
+        GradeStatistics::class,
         Message::class,
         Note::class,
         Homework::class,
-        Subject::class
+        Subject::class,
+        LuckyNumber::class,
+        CompletedLesson::class,
+        ReportingUnit::class,
+        Recipient::class
     ],
-    version = 1,
-    exportSchema = false
+    version = AppDatabase.VERSION_SCHEMA,
+    exportSchema = true
 )
 @TypeConverters(Converters::class)
 abstract class AppDatabase : RoomDatabase() {
 
     companion object {
+        const val VERSION_SCHEMA = 13
+
         fun newInstance(context: Context): AppDatabase {
             return Room.databaseBuilder(context, AppDatabase::class.java, "wulkanowy_database")
                 .setJournalMode(TRUNCATE)
+                .fallbackToDestructiveMigrationFrom(VERSION_SCHEMA + 1)
+                .fallbackToDestructiveMigrationOnDowngrade()
+                .addMigrations(
+                    Migration2(),
+                    Migration3(),
+                    Migration4(),
+                    Migration5(),
+                    Migration6(),
+                    Migration7(),
+                    Migration8(),
+                    Migration9(),
+                    Migration10(),
+                    Migration11(),
+                    Migration12(),
+                    Migration13()
+                )
                 .build()
         }
     }
@@ -78,6 +123,8 @@ abstract class AppDatabase : RoomDatabase() {
 
     abstract val gradeSummaryDao: GradeSummaryDao
 
+    abstract val gradeStatistics: GradeStatisticsDao
+
     abstract val messagesDao: MessagesDao
 
     abstract val noteDao: NoteDao
@@ -85,4 +132,12 @@ abstract class AppDatabase : RoomDatabase() {
     abstract val homeworkDao: HomeworkDao
 
     abstract val subjectDao: SubjectDao
+
+    abstract val luckyNumberDao: LuckyNumberDao
+
+    abstract val completedLessonsDao: CompletedLessonsDao
+
+    abstract val reportingUnitDao: ReportingUnitDao
+
+    abstract val recipientDao: RecipientDao
 }
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 a550df893..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
@@ -1,6 +1,8 @@
 package io.github.wulkanowy.data.db
 
 import androidx.room.TypeConverter
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
 import org.threeten.bp.DateTimeUtils
 import org.threeten.bp.Instant
 import org.threeten.bp.LocalDate
@@ -36,4 +38,14 @@ class Converters {
 
     @TypeConverter
     fun intToMonth(value: Int?) = value?.let { Month.of(it) }
+
+    @TypeConverter
+    fun intListToGson(list: List<Int>): String {
+        return Gson().toJson(list)
+    }
+
+    @TypeConverter
+    fun gsonToIntList(value: String): List<Int> {
+        return Gson().fromJson(value, object : TypeToken<List<Int>>() {}.type)
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/SharedPrefHelper.kt b/app/src/main/java/io/github/wulkanowy/data/db/SharedPrefHelper.kt
index 656b39d49..74f9fa654 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/SharedPrefHelper.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/SharedPrefHelper.kt
@@ -6,26 +6,16 @@ import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
+@SuppressLint("ApplySharedPref")
 class SharedPrefHelper @Inject constructor(private val sharedPref: SharedPreferences) {
 
-    @SuppressLint("ApplySharedPref")
     fun putLong(key: String, value: Long, sync: Boolean = false) {
         sharedPref.edit().putLong(key, value).apply {
             if (sync) commit() else apply()
         }
     }
 
-    fun getLong(key: String, defaultValue: Long): Long {
-        return sharedPref.getLong(key, defaultValue)
-    }
-
-    fun putBoolean(key: String, value: Boolean) {
-        sharedPref.edit().putBoolean(key, value).apply()
-    }
-
-    fun getBoolean(key: String, defaultValue: Boolean): Boolean {
-        return sharedPref.getBoolean(key, defaultValue)
-    }
+    fun getLong(key: String, defaultValue: Long) = sharedPref.getLong(key, defaultValue)
 
     fun delete(key: String) {
         sharedPref.edit().remove(key).apply()
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/CompletedLessonsDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/CompletedLessonsDao.kt
new file mode 100644
index 000000000..6816ceaaf
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/CompletedLessonsDao.kt
@@ -0,0 +1,24 @@
+package io.github.wulkanowy.data.db.dao
+
+import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
+import androidx.room.Query
+import io.github.wulkanowy.data.db.entities.CompletedLesson
+import io.reactivex.Maybe
+import org.threeten.bp.LocalDate
+import javax.inject.Singleton
+
+@Singleton
+@Dao
+interface CompletedLessonsDao {
+
+    @Insert
+    fun insertAll(exams: List<CompletedLesson>)
+
+    @Delete
+    fun deleteAll(exams: List<CompletedLesson>)
+
+    @Query("SELECT * FROM CompletedLesson WHERE diary_id = :diaryId AND student_id = :studentId AND date >= :from AND date <= :end")
+    fun loadAll(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): Maybe<List<CompletedLesson>>
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeDao.kt
index 629f201d4..0bd210b02 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeDao.kt
@@ -16,9 +16,6 @@ interface GradeDao {
     @Insert
     fun insertAll(grades: List<Grade>)
 
-    @Update
-    fun update(grade: Grade)
-
     @Update
     fun updateAll(grade: List<Grade>)
 
@@ -28,6 +25,4 @@ interface GradeDao {
     @Query("SELECT * FROM Grades WHERE semester_id = :semesterId AND student_id = :studentId")
     fun loadAll(semesterId: Int, studentId: Int): Maybe<List<Grade>>
 
-    @Query("SELECT * FROM Grades WHERE is_read = 0 AND semester_id = :semesterId AND student_id = :studentId")
-    fun loadAllNew(semesterId: Int, studentId: Int): Maybe<List<Grade>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeStatisticsDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeStatisticsDao.kt
new file mode 100644
index 000000000..338c369fa
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeStatisticsDao.kt
@@ -0,0 +1,26 @@
+package io.github.wulkanowy.data.db.dao
+
+import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
+import androidx.room.Query
+import io.github.wulkanowy.data.db.entities.GradeStatistics
+import io.reactivex.Maybe
+import javax.inject.Singleton
+
+@Singleton
+@Dao
+interface GradeStatisticsDao {
+
+    @Insert
+    fun insertAll(gradesStatistics: List<GradeStatistics>)
+
+    @Delete
+    fun deleteAll(gradesStatistics: List<GradeStatistics>)
+
+    @Query("SELECT * FROM GradesStatistics WHERE student_id = :studentId AND semester_id = :semesterId AND subject = :subjectName AND is_semester = :isSemester")
+    fun loadSubject(semesterId: Int, studentId: Int, subjectName: String, isSemester: Boolean): Maybe<List<GradeStatistics>>
+
+    @Query("SELECT * FROM GradesStatistics WHERE student_id = :studentId AND semester_id = :semesterId AND is_semester = :isSemester")
+    fun loadAll(semesterId: Int, studentId: Int, isSemester: Boolean): Maybe<List<GradeStatistics>>
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeSummaryDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeSummaryDao.kt
index 3530118c2..3f2e87bd0 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeSummaryDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeSummaryDao.kt
@@ -18,6 +18,6 @@ interface GradeSummaryDao {
     @Delete
     fun deleteAll(gradesSummary: List<GradeSummary>)
 
-    @Query("SELECT * FROM grades_summary WHERE student_id = :studentId AND semester_id = :semesterId")
+    @Query("SELECT * FROM GradesSummary WHERE student_id = :studentId AND semester_id = :semesterId")
     fun loadAll(semesterId: Int, studentId: Int): Maybe<List<GradeSummary>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/HomeworkDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/HomeworkDao.kt
index 4127460f0..253bdb11f 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/HomeworkDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/HomeworkDao.kt
@@ -19,6 +19,6 @@ interface HomeworkDao {
     @Delete
     fun deleteAll(homework: List<Homework>)
 
-    @Query("SELECT * FROM Homework WHERE semester_id = :semesterId AND student_id = :studentId AND date = :date")
-    fun loadAll(semesterId: Int, studentId: Int, date: LocalDate): Maybe<List<Homework>>
+    @Query("SELECT * FROM Homework WHERE semester_id = :semesterId AND student_id = :studentId AND date >= :from AND date <= :end")
+    fun loadAll(semesterId: Int, studentId: Int, from: LocalDate, end: LocalDate): Maybe<List<Homework>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/LuckyNumberDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/LuckyNumberDao.kt
new file mode 100644
index 000000000..afd7905c0
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/LuckyNumberDao.kt
@@ -0,0 +1,29 @@
+package io.github.wulkanowy.data.db.dao
+
+import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
+import androidx.room.Query
+import androidx.room.Update
+import io.github.wulkanowy.data.db.entities.LuckyNumber
+import io.reactivex.Maybe
+import org.threeten.bp.LocalDate
+import javax.inject.Singleton
+
+@Singleton
+@Dao
+interface LuckyNumberDao {
+
+    @Insert
+    fun insert(luckyNumber: LuckyNumber)
+
+    @Update
+    fun update(luckyNumber: LuckyNumber)
+
+    @Delete
+    fun delete(luckyNumber: LuckyNumber)
+
+    @Query("SELECT * FROM LuckyNumbers WHERE student_id = :studentId AND date = :date")
+    fun load(studentId: Int, date: LocalDate): Maybe<LuckyNumber>
+
+}
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 5018b6900..4f72c6c91 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
@@ -12,26 +12,20 @@ import io.reactivex.Maybe
 interface MessagesDao {
 
     @Insert
-    fun insertAll(messages: List<Message>): List<Long>
+    fun insertAll(messages: List<Message>)
 
     @Delete
     fun deleteAll(messages: List<Message>)
 
-    @Update
-    fun update(message: Message)
-
     @Update
     fun updateAll(messages: List<Message>)
 
-    @Query("SELECT * FROM Messages WHERE student_id = :studentId AND real_id = :id")
-    fun loadOne(studentId: Int, id: Int): Maybe<Message>
+    @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 student_id = :studentId AND folder_id = :folder ORDER BY date DESC")
-    fun load(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>>
-
-    @Query("SELECT * FROM Messages WHERE unread = 1 AND student_id = :studentId")
-    fun loadNewMessages(studentId: Int): Maybe<List<Message>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/NoteDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/NoteDao.kt
index 2c1828606..867e06a25 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/NoteDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/NoteDao.kt
@@ -16,18 +16,13 @@ interface NoteDao {
     @Insert
     fun insertAll(notes: List<Note>)
 
-    @Update
-    fun update(note: Note)
-
     @Update
     fun updateAll(notes: List<Note>)
 
     @Delete
     fun deleteAll(notes: List<Note>)
 
-    @Query("SELECT * FROM Notes WHERE semester_id = :semesterId AND student_id = :studentId")
-    fun loadAll(semesterId: Int, studentId: Int): Maybe<List<Note>>
+    @Query("SELECT * FROM Notes WHERE student_id = :studentId")
+    fun loadAll(studentId: Int): Maybe<List<Note>>
 
-    @Query("SELECT * FROM Notes WHERE is_read = 0 AND semester_id = :semesterId AND student_id = :studentId")
-    fun loadNew(semesterId: Int, studentId: Int): Maybe<List<Note>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/RecipientDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/RecipientDao.kt
new file mode 100644
index 000000000..7c5fd6ca6
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/RecipientDao.kt
@@ -0,0 +1,23 @@
+package io.github.wulkanowy.data.db.dao
+
+import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
+import androidx.room.Query
+import io.github.wulkanowy.data.db.entities.Recipient
+import io.reactivex.Maybe
+import javax.inject.Singleton
+
+@Singleton
+@Dao
+interface RecipientDao {
+
+    @Insert
+    fun insertAll(messages: List<Recipient>)
+
+    @Delete
+    fun deleteAll(messages: List<Recipient>)
+
+    @Query("SELECT * FROM Recipients WHERE student_id = :studentId AND role = :role AND unit_id = :unitId")
+    fun load(studentId: Int, role: Int, unitId: Int): Maybe<List<Recipient>>
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/ReportingUnitDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/ReportingUnitDao.kt
new file mode 100644
index 000000000..1898390a9
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/ReportingUnitDao.kt
@@ -0,0 +1,26 @@
+package io.github.wulkanowy.data.db.dao
+
+import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
+import androidx.room.Query
+import io.github.wulkanowy.data.db.entities.ReportingUnit
+import io.reactivex.Maybe
+import javax.inject.Singleton
+
+@Singleton
+@Dao
+interface ReportingUnitDao {
+
+    @Insert
+    fun insertAll(reportingUnits: List<ReportingUnit>)
+
+    @Delete
+    fun deleteAll(reportingUnits: List<ReportingUnit>)
+
+    @Query("SELECT * FROM ReportingUnits WHERE student_id = :studentId")
+    fun load(studentId: Int): Maybe<List<ReportingUnit>>
+
+    @Query("SELECT * FROM ReportingUnits WHERE student_id = :studentId AND real_id = :unitId")
+    fun loadOne(studentId: Int, unitId: Int): Maybe<ReportingUnit>
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/SemesterDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/SemesterDao.kt
index 44de31d85..01841fb67 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/SemesterDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/SemesterDao.kt
@@ -1,8 +1,8 @@
 package io.github.wulkanowy.data.db.dao
 
 import androidx.room.Dao
+import androidx.room.Delete
 import androidx.room.Insert
-import androidx.room.OnConflictStrategy.IGNORE
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Semester
 import io.reactivex.Maybe
@@ -12,15 +12,12 @@ import javax.inject.Singleton
 @Dao
 interface SemesterDao {
 
-    @Insert(onConflict = IGNORE)
+    @Insert
     fun insertAll(semester: List<Semester>)
 
-    @Query("SELECT * FROM Semesters WHERE student_id = :studentId")
-    fun loadAll(studentId: Int): Maybe<List<Semester>>
+    @Delete
+    fun deleteAll(semester: List<Semester>)
 
-    @Query("UPDATE Semesters SET is_current = 1 WHERE semester_id = :semesterId AND diary_id = :diaryId")
-    fun updateCurrent(semesterId: Int, diaryId: Int)
-
-    @Query("UPDATE Semesters SET is_current = 0 WHERE student_id = :studentId")
-    fun resetCurrent(studentId: Int)
+    @Query("SELECT * FROM Semesters WHERE student_id = :studentId AND class_id = :classId")
+    fun loadAll(studentId: Int, classId: Int): Maybe<List<Semester>>
 }
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 76e295392..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
@@ -3,7 +3,7 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Dao
 import androidx.room.Delete
 import androidx.room.Insert
-import androidx.room.OnConflictStrategy.FAIL
+import androidx.room.OnConflictStrategy.ABORT
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Student
 import io.reactivex.Maybe
@@ -13,8 +13,8 @@ import javax.inject.Singleton
 @Dao
 interface StudentDao {
 
-    @Insert(onConflict = FAIL)
-    fun insert(student: Student): Long
+    @Insert(onConflict = ABORT)
+    fun insertAll(student: List<Student>): List<Long>
 
     @Delete
     fun delete(student: Student)
@@ -25,8 +25,8 @@ interface StudentDao {
     @Query("SELECT * FROM Students")
     fun loadAll(): Maybe<List<Student>>
 
-    @Query("UPDATE Students SET is_current = 1 WHERE student_id = :studentId")
-    fun updateCurrent(studentId: Int)
+    @Query("UPDATE Students SET is_current = 1 WHERE id = :id")
+    fun updateCurrent(id: Long)
 
     @Query("UPDATE Students SET is_current = 0")
     fun resetCurrent()
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Attendance.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Attendance.kt
index 7588201b3..3c58971ae 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Attendance.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Attendance.kt
@@ -10,30 +10,30 @@ import java.io.Serializable
 data class Attendance(
 
     @ColumnInfo(name = "student_id")
-    var studentId: Int,
+    val studentId: Int,
 
     @ColumnInfo(name = "diary_id")
-    var diaryId: Int,
+    val diaryId: Int,
 
-    var date: LocalDate,
+    val date: LocalDate,
 
-    var number: Int,
+    val number: Int,
 
-    var subject: String,
+    val subject: String,
 
-    var name: String,
+    val name: String,
 
-    var presence: Boolean = false,
+    val presence: Boolean,
 
-    var absence: Boolean = false,
+    val absence: Boolean,
 
-    var exemption: Boolean = false,
+    val exemption: Boolean,
 
-    var lateness: Boolean = false,
+    val lateness: Boolean,
 
-    var excused: Boolean = false,
+    val excused: Boolean,
 
-    var deleted: Boolean = false
+    val deleted: Boolean
 ) : Serializable {
 
     @PrimaryKey(autoGenerate = true)
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/AttendanceSummary.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/AttendanceSummary.kt
index de2de98f6..d2e1f174e 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/AttendanceSummary.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/AttendanceSummary.kt
@@ -10,13 +10,13 @@ import java.io.Serializable
 data class AttendanceSummary(
 
     @ColumnInfo(name = "student_id")
-    var studentId: Int,
+    val studentId: Int,
 
     @ColumnInfo(name = "diary_id")
-    var diaryId: Int,
+    val diaryId: Int,
 
     @ColumnInfo(name = "subject_id")
-    var subjectId: Int = 0,
+    val subjectId: Int,
 
     val month: Month,
 
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/CompletedLesson.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/CompletedLesson.kt
new file mode 100644
index 000000000..775f3f558
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/CompletedLesson.kt
@@ -0,0 +1,40 @@
+package io.github.wulkanowy.data.db.entities
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import org.threeten.bp.LocalDate
+import java.io.Serializable
+
+@Entity(tableName = "CompletedLesson")
+data class CompletedLesson(
+
+    @ColumnInfo(name = "student_id")
+    val studentId: Int,
+
+    @ColumnInfo(name = "diary_id")
+    val diaryId: Int,
+
+    val date: LocalDate,
+
+    val number: Int,
+
+    val subject: String,
+
+    val topic: String,
+
+    val teacher: String,
+
+    @ColumnInfo(name = "teacher_symbol")
+    val teacherSymbol: String,
+
+    val substitution: String,
+
+    val absence: String,
+
+    val resources: String
+) : Serializable {
+
+    @PrimaryKey(autoGenerate = true)
+    var id: Long = 0
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Exam.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Exam.kt
index daa886d54..9ae795e71 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Exam.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Exam.kt
@@ -9,29 +9,29 @@ import java.io.Serializable
 @Entity(tableName = "Exams")
 data class Exam(
 
-        @ColumnInfo(name = "student_id")
-        var studentId: Int,
+    @ColumnInfo(name = "student_id")
+    val studentId: Int,
 
-        @ColumnInfo(name = "diary_id")
-        var diaryId: Int,
+    @ColumnInfo(name = "diary_id")
+    val diaryId: Int,
 
-        var date: LocalDate,
+    val date: LocalDate,
 
-        @ColumnInfo(name = "entry_date")
-        var entryDate: LocalDate = LocalDate.now(),
+    @ColumnInfo(name = "entry_date")
+    val entryDate: LocalDate,
 
-        var subject: String,
+    val subject: String,
 
-        var group: String,
+    val group: String,
 
-        var type: String,
+    val type: String,
 
-        var description: String,
+    val description: String,
 
-        var teacher: String,
+    val teacher: String,
 
-        @ColumnInfo(name = "teacher_symbol")
-        var teacherSymbol: String
+    @ColumnInfo(name = "teacher_symbol")
+    val teacherSymbol: String
 ) : Serializable {
 
     @PrimaryKey(autoGenerate = true)
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Grade.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Grade.kt
index d665f9d20..1221a7aab 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Grade.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Grade.kt
@@ -10,35 +10,35 @@ import java.io.Serializable
 data class Grade(
 
     @ColumnInfo(name = "semester_id")
-    var semesterId: Int,
+    val semesterId: Int,
 
     @ColumnInfo(name = "student_id")
-    var studentId: Int,
+    val studentId: Int,
 
-    var subject: String,
+    val subject: String,
 
-    var entry: String,
+    val entry: String,
 
-    var value: Int,
+    val value: Int,
 
-    var modifier: Double,
+    val modifier: Double,
 
-    var comment: String,
+    val comment: String,
 
-    var color: String,
+    val color: String,
 
     @ColumnInfo(name = "grade_symbol")
-    var gradeSymbol: String,
+    val gradeSymbol: String,
 
-    var description: String,
+    val description: String,
 
-    var weight: String,
+    val weight: String,
 
-    var weightValue: Int,
+    val weightValue: Double,
 
-    var date: LocalDate,
+    val date: LocalDate,
 
-    var teacher: String
+    val teacher: String
 ) : Serializable {
 
     @PrimaryKey(autoGenerate = true)
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/GradeStatistics.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/GradeStatistics.kt
new file mode 100644
index 000000000..8ad8b8b8d
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/GradeStatistics.kt
@@ -0,0 +1,27 @@
+package io.github.wulkanowy.data.db.entities
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+@Entity(tableName = "GradesStatistics")
+data class GradeStatistics(
+
+    @ColumnInfo(name = "student_id")
+    val studentId: Int,
+
+    @ColumnInfo(name = "semester_id")
+    val semesterId: Int,
+
+    val subject: String,
+
+    val grade: Int,
+
+    val amount: Int,
+
+    @ColumnInfo(name = "is_semester")
+    val semester: Boolean
+) {
+    @PrimaryKey(autoGenerate = true)
+    var id: Long = 0
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/GradeSummary.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/GradeSummary.kt
index 74d709bb3..e6ac4926d 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/GradeSummary.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/GradeSummary.kt
@@ -4,22 +4,21 @@ import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 
-@Entity(tableName = "Grades_Summary")
+@Entity(tableName = "GradesSummary")
 data class GradeSummary(
 
-        @ColumnInfo(name = "semester_id")
-        var semesterId: Int,
+    @ColumnInfo(name = "semester_id")
+    val semesterId: Int,
 
-        @ColumnInfo(name = "student_id")
-        var studentId: Int,
+    @ColumnInfo(name = "student_id")
+    val studentId: Int,
 
-        var subject: String,
+    val subject: String,
 
-        var predictedGrade: String,
+    val predictedGrade: String,
 
-        var finalGrade: String
+    val finalGrade: String
 ) {
     @PrimaryKey(autoGenerate = true)
     var id: Long = 0
-
 }
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 705d1d639..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
@@ -10,24 +10,24 @@ import java.io.Serializable
 data class Homework(
 
     @ColumnInfo(name = "semester_id")
-    var semesterId: Int,
+    val semesterId: Int,
 
     @ColumnInfo(name = "student_id")
-    var studentId: Int,
+    val studentId: Int,
 
-    var date: LocalDate,
+    val date: LocalDate,
 
     @ColumnInfo(name = "entry_date")
-    var entryDate: LocalDate,
+    val entryDate: LocalDate,
 
-    var subject: String,
+    val subject: String,
 
-    var content: String,
+    val content: String,
 
-    var teacher: String,
+    val teacher: String,
 
     @ColumnInfo(name = "teacher_symbol")
-    var teacherSymbol: String
+    val teacherSymbol: String
 
 ) : Serializable {
 
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/LuckyNumber.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/LuckyNumber.kt
new file mode 100644
index 000000000..5b9130f5d
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/LuckyNumber.kt
@@ -0,0 +1,27 @@
+package io.github.wulkanowy.data.db.entities
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import org.threeten.bp.LocalDate
+import java.io.Serializable
+
+@Entity(tableName = "LuckyNumbers")
+data class LuckyNumber (
+
+    @ColumnInfo(name = "student_id")
+    val studentId: Int,
+
+    val date: LocalDate,
+
+    @ColumnInfo(name = "lucky_number")
+    val luckyNumber: Int
+
+) : Serializable {
+
+    @PrimaryKey(autoGenerate = true)
+    var id: Long = 0
+
+    @ColumnInfo(name = "is_notified")
+    var isNotified: Boolean = true
+}
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 320e9322e..48b4fd022 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
@@ -10,40 +10,39 @@ import java.io.Serializable
 data class Message(
 
     @ColumnInfo(name = "student_id")
-    var studentId: Int? = null,
+    val studentId: Int,
 
     @ColumnInfo(name = "real_id")
-    val realId: Int? = null,
+    val realId: Int,
 
     @ColumnInfo(name = "message_id")
-    val messageId: Int? = null,
+    val messageId: Int,
 
     @ColumnInfo(name = "sender_name")
-    val sender: String? = null,
+    val sender: String,
 
     @ColumnInfo(name = "sender_id")
-    val senderId: Int? = null,
-
-    @ColumnInfo(name = "recipient_id")
-    val recipientId: Int? = null,
+    val senderId: Int,
 
     @ColumnInfo(name = "recipient_name")
-    val recipient: String? = "",
+    val recipient: String,
 
-    val subject: String = "",
+    val subject: String,
 
-    val date: LocalDateTime? = null,
+    val date: LocalDateTime,
 
     @ColumnInfo(name = "folder_id")
-    val folderId: Int = 0,
+    val folderId: Int,
 
-    var unread: Boolean? = false,
+    var unread: Boolean,
 
-    val unreadBy: Int? = 0,
+    @ColumnInfo(name = "unread_by")
+    val unreadBy: Int,
 
-    val readBy: Int? = 0,
+    @ColumnInfo(name = "read_by")
+    val readBy: Int,
 
-    val removed: Boolean = false
+    val removed: Boolean
 ) : Serializable {
 
     @PrimaryKey(autoGenerate = true)
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 1f61f0870..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
@@ -9,26 +9,23 @@ import java.io.Serializable
 @Entity(tableName = "Notes")
 data class Note(
 
-    @ColumnInfo(name = "semester_id")
-    var semesterId: Int,
-
     @ColumnInfo(name = "student_id")
-    var studentId: Int,
+    val studentId: Int,
 
-    var date: LocalDate,
+    val date: LocalDate,
 
-    var teacher: String,
+    val teacher: String,
 
-    var category: String,
+    val category: String,
 
-    var content: String
+    val content: String
 ) : Serializable {
 
     @PrimaryKey(autoGenerate = true)
     var id: Long = 0
 
     @ColumnInfo(name = "is_read")
-    var isRead: Boolean = false
+    var isRead: Boolean = true
 
     @ColumnInfo(name = "is_notified")
     var isNotified: Boolean = true
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Recipient.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Recipient.kt
new file mode 100644
index 000000000..3021da72d
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Recipient.kt
@@ -0,0 +1,38 @@
+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 = "Recipients")
+data class Recipient(
+
+    @ColumnInfo(name = "student_id")
+    val studentId: Int,
+
+    @ColumnInfo(name = "real_id")
+    val realId: String,
+
+    val name: String,
+
+    @ColumnInfo(name = "real_name")
+    val realName: String,
+
+    @ColumnInfo(name = "login_id")
+    val loginId: Int,
+
+    @ColumnInfo(name = "unit_id")
+    val unitId: Int,
+
+    val role: Int,
+
+    val hash: String
+
+) : Serializable {
+
+    @PrimaryKey(autoGenerate = true)
+    var id: Long = 0
+
+    override fun toString() = name
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/ReportingUnit.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/ReportingUnit.kt
new file mode 100644
index 000000000..601d8aac7
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/ReportingUnit.kt
@@ -0,0 +1,32 @@
+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 = "ReportingUnits")
+data class ReportingUnit(
+
+    @ColumnInfo(name = "student_id")
+    val studentId: Int,
+
+    @ColumnInfo(name = "real_id")
+    val realId: Int,
+
+    @ColumnInfo(name = "short")
+    val shortName: String,
+
+    @ColumnInfo(name = "sender_id")
+    val senderId: Int,
+
+    @ColumnInfo(name = "sender_name")
+    val senderName: String,
+
+    val roles: List<Int>
+
+) : Serializable {
+
+    @PrimaryKey(autoGenerate = true)
+    var id: Long = 0
+}
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 509a692e6..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
@@ -4,28 +4,43 @@ import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.Index
 import androidx.room.PrimaryKey
+import org.threeten.bp.LocalDate
 
 @Entity(tableName = "Semesters", indices = [Index(value = ["student_id", "diary_id", "semester_id"], unique = true)])
 data class Semester(
 
-    @PrimaryKey(autoGenerate = true)
-    var id: Long = 0,
-
     @ColumnInfo(name = "student_id")
-    var studentId: Int,
+    val studentId: Int,
 
     @ColumnInfo(name = "diary_id")
-    var diaryId: Int,
+    val diaryId: Int,
 
     @ColumnInfo(name = "diary_name")
-    var diaryName: String,
+    val diaryName: String,
+
+    @ColumnInfo(name = "school_year")
+    val schoolYear: Int,
 
     @ColumnInfo(name = "semester_id")
-    var semesterId: Int,
+    val semesterId: Int,
 
     @ColumnInfo(name = "semester_name")
-    var semesterName: Int,
+    val semesterName: Int,
 
     @ColumnInfo(name = "is_current")
-    var isCurrent: Boolean = false
-)
+    val isCurrent: Boolean,
+
+    val start: LocalDate,
+
+    val end: LocalDate,
+
+    @ColumnInfo(name = "class_id")
+    val classId: Int,
+
+    @ColumnInfo(name = "unit_id")
+    val unitId: Int
+) {
+
+    @PrimaryKey(autoGenerate = true)
+    var id: Long = 0
+}
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 1fe4cf8d0..13c5ee084 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
@@ -4,35 +4,47 @@ import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.Index
 import androidx.room.PrimaryKey
+import org.threeten.bp.LocalDateTime
+import java.io.Serializable
 
-@Entity(tableName = "Students", indices = [Index(value = ["email", "symbol", "student_id", "school_id"], unique = true)])
+@Entity(tableName = "Students", indices = [Index(value = ["email", "symbol", "student_id", "school_id", "class_id"], unique = true)])
 data class Student(
 
-    @PrimaryKey(autoGenerate = true)
-    var id: Long = 0,
+    val endpoint: String,
 
-    var endpoint: String,
+    val loginType: String,
 
-    var loginType: String,
-
-    var email: String,
+    val email: String,
 
     var password: String,
 
-    var symbol: String = "",
+    val symbol: String,
 
     @ColumnInfo(name = "student_id")
-    var studentId: Int = 0,
+    val studentId: Int,
 
     @ColumnInfo(name = "student_name")
-    var studentName: String = "",
+    val studentName: String,
 
     @ColumnInfo(name = "school_id")
-    var schoolSymbol: String = "",
+    val schoolSymbol: String,
 
     @ColumnInfo(name = "school_name")
-    var schoolName: String = "",
+    val schoolName: String,
+
+    @ColumnInfo(name = "class_name")
+    val className: String,
+
+    @ColumnInfo(name = "class_id")
+    val classId: Int,
 
     @ColumnInfo(name = "is_current")
-    var isCurrent: Boolean = false
-)
+    val isCurrent: Boolean,
+
+    @ColumnInfo(name = "registration_date")
+    val registrationDate: LocalDateTime
+) : Serializable {
+
+    @PrimaryKey(autoGenerate = true)
+    var id: Long = 0
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Subject.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Subject.kt
index 45306be36..dbaa6f4ed 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Subject.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Subject.kt
@@ -9,15 +9,15 @@ import java.io.Serializable
 data class Subject(
 
     @ColumnInfo(name = "student_id")
-    var studentId: Int,
+    val studentId: Int,
 
     @ColumnInfo(name = "diary_id")
-    var diaryId: Int,
+    val diaryId: Int,
 
     @ColumnInfo(name = "real_id")
-    var realId: Int,
+    val realId: Int,
 
-    var name: String
+    val name: String
 ) : Serializable {
 
     @PrimaryKey(autoGenerate = true)
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 2aa1eafa7..9bc3d2140 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
@@ -10,33 +10,39 @@ import java.io.Serializable
 @Entity(tableName = "Timetable")
 data class Timetable(
 
-        @ColumnInfo(name = "student_id")
-        var studentId: Int,
+    @ColumnInfo(name = "student_id")
+    val studentId: Int,
 
-        @ColumnInfo(name = "diary_id")
-        var diaryId: Int,
+    @ColumnInfo(name = "diary_id")
+    val diaryId: Int,
 
-        val number: Int = 0,
+    val number: Int,
 
-        val start: LocalDateTime = LocalDateTime.now(),
+    val start: LocalDateTime,
 
-        val end: LocalDateTime = LocalDateTime.now(),
+    val end: LocalDateTime,
 
-        val date: LocalDate,
+    val date: LocalDate,
 
-        val subject: String,
+    val subject: String,
 
-        val group: String,
+    val subjectOld: String,
 
-        val room: String,
+    val group: String,
 
-        val teacher: String,
+    val room: String,
 
-        val info: String,
+    val roomOld: String,
 
-        val changes: Boolean = false,
+    val teacher: String,
 
-        val canceled: Boolean = false
+    val teacherOld: String,
+
+    val info: String,
+
+    val changes: Boolean,
+
+    val canceled: Boolean
 ) : Serializable {
 
     @PrimaryKey(autoGenerate = true)
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration10.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration10.kt
new file mode 100644
index 000000000..c26a02d1f
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration10.kt
@@ -0,0 +1,11 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration10 : Migration(9, 10) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("ALTER TABLE Grades_Summary RENAME TO GradesSummary")
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration11.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration11.kt
new file mode 100644
index 000000000..6d129bca0
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration11.kt
@@ -0,0 +1,34 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration11 : Migration(10, 11) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("""
+            CREATE TABLE IF NOT EXISTS Grades_temp (
+                id INTEGER PRIMARY KEY 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 INTEGER 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
+            )
+        """)
+        database.execSQL("INSERT INTO Grades_temp SELECT * FROM Grades")
+        database.execSQL("DROP TABLE Grades")
+        database.execSQL("ALTER TABLE Grades_temp RENAME TO Grades")
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration12.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration12.kt
new file mode 100644
index 000000000..1dc38e14c
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration12.kt
@@ -0,0 +1,69 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration12 : Migration(11, 12) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        createTempStudentsTable(database)
+        replaceStudentTable(database)
+        updateStudentsWithClassId(database, getStudentsIds(database))
+        removeStudentsWithNoClassId(database)
+        ensureThereIsOnlyOneCurrentStudent(database)
+    }
+
+    private fun createTempStudentsTable(database: SupportSQLiteDatabase) {
+        database.execSQL("""
+            CREATE TABLE IF NOT EXISTS Students_tmp (
+                id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+                endpoint TEXT NOT NULL,
+                loginType TEXT NOT NULL,
+                email TEXT NOT NULL,
+                password TEXT NOT NULL,
+                symbol TEXT NOT NULL,
+                student_id INTEGER NOT NULL,
+                student_name TEXT NOT NULL,
+                school_id TEXT NOT NULL,
+                school_name TEXT NOT NULL,
+                is_current INTEGER NOT NULL,
+                registration_date INTEGER NOT NULL,
+                class_id INTEGER NOT NULL
+            )
+        """)
+        database.execSQL("CREATE UNIQUE INDEX index_Students_email_symbol_student_id_school_id_class_id ON Students_tmp (email, symbol, student_id, school_id, class_id)")
+    }
+
+    private fun replaceStudentTable(database: SupportSQLiteDatabase) {
+        database.execSQL("ALTER TABLE Students ADD COLUMN class_id INTEGER DEFAULT 0 NOT NULL")
+        database.execSQL("INSERT INTO Students_tmp SELECT * FROM Students")
+        database.execSQL("DROP TABLE Students")
+        database.execSQL("ALTER TABLE Students_tmp RENAME TO Students")
+    }
+
+    private fun getStudentsIds(database: SupportSQLiteDatabase): List<Int> {
+        val students = mutableListOf<Int>()
+        val studentsCursor = database.query("SELECT student_id FROM Students")
+        if (studentsCursor.moveToFirst()) {
+            do {
+                students.add(studentsCursor.getInt(0))
+            } while (studentsCursor.moveToNext())
+        }
+        return students
+    }
+
+    private fun updateStudentsWithClassId(database: SupportSQLiteDatabase, students: List<Int>) {
+        students.forEach {
+            database.execSQL("UPDATE Students SET class_id = IFNULL((SELECT class_id FROM Semesters WHERE student_id = $it), 0) WHERE student_id = $it")
+        }
+    }
+
+    private fun removeStudentsWithNoClassId(database: SupportSQLiteDatabase) {
+        database.execSQL("DELETE FROM Students WHERE class_id = 0")
+    }
+
+    private fun ensureThereIsOnlyOneCurrentStudent(database: SupportSQLiteDatabase) {
+        database.execSQL("UPDATE Students SET is_current = 0")
+        database.execSQL("UPDATE Students SET is_current = 1 WHERE id = (SELECT MAX(id) FROM Students)")
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration13.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration13.kt
new file mode 100644
index 000000000..0cf8cd9b0
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration13.kt
@@ -0,0 +1,64 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration13 : Migration(12, 13) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        addClassNameToStudents(database, getStudentsIds(database))
+        updateSemestersTable(database)
+        markAtLeastAndOnlyOneSemesterAtCurrent(database, getStudentsAndClassIds(database))
+        clearMessagesTable(database)
+    }
+
+    private fun addClassNameToStudents(database: SupportSQLiteDatabase, students: List<Pair<Int, String>>) {
+        database.execSQL("ALTER TABLE Students ADD COLUMN class_name TEXT DEFAULT \"\" NOT NULL")
+
+        students.forEach { (id, name) ->
+            val schoolName = name.substringAfter(" - ")
+            val className = name.substringBefore(" - ", "").replace("Klasa ", "")
+            database.execSQL("UPDATE Students SET class_name = '$className' WHERE id = '$id'")
+            database.execSQL("UPDATE Students SET school_name = '$schoolName' WHERE id = '$id'")
+        }
+    }
+
+    private fun getStudentsIds(database: SupportSQLiteDatabase): MutableList<Pair<Int, String>> {
+        val students = mutableListOf<Pair<Int, String>>()
+        val studentsCursor = database.query("SELECT id, school_name FROM Students")
+        if (studentsCursor.moveToFirst()) {
+            do {
+                students.add(studentsCursor.getInt(0) to studentsCursor.getString(1))
+            } while (studentsCursor.moveToNext())
+        }
+        return students
+    }
+
+    private fun updateSemestersTable(database: SupportSQLiteDatabase) {
+        database.execSQL("ALTER TABLE Semesters ADD COLUMN school_year INTEGER DEFAULT 1970 NOT NULL")
+        database.execSQL("ALTER TABLE Semesters ADD COLUMN start INTEGER DEFAULT 0 NOT NULL")
+        database.execSQL("ALTER TABLE Semesters ADD COLUMN `end` INTEGER DEFAULT 0 NOT NULL")
+    }
+
+    private fun getStudentsAndClassIds(database: SupportSQLiteDatabase): List<Pair<Int, Int>> {
+        val students = mutableListOf<Pair<Int, Int>>()
+        val studentsCursor = database.query("SELECT student_id, class_id FROM Students")
+        if (studentsCursor.moveToFirst()) {
+            do {
+                students.add(studentsCursor.getInt(0) to studentsCursor.getInt(1))
+            } while (studentsCursor.moveToNext())
+        }
+        return students
+    }
+
+    private fun markAtLeastAndOnlyOneSemesterAtCurrent(database: SupportSQLiteDatabase, students: List<Pair<Int, Int>>) {
+        students.forEach { (studentId, classId) ->
+            database.execSQL("UPDATE Semesters SET is_current = 0 WHERE student_id = '$studentId' AND class_id = '$classId'")
+            database.execSQL("UPDATE Semesters SET is_current = 1 WHERE id = (SELECT id FROM Semesters WHERE student_id = '$studentId' AND class_id = '$classId' ORDER BY semester_id DESC)")
+        }
+    }
+
+    private fun clearMessagesTable(database: SupportSQLiteDatabase) {
+        database.execSQL("DELETE FROM Messages")
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration2.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration2.kt
new file mode 100644
index 000000000..c5a30991a
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration2.kt
@@ -0,0 +1,18 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration2 : Migration(1, 2) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("""
+            CREATE TABLE IF NOT EXISTS LuckyNumbers (
+                id INTEGER PRIMARY KEY NOT NULL,
+                is_notified INTEGER NOT NULL,
+                student_id INTEGER NOT NULL,
+                date INTEGER NOT NULL,
+                lucky_number INTEGER NOT NULL)
+            """)
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration3.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration3.kt
new file mode 100644
index 000000000..d9699c0f4
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration3.kt
@@ -0,0 +1,25 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration3 : Migration(2, 3) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("""
+            CREATE TABLE IF NOT EXISTS CompletedLesson (
+                id INTEGER PRIMARY KEY 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)
+            """)
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration4.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration4.kt
new file mode 100644
index 000000000..0ae89bdd6
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration4.kt
@@ -0,0 +1,31 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration4 : Migration(3, 4) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("DROP TABLE IF EXISTS Messages")
+        database.execSQL("""
+            CREATE TABLE IF NOT EXISTS Messages (
+                id INTEGER PRIMARY KEY NOT NULL,
+                is_notified INTEGER NOT NULL,
+                content TEXT,
+                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_id INTEGER NOT NULL,
+                recipient_name TEXT NOT NULL,
+                subject TEXT NOT NULL,
+                date INTEGER NOT NULL,
+                folder_id INTEGER NOT NULL,
+                unread INTEGER NOT NULL,
+                unreadBy INTEGER NOT NULL,
+                readBy INTEGER NOT NULL,
+                removed INTEGER NOT NULL)
+            """)
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration5.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration5.kt
new file mode 100644
index 000000000..fe0dec48f
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration5.kt
@@ -0,0 +1,26 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+import org.threeten.bp.LocalDateTime.now
+import org.threeten.bp.ZoneOffset
+
+class Migration5 : Migration(4, 5) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("ALTER TABLE Students ADD COLUMN registration_date INTEGER DEFAULT 0 NOT NULL")
+        database.execSQL("UPDATE Students SET registration_date = '${now().atZone(ZoneOffset.UTC).toInstant().toEpochMilli()}'")
+        database.execSQL("DROP TABLE IF EXISTS Notes")
+        database.execSQL("""
+            CREATE TABLE IF NOT EXISTS Notes (
+                id INTEGER PRIMARY KEY 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)
+            """)
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration6.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration6.kt
new file mode 100644
index 000000000..fa9436187
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration6.kt
@@ -0,0 +1,37 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration6 : Migration(5, 6) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("""
+            CREATE TABLE IF NOT EXISTS ReportingUnits (
+                id INTEGER PRIMARY KEY 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)
+                """)
+
+        database.execSQL("""
+            CREATE TABLE IF NOT EXISTS Recipients (
+                id INTEGER PRIMARY KEY 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)
+                """)
+
+        database.execSQL("DELETE FROM Semesters WHERE 1")
+        database.execSQL("ALTER TABLE Semesters ADD COLUMN class_id INTEGER DEFAULT 0 NOT NULL")
+        database.execSQL("ALTER TABLE Semesters ADD COLUMN unit_id INTEGER DEFAULT 0 NOT NULL")
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration7.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration7.kt
new file mode 100644
index 000000000..120716c81
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration7.kt
@@ -0,0 +1,20 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration7 : Migration(6, 7) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("""
+            CREATE TABLE IF NOT EXISTS GradesStatistics (
+                id INTEGER PRIMARY KEY 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)
+            """)
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration8.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration8.kt
new file mode 100644
index 000000000..7009ee129
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration8.kt
@@ -0,0 +1,13 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration8 : Migration(7, 8) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("ALTER TABLE Timetable ADD COLUMN subjectOld TEXT DEFAULT \"\" NOT NULL")
+        database.execSQL("ALTER TABLE Timetable ADD COLUMN roomOld TEXT DEFAULT \"\" NOT NULL")
+        database.execSQL("ALTER TABLE Timetable ADD COLUMN teacherOld TEXT DEFAULT \"\" NOT NULL")
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration9.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration9.kt
new file mode 100644
index 000000000..d79a57062
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration9.kt
@@ -0,0 +1,30 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration9 : Migration(8, 9) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("DROP TABLE IF EXISTS Messages")
+        database.execSQL("""
+            CREATE TABLE IF NOT EXISTS Messages (
+                id INTEGER PRIMARY KEY 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,
+                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,
+                is_notified INTEGER NOT NULL,
+                content TEXT)
+            """)
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/exceptions/NoCurrentStudent.kt b/app/src/main/java/io/github/wulkanowy/data/exceptions/NoCurrentStudent.kt
new file mode 100644
index 000000000..58a2396e2
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/exceptions/NoCurrentStudent.kt
@@ -0,0 +1,3 @@
+package io.github.wulkanowy.data.exceptions
+
+class NoCurrentStudentException : Exception("There no set current student in database")
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/GradeRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/GradeRepository.kt
deleted file mode 100644
index 42266955e..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/GradeRepository.kt
+++ /dev/null
@@ -1,52 +0,0 @@
-package io.github.wulkanowy.data.repositories
-
-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.Semester
-import io.github.wulkanowy.data.repositories.local.GradeLocal
-import io.github.wulkanowy.data.repositories.remote.GradeRemote
-import io.reactivex.Completable
-import io.reactivex.Single
-import java.net.UnknownHostException
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class GradeRepository @Inject constructor(
-    private val settings: InternetObservingSettings,
-    private val local: GradeLocal,
-    private val remote: GradeRemote
-) {
-
-    fun getGrades(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 { newGrades ->
-                    local.getGrades(semester).toSingle(emptyList())
-                        .doOnSuccess { oldGrades ->
-                            local.deleteGrades(oldGrades - newGrades)
-                            local.saveGrades((newGrades - oldGrades)
-                                .onEach {
-                                    if (oldGrades.isNotEmpty()) it.isRead = false
-                                    if (notify) it.isNotified = false
-                                })
-                        }
-                }.flatMap { local.getGrades(semester).toSingle(emptyList()) })
-    }
-
-    fun getNewGrades(semester: Semester): Single<List<Grade>> {
-        return local.getNewGrades(semester).toSingle(emptyList())
-    }
-
-    fun updateGrade(grade: Grade): Completable {
-        return local.updateGrade(grade)
-    }
-
-    fun updateGrades(grades: List<Grade>): Completable {
-        return local.updateGrades(grades)
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/HomeworkRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/HomeworkRepository.kt
deleted file mode 100644
index a2a477b56..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/HomeworkRepository.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-package io.github.wulkanowy.data.repositories
-
-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.repositories.local.HomeworkLocal
-import io.github.wulkanowy.data.repositories.remote.HomeworkRemote
-import io.reactivex.Single
-import org.threeten.bp.LocalDate
-import java.net.UnknownHostException
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class HomeworkRepository @Inject constructor(
-    private val settings: InternetObservingSettings,
-    private val local: HomeworkLocal,
-    private val remote: HomeworkRemote
-) {
-
-    fun getHomework(semester: Semester, date: LocalDate, forceRefresh: Boolean = false): Single<List<Homework>> {
-        return local.getHomework(semester, date).filter { !forceRefresh }
-            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                .flatMap {
-                    if (it) remote.getHomework(semester, date)
-                    else Single.error(UnknownHostException())
-                }.flatMap { newGrades ->
-                    local.getHomework(semester, date).toSingle(emptyList())
-                        .doOnSuccess { oldGrades ->
-                            local.deleteHomework(oldGrades - newGrades)
-                            local.saveHomework(newGrades - oldGrades)
-                        }
-                }.flatMap { local.getHomework(semester, date).toSingle(emptyList()) })
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/MessagesRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/MessagesRepository.kt
deleted file mode 100644
index 06a0f6f95..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/MessagesRepository.kt
+++ /dev/null
@@ -1,79 +0,0 @@
-package io.github.wulkanowy.data.repositories
-
-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.Message
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.repositories.local.MessagesLocal
-import io.github.wulkanowy.data.repositories.remote.MessagesRemote
-import io.reactivex.Completable
-import io.reactivex.Single
-import java.net.UnknownHostException
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class MessagesRepository @Inject constructor(
-    private val settings: InternetObservingSettings,
-    private val local: MessagesLocal,
-    private val remote: MessagesRemote
-) {
-
-    enum class MessageFolder(val id: Int = 1) {
-        RECEIVED(1),
-        SENT(2),
-        TRASHED(3)
-    }
-
-    fun getMessages(studentId: Int, folder: MessageFolder, forceRefresh: Boolean = false, notify: Boolean = false): Single<List<Message>> {
-        return local.getMessages(studentId, folder).filter { !forceRefresh }
-            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                .flatMap {
-                    if (it) remote.getMessages(studentId, folder)
-                    else Single.error(UnknownHostException())
-                }.flatMap { new ->
-                    local.getMessages(studentId, folder).toSingle(emptyList())
-                        .doOnSuccess { old ->
-                            local.deleteMessages(old - new)
-                            local.saveMessages((new - old)
-                                .onEach {
-                                    it.isNotified = !notify
-                                })
-                        }
-                }.flatMap { local.getMessages(studentId, folder).toSingle(emptyList()) }
-            )
-    }
-
-    fun getMessage(studentId: Int, messageId: Int, markAsRead: Boolean = false): Single<Message> {
-        return local.getMessage(studentId, messageId)
-            .filter { !it.content.isNullOrEmpty() }
-            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                .flatMap {
-                    if (it) local.getMessage(studentId, messageId).toSingle()
-                    else Single.error(UnknownHostException())
-                }
-                .flatMap { dbMessage ->
-                    remote.getMessagesContent(dbMessage, markAsRead).doOnSuccess {
-                        local.updateMessage(dbMessage.copy(unread = false).apply {
-                            id = dbMessage.id
-                            content = it
-                        })
-                    }
-                }.flatMap {
-                    local.getMessage(studentId, messageId).toSingle()
-                }
-            )
-    }
-
-    fun getNewMessages(student: Student): Single<List<Message>> {
-        return local.getNewMessages(student).toSingle(emptyList())
-    }
-
-    fun updateMessage(message: Message): Completable {
-        return Completable.fromCallable { local.updateMessage(message) }
-    }
-
-    fun updateMessages(messages: List<Message>): Completable {
-        return Completable.fromCallable { local.updateMessages(messages) }
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/NoteRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/NoteRepository.kt
deleted file mode 100644
index 2836894f2..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/NoteRepository.kt
+++ /dev/null
@@ -1,52 +0,0 @@
-package io.github.wulkanowy.data.repositories
-
-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.Note
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.repositories.local.NoteLocal
-import io.github.wulkanowy.data.repositories.remote.NoteRemote
-import io.reactivex.Completable
-import io.reactivex.Single
-import java.net.UnknownHostException
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class NoteRepository @Inject constructor(
-    private val settings: InternetObservingSettings,
-    private val local: NoteLocal,
-    private val remote: NoteRemote
-) {
-
-    fun getNotes(semester: Semester, forceRefresh: Boolean = false, notify: Boolean = false): Single<List<Note>> {
-        return local.getNotes(semester).filter { !forceRefresh }
-            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                .flatMap {
-                    if (it) remote.getNotes(semester)
-                    else Single.error(UnknownHostException())
-                }.flatMap { new ->
-                    local.getNotes(semester).toSingle(emptyList())
-                        .doOnSuccess { old ->
-                            local.deleteNotes(old - new)
-                            local.saveNotes((new - old)
-                                .onEach {
-                                    if (notify) it.isNotified = false
-                                })
-                        }
-                }.flatMap { local.getNotes(semester).toSingle(emptyList()) }
-            )
-    }
-
-    fun getNewNotes(semester: Semester): Single<List<Note>> {
-        return local.getNewNotes(semester).toSingle(emptyList())
-    }
-
-    fun updateNote(note: Note): Completable {
-        return local.updateNote(note)
-    }
-
-    fun updateNotes(notes: List<Note>): Completable {
-        return local.updateNotes(notes)
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/TimetableRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/TimetableRepository.kt
deleted file mode 100644
index 6cc6a0435..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/TimetableRepository.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-package io.github.wulkanowy.data.repositories
-
-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.Timetable
-import io.github.wulkanowy.data.repositories.local.TimetableLocal
-import io.github.wulkanowy.data.repositories.remote.TimetableRemote
-import io.github.wulkanowy.utils.friday
-import io.github.wulkanowy.utils.monday
-import io.reactivex.Single
-import org.threeten.bp.LocalDate
-import java.net.UnknownHostException
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class TimetableRepository @Inject constructor(
-    private val settings: InternetObservingSettings,
-    private val local: TimetableLocal,
-    private val remote: TimetableRemote
-) {
-
-    fun getTimetable(semester: Semester, startDate: LocalDate, endDate: LocalDate, forceRefresh: Boolean = false)
-        : Single<List<Timetable>> {
-        return Single.fromCallable { startDate.monday to endDate.friday }
-            .flatMap { dates ->
-                local.getTimetable(semester, dates.first, dates.second).filter { !forceRefresh }
-                    .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                        .flatMap {
-                            if (it) remote.getTimetable(semester, dates.first, dates.second)
-                            else Single.error(UnknownHostException())
-                        }.flatMap { newTimetable ->
-                            local.getTimetable(semester, dates.first, dates.second)
-                                .toSingle(emptyList())
-                                .doOnSuccess { oldTimetable ->
-                                    local.deleteTimetable(oldTimetable - newTimetable)
-                                    local.saveTimetable(newTimetable - oldTimetable)
-                                }
-                        }.flatMap {
-                            local.getTimetable(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/local/AttendanceLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceLocal.kt
similarity index 82%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/local/AttendanceLocal.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceLocal.kt
index 9a318dba2..0f5873766 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/local/AttendanceLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceLocal.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.repositories.local
+package io.github.wulkanowy.data.repositories.attendance
 
 import io.github.wulkanowy.data.db.dao.AttendanceDao
 import io.github.wulkanowy.data.db.entities.Attendance
@@ -6,14 +6,11 @@ import io.github.wulkanowy.data.db.entities.Semester
 import io.reactivex.Maybe
 import org.threeten.bp.LocalDate
 import javax.inject.Inject
+import javax.inject.Singleton
 
+@Singleton
 class AttendanceLocal @Inject constructor(private val attendanceDb: AttendanceDao) {
 
-    fun getAttendance(semester: Semester, startDate: LocalDate, endDate: LocalDate): Maybe<List<Attendance>> {
-        return attendanceDb.loadAll(semester.diaryId, semester.studentId, startDate, endDate)
-                .filter { !it.isEmpty() }
-    }
-
     fun saveAttendance(attendance: List<Attendance>) {
         attendanceDb.insertAll(attendance)
     }
@@ -21,4 +18,8 @@ class AttendanceLocal @Inject constructor(private val attendanceDb: AttendanceDa
     fun deleteAttendance(attendance: List<Attendance>) {
         attendanceDb.deleteAll(attendance)
     }
+
+    fun getAttendance(semester: Semester, startDate: LocalDate, endDate: LocalDate): Maybe<List<Attendance>> {
+        return attendanceDb.loadAll(semester.diaryId, semester.studentId, startDate, endDate).filter { it.isNotEmpty() }
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/AttendanceRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRemote.kt
similarity index 95%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/remote/AttendanceRemote.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRemote.kt
index 79047606f..b3544c3f5 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/AttendanceRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRemote.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.repositories.remote
+package io.github.wulkanowy.data.repositories.attendance
 
 import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.data.db.entities.Attendance
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/AttendanceRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRepository.kt
similarity index 89%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/AttendanceRepository.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRepository.kt
index eb7230ae5..85102b3c5 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/AttendanceRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRepository.kt
@@ -1,13 +1,12 @@
-package io.github.wulkanowy.data.repositories
+package io.github.wulkanowy.data.repositories.attendance
 
 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.repositories.local.AttendanceLocal
-import io.github.wulkanowy.data.repositories.remote.AttendanceRemote
 import io.github.wulkanowy.utils.friday
 import io.github.wulkanowy.utils.monday
+import io.github.wulkanowy.utils.uniqueSubtract
 import io.reactivex.Single
 import org.threeten.bp.LocalDate
 import java.net.UnknownHostException
@@ -33,8 +32,8 @@ class AttendanceRepository @Inject constructor(
                         local.getAttendance(semester, dates.first, dates.second)
                             .toSingle(emptyList())
                             .doOnSuccess { oldAttendance ->
-                                local.deleteAttendance(oldAttendance - newAttendance)
-                                local.saveAttendance(newAttendance - oldAttendance)
+                                local.deleteAttendance(oldAttendance.uniqueSubtract(newAttendance))
+                                local.saveAttendance(newAttendance.uniqueSubtract(oldAttendance))
                             }
                     }.flatMap {
                         local.getAttendance(semester, dates.first, dates.second)
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/local/AttendanceSummaryLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryLocal.kt
similarity index 82%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/local/AttendanceSummaryLocal.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryLocal.kt
index 2bb9f1220..2e9a10067 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/local/AttendanceSummaryLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryLocal.kt
@@ -1,17 +1,15 @@
-package io.github.wulkanowy.data.repositories.local
+package io.github.wulkanowy.data.repositories.attendancesummary
 
 import io.github.wulkanowy.data.db.dao.AttendanceSummaryDao
 import io.github.wulkanowy.data.db.entities.AttendanceSummary
 import io.github.wulkanowy.data.db.entities.Semester
 import io.reactivex.Maybe
 import javax.inject.Inject
+import javax.inject.Singleton
 
+@Singleton
 class AttendanceSummaryLocal @Inject constructor(private val attendanceDb: AttendanceSummaryDao) {
 
-    fun getAttendanceSummary(semester: Semester, subjectId: Int): Maybe<List<AttendanceSummary>> {
-        return attendanceDb.loadAll(semester.diaryId, semester.studentId, subjectId).filter { !it.isEmpty() }
-    }
-
     fun saveAttendanceSummary(attendance: List<AttendanceSummary>) {
         attendanceDb.insertAll(attendance)
     }
@@ -19,4 +17,8 @@ class AttendanceSummaryLocal @Inject constructor(private val attendanceDb: Atten
     fun deleteAttendanceSummary(attendance: List<AttendanceSummary>) {
         attendanceDb.deleteAll(attendance)
     }
+
+    fun getAttendanceSummary(semester: Semester, subjectId: Int): Maybe<List<AttendanceSummary>> {
+        return attendanceDb.loadAll(semester.diaryId, semester.studentId, subjectId).filter { it.isNotEmpty() }
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/AttendanceSummaryRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRemote.kt
similarity index 95%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/remote/AttendanceSummaryRemote.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRemote.kt
index 079eb4b8e..d38dd3a4b 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/AttendanceSummaryRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRemote.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.repositories.remote
+package io.github.wulkanowy.data.repositories.attendancesummary
 
 import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.data.db.entities.AttendanceSummary
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/AttendanceSummaryRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRepository.kt
similarity index 80%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/AttendanceSummaryRepository.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRepository.kt
index 8e21b12c6..c65870508 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/AttendanceSummaryRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRepository.kt
@@ -1,11 +1,10 @@
-package io.github.wulkanowy.data.repositories
+package io.github.wulkanowy.data.repositories.attendancesummary
 
 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.repositories.local.AttendanceSummaryLocal
-import io.github.wulkanowy.data.repositories.remote.AttendanceSummaryRemote
+import io.github.wulkanowy.utils.uniqueSubtract
 import io.reactivex.Single
 import java.net.UnknownHostException
 import javax.inject.Inject
@@ -18,7 +17,7 @@ class AttendanceSummaryRepository @Inject constructor(
     private val remote: AttendanceSummaryRemote
 ) {
 
-    fun getAttendanceSummary(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 {
@@ -27,8 +26,8 @@ class AttendanceSummaryRepository @Inject constructor(
                 }.flatMap { new ->
                     local.getAttendanceSummary(semester, subjectId).toSingle(emptyList())
                         .doOnSuccess { old ->
-                            local.deleteAttendanceSummary(old - new)
-                            local.saveAttendanceSummary(new - old)
+                            local.deleteAttendanceSummary(old.uniqueSubtract(new))
+                            local.saveAttendanceSummary(new.uniqueSubtract(old))
                         }
                 }.flatMap { local.getAttendanceSummary(semester, subjectId).toSingle(emptyList()) })
     }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsLocal.kt
new file mode 100644
index 000000000..9b275908e
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsLocal.kt
@@ -0,0 +1,25 @@
+package io.github.wulkanowy.data.repositories.completedlessons
+
+import io.github.wulkanowy.data.db.dao.CompletedLessonsDao
+import io.github.wulkanowy.data.db.entities.CompletedLesson
+import io.github.wulkanowy.data.db.entities.Semester
+import io.reactivex.Maybe
+import org.threeten.bp.LocalDate
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class CompletedLessonsLocal @Inject constructor(private val completedLessonsDb: CompletedLessonsDao) {
+
+    fun saveCompletedLessons(completedLessons: List<CompletedLesson>) {
+        completedLessonsDb.insertAll(completedLessons)
+    }
+
+    fun deleteCompleteLessons(completedLessons: List<CompletedLesson>) {
+        completedLessonsDb.deleteAll(completedLessons)
+    }
+
+    fun getCompletedLessons(semester: Semester, start: LocalDate, end: LocalDate): Maybe<List<CompletedLesson>> {
+        return completedLessonsDb.loadAll(semester.diaryId, semester.studentId, start, end).filter { it.isNotEmpty() }
+    }
+}
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
new file mode 100644
index 000000000..58dd5a9d1
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRemote.kt
@@ -0,0 +1,37 @@
+package io.github.wulkanowy.data.repositories.completedlessons
+
+import io.github.wulkanowy.api.Api
+import io.github.wulkanowy.api.toLocalDate
+import io.github.wulkanowy.data.db.entities.CompletedLesson
+import io.github.wulkanowy.data.db.entities.Semester
+import io.reactivex.Single
+import org.threeten.bp.LocalDate
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class CompletedLessonsRemote @Inject constructor(private val api: Api) {
+
+    fun getCompletedLessons(semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<CompletedLesson>> {
+        return Single.just(api.apply { diaryId = semester.diaryId })
+            .flatMap { it.getCompletedLessons(startDate, endDate) }
+            .map { lessons ->
+                lessons.map {
+                    it.absence
+                    CompletedLesson(
+                        studentId = semester.studentId,
+                        diaryId = semester.diaryId,
+                        date = it.date.toLocalDate(),
+                        number = it.number,
+                        subject = it.subject,
+                        topic = it.topic,
+                        teacher = it.teacher,
+                        teacherSymbol = it.teacherSymbol,
+                        substitution = it.substitution,
+                        absence = it.absence,
+                        resources = it.resources
+                    )
+                }
+            }
+    }
+}
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
new file mode 100644
index 000000000..c22fabc39
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRepository.kt
@@ -0,0 +1,44 @@
+package io.github.wulkanowy.data.repositories.completedlessons
+
+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.utils.friday
+import io.github.wulkanowy.utils.monday
+import io.github.wulkanowy.utils.uniqueSubtract
+import io.reactivex.Single
+import org.threeten.bp.LocalDate
+import java.net.UnknownHostException
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class CompletedLessonsRepository @Inject constructor(
+    private val settings: InternetObservingSettings,
+    private val local: CompletedLessonsLocal,
+    private val remote: CompletedLessonsRemote
+) {
+
+    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/local/ExamLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamLocal.kt
similarity index 88%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/local/ExamLocal.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamLocal.kt
index 3e32a6357..0f484d323 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/local/ExamLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamLocal.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.repositories.local
+package io.github.wulkanowy.data.repositories.exam
 
 import io.github.wulkanowy.data.db.dao.ExamDao
 import io.github.wulkanowy.data.db.entities.Exam
@@ -6,7 +6,9 @@ import io.github.wulkanowy.data.db.entities.Semester
 import io.reactivex.Maybe
 import org.threeten.bp.LocalDate
 import javax.inject.Inject
+import javax.inject.Singleton
 
+@Singleton
 class ExamLocal @Inject constructor(private val examDb: ExamDao) {
 
     fun getExams(semester: Semester, startDate: LocalDate, endDate: LocalDate): Maybe<List<Exam>> {
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/ExamRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRemote.kt
similarity index 92%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/remote/ExamRemote.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRemote.kt
index 3937b768d..f6d653a61 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/ExamRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRemote.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.repositories.remote
+package io.github.wulkanowy.data.repositories.exam
 
 import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.data.db.entities.Exam
@@ -7,7 +7,9 @@ import io.github.wulkanowy.utils.toLocalDate
 import io.reactivex.Single
 import org.threeten.bp.LocalDate
 import javax.inject.Inject
+import javax.inject.Singleton
 
+@Singleton
 class ExamRemote @Inject constructor(private val api: Api) {
 
     fun getExams(semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<Exam>> {
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/ExamRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRepository.kt
similarity index 80%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/ExamRepository.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRepository.kt
index cb78df53d..be60eaecd 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/ExamRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRepository.kt
@@ -1,13 +1,12 @@
-package io.github.wulkanowy.data.repositories
+package io.github.wulkanowy.data.repositories.exam
 
 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.repositories.local.ExamLocal
-import io.github.wulkanowy.data.repositories.remote.ExamRemote
 import io.github.wulkanowy.utils.friday
 import io.github.wulkanowy.utils.monday
+import io.github.wulkanowy.utils.uniqueSubtract
 import io.reactivex.Single
 import org.threeten.bp.LocalDate
 import java.net.UnknownHostException
@@ -29,12 +28,12 @@ class ExamRepository @Inject constructor(
                         .flatMap {
                             if (it) remote.getExams(semester, dates.first, dates.second)
                             else Single.error(UnknownHostException())
-                        }.flatMap { newExams ->
+                        }.flatMap { new ->
                             local.getExams(semester, dates.first, dates.second)
                                 .toSingle(emptyList())
-                                .doOnSuccess { oldExams ->
-                                    local.deleteExams(oldExams - newExams)
-                                    local.saveExams(newExams - oldExams)
+                                .doOnSuccess { old ->
+                                    local.deleteExams(old.uniqueSubtract(new))
+                                    local.saveExams(new.uniqueSubtract(old))
                                 }
                         }.flatMap {
                             local.getExams(semester, dates.first, dates.second)
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/local/GradeLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeLocal.kt
similarity index 55%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/local/GradeLocal.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeLocal.kt
index d6d46340f..4983a4740 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/local/GradeLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeLocal.kt
@@ -1,9 +1,8 @@
-package io.github.wulkanowy.data.repositories.local
+package io.github.wulkanowy.data.repositories.grade
 
 import io.github.wulkanowy.data.db.dao.GradeDao
 import io.github.wulkanowy.data.db.entities.Grade
 import io.github.wulkanowy.data.db.entities.Semester
-import io.reactivex.Completable
 import io.reactivex.Maybe
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -11,27 +10,19 @@ import javax.inject.Singleton
 @Singleton
 class GradeLocal @Inject constructor(private val gradeDb: GradeDao) {
 
-    fun getGrades(semester: Semester): Maybe<List<Grade>> {
-        return gradeDb.loadAll(semester.semesterId, semester.studentId).filter { !it.isEmpty() }
-    }
-
-    fun getNewGrades(semester: Semester): Maybe<List<Grade>> {
-        return gradeDb.loadAllNew(semester.semesterId, semester.studentId)
-    }
-
     fun saveGrades(grades: List<Grade>) {
         gradeDb.insertAll(grades)
     }
 
-    fun updateGrade(grade: Grade): Completable {
-        return Completable.fromCallable { gradeDb.update(grade) }
-    }
-
-    fun updateGrades(grades: List<Grade>): Completable {
-        return Completable.fromCallable { gradeDb.updateAll(grades) }
-    }
-
     fun deleteGrades(grades: List<Grade>) {
         gradeDb.deleteAll(grades)
     }
+
+    fun updateGrades(grades: List<Grade>) {
+        gradeDb.updateAll(grades)
+    }
+
+    fun getGrades(semester: Semester): Maybe<List<Grade>> {
+        return gradeDb.loadAll(semester.semesterId, semester.studentId).filter { it.isNotEmpty() }
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/GradeRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRemote.kt
similarity index 87%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/remote/GradeRemote.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRemote.kt
index df3bf4d28..570ab7a77 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/GradeRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRemote.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.repositories.remote
+package io.github.wulkanowy.data.repositories.grade
 
 import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.data.db.entities.Grade
@@ -25,8 +25,8 @@ class GradeRemote @Inject constructor(private val api: Api) {
                         modifier = it.modifier,
                         comment = it.comment,
                         color = it.color,
-                        gradeSymbol = it.symbol ?: "",
-                        description = it.description,
+                        gradeSymbol = it.symbol.orEmpty(),
+                        description = it.description.orEmpty(),
                         weight = it.weight,
                         weightValue = it.weightValue,
                         date = it.date.toLocalDate(),
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
new file mode 100644
index 000000000..7f8e92a2e
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRepository.kt
@@ -0,0 +1,59 @@
+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.Semester
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.utils.uniqueSubtract
+import io.reactivex.Completable
+import io.reactivex.Single
+import java.net.UnknownHostException
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class GradeRepository @Inject constructor(
+    private val settings: InternetObservingSettings,
+    private val local: GradeLocal,
+    private val remote: GradeRemote
+) {
+
+    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.getGrades(semester).map { it.filter { grade -> !grade.isRead } }.toSingle(emptyList())
+    }
+
+    fun getNotNotifiedGrades(semester: Semester): Single<List<Grade>> {
+        return local.getGrades(semester).map { it.filter { grade -> !grade.isNotified } }.toSingle(emptyList())
+    }
+
+    fun updateGrade(grade: Grade): Completable {
+        return Completable.fromCallable { local.updateGrades(listOf(grade)) }
+    }
+
+    fun updateGrades(grades: List<Grade>): Completable {
+        return Completable.fromCallable { local.updateGrades(grades) }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/local/GradeSummaryLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryLocal.kt
similarity index 87%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/local/GradeSummaryLocal.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryLocal.kt
index 6a72416d2..e74641d3a 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/local/GradeSummaryLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryLocal.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.repositories.local
+package io.github.wulkanowy.data.repositories.gradessummary
 
 import io.github.wulkanowy.data.db.dao.GradeSummaryDao
 import io.github.wulkanowy.data.db.entities.GradeSummary
@@ -10,11 +10,6 @@ import javax.inject.Singleton
 @Singleton
 class GradeSummaryLocal @Inject constructor(private val gradeSummaryDb: GradeSummaryDao) {
 
-    fun getGradesSummary(semester: Semester): Maybe<List<GradeSummary>> {
-        return gradeSummaryDb.loadAll(semester.semesterId, semester.studentId)
-                .filter { !it.isEmpty() }
-    }
-
     fun saveGradesSummary(gradesSummary: List<GradeSummary>) {
         gradeSummaryDb.insertAll(gradesSummary)
     }
@@ -22,4 +17,8 @@ class GradeSummaryLocal @Inject constructor(private val gradeSummaryDb: GradeSum
     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/remote/GradeSummaryRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryRemote.kt
similarity index 94%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/remote/GradeSummaryRemote.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryRemote.kt
index af45ca737..d395decf8 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/GradeSummaryRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryRemote.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.repositories.remote
+package io.github.wulkanowy.data.repositories.gradessummary
 
 import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.data.db.entities.GradeSummary
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/GradeSummaryRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryRepository.kt
similarity index 71%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/GradeSummaryRepository.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryRepository.kt
index a59a2cd54..660a032c2 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/GradeSummaryRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryRepository.kt
@@ -1,11 +1,10 @@
-package io.github.wulkanowy.data.repositories
+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.data.repositories.local.GradeSummaryLocal
-import io.github.wulkanowy.data.repositories.remote.GradeSummaryRemote
+import io.github.wulkanowy.utils.uniqueSubtract
 import io.reactivex.Single
 import java.net.UnknownHostException
 import javax.inject.Inject
@@ -24,11 +23,11 @@ class GradeSummaryRepository @Inject constructor(
                 .flatMap {
                     if (it) remote.getGradeSummary(semester)
                     else Single.error(UnknownHostException())
-                }.flatMap { newGradesSummary ->
+                }.flatMap { new ->
                     local.getGradesSummary(semester).toSingle(emptyList())
-                        .doOnSuccess { oldGradesSummary ->
-                            local.deleteGradesSummary(oldGradesSummary - newGradesSummary)
-                            local.saveGradesSummary(newGradesSummary - oldGradesSummary)
+                        .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
new file mode 100644
index 000000000..581ac2f81
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsLocal.kt
@@ -0,0 +1,34 @@
+package io.github.wulkanowy.data.repositories.gradestatistics
+
+import io.github.wulkanowy.data.db.dao.GradeStatisticsDao
+import io.github.wulkanowy.data.db.entities.GradeStatistics
+import io.github.wulkanowy.data.db.entities.Semester
+import io.reactivex.Maybe
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class GradeStatisticsLocal @Inject constructor(private val gradeStatisticsDb: GradeStatisticsDao) {
+
+    fun getGradesStatistics(semester: Semester, isSemester: Boolean): Maybe<List<GradeStatistics>> {
+        return gradeStatisticsDb.loadAll(semester.semesterId, semester.studentId, isSemester)
+            .filter { !it.isEmpty() }
+    }
+
+    fun getGradesStatistics(semester: Semester, isSemester: Boolean, subjectName: String): Maybe<List<GradeStatistics>> {
+        return (if ("Wszystkie" == subjectName) gradeStatisticsDb.loadAll(semester.semesterId, semester.studentId, isSemester).map { list ->
+            list.groupBy { it.grade }.map {
+                GradeStatistics(semester.studentId, semester.semesterId, subjectName, it.key, it.value.fold(0) { acc, e -> acc + e.amount }, false)
+            }
+        }
+        else gradeStatisticsDb.loadSubject(semester.semesterId, semester.studentId, subjectName, isSemester)).filter { !it.isEmpty() }
+    }
+
+    fun saveGradesStatistics(gradesStatistics: List<GradeStatistics>) {
+        gradeStatisticsDb.insertAll(gradesStatistics)
+    }
+
+    fun deleteGradesStatistics(gradesStatistics: List<GradeStatistics>) {
+        gradeStatisticsDb.deleteAll(gradesStatistics)
+    }
+}
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
new file mode 100644
index 000000000..fa3b951f6
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRemote.kt
@@ -0,0 +1,29 @@
+package io.github.wulkanowy.data.repositories.gradestatistics
+
+import io.github.wulkanowy.api.Api
+import io.github.wulkanowy.data.db.entities.GradeStatistics
+import io.github.wulkanowy.data.db.entities.Semester
+import io.reactivex.Single
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class GradeStatisticsRemote @Inject constructor(private val api: Api) {
+
+    fun getGradeStatistics(semester: Semester, isSemester: Boolean): Single<List<GradeStatistics>> {
+        return Single.just(api.apply { diaryId = semester.diaryId })
+            .flatMap { it.getGradesStatistics(semester.semesterId, isSemester) }
+            .map { gradeStatistics ->
+                gradeStatistics.map {
+                    GradeStatistics(
+                        semesterId = semester.semesterId,
+                        studentId = semester.studentId,
+                        subject = it.subject,
+                        grade = it.gradeValue,
+                        amount = it.amount ?: 0,
+                        semester = isSemester
+                    )
+                }
+            }
+    }
+}
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
new file mode 100644
index 000000000..9617cdd64
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRepository.kt
@@ -0,0 +1,34 @@
+package io.github.wulkanowy.data.repositories.gradestatistics
+
+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.GradeStatistics
+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 GradeStatisticsRepository @Inject constructor(
+    private val settings: InternetObservingSettings,
+    private val local: GradeStatisticsLocal,
+    private val remote: GradeStatisticsRemote
+) {
+
+    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(semester, isSemester)
+                    else Single.error(UnknownHostException())
+                }.flatMap { new ->
+                    local.getGradesStatistics(semester, isSemester).toSingle(emptyList())
+                        .doOnSuccess { old ->
+                            local.deleteGradesStatistics(old.uniqueSubtract(new))
+                            local.saveGradesStatistics(new.uniqueSubtract(old))
+                        }
+                }.flatMap { local.getGradesStatistics(semester, isSemester, subjectName).toSingle(emptyList()) })
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/local/HomeworkLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkLocal.kt
similarity index 73%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/local/HomeworkLocal.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkLocal.kt
index ea18d8145..671ecafd7 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/local/HomeworkLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkLocal.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.repositories.local
+package io.github.wulkanowy.data.repositories.homework
 
 import io.github.wulkanowy.data.db.dao.HomeworkDao
 import io.github.wulkanowy.data.db.entities.Homework
@@ -11,10 +11,6 @@ import javax.inject.Singleton
 @Singleton
 class HomeworkLocal @Inject constructor(private val homeworkDb: HomeworkDao) {
 
-    fun getHomework(semester: Semester, date: LocalDate): Maybe<List<Homework>> {
-        return homeworkDb.loadAll(semester.semesterId, semester.studentId, date).filter { !it.isEmpty() }
-    }
-
     fun saveHomework(homework: List<Homework>) {
         homeworkDb.insertAll(homework)
     }
@@ -22,4 +18,9 @@ class HomeworkLocal @Inject constructor(private val homeworkDb: HomeworkDao) {
     fun deleteHomework(homework: List<Homework>) {
         homeworkDb.deleteAll(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/remote/HomeworkRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRemote.kt
similarity index 82%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/remote/HomeworkRemote.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRemote.kt
index 0fdc02512..681b66469 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/HomeworkRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRemote.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.repositories.remote
+package io.github.wulkanowy.data.repositories.homework
 
 import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.data.db.entities.Homework
@@ -12,9 +12,9 @@ import javax.inject.Singleton
 @Singleton
 class HomeworkRemote @Inject constructor(private val api: Api) {
 
-    fun getHomework(semester: Semester, date: LocalDate): Single<List<Homework>> {
+    fun getHomework(semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<Homework>> {
         return Single.just(api.apply { diaryId = semester.diaryId })
-            .flatMap { it.getHomework(date, date) }
+            .flatMap { it.getHomework(startDate, endDate) }
             .map { homework ->
                 homework.map {
                     Homework(
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
new file mode 100644
index 000000000..3f924944d
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRepository.kt
@@ -0,0 +1,39 @@
+package io.github.wulkanowy.data.repositories.homework
+
+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.utils.friday
+import io.github.wulkanowy.utils.monday
+import io.github.wulkanowy.utils.uniqueSubtract
+import io.reactivex.Single
+import org.threeten.bp.LocalDate
+import java.net.UnknownHostException
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class HomeworkRepository @Inject constructor(
+    private val settings: InternetObservingSettings,
+    private val local: HomeworkLocal,
+    private val remote: HomeworkRemote
+) {
+
+    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(semester, monday, friday)
+                        else Single.error(UnknownHostException())
+                    }.flatMap { new ->
+                        local.getHomework(semester, monday, friday).toSingle(emptyList())
+                            .doOnSuccess { old ->
+                                local.deleteHomework(old.uniqueSubtract(new))
+                                local.saveHomework(new.uniqueSubtract(old))
+                            }
+                    }.flatMap { local.getHomework(semester, monday, friday).toSingle(emptyList()) })
+        }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/local/MessagesLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/local/MessagesLocal.kt
deleted file mode 100644
index 531cd8b0d..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/local/MessagesLocal.kt
+++ /dev/null
@@ -1,44 +0,0 @@
-package io.github.wulkanowy.data.repositories.local
-
-import io.github.wulkanowy.data.db.dao.MessagesDao
-import io.github.wulkanowy.data.db.entities.Message
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.repositories.MessagesRepository
-import io.reactivex.Maybe
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class MessagesLocal @Inject constructor(private val messagesDb: MessagesDao) {
-
-    fun getMessage(studentId: Int, id: Int): Maybe<Message> {
-        return messagesDb.loadOne(studentId, id)
-    }
-
-    fun getMessages(studentId: Int, folder: MessagesRepository.MessageFolder): Maybe<List<Message>> {
-        return when (folder) {
-            MessagesRepository.MessageFolder.TRASHED -> messagesDb.loadDeleted(studentId)
-            else -> messagesDb.load(studentId, folder.id)
-        }.filter { !it.isEmpty() }
-    }
-
-    fun getNewMessages(student: Student): Maybe<List<Message>> {
-        return messagesDb.loadNewMessages(student.studentId)
-    }
-
-    fun saveMessages(messages: List<Message>): List<Long> {
-        return messagesDb.insertAll(messages)
-    }
-
-    fun updateMessage(message: Message) {
-        return messagesDb.update(message)
-    }
-
-    fun updateMessages(messages: List<Message>) {
-        return messagesDb.updateAll(messages)
-    }
-
-    fun deleteMessages(messages: List<Message>) {
-        messagesDb.deleteAll(messages)
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/local/NoteLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/local/NoteLocal.kt
deleted file mode 100644
index 543eab9b3..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/local/NoteLocal.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-package io.github.wulkanowy.data.repositories.local
-
-import io.github.wulkanowy.data.db.dao.NoteDao
-import io.github.wulkanowy.data.db.entities.Note
-import io.github.wulkanowy.data.db.entities.Semester
-import io.reactivex.Completable
-import io.reactivex.Maybe
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class NoteLocal @Inject constructor(private val noteDb: NoteDao) {
-
-    fun getNotes(semester: Semester): Maybe<List<Note>> {
-        return noteDb.loadAll(semester.semesterId, semester.studentId).filter { !it.isEmpty() }
-    }
-
-    fun getNewNotes(semester: Semester): Maybe<List<Note>> {
-        return noteDb.loadNew(semester.semesterId, semester.studentId)
-    }
-
-    fun saveNotes(notes: List<Note>) {
-        noteDb.insertAll(notes)
-    }
-
-    fun updateNote(note: Note): Completable {
-        return Completable.fromCallable { noteDb.update(note) }
-    }
-
-    fun updateNotes(notes: List<Note>): Completable {
-        return Completable.fromCallable { noteDb.updateAll(notes) }
-    }
-
-    fun deleteNotes(notes: List<Note>) {
-        noteDb.deleteAll(notes)
-    }
-}
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
new file mode 100644
index 000000000..115c89652
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberLocal.kt
@@ -0,0 +1,29 @@
+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.Semester
+import io.reactivex.Maybe
+import org.threeten.bp.LocalDate
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class LuckyNumberLocal @Inject constructor(private val luckyNumberDb: LuckyNumberDao) {
+
+    fun saveLuckyNumber(luckyNumber: LuckyNumber) {
+        luckyNumberDb.insert(luckyNumber)
+    }
+
+    fun updateLuckyNumber(luckyNumber: LuckyNumber) {
+        luckyNumberDb.update(luckyNumber)
+    }
+
+    fun deleteLuckyNumber(luckyNumber: LuckyNumber) {
+        luckyNumberDb.delete(luckyNumber)
+    }
+
+    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
new file mode 100644
index 000000000..1b0f12b3e
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRemote.kt
@@ -0,0 +1,26 @@
+package io.github.wulkanowy.data.repositories.luckynumber
+
+import io.github.wulkanowy.api.Api
+import io.github.wulkanowy.data.db.entities.LuckyNumber
+import io.github.wulkanowy.data.db.entities.Semester
+import io.reactivex.Maybe
+import io.reactivex.Single
+import org.threeten.bp.LocalDate
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class LuckyNumberRemote @Inject constructor(private val api: Api) {
+
+    fun getLuckyNumber(semester: Semester): Maybe<LuckyNumber> {
+        return Single.just(api.apply { diaryId = semester.diaryId })
+            .flatMapMaybe { it.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
new file mode 100644
index 000000000..4036521f7
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRepository.kt
@@ -0,0 +1,54 @@
+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.Semester
+import io.reactivex.Completable
+import io.reactivex.Maybe
+import org.threeten.bp.LocalDate
+import java.net.UnknownHostException
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class LuckyNumberRepository @Inject constructor(
+    private val settings: InternetObservingSettings,
+    private val local: LuckyNumberLocal,
+    private val remote: LuckyNumberRemote
+) {
+
+    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(semester)
+                    else Maybe.error(UnknownHostException())
+                }.flatMap { new ->
+                    local.getLuckyNumber(semester, LocalDate.now())
+                        .doOnSuccess { old ->
+                            if (new != old) {
+                                local.deleteLuckyNumber(old)
+                                local.saveLuckyNumber(new.apply {
+                                    if (notify) isNotified = false
+                                })
+                            }
+                        }
+                        .doOnComplete {
+                            local.saveLuckyNumber(new.apply {
+                                if (notify) isNotified = false
+                            })
+                        }
+                }.flatMap({ local.getLuckyNumber(semester, LocalDate.now()) }, { Maybe.error(it) },
+                    { local.getLuckyNumber(semester, LocalDate.now()) })
+            )
+    }
+
+    fun getNotNotifiedLuckyNumber(semester: Semester): Maybe<LuckyNumber> {
+        return local.getLuckyNumber(semester, LocalDate.now()).filter { !it.isNotified }
+    }
+
+    fun updateLuckyNumber(luckyNumber: LuckyNumber): Completable {
+        return Completable.fromCallable { local.updateLuckyNumber(luckyNumber) }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageFolder.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageFolder.kt
new file mode 100644
index 000000000..06f5a1e05
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageFolder.kt
@@ -0,0 +1,7 @@
+package io.github.wulkanowy.data.repositories.message
+
+enum class MessageFolder(val id: Int = 1) {
+    RECEIVED(1),
+    SENT(2),
+    TRASHED(3)
+}
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
new file mode 100644
index 000000000..ce08d13ec
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageLocal.kt
@@ -0,0 +1,36 @@
+package io.github.wulkanowy.data.repositories.message
+
+import io.github.wulkanowy.data.db.dao.MessagesDao
+import io.github.wulkanowy.data.db.entities.Message
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.repositories.message.MessageFolder.TRASHED
+import io.reactivex.Maybe
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class MessageLocal @Inject constructor(private val messagesDb: MessagesDao) {
+
+    fun saveMessages(messages: List<Message>) {
+        messagesDb.insertAll(messages)
+    }
+
+    fun updateMessages(messages: List<Message>) {
+        messagesDb.updateAll(messages)
+    }
+
+    fun deleteMessages(messages: List<Message>) {
+        messagesDb.deleteAll(messages)
+    }
+
+    fun getMessage(id: Long): Maybe<Message> {
+        return messagesDb.load(id)
+    }
+
+    fun getMessages(student: Student, folder: MessageFolder): Maybe<List<Message>> {
+        return when (folder) {
+            TRASHED -> messagesDb.loadDeleted(student.id.toInt())
+            else -> messagesDb.loadAll(student.id.toInt(), folder.id)
+        }.filter { it.isNotEmpty() }
+    }
+}
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
new file mode 100644
index 000000000..b2bff1e77
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRemote.kt
@@ -0,0 +1,66 @@
+package io.github.wulkanowy.data.repositories.message
+
+import io.github.wulkanowy.api.Api
+import io.github.wulkanowy.api.messages.Folder
+import io.github.wulkanowy.api.messages.SentMessage
+import io.github.wulkanowy.data.db.entities.Message
+import io.github.wulkanowy.data.db.entities.Recipient
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.utils.toLocalDateTime
+import io.reactivex.Single
+import org.threeten.bp.LocalDateTime.now
+import javax.inject.Inject
+import javax.inject.Singleton
+import io.github.wulkanowy.api.messages.Message as ApiMessage
+import io.github.wulkanowy.api.messages.Recipient as ApiRecipient
+
+@Singleton
+class MessageRemote @Inject constructor(private val api: Api) {
+
+    fun getMessages(student: Student, folder: MessageFolder): Single<List<Message>> {
+        return api.getMessages(Folder.valueOf(folder.name)).map { messages ->
+            messages.map {
+                Message(
+                    studentId = student.id.toInt(),
+                    realId = it.id ?: 0,
+                    messageId = it.messageId ?: 0,
+                    sender = it.sender.orEmpty(),
+                    senderId = it.senderId ?: 0,
+                    recipient = it.recipient.orEmpty(),
+                    subject = it.subject.trim(),
+                    date = it.date?.toLocalDateTime() ?: now(),
+                    folderId = it.folderId,
+                    unread = it.unread ?: false,
+                    unreadBy = it.unreadBy ?: 0,
+                    readBy = it.readBy ?: 0,
+                    removed = it.removed
+                )
+            }
+        }
+    }
+
+    fun getMessagesContent(message: Message, markAsRead: Boolean = false): Single<String> {
+        return api.getMessageContent(message.messageId, message.folderId, markAsRead, message.realId)
+    }
+
+    fun sendMessage(subject: String, content: String, recipients: List<Recipient>): Single<SentMessage> {
+        return api.sendMessage(
+            subject = subject,
+            content = content,
+            recipients = recipients.map {
+                ApiRecipient(
+                    id = it.realId,
+                    name = it.realName,
+                    loginId = it.loginId,
+                    reportingUnitId = it.unitId,
+                    role = it.role,
+                    hash = it.hash
+                )
+            }
+        )
+    }
+
+    fun deleteMessage(message: Message): Single<Boolean> {
+        return api.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
new file mode 100644
index 000000000..c10cd5181
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRepository.kt
@@ -0,0 +1,110 @@
+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.api.messages.SentMessage
+import io.github.wulkanowy.data.ApiHelper
+import io.github.wulkanowy.data.db.entities.Message
+import io.github.wulkanowy.data.db.entities.Recipient
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.repositories.message.MessageFolder.RECEIVED
+import io.github.wulkanowy.utils.uniqueSubtract
+import io.reactivex.Completable
+import io.reactivex.Maybe
+import io.reactivex.Single
+import java.net.UnknownHostException
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class MessageRepository @Inject constructor(
+    private val settings: InternetObservingSettings,
+    private val local: MessageLocal,
+    private val remote: MessageRemote,
+    private val apiHelper: ApiHelper
+) {
+
+    fun getMessages(student: Student, folder: MessageFolder, forceRefresh: Boolean = false, notify: Boolean = false): Single<List<Message>> {
+        return Single.just(apiHelper.initApi(student))
+            .flatMap { _ ->
+                local.getMessages(student, folder).filter { !forceRefresh }
+                    .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                        .flatMap {
+                            if (it) remote.getMessages(student, 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, messageDbId: Long, markAsRead: Boolean = false): Single<Message> {
+        return Single.just(apiHelper.initApi(student))
+            .flatMap { _ ->
+                local.getMessage(messageDbId)
+                    .filter { !it.content.isNullOrEmpty() }
+                    .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 = it
+                                }))
+                            }
+                        }.flatMap {
+                            local.getMessage(messageDbId).toSingle()
+                        }
+                    )
+            }
+    }
+
+    fun getNotNotifiedMessages(student: Student): Single<List<Message>> {
+        return local.getMessages(student, RECEIVED)
+            .map { it.filter { message -> !message.isNotified && message.unread } }
+            .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(subject: String, content: String, recipients: List<Recipient>): Single<SentMessage> {
+        return ReactiveNetwork.checkInternetConnectivity(settings)
+            .flatMap {
+                if (it) remote.sendMessage(subject, content, recipients)
+                else Single.error(UnknownHostException())
+            }
+    }
+
+    fun deleteMessage(message: Message): Maybe<Boolean> {
+        return ReactiveNetwork.checkInternetConnectivity(settings)
+            .flatMap {
+                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
+                    content = message.content
+                }))
+                else local.deleteMessages(listOf(message))
+            }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteLocal.kt
new file mode 100644
index 000000000..784e61f0f
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteLocal.kt
@@ -0,0 +1,28 @@
+package io.github.wulkanowy.data.repositories.note
+
+import io.github.wulkanowy.data.db.dao.NoteDao
+import io.github.wulkanowy.data.db.entities.Note
+import io.github.wulkanowy.data.db.entities.Student
+import io.reactivex.Maybe
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class NoteLocal @Inject constructor(private val noteDb: NoteDao) {
+
+    fun saveNotes(notes: List<Note>) {
+        noteDb.insertAll(notes)
+    }
+
+    fun updateNotes(notes: List<Note>) {
+        noteDb.updateAll(notes)
+    }
+
+    fun deleteNotes(notes: List<Note>) {
+        noteDb.deleteAll(notes)
+    }
+
+    fun getNotes(student: Student): Maybe<List<Note>> {
+        return noteDb.loadAll(student.studentId).filter { it.isNotEmpty() }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/NoteRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRemote.kt
similarity index 89%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/remote/NoteRemote.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRemote.kt
index 31f28e113..aebc6230e 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/NoteRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRemote.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.repositories.remote
+package io.github.wulkanowy.data.repositories.note
 
 import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.data.db.entities.Note
@@ -17,7 +17,6 @@ class NoteRemote @Inject constructor(private val api: Api) {
             .map { notes ->
                 notes.map {
                     Note(
-                        semesterId = semester.semesterId,
                         studentId = semester.studentId,
                         date = it.date.toLocalDate(),
                         teacher = it.teacher,
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
new file mode 100644
index 000000000..52cb2d0f5
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRepository.kt
@@ -0,0 +1,54 @@
+package io.github.wulkanowy.data.repositories.note
+
+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.Note
+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.Completable
+import io.reactivex.Single
+import java.net.UnknownHostException
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class NoteRepository @Inject constructor(
+    private val settings: InternetObservingSettings,
+    private val local: NoteLocal,
+    private val remote: NoteRemote
+) {
+
+    fun getNotes(student: Student, semester: Semester, forceRefresh: Boolean = false, notify: Boolean = false): Single<List<Note>> {
+        return local.getNotes(student).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) remote.getNotes(semester)
+                    else Single.error(UnknownHostException())
+                }.flatMap { new ->
+                    local.getNotes(student).toSingle(emptyList())
+                        .doOnSuccess { old ->
+                            local.deleteNotes(old.uniqueSubtract(new))
+                            local.saveNotes(new.uniqueSubtract(old)
+                                .onEach {
+                                    if (it.date >= student.registrationDate.toLocalDate()) it.apply {
+                                        isRead = false
+                                        if (notify) isNotified = false
+                                    }
+                                })
+                        }
+                }.flatMap { local.getNotes(student).toSingle(emptyList()) })
+    }
+
+    fun getNotNotifiedNotes(student: Student): Single<List<Note>> {
+        return local.getNotes(student).map { it.filter { note -> !note.isNotified } }.toSingle(emptyList())
+    }
+
+    fun updateNote(note: Note): Completable {
+        return Completable.fromCallable { local.updateNotes(listOf(note)) }
+    }
+
+    fun updateNotes(notes: List<Note>): Completable {
+        return Completable.fromCallable { local.updateNotes(notes) }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/preferences/PreferencesRepository.kt
similarity index 56%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/preferences/PreferencesRepository.kt
index d83ae667d..91717ed77 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/preferences/PreferencesRepository.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.repositories
+package io.github.wulkanowy.data.repositories.preferences
 
 import android.content.Context
 import android.content.SharedPreferences
@@ -12,31 +12,31 @@ class PreferencesRepository @Inject constructor(
     val context: Context
 ) {
     val startMenuIndex: Int
-        get() = sharedPref.getString(context.getString(R.string.pref_key_start_menu), "0")?.toInt() ?: 0
+        get() = sharedPref.getString(context.getString(R.string.pref_key_start_menu), "0")?.toIntOrNull() ?: 0
 
     val isShowPresent: Boolean
         get() = sharedPref.getBoolean(context.getString(R.string.pref_key_attendance_present), true)
 
+    val gradeAverageMode: String
+        get() = sharedPref.getString(context.getString(R.string.pref_key_grade_average_mode), "only_one_semester") ?: "only_one_semester"
+
     val isGradeExpandable: Boolean
         get() = !sharedPref.getBoolean(context.getString(R.string.pref_key_expand_grade), false)
 
-    val currentThemeKey: String = context.getString(R.string.pref_key_theme)
-    val currentTheme: Int
-        get() = sharedPref.getString(currentThemeKey, "1")?.toInt() ?: 1
+    val appThemeKey: String = context.getString(R.string.pref_key_app_theme)
+    val appTheme: String
+        get() = sharedPref.getString(appThemeKey, "light") ?: "light"
 
-    val gradePlusModifier: Double
-        get() = sharedPref.getString(context.getString(R.string.pref_key_grade_modifier_plus), "0.0")?.toDouble() ?: 0.0
+    val gradeColorTheme: String
+        get() = sharedPref.getString(context.getString(R.string.pref_key_grade_color_scheme), "vulcan") ?: "vulcan"
 
-    val gradeMinusModifier: Double
-        get() = sharedPref.getString(context.getString(R.string.pref_key_grade_modifier_minus), "0.0")?.toDouble() ?: 0.0
-
-    val serviceEnablesKey: String = context.getString(R.string.pref_key_services_enable)
+    val serviceEnableKey: String = context.getString(R.string.pref_key_services_enable)
     val isServiceEnabled: Boolean
-        get() = sharedPref.getBoolean(serviceEnablesKey, true)
+        get() = sharedPref.getBoolean(serviceEnableKey, true)
 
     val servicesIntervalKey: String = context.getString(R.string.pref_key_services_interval)
-    val servicesInterval: Int
-        get() = sharedPref.getString(servicesIntervalKey, "60")?.toInt() ?: 60
+    val servicesInterval: Long
+        get() = sharedPref.getString(servicesIntervalKey, "60")?.toLongOrNull() ?: 60
 
     val servicesOnlyWifiKey: String = context.getString(R.string.pref_key_services_wifi_only)
     val isServicesOnlyWifi: Boolean
@@ -45,7 +45,16 @@ class PreferencesRepository @Inject constructor(
     val isNotificationsEnable: Boolean
         get() = sharedPref.getBoolean(context.getString(R.string.pref_key_notifications_enable), true)
 
-    val isShowChuckerNotificationKey: String = context.getString(R.string.pref_key_debug_chucker_notification)
-    val isShowChuckerNotification: Boolean
-        get() = sharedPref.getBoolean(isShowChuckerNotificationKey, false)
+    val isDebugNotificationEnableKey: String = context.getString(R.string.pref_key_notification_debug)
+    val isDebugNotificationEnable: Boolean
+        get() = sharedPref.getBoolean(isDebugNotificationEnableKey, false)
+
+    val gradePlusModifier: Double
+        get() = sharedPref.getString(context.getString(R.string.pref_key_grade_modifier_plus), "0.0")?.toDouble() ?: 0.0
+
+    val gradeMinusModifier: Double
+        get() = sharedPref.getString(context.getString(R.string.pref_key_grade_modifier_minus), "0.0")?.toDouble() ?: 0.0
+
+    val fillMessageContent: Boolean
+        get() = sharedPref.getBoolean(context.getString(R.string.pref_key_fill_message_content), true)
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientLocal.kt
new file mode 100644
index 000000000..6b8328ec2
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientLocal.kt
@@ -0,0 +1,25 @@
+package io.github.wulkanowy.data.repositories.recipient
+
+import io.github.wulkanowy.data.db.dao.RecipientDao
+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.reactivex.Maybe
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class RecipientLocal @Inject constructor(private val recipientDb: RecipientDao) {
+
+    fun getRecipients(student: Student, role: Int, unit: ReportingUnit): Maybe<List<Recipient>> {
+        return recipientDb.load(student.studentId, role, unit.realId).filter { !it.isEmpty() }
+    }
+
+    fun saveRecipients(recipients: List<Recipient>) {
+        return recipientDb.insertAll(recipients)
+    }
+
+    fun deleteRecipients(recipients: List<Recipient>) {
+        recipientDb.deleteAll(recipients)
+    }
+}
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
new file mode 100644
index 000000000..b726edda9
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientRemote.kt
@@ -0,0 +1,41 @@
+package io.github.wulkanowy.data.repositories.recipient
+
+import io.github.wulkanowy.api.Api
+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.reactivex.Single
+import javax.inject.Inject
+import javax.inject.Singleton
+import io.github.wulkanowy.api.messages.Recipient as ApiRecipient
+
+@Singleton
+class RecipientRemote @Inject constructor(private val api: Api) {
+
+    fun getRecipients(role: Int, unit: ReportingUnit): Single<List<Recipient>> {
+        return api.getRecipients(unit.realId, role)
+            .map { recipients ->
+                recipients.map { it.toRecipient() }
+            }
+    }
+
+    fun getMessageRecipients(message: Message): Single<List<Recipient>> {
+        return api.getMessageRecipients(message.messageId, message.senderId)
+            .map { recipients ->
+                recipients.map { it.toRecipient() }
+            }
+    }
+
+    private fun ApiRecipient.toRecipient(): Recipient {
+        return Recipient(
+            studentId = api.studentId,
+            realId = id,
+            realName = name,
+            name = shortName,
+            hash = hash,
+            loginId = loginId,
+            role = role,
+            unitId = reportingUnitId ?: 0
+        )
+    }
+}
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
new file mode 100644
index 000000000..cde75ea8b
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientRepository.kt
@@ -0,0 +1,53 @@
+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.ApiHelper
+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.utils.uniqueSubtract
+import io.reactivex.Single
+import java.net.UnknownHostException
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class RecipientRepository @Inject constructor(
+    private val settings: InternetObservingSettings,
+    private val local: RecipientLocal,
+    private val remote: RecipientRemote,
+    private val apiHelper: ApiHelper
+) {
+
+    fun getRecipients(student: Student, role: Int, unit: ReportingUnit, forceRefresh: Boolean = false): Single<List<Recipient>> {
+        return Single.just(apiHelper.initApi(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())
+                        }
+                    )
+            }
+    }
+
+    fun getMessageRecipients(student: Student, message: Message): Single<List<Recipient>> {
+        return Single.just(apiHelper.initApi(student))
+            .flatMap { ReactiveNetwork.checkInternetConnectivity(settings) }
+            .flatMap {
+                if (it) remote.getMessageRecipients(message)
+                else Single.error(UnknownHostException())
+            }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/MessagesRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/remote/MessagesRemote.kt
deleted file mode 100644
index bc0f3400a..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/MessagesRemote.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-package io.github.wulkanowy.data.repositories.remote
-
-import io.github.wulkanowy.api.Api
-import io.github.wulkanowy.api.messages.Folder
-import io.github.wulkanowy.data.db.entities.Message
-import io.github.wulkanowy.data.repositories.MessagesRepository
-import io.github.wulkanowy.utils.toLocalDateTime
-import io.reactivex.Single
-import javax.inject.Inject
-import io.github.wulkanowy.api.messages.Message as ApiMessage
-
-class MessagesRemote @Inject constructor(private val api: Api) {
-
-    fun getMessages(studentId: Int, folder: MessagesRepository.MessageFolder): Single<List<Message>> {
-        return api.getMessages(Folder.valueOf(folder.name)).map { messages ->
-            messages.map {
-                Message(
-                    studentId = studentId,
-                    realId = it.id,
-                    messageId = it.messageId,
-                    sender = it.sender,
-                    senderId = it.senderId,
-                    recipient = it.recipient,
-                    recipientId = it.recipientId,
-                    subject = it.subject.trim(),
-                    date = it.date?.toLocalDateTime(),
-                    folderId = it.folderId,
-                    unread = it.unread,
-                    unreadBy = it.unreadBy,
-                    readBy = it.readBy,
-                    removed = it.removed
-                )
-            }
-        }
-    }
-
-    fun getMessagesContent(message: Message, markAsRead: Boolean = false): Single<String> {
-        return api.getMessageContent(message.messageId ?: 0, message.folderId, markAsRead, message.realId ?: 0)
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/StudentRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/remote/StudentRemote.kt
deleted file mode 100644
index 6c6e26a9d..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/StudentRemote.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package io.github.wulkanowy.data.repositories.remote
-
-import io.github.wulkanowy.api.Api
-import io.github.wulkanowy.data.db.entities.Student
-import io.reactivex.Single
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class StudentRemote @Inject constructor(private val api: Api) {
-
-    fun getStudents(email: String, password: String, endpoint: String): Single<List<Student>> {
-        return api.getPupils().map { students ->
-            students.map { pupil ->
-                Student(
-                    email = email,
-                    password = password,
-                    symbol = pupil.symbol,
-                    studentId = pupil.studentId,
-                    studentName = pupil.studentName,
-                    schoolSymbol = pupil.schoolSymbol,
-                    schoolName = pupil.description,
-                    endpoint = endpoint,
-                    loginType = pupil.loginType.name
-                )
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitLocal.kt
new file mode 100644
index 000000000..b4281cbfd
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitLocal.kt
@@ -0,0 +1,28 @@
+package io.github.wulkanowy.data.repositories.reportingunit
+
+import io.github.wulkanowy.data.db.dao.ReportingUnitDao
+import io.github.wulkanowy.data.db.entities.ReportingUnit
+import io.github.wulkanowy.data.db.entities.Student
+import io.reactivex.Maybe
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class ReportingUnitLocal @Inject constructor(private val reportingUnitDb: ReportingUnitDao) {
+
+    fun getReportingUnits(student: Student): Maybe<List<ReportingUnit>> {
+        return reportingUnitDb.load(student.studentId).filter { !it.isEmpty() }
+    }
+
+    fun getReportingUnit(student: Student, unitId: Int): Maybe<ReportingUnit> {
+        return reportingUnitDb.loadOne(student.studentId, unitId)
+    }
+
+    fun saveReportingUnits(reportingUnits: List<ReportingUnit>) {
+        return reportingUnitDb.insertAll(reportingUnits)
+    }
+
+    fun deleteReportingUnits(reportingUnits: List<ReportingUnit>) {
+        reportingUnitDb.deleteAll(reportingUnits)
+    }
+}
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
new file mode 100644
index 000000000..feb4b0134
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRemote.kt
@@ -0,0 +1,26 @@
+package io.github.wulkanowy.data.repositories.reportingunit
+
+import io.github.wulkanowy.api.Api
+import io.github.wulkanowy.data.db.entities.ReportingUnit
+import io.reactivex.Single
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class ReportingUnitRemote @Inject constructor(private val api: Api) {
+
+    fun getReportingUnits(): Single<List<ReportingUnit>> {
+        return api.getReportingUnits().map {
+            it.map { unit ->
+                ReportingUnit(
+                    studentId = api.studentId,
+                    realId = unit.id,
+                    roles = unit.roles,
+                    senderId = unit.senderId,
+                    senderName = unit.senderName,
+                    shortName = unit.short
+                )
+            }
+        }
+    }
+}
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
new file mode 100644
index 000000000..6758898e2
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRepository.kt
@@ -0,0 +1,56 @@
+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.ApiHelper
+import io.github.wulkanowy.data.db.entities.ReportingUnit
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.utils.uniqueSubtract
+import io.reactivex.Maybe
+import io.reactivex.Single
+import java.net.UnknownHostException
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class ReportingUnitRepository @Inject constructor(
+    private val settings: InternetObservingSettings,
+    private val local: ReportingUnitLocal,
+    private val remote: ReportingUnitRemote,
+    private val apiHelper: ApiHelper
+) {
+
+    fun getReportingUnits(student: Student, forceRefresh: Boolean = false): Single<List<ReportingUnit>> {
+        return Single.just(apiHelper.initApi(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 Maybe.just(apiHelper.initApi(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/local/SemesterLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterLocal.kt
similarity index 55%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/local/SemesterLocal.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterLocal.kt
index 77000478f..b9750e7d5 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/local/SemesterLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterLocal.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.repositories.local
+package io.github.wulkanowy.data.repositories.semester
 
 import io.github.wulkanowy.data.db.dao.SemesterDao
 import io.github.wulkanowy.data.db.entities.Semester
@@ -11,17 +11,14 @@ import javax.inject.Singleton
 class SemesterLocal @Inject constructor(private val semesterDb: SemesterDao) {
 
     fun saveSemesters(semesters: List<Semester>) {
-        return semesterDb.insertAll(semesters)
+        semesterDb.insertAll(semesters)
+    }
+
+    fun deleteSemesters(semesters: List<Semester>) {
+        semesterDb.deleteAll(semesters)
     }
 
     fun getSemesters(student: Student): Maybe<List<Semester>> {
-        return semesterDb.loadAll(student.studentId).filter { !it.isEmpty() }
-    }
-
-    fun setCurrentSemester(semester: Semester) {
-        semesterDb.run {
-            resetCurrent(semester.studentId)
-            updateCurrent(semester.semesterId, semester.diaryId)
-        }
+        return semesterDb.loadAll(student.studentId, student.classId).filter { !it.isEmpty() }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/SemesterRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRemote.kt
similarity index 70%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/remote/SemesterRemote.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRemote.kt
index 1cf105014..c199c16c0 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/SemesterRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRemote.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.repositories.remote
+package io.github.wulkanowy.data.repositories.semester
 
 import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.data.db.entities.Semester
@@ -17,9 +17,14 @@ class SemesterRemote @Inject constructor(private val api: Api) {
                     studentId = student.studentId,
                     diaryId = semester.diaryId,
                     diaryName = semester.diaryName,
+                    schoolYear = semester.schoolYear,
                     semesterId = semester.semesterId,
                     semesterName = semester.semesterNumber,
-                    isCurrent = semester.current
+                    isCurrent = semester.current,
+                    start = semester.start,
+                    end = semester.end,
+                    classId = semester.classId,
+                    unitId = semester.unitId
                 )
             }
 
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/SemesterRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRepository.kt
similarity index 63%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/SemesterRepository.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRepository.kt
index b79021064..593014032 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/SemesterRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRepository.kt
@@ -1,14 +1,14 @@
-package io.github.wulkanowy.data.repositories
+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.ApiHelper
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.repositories.local.SemesterLocal
-import io.github.wulkanowy.data.repositories.remote.SemesterRemote
+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
@@ -27,10 +27,17 @@ class SemesterRepository @Inject constructor(
             .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
                 .flatMap {
                     if (it) remote.getSemesters(student) else Single.error(UnknownHostException())
-                }.map { newSemesters ->
-                    local.apply {
-                        saveSemesters(newSemesters)
-                        setCurrentSemester(newSemesters.single { it.isCurrent })
+                }.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${currentSemesters.joinToString(separator = "\n")}")
+                        throw IllegalArgumentException("Current semester can be only one.")
                     }
                 }.flatMap { local.getSemesters(student).toSingle(emptyList()) })
     }
@@ -39,4 +46,3 @@ class SemesterRepository @Inject constructor(
         return getSemesters(student, forceRefresh).map { item -> item.single { it.isCurrent } }
     }
 }
-
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/local/StudentLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentLocal.kt
similarity index 57%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/local/StudentLocal.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentLocal.kt
index 0e4e9cbd0..e6d744213 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/local/StudentLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentLocal.kt
@@ -1,7 +1,6 @@
-package io.github.wulkanowy.data.repositories.local
+package io.github.wulkanowy.data.repositories.student
 
 import android.content.Context
-import io.github.wulkanowy.data.db.SharedPrefHelper
 import io.github.wulkanowy.data.db.dao.StudentDao
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.utils.security.decrypt
@@ -15,25 +14,17 @@ import javax.inject.Singleton
 @Singleton
 class StudentLocal @Inject constructor(
     private val studentDb: StudentDao,
-    private val sharedPref: SharedPrefHelper,
     private val context: Context
 ) {
 
-    companion object {
-        const val STUDENT_SAVED_KEY: String = "is_student_saved"
-    }
-
-    val isStudentSaved
-        get() = sharedPref.getBoolean(STUDENT_SAVED_KEY, false)
-
-    fun saveStudent(student: Student): Single<Long> {
-        return Single.fromCallable { studentDb.insert(student.copy(password = encrypt(student.password, context))) }
-            .doOnSuccess { sharedPref.putBoolean(STUDENT_SAVED_KEY, true) }
+    fun saveStudents(students: List<Student>): Single<List<Long>> {
+        return Single.fromCallable { studentDb.insertAll(students.map { it.copy(password = encrypt(it.password, context)) }) }
     }
 
     fun getStudents(decryptPass: Boolean): Maybe<List<Student>> {
         return studentDb.loadAll()
             .map { list -> list.map { it.apply { if (decryptPass) password = decrypt(password) } } }
+            .filter { !it.isEmpty() }
     }
 
     fun getCurrentStudent(decryptPass: Boolean): Maybe<Student> {
@@ -44,15 +35,12 @@ class StudentLocal @Inject constructor(
         return Completable.fromCallable {
             studentDb.run {
                 resetCurrent()
-                updateCurrent(student.studentId)
+                updateCurrent(student.id)
             }
-        }.doOnComplete { sharedPref.putBoolean(STUDENT_SAVED_KEY, true) }
+        }
     }
 
     fun logoutStudent(student: Student): Completable {
-        return Completable.fromCallable {
-            studentDb.delete(student)
-            if (student.isCurrent) sharedPref.putBoolean(STUDENT_SAVED_KEY, false)
-        }
+        return Completable.fromCallable { studentDb.delete(student) }
     }
 }
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
new file mode 100644
index 000000000..251d38344
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRemote.kt
@@ -0,0 +1,34 @@
+package io.github.wulkanowy.data.repositories.student
+
+import io.github.wulkanowy.api.Api
+import io.github.wulkanowy.data.db.entities.Student
+import io.reactivex.Single
+import org.threeten.bp.LocalDateTime.now
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class StudentRemote @Inject constructor(private val api: Api) {
+
+    fun getStudents(email: String, password: String, endpoint: String): Single<List<Student>> {
+        return api.getStudents().map { students ->
+            students.map { student ->
+                Student(
+                    email = email,
+                    password = password,
+                    symbol = student.symbol,
+                    studentId = student.studentId,
+                    studentName = student.studentName,
+                    schoolSymbol = student.schoolSymbol,
+                    schoolName = student.schoolName,
+                    className = student.className,
+                    classId = student.classId,
+                    endpoint = endpoint,
+                    loginType = student.loginType.name,
+                    isCurrent = false,
+                    registrationDate = now()
+                )
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/StudentRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRepository.kt
similarity index 63%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/StudentRepository.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRepository.kt
index 97210da0b..5c4a60558 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/StudentRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRepository.kt
@@ -1,12 +1,12 @@
-package io.github.wulkanowy.data.repositories
+package io.github.wulkanowy.data.repositories.student
 
 import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.ApiHelper
 import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.repositories.local.StudentLocal
-import io.github.wulkanowy.data.repositories.remote.StudentRemote
+import io.github.wulkanowy.data.exceptions.NoCurrentStudentException
 import io.reactivex.Completable
+import io.reactivex.Maybe
 import io.reactivex.Single
 import java.net.UnknownHostException
 import javax.inject.Inject
@@ -20,20 +20,17 @@ class StudentRepository @Inject constructor(
     private val apiHelper: ApiHelper
 ) {
 
-    val isStudentSaved
-        get() = local.isStudentSaved
+    fun isStudentSaved(): Single<Boolean> = local.getStudents(false).isEmpty.map { !it }
 
-    lateinit var cachedStudents: Single<List<Student>>
-        private set
+    fun isCurrentStudentSet(): Single<Boolean> = local.getCurrentStudent(false).isEmpty.map { !it }
 
-    fun getStudents(email: String, password: String, symbol: String, endpoint: String): Single<List<Student>> {
-        cachedStudents = ReactiveNetwork.checkInternetConnectivity(settings)
+    fun getStudents(email: String, password: String, endpoint: String, symbol: String = ""): Single<List<Student>> {
+        return ReactiveNetwork.checkInternetConnectivity(settings)
             .flatMap {
                 apiHelper.initApi(email, password, symbol, endpoint)
                 if (it) remote.getStudents(email, password, endpoint)
                 else Single.error(UnknownHostException("No internet connection"))
-            }.doOnSuccess { cachedStudents = Single.just(it) }
-        return cachedStudents
+            }
     }
 
     fun getSavedStudents(decryptPass: Boolean = true): Single<List<Student>> {
@@ -41,11 +38,13 @@ class StudentRepository @Inject constructor(
     }
 
     fun getCurrentStudent(decryptPass: Boolean = true): Single<Student> {
-        return local.getCurrentStudent(decryptPass).toSingle()
+        return local.getCurrentStudent(decryptPass)
+            .switchIfEmpty(Maybe.error(NoCurrentStudentException()))
+            .toSingle()
     }
 
-    fun saveStudent(student: Student): Single<Long> {
-        return local.saveStudent(student)
+    fun saveStudents(students: List<Student>): Single<List<Long>> {
+        return local.saveStudents(students)
     }
 
     fun switchStudent(student: Student): Completable {
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/local/SubjectLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectLocal.kt
similarity index 92%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/local/SubjectLocal.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectLocal.kt
index 7ca7c1b06..63e334019 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/local/SubjectLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectLocal.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.repositories.local
+package io.github.wulkanowy.data.repositories.subject
 
 import io.github.wulkanowy.data.db.dao.SubjectDao
 import io.github.wulkanowy.data.db.entities.Semester
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/SubjectRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRemote.kt
similarity index 93%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/remote/SubjectRemote.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRemote.kt
index ae565d48c..88fbb196b 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/SubjectRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRemote.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.repositories.remote
+package io.github.wulkanowy.data.repositories.subject
 
 import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.data.db.entities.Semester
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/SubjectRepostory.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRepository.kt
similarity index 78%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/SubjectRepostory.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRepository.kt
index e3e8a2a7b..0c5f386b6 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/SubjectRepostory.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRepository.kt
@@ -1,18 +1,17 @@
-package io.github.wulkanowy.data.repositories
+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.Subject
-import io.github.wulkanowy.data.repositories.local.SubjectLocal
-import io.github.wulkanowy.data.repositories.remote.SubjectRemote
+import io.github.wulkanowy.utils.uniqueSubtract
 import io.reactivex.Single
 import java.net.UnknownHostException
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class SubjectRepostory @Inject constructor(
+class SubjectRepository @Inject constructor(
     private val settings: InternetObservingSettings,
     private val local: SubjectLocal,
     private val remote: SubjectRemote
@@ -28,8 +27,8 @@ class SubjectRepostory @Inject constructor(
                     local.getSubjects(semester)
                         .toSingle(emptyList())
                         .doOnSuccess { old ->
-                            local.deleteSubjects(old - new)
-                            local.saveSubjects(new - old)
+                            local.deleteSubjects(old.uniqueSubtract(new))
+                            local.saveSubjects(new.uniqueSubtract(old))
                         }
                 }.flatMap {
                     local.getSubjects(semester).toSingle(emptyList())
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/local/TimetableLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableLocal.kt
similarity index 82%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/local/TimetableLocal.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableLocal.kt
index 63cc7c94b..e074ce2a1 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/local/TimetableLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableLocal.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.repositories.local
+package io.github.wulkanowy.data.repositories.timetable
 
 import io.github.wulkanowy.data.db.dao.TimetableDao
 import io.github.wulkanowy.data.db.entities.Semester
@@ -6,14 +6,11 @@ import io.github.wulkanowy.data.db.entities.Timetable
 import io.reactivex.Maybe
 import org.threeten.bp.LocalDate
 import javax.inject.Inject
+import javax.inject.Singleton
 
+@Singleton
 class TimetableLocal @Inject constructor(private val timetableDb: TimetableDao) {
 
-    fun getTimetable(semester: Semester, startDate: LocalDate, endDate: LocalDate): Maybe<List<Timetable>> {
-        return timetableDb.loadAll(semester.diaryId, semester.studentId, startDate, endDate)
-            .filter { !it.isEmpty() }
-    }
-
     fun saveTimetable(timetables: List<Timetable>) {
         timetableDb.insertAll(timetables)
     }
@@ -21,4 +18,8 @@ class TimetableLocal @Inject constructor(private val timetableDb: TimetableDao)
     fun deleteTimetable(timetables: List<Timetable>) {
         timetableDb.deleteAll(timetables)
     }
+
+    fun getTimetable(semester: Semester, startDate: LocalDate, endDate: LocalDate): Maybe<List<Timetable>> {
+        return timetableDb.loadAll(semester.diaryId, semester.studentId, startDate, endDate).filter { it.isNotEmpty() }
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/TimetableRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRemote.kt
similarity index 85%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/remote/TimetableRemote.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRemote.kt
index aa8949fd8..77742e7b3 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/TimetableRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRemote.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.repositories.remote
+package io.github.wulkanowy.data.repositories.timetable
 
 import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.data.db.entities.Semester
@@ -8,7 +8,9 @@ import io.github.wulkanowy.utils.toLocalDateTime
 import io.reactivex.Single
 import org.threeten.bp.LocalDate
 import javax.inject.Inject
+import javax.inject.Singleton
 
+@Singleton
 class TimetableRemote @Inject constructor(private val api: Api) {
 
     fun getTimetable(semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<Timetable>> {
@@ -24,9 +26,12 @@ class TimetableRemote @Inject constructor(private val api: Api) {
                         end = it.end.toLocalDateTime(),
                         date = it.date.toLocalDate(),
                         subject = it.subject,
+                        subjectOld = it.subjectOld,
                         group = it.group,
                         room = it.room,
+                        roomOld = it.roomOld,
                         teacher = it.teacher,
+                        teacherOld = it.teacherOld,
                         info = it.info,
                         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
new file mode 100644
index 000000000..0e6331f91
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepository.kt
@@ -0,0 +1,49 @@
+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.Timetable
+import io.github.wulkanowy.utils.friday
+import io.github.wulkanowy.utils.monday
+import io.github.wulkanowy.utils.uniqueSubtract
+import io.reactivex.Single
+import org.threeten.bp.LocalDate
+import java.net.UnknownHostException
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class TimetableRepository @Inject constructor(
+    private val settings: InternetObservingSettings,
+    private val local: TimetableLocal,
+    private val remote: TimetableRemote
+) {
+
+    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(semester, monday, friday)
+                    else Single.error(UnknownHostException())
+                }.flatMap { new ->
+                    local.getTimetable(semester, monday, friday)
+                        .toSingle(emptyList())
+                        .doOnSuccess { old ->
+                            local.deleteTimetable(old.uniqueSubtract(new))
+                            local.saveTimetable(new.uniqueSubtract(old).map { item ->
+                                item.apply {
+                                    old.singleOrNull { this.start == it.start }?.let {
+                                        return@map copy(
+                                            room = if (room.isEmpty()) it.room else room
+                                        )
+                                    }
+                                }
+                            })
+                        }
+                }.flatMap {
+                    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/AppComponent.kt b/app/src/main/java/io/github/wulkanowy/di/AppComponent.kt
index 21c193e5a..3ac3a525b 100644
--- a/app/src/main/java/io/github/wulkanowy/di/AppComponent.kt
+++ b/app/src/main/java/io/github/wulkanowy/di/AppComponent.kt
@@ -5,6 +5,7 @@ import dagger.android.AndroidInjector
 import dagger.android.support.AndroidSupportInjectionModule
 import io.github.wulkanowy.WulkanowyApp
 import io.github.wulkanowy.data.RepositoryModule
+import io.github.wulkanowy.services.ServicesModule
 import javax.inject.Singleton
 
 @Singleton
@@ -12,9 +13,10 @@ import javax.inject.Singleton
     AndroidSupportInjectionModule::class,
     AppModule::class,
     RepositoryModule::class,
+    ServicesModule::class,
     BuilderModule::class])
 interface AppComponent : AndroidInjector<WulkanowyApp> {
 
-    @Component.Builder
-    abstract class Builder : AndroidInjector.Builder<WulkanowyApp>()
+    @Component.Factory
+    interface Factory : AndroidInjector.Factory<WulkanowyApp>
 }
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 fc2e92972..da1d8f7a8 100644
--- a/app/src/main/java/io/github/wulkanowy/di/AppModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/di/AppModule.kt
@@ -1,16 +1,16 @@
 package io.github.wulkanowy.di
 
+import android.appwidget.AppWidgetManager
 import android.content.Context
-import com.firebase.jobdispatcher.FirebaseJobDispatcher
-import com.firebase.jobdispatcher.GooglePlayDriver
 import com.google.firebase.analytics.FirebaseAnalytics
 import dagger.Module
 import dagger.Provides
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import io.github.wulkanowy.BuildConfig.DEBUG
 import io.github.wulkanowy.WulkanowyApp
-import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 import io.github.wulkanowy.utils.SchedulersProvider
+import javax.inject.Named
 import javax.inject.Singleton
 
 @Module
@@ -29,9 +29,14 @@ internal class AppModule {
 
     @Singleton
     @Provides
-    fun provideJobDispatcher(context: Context) = FirebaseJobDispatcher(GooglePlayDriver(context))
+    fun provideFirebaseAnalytics(context: Context) = FirebaseAnalytics.getInstance(context)
 
     @Singleton
     @Provides
-    fun provideFirebaseAnalyticsHelper(context: Context) = FirebaseAnalyticsHelper(FirebaseAnalytics.getInstance(context))
+    fun provideAppWidgetManager(context: Context): AppWidgetManager = AppWidgetManager.getInstance(context)
+
+    @Singleton
+    @Named("isDebug")
+    @Provides
+    fun provideIsDebug() = DEBUG
 }
diff --git a/app/src/main/java/io/github/wulkanowy/di/BuilderModule.kt b/app/src/main/java/io/github/wulkanowy/di/BuilderModule.kt
index 9f4ecb80f..a963e9a96 100644
--- a/app/src/main/java/io/github/wulkanowy/di/BuilderModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/di/BuilderModule.kt
@@ -3,20 +3,22 @@ package io.github.wulkanowy.di
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
 import io.github.wulkanowy.di.scopes.PerActivity
-import io.github.wulkanowy.services.job.SyncWorker
-import io.github.wulkanowy.services.widgets.TimetableWidgetService
 import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.ui.modules.login.LoginModule
+import io.github.wulkanowy.ui.modules.luckynumberwidget.LuckyNumberWidgetConfigureActivity
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainModule
+import io.github.wulkanowy.ui.modules.message.send.SendMessageActivity
 import io.github.wulkanowy.ui.modules.splash.SplashActivity
-import io.github.wulkanowy.ui.widgets.timetable.TimetableWidgetProvider
+import io.github.wulkanowy.ui.modules.luckynumberwidget.LuckyNumberWidgetProvider
+import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetConfigureActivity
+import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider
 
 @Module
 internal abstract class BuilderModule {
 
     @PerActivity
-    @ContributesAndroidInjector()
+    @ContributesAndroidInjector
     abstract fun bindSplashActivity(): SplashActivity
 
     @PerActivity
@@ -28,11 +30,17 @@ internal abstract class BuilderModule {
     abstract fun bindMainActivity(): MainActivity
 
     @ContributesAndroidInjector
-    abstract fun bindTimetableWidgetService(): TimetableWidgetService
+    abstract fun bindMessageSendActivity(): SendMessageActivity
+
+    @ContributesAndroidInjector
+    abstract fun bindTimetableWidgetAccountActivity(): TimetableWidgetConfigureActivity
 
     @ContributesAndroidInjector
     abstract fun bindTimetableWidgetProvider(): TimetableWidgetProvider
 
     @ContributesAndroidInjector
-    abstract fun bindSyncJob(): SyncWorker
+    abstract fun bindLuckyNumberWidgetAccountActivity(): LuckyNumberWidgetConfigureActivity
+
+    @ContributesAndroidInjector
+    abstract fun bindLuckyNumberWidgetProvider(): LuckyNumberWidgetProvider
 }
diff --git a/app/src/main/java/io/github/wulkanowy/services/ServicesModule.kt b/app/src/main/java/io/github/wulkanowy/services/ServicesModule.kt
new file mode 100644
index 000000000..84409a845
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/ServicesModule.kt
@@ -0,0 +1,107 @@
+package io.github.wulkanowy.services
+
+import android.app.NotificationManager
+import android.content.Context
+import android.content.Context.NOTIFICATION_SERVICE
+import androidx.core.app.NotificationManagerCompat
+import androidx.work.WorkManager
+import com.squareup.inject.assisted.dagger2.AssistedModule
+import dagger.Binds
+import dagger.Module
+import dagger.Provides
+import dagger.android.ContributesAndroidInjector
+import dagger.multibindings.IntoSet
+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
+import io.github.wulkanowy.services.sync.works.MessageWork
+import io.github.wulkanowy.services.sync.works.NoteWork
+import io.github.wulkanowy.services.sync.works.RecipientWork
+import io.github.wulkanowy.services.sync.works.TimetableWork
+import io.github.wulkanowy.services.sync.works.Work
+import io.github.wulkanowy.services.widgets.TimetableWidgetService
+import javax.inject.Singleton
+
+@AssistedModule
+@Module(includes = [AssistedInject_ServicesModule::class])
+abstract class ServicesModule {
+
+    @Module
+    companion object {
+
+        @JvmStatic
+        @Provides
+        fun provideWorkManager() = WorkManager.getInstance()
+
+        @JvmStatic
+        @Singleton
+        @Provides
+        fun provideNotificationManagerCompat(context: Context) = NotificationManagerCompat.from(context)
+
+        @JvmStatic
+        @Singleton
+        @Provides
+        fun provideNotificationManager(context: Context) = context.getSystemService(NOTIFICATION_SERVICE) as NotificationManager
+    }
+
+    @ContributesAndroidInjector
+    abstract fun bindTimetableWidgetService(): TimetableWidgetService
+
+    @Binds
+    @IntoSet
+    abstract fun provideGradeWork(work: GradeWork): Work
+
+    @Binds
+    @IntoSet
+    abstract fun provideNoteWork(work: NoteWork): Work
+
+    @Binds
+    @IntoSet
+    abstract fun provideAttendanceWork(work: AttendanceWork): Work
+
+    @Binds
+    @IntoSet
+    abstract fun provideGradeSummaryWork(work: GradeSummaryWork): Work
+
+    @Binds
+    @IntoSet
+    abstract fun provideExamWork(work: ExamWork): Work
+
+    @Binds
+    @IntoSet
+    abstract fun provideAttendanceSummaryWork(work: AttendanceSummaryWork): Work
+
+    @Binds
+    @IntoSet
+    abstract fun provideTimetableWork(work: TimetableWork): Work
+
+    @Binds
+    @IntoSet
+    abstract fun provideLuckyNumberWork(work: LuckyNumberWork): Work
+
+    @Binds
+    @IntoSet
+    abstract fun provideCompletedLessonWork(work: CompletedLessonWork): Work
+
+    @Binds
+    @IntoSet
+    abstract fun provideHomeworkWork(work: HomeworkWork): Work
+
+    @Binds
+    @IntoSet
+    abstract fun provideMessageWork(work: MessageWork): Work
+
+    @Binds
+    @IntoSet
+    abstract fun provideRecipientWork(work: RecipientWork): Work
+
+    @Binds
+    @IntoSet
+    abstract fun provideGradeStatistics(work: GradeStatisticsWork): Work
+}
diff --git a/app/src/main/java/io/github/wulkanowy/services/job/ServiceHelper.kt b/app/src/main/java/io/github/wulkanowy/services/job/ServiceHelper.kt
deleted file mode 100644
index d81b4b6d4..000000000
--- a/app/src/main/java/io/github/wulkanowy/services/job/ServiceHelper.kt
+++ /dev/null
@@ -1,57 +0,0 @@
-package io.github.wulkanowy.services.job
-
-import com.firebase.jobdispatcher.Constraint.ON_ANY_NETWORK
-import com.firebase.jobdispatcher.Constraint.ON_UNMETERED_NETWORK
-import com.firebase.jobdispatcher.FirebaseJobDispatcher
-import com.firebase.jobdispatcher.Lifetime.FOREVER
-import com.firebase.jobdispatcher.RetryStrategy.DEFAULT_EXPONENTIAL
-import com.firebase.jobdispatcher.Trigger.executionWindow
-import io.github.wulkanowy.data.repositories.PreferencesRepository
-import io.github.wulkanowy.utils.isHolidays
-import org.threeten.bp.LocalDate
-import timber.log.Timber
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class ServiceHelper @Inject constructor(
-    private val prefRepository: PreferencesRepository,
-    private val dispatcher: FirebaseJobDispatcher
-) {
-
-    fun reloadFullSyncService() {
-        startFullSyncService(true)
-    }
-
-    fun startFullSyncService(replaceCurrent: Boolean = false) {
-        if (LocalDate.now().isHolidays || !prefRepository.isServiceEnabled) {
-            Timber.d("Services disabled or it's holidays")
-            return
-        }
-
-        dispatcher.mustSchedule(
-            dispatcher.newJobBuilder()
-                .setLifetime(FOREVER)
-                .setRecurring(true)
-                .setService(SyncWorker::class.java)
-                .setTag(SyncWorker.WORK_TAG)
-                .setTrigger(
-                    executionWindow(
-                        prefRepository.servicesInterval * 60,
-                        (prefRepository.servicesInterval + 10) * 60
-                    )
-                )
-                .setConstraints(if (prefRepository.isServicesOnlyWifi) ON_UNMETERED_NETWORK else ON_ANY_NETWORK)
-                .setReplaceCurrent(replaceCurrent)
-                .setRetryStrategy(DEFAULT_EXPONENTIAL)
-                .build()
-        )
-
-        Timber.d("Services started")
-    }
-
-    fun stopFullSyncService() {
-        dispatcher.cancel(SyncWorker.WORK_TAG)
-        Timber.d("Services stopped")
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/services/job/SyncWorker.kt b/app/src/main/java/io/github/wulkanowy/services/job/SyncWorker.kt
deleted file mode 100644
index 65fb3abcf..000000000
--- a/app/src/main/java/io/github/wulkanowy/services/job/SyncWorker.kt
+++ /dev/null
@@ -1,174 +0,0 @@
-package io.github.wulkanowy.services.job
-
-import com.firebase.jobdispatcher.JobParameters
-import com.firebase.jobdispatcher.SimpleJobService
-import dagger.android.AndroidInjection
-import io.github.wulkanowy.data.repositories.AttendanceRepository
-import io.github.wulkanowy.data.repositories.ExamRepository
-import io.github.wulkanowy.data.repositories.GradeRepository
-import io.github.wulkanowy.data.repositories.GradeSummaryRepository
-import io.github.wulkanowy.data.repositories.HomeworkRepository
-import io.github.wulkanowy.data.repositories.MessagesRepository
-import io.github.wulkanowy.data.repositories.MessagesRepository.MessageFolder.RECEIVED
-import io.github.wulkanowy.data.repositories.NoteRepository
-import io.github.wulkanowy.data.repositories.PreferencesRepository
-import io.github.wulkanowy.data.repositories.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
-import io.github.wulkanowy.data.repositories.TimetableRepository
-import io.github.wulkanowy.services.notification.GradeNotification
-import io.github.wulkanowy.services.notification.MessageNotification
-import io.github.wulkanowy.services.notification.NoteNotification
-import io.github.wulkanowy.utils.friday
-import io.github.wulkanowy.utils.isHolidays
-import io.github.wulkanowy.utils.monday
-import io.reactivex.Single
-import io.reactivex.disposables.CompositeDisposable
-import org.threeten.bp.LocalDate
-import timber.log.Timber
-import javax.inject.Inject
-
-class SyncWorker : SimpleJobService() {
-
-    @Inject
-    lateinit var student: StudentRepository
-
-    @Inject
-    lateinit var semester: SemesterRepository
-
-    @Inject
-    lateinit var gradesDetails: GradeRepository
-
-    @Inject
-    lateinit var gradesSummary: GradeSummaryRepository
-
-    @Inject
-    lateinit var attendance: AttendanceRepository
-
-    @Inject
-    lateinit var exam: ExamRepository
-
-    @Inject
-    lateinit var timetable: TimetableRepository
-
-    @Inject
-    lateinit var message: MessagesRepository
-
-    @Inject
-    lateinit var note: NoteRepository
-
-    @Inject
-    lateinit var homework: HomeworkRepository
-
-    @Inject
-    lateinit var prefRepository: PreferencesRepository
-
-    private val disposable = CompositeDisposable()
-
-    companion object {
-        const val WORK_TAG = "FULL_SYNC"
-    }
-
-    override fun onCreate() {
-        super.onCreate()
-        AndroidInjection.inject(this)
-    }
-
-    override fun onRunJob(job: JobParameters?): Int {
-        Timber.d("Synchronization started")
-
-        val start = LocalDate.now().monday
-        val end = LocalDate.now().friday
-
-        if (start.isHolidays) return RESULT_FAIL_NORETRY
-
-        var error: Throwable? = null
-
-        disposable.add(student.getCurrentStudent()
-            .flatMap { semester.getCurrentSemester(it, true) }
-            .flatMapPublisher {
-                Single.merge(
-                    listOf(
-                        gradesDetails.getGrades(it, true, true),
-                        gradesSummary.getGradesSummary(it, true),
-                        attendance.getAttendance(it, start, end, true),
-                        exam.getExams(it, start, end, true),
-                        timetable.getTimetable(it, start, end, true),
-                        message.getMessages(it.studentId, RECEIVED, true, true),
-                        note.getNotes(it, true, true),
-                        homework.getHomework(it, LocalDate.now(), true),
-                        homework.getHomework(it, LocalDate.now().plusDays(1), true)
-                    )
-                )
-            }
-            .subscribe({}, { error = it }))
-
-        return if (null === error) {
-            if (prefRepository.isNotificationsEnable) sendNotifications()
-            Timber.d("Synchronization successful")
-            RESULT_SUCCESS
-        } else {
-            Timber.e(error, "Synchronization failed")
-            RESULT_FAIL_RETRY
-        }
-    }
-
-    private fun sendNotifications() {
-        sendGradeNotifications()
-        sendMessageNotification()
-        sendNoteNotification()
-    }
-
-    private fun sendGradeNotifications() {
-        disposable.add(student.getCurrentStudent()
-            .flatMap { semester.getCurrentSemester(it) }
-            .flatMap { gradesDetails.getNewGrades(it) }
-            .map { it.filter { grade -> !grade.isNotified } }
-            .doOnSuccess {
-                if (it.isNotEmpty()) {
-                    Timber.d("Found ${it.size} unread grades")
-                    GradeNotification(applicationContext).sendNotification(it)
-                }
-            }
-            .map { it.map { grade -> grade.apply { isNotified = true } } }
-            .flatMapCompletable { gradesDetails.updateGrades(it) }
-            .subscribe({}, { Timber.e(it, "Grade notifications sending failed") }))
-    }
-
-    private fun sendMessageNotification() {
-        disposable.add(student.getCurrentStudent()
-            .flatMap { message.getNewMessages(it) }
-            .map { it.filter { message -> !message.isNotified } }
-            .doOnSuccess{
-                if (it.isNotEmpty()) {
-                    Timber.d("Found ${it.size} unread messages")
-                    MessageNotification(applicationContext).sendNotification(it)
-                }
-            }
-            .map { it.map { message -> message.apply { isNotified = true } } }
-            .flatMapCompletable { message.updateMessages(it) }
-            .subscribe({}, { Timber.e(it, "Message notifications sending failed") })
-        )
-    }
-
-    private fun sendNoteNotification() {
-        disposable.add(student.getCurrentStudent()
-            .flatMap { semester.getCurrentSemester(it) }
-            .flatMap { note.getNewNotes(it) }
-            .map { it.filter { note -> !note.isNotified } }
-            .doOnSuccess {
-                if (it.isNotEmpty()) {
-                    Timber.d("Found ${it.size} unread notes")
-                    NoteNotification(applicationContext).sendNotification(it)
-                }
-            }
-            .map { it.map { note -> note.apply { isNotified = true } } }
-            .flatMapCompletable { note.updateNotes(it) }
-            .subscribe({}, { Timber.e("Notifications sending failed") })
-        )
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        disposable.clear()
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/services/notification/BaseNotification.kt b/app/src/main/java/io/github/wulkanowy/services/notification/BaseNotification.kt
deleted file mode 100644
index 945d0b153..000000000
--- a/app/src/main/java/io/github/wulkanowy/services/notification/BaseNotification.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-package io.github.wulkanowy.services.notification
-
-import android.app.Notification
-import android.app.NotificationManager
-import android.content.Context
-import android.content.Context.NOTIFICATION_SERVICE
-import android.os.Build.VERSION.SDK_INT
-import android.os.Build.VERSION_CODES.O
-import androidx.core.app.NotificationCompat
-import timber.log.Timber
-import kotlin.random.Random
-
-abstract class BaseNotification(protected val context: Context) {
-
-    protected val notificationManager: NotificationManager by lazy {
-        context.getSystemService(NOTIFICATION_SERVICE) as NotificationManager
-    }
-
-    fun notify(notification: Notification) {
-        notificationManager.notify(Random.nextInt(1000), notification)
-    }
-
-    fun notificationBuilder(channelId: String): NotificationCompat.Builder {
-        if (SDK_INT >= O) createChannel(channelId)
-        return NotificationCompat.Builder(context, channelId)
-    }
-
-    fun cancelAll() {
-        notificationManager.cancelAll()
-        Timber.d("Notifications canceled")
-    }
-
-    abstract fun createChannel(channelId: String)
-}
diff --git a/app/src/main/java/io/github/wulkanowy/services/notification/GradeNotification.kt b/app/src/main/java/io/github/wulkanowy/services/notification/GradeNotification.kt
deleted file mode 100644
index df57ec28c..000000000
--- a/app/src/main/java/io/github/wulkanowy/services/notification/GradeNotification.kt
+++ /dev/null
@@ -1,60 +0,0 @@
-package io.github.wulkanowy.services.notification
-
-import android.annotation.TargetApi
-import android.app.Notification.VISIBILITY_PUBLIC
-import android.app.NotificationChannel
-import android.app.NotificationManager.IMPORTANCE_HIGH
-import android.app.PendingIntent
-import android.app.PendingIntent.FLAG_UPDATE_CURRENT
-import android.content.Context
-import androidx.core.app.NotificationCompat
-import androidx.core.content.ContextCompat
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Grade
-import io.github.wulkanowy.ui.modules.main.MainActivity
-import io.github.wulkanowy.ui.modules.main.MainActivity.Companion.EXTRA_START_MENU_INDEX
-import timber.log.Timber
-
-class GradeNotification(context: Context) : BaseNotification(context) {
-
-    private val channelId = "Grade_Notify"
-
-    @TargetApi(26)
-    override fun createChannel(channelId: String) {
-        notificationManager.createNotificationChannel(NotificationChannel(
-            channelId, context.getString(R.string.notify_grade_channel), IMPORTANCE_HIGH
-        ).apply {
-            enableLights(true)
-            enableVibration(true)
-            lockscreenVisibility = VISIBILITY_PUBLIC
-        })
-    }
-
-    fun sendNotification(items: List<Grade>) {
-        notify(notificationBuilder(channelId)
-            .setContentTitle(context.resources.getQuantityString(R.plurals.grade_new_items, items.size, items.size))
-            .setContentText(context.resources.getQuantityString(R.plurals.notify_grade_new_items, items.size, items.size))
-            .setSmallIcon(R.drawable.ic_stat_notify_grade)
-            .setAutoCancel(true)
-            .setDefaults(NotificationCompat.DEFAULT_ALL)
-            .setPriority(NotificationCompat.PRIORITY_HIGH)
-            .setColor(ContextCompat.getColor(context, R.color.colorPrimary))
-            .setContentIntent(
-                PendingIntent.getActivity(context, 0,
-                    MainActivity.getStartIntent(context).putExtra(EXTRA_START_MENU_INDEX, 0),
-                    FLAG_UPDATE_CURRENT
-                )
-            )
-            .setStyle(NotificationCompat.InboxStyle().run {
-                setSummaryText(context.resources.getQuantityString(R.plurals.grade_number_item, items.size, items.size))
-                items.forEach {
-                    addLine("${it.subject}: ${it.entry}")
-                }
-                this
-            })
-            .build()
-        )
-
-        Timber.d("Notification sent")
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/services/notification/MessageNotification.kt b/app/src/main/java/io/github/wulkanowy/services/notification/MessageNotification.kt
deleted file mode 100644
index 8733cadab..000000000
--- a/app/src/main/java/io/github/wulkanowy/services/notification/MessageNotification.kt
+++ /dev/null
@@ -1,58 +0,0 @@
-package io.github.wulkanowy.services.notification
-
-import android.annotation.TargetApi
-import android.app.Notification
-import android.app.NotificationChannel
-import android.app.NotificationManager
-import android.app.PendingIntent
-import android.content.Context
-import androidx.core.app.NotificationCompat
-import androidx.core.content.ContextCompat
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Message
-import io.github.wulkanowy.ui.modules.main.MainActivity
-import timber.log.Timber
-
-class MessageNotification(context: Context) : BaseNotification(context) {
-
-    private val channelId = "Message_Notify"
-
-    @TargetApi(26)
-    override fun createChannel(channelId: String) {
-        notificationManager.createNotificationChannel(NotificationChannel(
-            channelId, context.getString(R.string.notify_message_channel), NotificationManager.IMPORTANCE_HIGH
-        ).apply {
-            enableLights(true)
-            enableVibration(true)
-            lockscreenVisibility = Notification.VISIBILITY_PUBLIC
-        })
-    }
-
-    fun sendNotification(items: List<Message>) {
-        notify(notificationBuilder(channelId)
-            .setContentTitle(context.resources.getQuantityString(R.plurals.message_new_items, items.size, items.size))
-            .setContentText(context.resources.getQuantityString(R.plurals.notify_message_new_items, items.size, items.size))
-            .setSmallIcon(R.drawable.ic_stat_notify_message)
-            .setAutoCancel(true)
-            .setDefaults(NotificationCompat.DEFAULT_ALL)
-            .setPriority(NotificationCompat.PRIORITY_HIGH)
-            .setColor(ContextCompat.getColor(context, R.color.colorPrimary))
-            .setContentIntent(
-                PendingIntent.getActivity(context, 0,
-                    MainActivity.getStartIntent(context).putExtra(MainActivity.EXTRA_START_MENU_INDEX, 4),
-                    PendingIntent.FLAG_UPDATE_CURRENT
-                )
-            )
-            .setStyle(NotificationCompat.InboxStyle().run {
-                setSummaryText(context.resources.getQuantityString(R.plurals.message_number_item, items.size, items.size))
-                items.forEach {
-                    addLine("${it.sender}: ${it.subject}")
-                }
-                this
-            })
-            .build()
-        )
-
-        Timber.d("Notification sent")
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/services/notification/NoteNotification.kt b/app/src/main/java/io/github/wulkanowy/services/notification/NoteNotification.kt
deleted file mode 100644
index 33c2fdc71..000000000
--- a/app/src/main/java/io/github/wulkanowy/services/notification/NoteNotification.kt
+++ /dev/null
@@ -1,58 +0,0 @@
-package io.github.wulkanowy.services.notification
-
-import android.annotation.TargetApi
-import android.app.Notification
-import android.app.NotificationChannel
-import android.app.NotificationManager
-import android.app.PendingIntent
-import android.content.Context
-import androidx.core.app.NotificationCompat
-import androidx.core.content.ContextCompat
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Note
-import io.github.wulkanowy.ui.modules.main.MainActivity
-import timber.log.Timber
-
-class NoteNotification(context: Context) : BaseNotification(context) {
-
-    private val channelId = "Note_Notify"
-
-    @TargetApi(26)
-    override fun createChannel(channelId: String) {
-        notificationManager.createNotificationChannel(NotificationChannel(
-            channelId, context.getString(R.string.notify_note_channel), NotificationManager.IMPORTANCE_HIGH
-        ).apply {
-            enableLights(true)
-            enableVibration(true)
-            lockscreenVisibility = Notification.VISIBILITY_PUBLIC
-        })
-    }
-
-    fun sendNotification(items: List<Note>) {
-        notify(notificationBuilder(channelId)
-            .setContentTitle(context.resources.getQuantityString(R.plurals.note_new_items, items.size, items.size))
-            .setContentText(context.resources.getQuantityString(R.plurals.notify_note_new_items, items.size, items.size))
-            .setSmallIcon(R.drawable.ic_stat_notify_note)
-            .setAutoCancel(true)
-            .setDefaults(NotificationCompat.DEFAULT_ALL)
-            .setPriority(NotificationCompat.PRIORITY_HIGH)
-            .setColor(ContextCompat.getColor(context, R.color.colorPrimary))
-            .setContentIntent(
-                PendingIntent.getActivity(context, 0,
-                    MainActivity.getStartIntent(context).putExtra(MainActivity.EXTRA_START_MENU_INDEX, 4),
-                    PendingIntent.FLAG_UPDATE_CURRENT
-                )
-            )
-            .setStyle(NotificationCompat.InboxStyle().run {
-                setSummaryText(context.resources.getQuantityString(R.plurals.note_number_item, items.size, items.size))
-                items.forEach {
-                    addLine("${it.teacher}: ${it.category}")
-                }
-                this
-            })
-            .build()
-        )
-
-        Timber.d("Notification sent")
-    }
-}
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
new file mode 100644
index 000000000..c1820afb9
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/SyncManager.kt
@@ -0,0 +1,55 @@
+package io.github.wulkanowy.services.sync
+
+import android.os.Build.VERSION.SDK_INT
+import android.os.Build.VERSION_CODES.O
+import androidx.work.BackoffPolicy.EXPONENTIAL
+import androidx.work.Constraints
+import androidx.work.ExistingPeriodicWorkPolicy.KEEP
+import androidx.work.ExistingPeriodicWorkPolicy.REPLACE
+import androidx.work.NetworkType.METERED
+import androidx.work.NetworkType.UNMETERED
+import androidx.work.PeriodicWorkRequest
+import androidx.work.WorkManager
+import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
+import io.github.wulkanowy.services.sync.channels.DebugChannel
+import io.github.wulkanowy.services.sync.channels.NewEntriesChannel
+import io.github.wulkanowy.utils.isHolidays
+import org.threeten.bp.LocalDate.now
+import timber.log.Timber
+import java.util.concurrent.TimeUnit.MINUTES
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+@Singleton
+class SyncManager @Inject constructor(
+    private val workManager: WorkManager,
+    private val preferencesRepository: PreferencesRepository,
+    newEntriesChannel: NewEntriesChannel,
+    debugChannel: DebugChannel,
+    @Named("isDebug") isDebug: Boolean
+) {
+
+    init {
+        if (SDK_INT >= O) newEntriesChannel.create()
+        if (SDK_INT >= O && isDebug) debugChannel.create()
+        if (now().isHolidays) stopSyncWorker()
+        Timber.i("SyncManager was initialized")
+    }
+
+    fun startSyncWorker(restart: Boolean = false) {
+        if (preferencesRepository.isServiceEnabled && !now().isHolidays) {
+            workManager.enqueueUniquePeriodicWork(SyncWorker::class.java.simpleName, if (restart) REPLACE else KEEP,
+                PeriodicWorkRequest.Builder(SyncWorker::class.java, preferencesRepository.servicesInterval, MINUTES, 10, MINUTES)
+                    .setBackoffCriteria(EXPONENTIAL, 30, MINUTES)
+                    .setConstraints(Constraints.Builder()
+                        .setRequiredNetworkType(if (preferencesRepository.isServicesOnlyWifi) METERED else UNMETERED)
+                        .build())
+                    .build())
+        }
+    }
+
+    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
new file mode 100644
index 000000000..6a4c4ca6d
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/SyncWorker.kt
@@ -0,0 +1,81 @@
+package io.github.wulkanowy.services.sync
+
+import android.content.Context
+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.ListenableWorker
+import androidx.work.RxWorker
+import androidx.work.WorkerParameters
+import com.squareup.inject.assisted.Assisted
+import com.squareup.inject.assisted.AssistedInject
+import io.github.wulkanowy.R
+import io.github.wulkanowy.api.interceptor.FeatureDisabledException
+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.services.sync.channels.DebugChannel
+import io.github.wulkanowy.services.sync.works.Work
+import io.github.wulkanowy.utils.getCompatColor
+import io.reactivex.Completable
+import io.reactivex.Single
+import timber.log.Timber
+import kotlin.random.Random
+
+class SyncWorker @AssistedInject constructor(
+    @Assisted appContext: Context,
+    @Assisted workerParameters: WorkerParameters,
+    private val studentRepository: StudentRepository,
+    private val semesterRepository: SemesterRepository,
+    private val works: Set<@JvmSuppressWildcards Work>,
+    private val preferencesRepository: PreferencesRepository,
+    private val notificationManager: NotificationManagerCompat
+) : RxWorker(appContext, workerParameters) {
+
+    override fun createWork(): Single<Result> {
+        Timber.i("SyncWorker is starting")
+        return studentRepository.isCurrentStudentSet()
+            .filter { true }
+            .flatMap { studentRepository.getCurrentStudent().toMaybe() }
+            .flatMapCompletable { student ->
+                semesterRepository.getCurrentSemester(student, true)
+                    .flatMapCompletable { semester ->
+                        Completable.mergeDelayError(works.map { work ->
+                            work.create(student, semester)
+                                .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") }
+                        })
+                    }
+            }
+            .toSingleDefault(Result.success())
+            .onErrorReturn {
+                Timber.e(it, "There was an error during synchronization")
+                if (it is FeatureDisabledException) Result.success()
+                else Result.retry()
+            }
+            .doOnSuccess {
+                if (preferencesRepository.isDebugNotificationEnable) notify(it)
+                Timber.i("SyncWorker result: $it")
+            }
+    }
+
+    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_more_settings_24dp)
+            .setAutoCancel(true)
+            .setColor(applicationContext.getCompatColor(R.color.colorPrimary))
+            .setStyle(BigTextStyle().bigText("${SyncWorker::class.java.simpleName} result: $result"))
+            .setPriority(PRIORITY_DEFAULT)
+            .build())
+    }
+
+    @AssistedInject.Factory
+    interface Factory {
+
+        fun create(appContext: Context, workerParameters: WorkerParameters): ListenableWorker
+    }
+}
+
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/SyncWorkerFactory.kt b/app/src/main/java/io/github/wulkanowy/services/sync/SyncWorkerFactory.kt
new file mode 100644
index 000000000..aadfc27f4
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/SyncWorkerFactory.kt
@@ -0,0 +1,20 @@
+package io.github.wulkanowy.services.sync
+
+import android.content.Context
+import androidx.work.ListenableWorker
+import androidx.work.WorkerFactory
+import androidx.work.WorkerParameters
+import timber.log.Timber
+import javax.inject.Inject
+
+class SyncWorkerFactory @Inject constructor(private val syncWorkerFactory: SyncWorker.Factory) : WorkerFactory() {
+
+    override fun createWorker(appContext: Context, workerClassName: String, workerParameters: WorkerParameters): ListenableWorker? {
+        return if (workerClassName == SyncWorker::class.java.name) {
+            syncWorkerFactory.create(appContext, workerParameters)
+        } else {
+            Timber.e(IllegalArgumentException("Unknown worker class name: $workerClassName"))
+            null
+        }
+    }
+}
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
new file mode 100644
index 000000000..02fff5690
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/channels/DebugChannel.kt
@@ -0,0 +1,28 @@
+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
+import android.app.NotificationManager.IMPORTANCE_DEFAULT
+import android.content.Context
+import io.github.wulkanowy.R
+import javax.inject.Inject
+
+@TargetApi(26)
+class DebugChannel @Inject constructor(
+    private val notificationManager: NotificationManager,
+    private val context: Context
+) {
+
+    companion object {
+        const val CHANNEL_ID = "debug_channel"
+    }
+
+    fun create() {
+        notificationManager.createNotificationChannel(
+            NotificationChannel(CHANNEL_ID, context.getString(R.string.channel_debug), IMPORTANCE_DEFAULT).apply {
+                lockscreenVisibility = VISIBILITY_PUBLIC
+            })
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewEntriesChannel.kt b/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewEntriesChannel.kt
new file mode 100644
index 000000000..8e24a2a67
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewEntriesChannel.kt
@@ -0,0 +1,30 @@
+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
+import android.app.NotificationManager.IMPORTANCE_HIGH
+import android.content.Context
+import io.github.wulkanowy.R
+import javax.inject.Inject
+
+@TargetApi(26)
+class NewEntriesChannel @Inject constructor(
+    private val notificationManager: NotificationManager,
+    private val context: Context
+) {
+
+    companion object {
+        const val CHANNEL_ID = "new_entries_channel"
+    }
+
+    fun create() {
+        notificationManager.createNotificationChannel(
+            NotificationChannel(CHANNEL_ID, context.getString(R.string.channel_new_entries), IMPORTANCE_HIGH).apply {
+                enableLights(true)
+                enableVibration(true)
+                lockscreenVisibility = VISIBILITY_PUBLIC
+            })
+    }
+}
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
new file mode 100644
index 000000000..01978c5b6
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/AttendanceSummaryWork.kt
@@ -0,0 +1,17 @@
+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.attendancesummary.AttendanceSummaryRepository
+import io.reactivex.Completable
+import javax.inject.Inject
+
+class AttendanceSummaryWork @Inject constructor(
+    private val attendanceSummaryRepository: AttendanceSummaryRepository
+) : Work {
+
+    override fun create(student: Student, semester: Semester): Completable {
+        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
new file mode 100644
index 000000000..e4b55b0ea
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/AttendanceWork.kt
@@ -0,0 +1,18 @@
+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.friday
+import io.github.wulkanowy.utils.monday
+import io.reactivex.Completable
+import org.threeten.bp.LocalDate.now
+import javax.inject.Inject
+
+class AttendanceWork @Inject constructor(private val attendanceRepository: AttendanceRepository) : Work {
+
+    override fun create(student: Student, semester: Semester): Completable {
+        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
new file mode 100644
index 000000000..29642ad6f
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/CompletedLessonWork.kt
@@ -0,0 +1,21 @@
+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.friday
+import io.github.wulkanowy.utils.monday
+import io.reactivex.Completable
+import org.threeten.bp.LocalDate.now
+import javax.inject.Inject
+
+class CompletedLessonWork @Inject constructor(
+    private val completedLessonsRepository: CompletedLessonsRepository
+) : Work {
+
+    override fun create(student: Student, semester: Semester): Completable {
+        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
new file mode 100644
index 000000000..8744fcc79
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/ExamWork.kt
@@ -0,0 +1,17 @@
+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.friday
+import io.github.wulkanowy.utils.monday
+import io.reactivex.Completable
+import org.threeten.bp.LocalDate.now
+import javax.inject.Inject
+
+class ExamWork @Inject constructor(private val examRepository: ExamRepository) : Work {
+
+    override fun create(student: Student, semester: Semester): Completable {
+        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
new file mode 100644
index 000000000..1de39a95f
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeStatisticsWork.kt
@@ -0,0 +1,16 @@
+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.gradestatistics.GradeStatisticsRepository
+import io.reactivex.Completable
+import javax.inject.Inject
+
+class GradeStatisticsWork @Inject constructor(private val gradeStatisticsRepository: GradeStatisticsRepository) : Work {
+
+    override fun create(student: Student, semester: Semester): Completable {
+        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
new file mode 100644
index 000000000..0c70b476f
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeWork.kt
@@ -0,0 +1,61 @@
+package io.github.wulkanowy.services.sync.works
+
+import android.app.PendingIntent
+import android.app.PendingIntent.FLAG_UPDATE_CURRENT
+import android.content.Context
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationCompat.DEFAULT_ALL
+import androidx.core.app.NotificationCompat.PRIORITY_HIGH
+import androidx.core.app.NotificationManagerCompat
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Grade
+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.NewEntriesChannel
+import io.github.wulkanowy.ui.modules.main.MainActivity
+import io.github.wulkanowy.ui.modules.main.MainView.MenuView
+import io.github.wulkanowy.utils.getCompatColor
+import io.reactivex.Completable
+import javax.inject.Inject
+import kotlin.random.Random
+
+class GradeWork @Inject constructor(
+    private val context: Context,
+    private val notificationManager: NotificationManagerCompat,
+    private val gradeRepository: GradeRepository,
+    private val preferencesRepository: PreferencesRepository
+) : Work {
+
+    override fun create(student: Student, semester: Semester): Completable {
+        return gradeRepository.getGrades(student, semester, true, preferencesRepository.isNotificationsEnable)
+            .flatMap { gradeRepository.getNotNotifiedGrades(semester) }
+            .flatMapCompletable {
+                if (it.isNotEmpty()) notify(it)
+                gradeRepository.updateGrades(it.onEach { grade -> grade.isNotified = true })
+            }
+    }
+
+    private fun notify(grades: List<Grade>) {
+        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_notify_grade)
+            .setAutoCancel(true)
+            .setPriority(PRIORITY_HIGH)
+            .setDefaults(DEFAULT_ALL)
+            .setColor(context.getCompatColor(R.color.colorPrimary))
+            .setContentIntent(
+                PendingIntent.getActivity(context, MenuView.GRADE.id,
+                    MainActivity.getStartIntent(context, MenuView.GRADE, true), FLAG_UPDATE_CURRENT))
+            .setStyle(NotificationCompat.InboxStyle().run {
+                setSummaryText(context.resources.getQuantityString(R.plurals.grade_number_item, grades.size, grades.size))
+                grades.forEach { addLine("${it.subject}: ${it.entry}") }
+                this
+            })
+            .build()
+        )
+    }
+}
+
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
new file mode 100644
index 000000000..32b356c68
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/HomeworkWork.kt
@@ -0,0 +1,17 @@
+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.friday
+import io.github.wulkanowy.utils.monday
+import io.reactivex.Completable
+import org.threeten.bp.LocalDate.now
+import javax.inject.Inject
+
+class HomeworkWork @Inject constructor(private val homeworkRepository: HomeworkRepository) : Work {
+
+    override fun create(student: Student, semester: Semester): Completable {
+        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
new file mode 100644
index 000000000..ebd536b75
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/LuckyNumberWork.kt
@@ -0,0 +1,54 @@
+package io.github.wulkanowy.services.sync.works
+
+import android.app.PendingIntent
+import android.app.PendingIntent.FLAG_UPDATE_CURRENT
+import android.content.Context
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationCompat.DEFAULT_ALL
+import androidx.core.app.NotificationCompat.PRIORITY_HIGH
+import androidx.core.app.NotificationManagerCompat
+import io.github.wulkanowy.R
+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 io.github.wulkanowy.data.repositories.luckynumber.LuckyNumberRepository
+import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
+import io.github.wulkanowy.services.sync.channels.NewEntriesChannel
+import io.github.wulkanowy.ui.modules.main.MainActivity
+import io.github.wulkanowy.ui.modules.main.MainView.MenuView
+import io.github.wulkanowy.utils.getCompatColor
+import io.reactivex.Completable
+import javax.inject.Inject
+import kotlin.random.Random
+
+class LuckyNumberWork @Inject constructor(
+    private val context: Context,
+    private val notificationManager: NotificationManagerCompat,
+    private val luckyNumberRepository: LuckyNumberRepository,
+    private val preferencesRepository: PreferencesRepository
+) : Work {
+
+    override fun create(student: Student, semester: Semester): Completable {
+        return luckyNumberRepository.getLuckyNumber(semester, true, preferencesRepository.isNotificationsEnable)
+            .flatMap { luckyNumberRepository.getNotNotifiedLuckyNumber(semester) }
+            .flatMapCompletable {
+                notify(it)
+                luckyNumberRepository.updateLuckyNumber(it.apply { isNotified = true })
+            }
+    }
+
+    private fun notify(luckyNumber: LuckyNumber) {
+        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_notify_lucky_number)
+            .setAutoCancel(true)
+            .setDefaults(DEFAULT_ALL)
+            .setPriority(PRIORITY_HIGH)
+            .setColor(context.getCompatColor(R.color.colorPrimary))
+            .setContentIntent(
+                PendingIntent.getActivity(context, MenuView.MESSAGE.id,
+                    MainActivity.getStartIntent(context, MenuView.LUCKY_NUMBER, true), FLAG_UPDATE_CURRENT))
+            .build())
+    }
+}
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
new file mode 100644
index 000000000..d5016aeed
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/MessageWork.kt
@@ -0,0 +1,61 @@
+package io.github.wulkanowy.services.sync.works
+
+import android.app.PendingIntent
+import android.app.PendingIntent.FLAG_UPDATE_CURRENT
+import android.content.Context
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationCompat.DEFAULT_ALL
+import androidx.core.app.NotificationCompat.PRIORITY_HIGH
+import androidx.core.app.NotificationManagerCompat
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Message
+import io.github.wulkanowy.data.db.entities.Semester
+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.NewEntriesChannel
+import io.github.wulkanowy.ui.modules.main.MainActivity
+import io.github.wulkanowy.ui.modules.main.MainView.MenuView
+import io.github.wulkanowy.utils.getCompatColor
+import io.reactivex.Completable
+import javax.inject.Inject
+import kotlin.random.Random
+
+class MessageWork @Inject constructor(
+    private val context: Context,
+    private val notificationManager: NotificationManagerCompat,
+    private val messageRepository: MessageRepository,
+    private val preferencesRepository: PreferencesRepository
+) : Work {
+
+    override fun create(student: Student, semester: Semester): Completable {
+        return messageRepository.getMessages(student, RECEIVED, true, preferencesRepository.isNotificationsEnable)
+            .flatMap { messageRepository.getNotNotifiedMessages(student) }
+            .flatMapCompletable {
+                if (it.isNotEmpty()) notify(it)
+                messageRepository.updateMessages(it.onEach { message -> message.isNotified = true })
+            }
+    }
+
+    private fun notify(messages: List<Message>) {
+        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_notify_message)
+            .setAutoCancel(true)
+            .setDefaults(DEFAULT_ALL)
+            .setPriority(PRIORITY_HIGH)
+            .setColor(context.getCompatColor(R.color.colorPrimary))
+            .setContentIntent(
+                PendingIntent.getActivity(context, MenuView.MESSAGE.id,
+                    MainActivity.getStartIntent(context, MenuView.MESSAGE, true), FLAG_UPDATE_CURRENT)
+            )
+            .setStyle(NotificationCompat.InboxStyle().run {
+                setSummaryText(context.resources.getQuantityString(R.plurals.message_number_item, messages.size, messages.size))
+                messages.forEach { addLine("${it.sender}: ${it.subject}") }
+                this
+            })
+            .build())
+    }
+}
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
new file mode 100644
index 000000000..86e540c43
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/NoteWork.kt
@@ -0,0 +1,60 @@
+package io.github.wulkanowy.services.sync.works
+
+import android.app.PendingIntent
+import android.app.PendingIntent.FLAG_UPDATE_CURRENT
+import android.content.Context
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationCompat.DEFAULT_ALL
+import androidx.core.app.NotificationCompat.PRIORITY_HIGH
+import androidx.core.app.NotificationManagerCompat
+import io.github.wulkanowy.R
+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.data.repositories.note.NoteRepository
+import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
+import io.github.wulkanowy.services.sync.channels.NewEntriesChannel
+import io.github.wulkanowy.ui.modules.main.MainActivity
+import io.github.wulkanowy.ui.modules.main.MainView.MenuView
+import io.github.wulkanowy.utils.getCompatColor
+import io.reactivex.Completable
+import javax.inject.Inject
+import kotlin.random.Random
+
+class NoteWork @Inject constructor(
+    private val context: Context,
+    private val notificationManager: NotificationManagerCompat,
+    private val noteRepository: NoteRepository,
+    private val preferencesRepository: PreferencesRepository
+) : Work {
+
+    override fun create(student: Student, semester: Semester): Completable {
+        return noteRepository.getNotes(student, semester, true, preferencesRepository.isNotificationsEnable)
+            .flatMap { noteRepository.getNotNotifiedNotes(student) }
+            .flatMapCompletable {
+                if (it.isNotEmpty()) notify(it)
+                noteRepository.updateNotes(it.onEach { note -> note.isNotified = true })
+            }
+    }
+
+    private fun notify(notes: List<Note>) {
+        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_notify_note)
+            .setAutoCancel(true)
+            .setDefaults(DEFAULT_ALL)
+            .setPriority(PRIORITY_HIGH)
+            .setColor(context.getCompatColor(R.color.colorPrimary))
+            .setContentIntent(
+                PendingIntent.getActivity(context, MenuView.NOTE.id,
+                    MainActivity.getStartIntent(context, MenuView.NOTE, true), FLAG_UPDATE_CURRENT))
+            .setStyle(NotificationCompat.InboxStyle().run {
+                setSummaryText(context.resources.getQuantityString(R.plurals.note_number_item, notes.size, notes.size))
+                notes.forEach { addLine("${it.teacher}: ${it.category}") }
+                this
+            })
+            .build())
+    }
+}
+
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/RecipientWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/RecipientWork.kt
new file mode 100644
index 000000000..fa610dee4
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/RecipientWork.kt
@@ -0,0 +1,24 @@
+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.recipient.RecipientRepository
+import io.github.wulkanowy.data.repositories.reportingunit.ReportingUnitRepository
+import io.reactivex.Completable
+import javax.inject.Inject
+
+class RecipientWork @Inject constructor(
+    private val reportingUnitRepository: ReportingUnitRepository,
+    private val recipientRepository: RecipientRepository
+) : Work {
+
+    override fun create(student: Student, semester: Semester): Completable {
+        return reportingUnitRepository.getReportingUnits(student, true)
+            .flatMapCompletable { units ->
+                Completable.mergeDelayError(units.map {
+                    recipientRepository.getRecipients(student, 2, it, 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
new file mode 100644
index 000000000..743ae0e83
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/TimetableWork.kt
@@ -0,0 +1,18 @@
+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.friday
+import io.github.wulkanowy.utils.monday
+import io.reactivex.Completable
+import org.threeten.bp.LocalDate.now
+import javax.inject.Inject
+
+class TimetableWork @Inject constructor(private val timetableRepository: TimetableRepository) : Work {
+
+    override fun create(student: Student, semester: Semester): Completable {
+        return timetableRepository.getTimetable(semester, now().monday, now().friday, true)
+            .ignoreElement()
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/Work.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/Work.kt
new file mode 100644
index 000000000..1601a103b
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/Work.kt
@@ -0,0 +1,11 @@
+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.reactivex.Completable
+
+interface Work {
+
+    fun create(student: Student, semester: Semester): Completable
+}
+
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 d1e275b71..f3429457b 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,10 +4,11 @@ import android.content.Intent
 import android.widget.RemoteViewsService
 import dagger.android.AndroidInjection
 import io.github.wulkanowy.data.db.SharedPrefHelper
-import io.github.wulkanowy.data.repositories.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
-import io.github.wulkanowy.data.repositories.TimetableRepository
-import io.github.wulkanowy.ui.widgets.timetable.TimetableWidgetFactory
+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.TimetableWidgetFactory
+import io.github.wulkanowy.utils.SchedulersProvider
 import javax.inject.Inject
 
 class TimetableWidgetService : RemoteViewsService() {
@@ -24,8 +25,11 @@ class TimetableWidgetService : RemoteViewsService() {
     @Inject
     lateinit var sharedPref: SharedPrefHelper
 
+    @Inject
+    lateinit var schedulers: SchedulersProvider
+
     override fun onGetViewFactory(intent: Intent?): RemoteViewsFactory {
         AndroidInjection.inject(this)
-        return TimetableWidgetFactory(timetableRepo, studentRepo, semesterRepo, sharedPref, 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 f227dc19a..d8b53607b 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
@@ -2,33 +2,59 @@ package io.github.wulkanowy.ui.base
 
 import android.os.Bundle
 import android.view.View
+import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
+import androidx.fragment.app.Fragment
 import com.google.android.material.snackbar.Snackbar
 import com.google.android.material.snackbar.Snackbar.LENGTH_LONG
-import dagger.android.support.DaggerAppCompatActivity
+import dagger.android.AndroidInjection
+import dagger.android.DispatchingAndroidInjector
+import dagger.android.support.HasSupportFragmentInjector
 import io.github.wulkanowy.R
+import io.github.wulkanowy.utils.FragmentLifecycleLogger
+import javax.inject.Inject
 
-abstract class BaseActivity : DaggerAppCompatActivity(), BaseView {
+abstract class BaseActivity : AppCompatActivity(), BaseView, HasSupportFragmentInjector {
 
-    protected lateinit var messageContainer: View
+    @Inject
+    lateinit var supportFragmentInjector: DispatchingAndroidInjector<Fragment>
+
+    @Inject
+    lateinit var fragmentLifecycleLogger: FragmentLifecycleLogger
+
+    @Inject
+    lateinit var themeManager: ThemeManager
+
+    protected var messageContainer: View? = null
 
     public override fun onCreate(savedInstanceState: Bundle?) {
+        AndroidInjection.inject(this)
+        themeManager.applyTheme(this)
         super.onCreate(savedInstanceState)
+        supportFragmentManager.registerFragmentLifecycleCallbacks(fragmentLifecycleLogger, true)
         AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
     }
 
     override fun showError(text: String, error: Throwable) {
-        Snackbar.make(messageContainer, text, LENGTH_LONG).setAction(R.string.all_details) {
-            ErrorDialog.newInstance(error).show(supportFragmentManager, error.toString())
-        }.show()
+        if (messageContainer != null) {
+            Snackbar.make(messageContainer!!, text, LENGTH_LONG)
+                .setAction(R.string.all_details) {
+                    ErrorDialog.newInstance(error).show(supportFragmentManager, error.toString())
+                }
+                .show()
+        } else showMessage(text)
     }
 
     override fun showMessage(text: String) {
-        Snackbar.make(messageContainer, text, LENGTH_LONG).show()
+        if (messageContainer != null) Snackbar.make(messageContainer!!, text, LENGTH_LONG).show()
+        else Toast.makeText(this, text, Toast.LENGTH_LONG).show()
     }
 
     override fun onDestroy() {
         super.onDestroy()
         invalidateOptionsMenu()
     }
+
+    override fun supportFragmentInjector() = supportFragmentInjector
 }
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 6e863c511..4beb0ac4f 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
@@ -2,6 +2,7 @@ package io.github.wulkanowy.ui.base
 
 import android.view.View
 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
 
@@ -10,16 +11,22 @@ abstract class BaseFragment : DaggerFragment(), BaseView {
     protected var messageContainer: View? = null
 
     override fun showError(text: String, error: Throwable) {
-        if (messageContainer == null) (activity as? BaseActivity)?.showError(text, error)
-        else messageContainer?.also {
-            Snackbar.make(it, text, Snackbar.LENGTH_LONG).setAction(R.string.all_details) {
-                ErrorDialog.newInstance(error).show(childFragmentManager, error.toString())
-            }.show()
+        if (messageContainer != null) {
+            Snackbar.make(messageContainer!!, text, LENGTH_LONG)
+                .setAction(R.string.all_details) {
+                    if (isAdded) ErrorDialog.newInstance(error).show(childFragmentManager, error.toString())
+                }
+                .show()
+        } else {
+            (activity as? BaseActivity)?.showError(text, error)
         }
     }
 
     override fun showMessage(text: String) {
-        if (messageContainer == null) (activity as? BaseActivity)?.showMessage(text)
-        else messageContainer?.also { Snackbar.make(it, text, Snackbar.LENGTH_LONG).show() }
+        if (messageContainer != null) {
+            Snackbar.make(messageContainer!!, text, LENGTH_LONG).show()
+        } else {
+            (activity as? BaseActivity)?.showMessage(text)
+        }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/BaseFragmentPagerAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/base/BaseFragmentPagerAdapter.kt
new file mode 100644
index 000000000..fcf7e9809
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/BaseFragmentPagerAdapter.kt
@@ -0,0 +1,31 @@
+package io.github.wulkanowy.ui.base
+
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
+import androidx.fragment.app.FragmentPagerAdapter
+
+class BaseFragmentPagerAdapter(private val fragmentManager: FragmentManager) : FragmentPagerAdapter(fragmentManager) {
+
+    private val pages = mutableMapOf<Fragment, String?>()
+
+    var containerId = 0
+
+    fun getFragmentInstance(position: Int): Fragment? {
+        if (containerId == 0) throw IllegalArgumentException("Container id is 0")
+        return fragmentManager.findFragmentByTag("android:switcher:$containerId:$position")
+    }
+
+    fun addFragments(fragments: List<Fragment>) {
+        fragments.forEach { pages[it] = null }
+    }
+
+    fun addFragmentsWithTitle(pages: Map<Fragment, String>) {
+        this.pages.putAll(pages)
+    }
+
+    override fun getItem(position: Int) = pages.keys.elementAt(position)
+
+    override fun getCount() = pages.size
+
+    override fun getPageTitle(position: Int) = pages.values.elementAt(position)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/BasePagerAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/base/BasePagerAdapter.kt
deleted file mode 100644
index 000efdcd3..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/base/BasePagerAdapter.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package io.github.wulkanowy.ui.base
-
-import android.view.ViewGroup
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentManager
-import androidx.fragment.app.FragmentStatePagerAdapter
-
-class BasePagerAdapter(fragmentManager: FragmentManager) : FragmentStatePagerAdapter(fragmentManager) {
-
-    val fragments = mutableMapOf<String?, Fragment>()
-
-    val registeredFragments = mutableMapOf<Int, Fragment>()
-
-    override fun getItem(position: Int) = fragments.values.elementAt(position)
-
-    override fun getCount() = fragments.size
-
-    override fun getPageTitle(position: Int): CharSequence? {
-        return fragments.keys.elementAtOrNull(position)
-    }
-
-    override fun instantiateItem(container: ViewGroup, position: Int): Any {
-        return super.instantiateItem(container, position).also {
-            registeredFragments[position] = it as Fragment
-        }
-    }
-
-    override fun destroyItem(container: ViewGroup, position: Int, fragment: Any) {
-        registeredFragments.remove(position)
-        super.destroyItem(container, position, fragment)
-    }
-}
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 a8f210e67..83cbf0ef0 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
@@ -3,6 +3,7 @@ package io.github.wulkanowy.ui.base
 import android.content.res.Resources
 import com.readystatesoftware.chuck.api.ChuckCollector
 import io.github.wulkanowy.R
+import io.github.wulkanowy.api.interceptor.FeatureDisabledException
 import io.github.wulkanowy.api.interceptor.ServiceUnavailableException
 import io.github.wulkanowy.api.login.NotLoggedInException
 import timber.log.Timber
@@ -26,6 +27,7 @@ open class ErrorHandler @Inject constructor(protected val resources: Resources,
             is SocketTimeoutException -> resources.getString(R.string.error_timeout)
             is NotLoggedInException -> resources.getString(R.string.error_login_failed)
             is ServiceUnavailableException -> resources.getString(R.string.error_service_unavailable)
+            is FeatureDisabledException -> resources.getString(R.string.error_feature_disabled)
             else -> resources.getString(R.string.error_unknown)
         }), error)
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/ThemeManager.kt b/app/src/main/java/io/github/wulkanowy/ui/base/ThemeManager.kt
new file mode 100644
index 000000000..449f451be
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/ThemeManager.kt
@@ -0,0 +1,33 @@
+package io.github.wulkanowy.ui.base
+
+import android.content.pm.PackageManager.GET_ACTIVITIES
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_NO
+import androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_YES
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
+import javax.inject.Inject
+
+class ThemeManager @Inject constructor(private val preferencesRepository: PreferencesRepository) {
+
+    fun applyTheme(activity: AppCompatActivity) {
+        if (isThemeApplicable(activity)) {
+            activity.delegate.apply {
+                when (preferencesRepository.appTheme) {
+                    "light" -> setLocalNightMode(MODE_NIGHT_NO)
+                    "dark" -> setLocalNightMode(MODE_NIGHT_YES)
+                    "black" -> {
+                        setLocalNightMode(MODE_NIGHT_YES)
+                        activity.setTheme(R.style.WulkanowyTheme_Black)
+                    }
+                }
+            }
+        }
+    }
+
+    private fun isThemeApplicable(activity: AppCompatActivity): Boolean {
+        return activity.packageManager.getPackageInfo(activity.packageName, GET_ACTIVITIES)
+            .activities.singleOrNull { it.name == activity::class.java.canonicalName }?.theme
+            .let { it == R.style.WulkanowyTheme_Black || it == R.style.WulkanowyTheme_NoActionBar }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/session/BaseSessionFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/base/session/BaseSessionFragment.kt
index 42622b500..110729d4f 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/session/BaseSessionFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/session/BaseSessionFragment.kt
@@ -1,6 +1,9 @@
 package io.github.wulkanowy.ui.base.session
 
+import android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK
+import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
 import io.github.wulkanowy.ui.base.BaseFragment
+import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.ui.modules.main.MainActivity
 
 open class BaseSessionFragment : BaseFragment(), BaseSessionView {
@@ -8,4 +11,11 @@ open class BaseSessionFragment : BaseFragment(), BaseSessionView {
     override fun showExpiredDialog() {
         (activity as? MainActivity)?.showExpiredDialog()
     }
+
+    override fun openLoginView() {
+        activity?.also {
+            startActivity(LoginActivity.getStartIntent(it)
+                .apply { addFlags(FLAG_ACTIVITY_CLEAR_TASK or FLAG_ACTIVITY_NEW_TASK) })
+        }
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/session/BaseSessionPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/base/session/BaseSessionPresenter.kt
index 17ed65371..2c9f50ea9 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/session/BaseSessionPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/session/BaseSessionPresenter.kt
@@ -7,6 +7,9 @@ open class BaseSessionPresenter<T : BaseSessionView>(private val errorHandler: S
 
     override fun onAttachView(view: T) {
         super.onAttachView(view)
-        errorHandler.onDecryptionFail = { view.showExpiredDialog() }
+        errorHandler.apply {
+            onDecryptionFail = { view.showExpiredDialog() }
+            onNoCurrentStudent = { view.openLoginView() }
+        }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/session/BaseSessionView.kt b/app/src/main/java/io/github/wulkanowy/ui/base/session/BaseSessionView.kt
index 81ce4d8f9..619c2863a 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/session/BaseSessionView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/session/BaseSessionView.kt
@@ -5,4 +5,6 @@ import io.github.wulkanowy.ui.base.BaseView
 interface BaseSessionView : BaseView {
 
     fun showExpiredDialog()
+
+    fun openLoginView()
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/session/SessionErrorHandler.kt b/app/src/main/java/io/github/wulkanowy/ui/base/session/SessionErrorHandler.kt
index f8ea6e3db..017eabbab 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/session/SessionErrorHandler.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/session/SessionErrorHandler.kt
@@ -2,17 +2,24 @@ package io.github.wulkanowy.ui.base.session
 
 import android.content.res.Resources
 import com.readystatesoftware.chuck.api.ChuckCollector
+import io.github.wulkanowy.data.exceptions.NoCurrentStudentException
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.security.ScramblerException
 import javax.inject.Inject
 
-class SessionErrorHandler @Inject constructor(resources: Resources, chuckCollector: ChuckCollector) : ErrorHandler(resources, chuckCollector) {
+open class SessionErrorHandler @Inject constructor(
+    resources: Resources,
+    chuckCollector: ChuckCollector
+) : ErrorHandler(resources, chuckCollector) {
 
     var onDecryptionFail: () -> Unit = {}
 
+    var onNoCurrentStudent: () -> Unit = {}
+
     override fun proceed(error: Throwable) {
         when (error) {
             is ScramblerException -> onDecryptionFail()
+            is NoCurrentStudentException -> onNoCurrentStudent()
             else -> super.proceed(error)
         }
     }
@@ -20,5 +27,6 @@ class SessionErrorHandler @Inject constructor(resources: Resources, chuckCollect
     override fun clear() {
         super.clear()
         onDecryptionFail = {}
+        onNoCurrentStudent = {}
     }
 }
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 ddc4e11fa..8d07566f7 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,15 +1,18 @@
 package io.github.wulkanowy.ui.modules.about
 
 import android.content.Intent
+import android.net.Uri
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.mikepenz.aboutlibraries.LibsBuilder
 import com.mikepenz.aboutlibraries.LibsFragmentCompat
+import io.github.wulkanowy.BuildConfig
 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.withOnExtraListener
 import javax.inject.Inject
 
@@ -36,12 +39,13 @@ class AboutFragment : BaseFragment(), AboutView, MainView.TitledView {
                 .withAboutVersionShown(true)
                 .withAboutIconShown(true)
                 .withLicenseShown(true)
-                .withAboutSpecial1(getString(R.string.about_source_code))
-                .withAboutSpecial2(getString(R.string.about_feedback))
+                .withAboutSpecial1(getString(R.string.about_discord_invite))
+                .withAboutSpecial2(getString(R.string.about_homepage))
+                .withAboutSpecial3(getString(R.string.about_feedback))
                 .withFields(R.string::class.java.fields)
                 .withCheckCachedDetection(false)
-                .withExcludedLibraries("fastadapter", "AndroidIconics", "gson",
-                    "Jsoup", "Retrofit", "okio", "OkHttp")
+                .withExcludedLibraries("fastadapter", "AndroidIconics", "Jsoup", "Retrofit", "okio",
+                    "Butterknife", "CircleImageView")
                 .withOnExtraListener { presenter.onExtraSelect(it) })
         }.let {
             fragmentCompat.onCreateView(inflater.context, inflater, container, savedInstanceState, it)
@@ -53,12 +57,33 @@ class AboutFragment : BaseFragment(), AboutView, MainView.TitledView {
         fragmentCompat.onViewCreated(view, savedInstanceState)
     }
 
-    override fun openSourceWebView() {
-        startActivity(Intent.parseUri("https://github.com/wulkanowy/wulkanowy", 0))
+    override fun openDiscordInviteView() {
+        context?.openInternetBrowser("https://discord.gg/vccAQBr", ::showMessage)
     }
 
-    override fun openIssuesWebView() {
-        startActivity(Intent.parseUri("https://github.com/wulkanowy/wulkanowy/issues", 0))
+    override fun openHomepageWebView() {
+        context?.openInternetBrowser("https://wulkanowy.github.io/", ::showMessage)
+    }
+
+    override fun openEmailClientView() {
+        val intent = Intent(Intent.ACTION_SENDTO).apply {
+            data = Uri.parse("mailto:")
+            putExtra(Intent.EXTRA_EMAIL, Array(1) { "wulkanowyinc@gmail.com" })
+            putExtra(Intent.EXTRA_SUBJECT, "Zgłoszenie błędu")
+            putExtra(Intent.EXTRA_TEXT, "Tu umieść treść zgłoszenia\n\n" + "-".repeat(40) + "\n" + """
+                Build: ${BuildConfig.VERSION_CODE}
+                SDK: ${android.os.Build.VERSION.SDK_INT}
+                Device: ${android.os.Build.MANUFACTURER} ${android.os.Build.MODEL}
+            """.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 onDestroyView() {
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 9a512f70f..0b6db107c 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
@@ -15,21 +15,28 @@ class AboutPresenter @Inject constructor(
     private val analytics: FirebaseAnalyticsHelper
 ) : BasePresenter<AboutView>(errorHandler) {
 
+    override fun onAttachView(view: AboutView) {
+        super.onAttachView(view)
+        Timber.i("About view was initialized")
+    }
+
     fun onExtraSelect(type: Libs.SpecialButton?) {
         view?.run {
             when (type) {
                 SPECIAL1 -> {
-                    Timber.i("Opening github page")
-                    analytics.logEvent("open_page", mapOf("name" to "github"))
-                    openSourceWebView()
+                    Timber.i("Opening discord invide page")
+                    analytics.logEvent("open_page", "name" to "discord")
+                    openDiscordInviteView()
                 }
                 SPECIAL2 -> {
-                    Timber.i("Opening issues page")
-                    analytics.logEvent("open_page", mapOf("name" to "issues"))
-                    openIssuesWebView()
+                    Timber.i("Opening home page")
+                    analytics.logEvent("open_page", "name" to "home")
+                    openHomepageWebView()
                 }
                 SPECIAL3 -> {
-                    //empty for now
+                    Timber.i("Opening email client")
+                    analytics.logEvent("open_page", "name" to "email")
+                    openEmailClientView()
                 }
             }
         }
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 a3ae2ada8..5b206ad82 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
@@ -4,7 +4,9 @@ import io.github.wulkanowy.ui.base.BaseView
 
 interface AboutView : BaseView {
 
-    fun openSourceWebView()
+    fun openDiscordInviteView()
 
-    fun openIssuesWebView()
+    fun openEmailClientView()
+
+    fun openHomepageWebView()
 }
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 32458f276..1eaa07c16 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
@@ -15,7 +15,6 @@ import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.R
 import io.github.wulkanowy.ui.modules.login.LoginActivity
-import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.utils.setOnItemClickListener
 import kotlinx.android.synthetic.main.dialog_account.*
 import javax.inject.Inject
@@ -97,11 +96,8 @@ class AccountDialog : DaggerAppCompatDialogFragment(), AccountView {
         }
     }
 
-    override fun recreateView() {
-        activity?.also {
-            startActivity(MainActivity.getStartIntent(it))
-            it.finish()
-        }
+    override fun recreateMainView() {
+        activity?.recreate()
     }
 
     override fun onDestroy() {
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
index a564306d5..972d10a26 100644
--- 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
@@ -1,5 +1,6 @@
 package io.github.wulkanowy.ui.modules.account
 
+import android.annotation.SuppressLint
 import android.view.View
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
@@ -14,13 +15,14 @@ class AccountItem(val student: Student) : AbstractFlexibleItem<AccountItem.ViewH
 
     override fun getLayoutRes() = R.layout.item_account
 
-    override fun createViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?): ViewHolder {
+    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 {
-            accountItemName.text = student.studentName
+    @SuppressLint("SetTextI18n")
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
+        holder.apply {
+            accountItemName.text = "${student.studentName} ${student.className}"
             accountItemSchool.text = student.schoolName
             accountItemImage.setBackgroundResource(if (student.isCurrent) R.drawable.ic_account_circular_border else 0)
         }
@@ -38,14 +40,13 @@ class AccountItem(val student: Student) : AbstractFlexibleItem<AccountItem.ViewH
     }
 
     override fun hashCode(): Int {
-        return student.hashCode()
+        var result = student.hashCode()
+        result = 31 * result + student.id.toInt()
+        return result
     }
 
-    class ViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?) : FlexibleViewHolder(view, adapter),
-        LayoutContainer {
-
-        override val containerView: View?
+    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 e1459fe7d..a16c544a8 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,34 +1,41 @@
 package io.github.wulkanowy.ui.modules.account
 
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
-import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.data.repositories.student.StudentRepository
+import io.github.wulkanowy.services.sync.SyncManager
 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 timber.log.Timber
 import javax.inject.Inject
 
 class AccountPresenter @Inject constructor(
     private val errorHandler: ErrorHandler,
     private val studentRepository: StudentRepository,
+    private val syncManager: SyncManager,
     private val schedulers: SchedulersProvider
 ) : BasePresenter<AccountView>(errorHandler) {
 
     override fun onAttachView(view: AccountView) {
         super.onAttachView(view)
         view.initView()
+        Timber.i("Account dialog view was initialized")
         loadData()
     }
 
     fun onAddSelected() {
+        Timber.i("Select add account")
         view?.openLoginView()
     }
 
     fun onRemoveSelected() {
+        Timber.i("Select remove account")
         view?.showConfirmDialog()
     }
 
     fun onLogoutConfirm() {
+        Timber.i("Attempt to logout current user ")
         disposable.add(studentRepository.getCurrentStudent()
             .flatMapCompletable { studentRepository.logoutStudent(it) }
             .andThen(studentRepository.getSavedStudents(false))
@@ -41,31 +48,56 @@ class AccountPresenter @Inject constructor(
             .doFinally { view?.dismissView() }
             .subscribe({
                 view?.apply {
-                    if (it.isEmpty()) openClearLoginView()
-                    else recreateView()
+                    if (it.isEmpty()) {
+                        Timber.i("Logout result: Open login view")
+                        syncManager.stopSyncWorker()
+                        openClearLoginView()
+                    } else {
+                        Timber.i("Logout result: Switch to another student")
+                        recreateMainView()
+                    }
                 }
-            }, { errorHandler.dispatch(it) }))
+            }, {
+                Timber.i("Logout 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)
-                    .subscribe({ view?.recreateView() }, { errorHandler.dispatch(it) }))
+                    .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({ view?.updateData(it) }, { errorHandler.dispatch(it) }))
+            .subscribe({
+                Timber.i("Loading account result: Success")
+                view?.updateData(it)
+            }, {
+                Timber.i("Loading account result: An exception occurred")
+                errorHandler.dispatch(it)
+            }))
     }
 }
 
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 ca74998a1..74662cf4e 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
@@ -16,6 +16,6 @@ interface AccountView : BaseView {
 
     fun openClearLoginView()
 
-    fun recreateView()
+    fun recreateMainView()
 }
 
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 3b60d8cb7..e5d8150d3 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
@@ -8,6 +8,7 @@ import android.view.MenuItem
 import android.view.View
 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
@@ -66,18 +67,22 @@ class AttendanceFragment : BaseSessionFragment(), AttendanceView, MainView.MainC
         attendanceRecycler.run {
             layoutManager = SmoothScrollLinearLayoutManager(context)
             adapter = attendanceAdapter
+            addItemDecoration(FlexibleItemDecoration(context)
+                .withDefaultDivider()
+                .withDrawDividerOnLastItem(false)
+            )
         }
         attendanceSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
         attendancePreviousButton.setOnClickListener { presenter.onPreviousDay() }
         attendanceNextButton.setOnClickListener { presenter.onNextDay() }
     }
 
-    override fun onCreateOptionsMenu(menu: Menu?, inflater: MenuInflater?) {
-        inflater?.inflate(R.menu.action_menu_attendance, menu)
+    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+        inflater.inflate(R.menu.action_menu_attendance, menu)
     }
 
-    override fun onOptionsItemSelected(item: MenuItem?): Boolean {
-        return if (item?.itemId == R.id.attendanceMenuSummary) presenter.onSummarySwitchSelected()
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        return if (item.itemId == R.id.attendanceMenuSummary) presenter.onSummarySwitchSelected()
         else false
     }
 
@@ -98,7 +103,7 @@ class AttendanceFragment : BaseSessionFragment(), AttendanceView, MainView.MainC
     }
 
     override fun onFragmentReselected() {
-        presenter.onViewReselected()
+        if (::presenter.isInitialized) presenter.onViewReselected()
     }
 
     override fun popView() {
@@ -113,6 +118,10 @@ class AttendanceFragment : BaseSessionFragment(), AttendanceView, MainView.MainC
         attendanceProgress.visibility = if (show) View.VISIBLE else View.GONE
     }
 
+    override fun enableSwipe(enable: Boolean) {
+        attendanceSwipe.isEnabled = enable
+    }
+
     override fun showContent(show: Boolean) {
         attendanceRecycler.visibility = if (show) View.VISIBLE else View.GONE
     }
@@ -130,7 +139,7 @@ class AttendanceFragment : BaseSessionFragment(), AttendanceView, MainView.MainC
     }
 
     override fun showAttendanceDialog(lesson: Attendance) {
-        AttendanceDialog.newInstance(lesson).show(fragmentManager, lesson.toString())
+        (activity as? MainActivity)?.showDialogFragment(AttendanceDialog.newInstance(lesson))
     }
 
     override fun openSummaryView() {
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
index c2698ebba..16a140cbf 100644
--- 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
@@ -14,14 +14,13 @@ 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 getLayoutRes(): Int = R.layout.item_attendance
-
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder,
-                                position: Int, payloads: MutableList<Any>?) {
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
         holder.apply {
             attendanceItemNumber.text = attendance.number.toString()
             attendanceItemSubject.text = attendance.subject
@@ -37,16 +36,17 @@ class AttendanceItem(val attendance: Attendance) : AbstractFlexibleItem<Attendan
         other as AttendanceItem
 
         if (attendance != other.attendance) return false
+
         return true
     }
 
     override fun hashCode(): Int {
-        return attendance.hashCode()
+        var result = attendance.hashCode()
+        result = 31 * result + attendance.id.toInt()
+        return result
     }
 
-    class ViewHolder(val view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter),
-            LayoutContainer {
-
+    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/AttendancePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt
index 9be87b441..ec3d57e34 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
@@ -2,10 +2,10 @@ package io.github.wulkanowy.ui.modules.attendance
 
 import com.google.firebase.analytics.FirebaseAnalytics.Param.START_DATE
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
-import io.github.wulkanowy.data.repositories.AttendanceRepository
-import io.github.wulkanowy.data.repositories.PreferencesRepository
-import io.github.wulkanowy.data.repositories.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.data.repositories.attendance.AttendanceRepository
+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.ui.base.session.BaseSessionPresenter
 import io.github.wulkanowy.ui.base.session.SessionErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
@@ -18,6 +18,7 @@ import io.github.wulkanowy.utils.toFormattedString
 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
 
@@ -37,6 +38,7 @@ class AttendancePresenter @Inject constructor(
     fun onAttachView(view: AttendanceView, date: Long?) {
         super.onAttachView(view)
         view.initView()
+        Timber.i("Attendance view was initialized")
         loadData(ofEpochDay(date ?: now().previousOrSameSchoolDay.toEpochDay()))
         reloadView()
     }
@@ -52,10 +54,12 @@ class AttendancePresenter @Inject constructor(
     }
 
     fun onSwipeRefresh() {
+        Timber.i("Force refreshing the attendance")
         loadData(currentDate, true)
     }
 
     fun onViewReselected() {
+        Timber.i("Attendance view is reselected")
         view?.also { view ->
             if (view.currentStackSize == 1) {
                 now().previousOrSameSchoolDay.also {
@@ -69,7 +73,10 @@ class AttendancePresenter @Inject constructor(
     }
 
     fun onAttendanceItemSelected(item: AbstractFlexibleItem<*>?) {
-        if (item is AttendanceItem) view?.showAttendanceDialog(item.attendance)
+        if (item is AttendanceItem) {
+            Timber.i("Select attendance item ${item.attendance.id}")
+            view?.showAttendanceDialog(item.attendance)
+        }
     }
 
     fun onSummarySwitchSelected(): Boolean {
@@ -78,6 +85,7 @@ class AttendancePresenter @Inject constructor(
     }
 
     private fun loadData(date: LocalDate, forceRefresh: Boolean = false) {
+        Timber.i("Loading attendance data started")
         currentDate = date
         disposable.apply {
             clear()
@@ -97,16 +105,19 @@ class AttendancePresenter @Inject constructor(
                     view?.run {
                         hideRefresh()
                         showProgress(false)
+                        enableSwipe(true)
                     }
                 }
                 .subscribe({
+                    Timber.i("Loading attendance result: Success")
                     view?.apply {
                         updateData(it)
                         showEmpty(it.isEmpty())
                         showContent(it.isNotEmpty())
                     }
-                    analytics.logEvent("load_attendance", mapOf("items" to it.size, "force_refresh" to forceRefresh, START_DATE to currentDate.toFormattedString("yyyy-MM-dd")))
+                    analytics.logEvent("load_attendance", "items" to it.size, "force_refresh" to forceRefresh, START_DATE to currentDate.toFormattedString("yyyy-MM-dd"))
                 }) {
+                    Timber.i("Loading attendance result: An exception occurred")
                     view?.run { showEmpty(isViewEmpty) }
                     errorHandler.dispatch(it)
                 }
@@ -115,14 +126,16 @@ class AttendancePresenter @Inject constructor(
     }
 
     private fun reloadView() {
+        Timber.i("Reload attendance view with the date ${currentDate.toFormattedString()}")
         view?.apply {
             showProgress(true)
+            enableSwipe(false)
             showContent(false)
             showEmpty(false)
             clearData()
             showNextButton(!currentDate.plusDays(1).isHolidays)
             showPreButton(!currentDate.minusDays(1).isHolidays)
-            updateNavigationDay(currentDate.toFormattedString("EEEE \n dd.MM.YYYY").capitalize())
+            updateNavigationDay(currentDate.toFormattedString("EEEE\ndd.MM.YYYY").capitalize())
         }
     }
 }
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 f839e89a9..ef3b874b6 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
@@ -25,6 +25,8 @@ interface AttendanceView : BaseSessionView {
 
     fun showProgress(show: Boolean)
 
+    fun enableSwipe(enable: Boolean)
+
     fun showContent(show: Boolean)
 
     fun showPreButton(show: Boolean)
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 8f36d7468..b8d2c9528 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
@@ -97,6 +97,10 @@ class AttendanceSummaryFragment : BaseSessionFragment(), AttendanceSummaryView,
         attendanceSummaryProgress.visibility = if (show) VISIBLE else GONE
     }
 
+    override fun enableSwipe(enable: Boolean) {
+        attendanceSummarySwipe.isEnabled = enable
+    }
+
     override fun showContent(show: Boolean) {
         attendanceSummaryRecycler.visibility = if (show) VISIBLE else GONE
     }
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
index 3102ce116..265d6ce44 100644
--- 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
@@ -23,12 +23,12 @@ class AttendanceSummaryItem(
 
     override fun getLayoutRes() = R.layout.item_attendance_summary
 
-    override fun createViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?): ViewHolder {
+    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 {
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
+        holder.apply {
             attendanceSummaryMonth.text = month
             attendanceSummaryPercentage.text = percentage
             attendanceSummaryPresent.text = present
@@ -73,10 +73,8 @@ class AttendanceSummaryItem(
         return result
     }
 
-    class ViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?) : FlexibleViewHolder(view, adapter),
-        LayoutContainer {
-
-        override val containerView: View?
+    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 5086e80cc..09ad8980f 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
@@ -2,16 +2,17 @@ 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.AttendanceSummaryRepository
-import io.github.wulkanowy.data.repositories.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
-import io.github.wulkanowy.data.repositories.SubjectRepostory
+import io.github.wulkanowy.data.repositories.attendancesummary.AttendanceSummaryRepository
+import io.github.wulkanowy.data.repositories.semester.SemesterRepository
+import io.github.wulkanowy.data.repositories.student.StudentRepository
+import io.github.wulkanowy.data.repositories.subject.SubjectRepository
 import io.github.wulkanowy.ui.base.session.BaseSessionPresenter
 import io.github.wulkanowy.ui.base.session.SessionErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 import io.github.wulkanowy.utils.SchedulersProvider
 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
@@ -20,7 +21,7 @@ import javax.inject.Inject
 class AttendanceSummaryPresenter @Inject constructor(
     private val errorHandler: SessionErrorHandler,
     private val attendanceSummaryRepository: AttendanceSummaryRepository,
-    private val subjectRepository: SubjectRepostory,
+    private val subjectRepository: SubjectRepository,
     private val studentRepository: StudentRepository,
     private val semesterRepository: SemesterRepository,
     private val schedulers: SchedulersProvider,
@@ -35,24 +36,31 @@ class AttendanceSummaryPresenter @Inject constructor(
     fun onAttachView(view: AttendanceSummaryView, subjectId: Int?) {
         super.onAttachView(view)
         view.initView()
+        Timber.i("Attendance summary view was initialized with subject id ${subjectId ?: -1}")
         loadData(subjectId ?: -1)
         loadSubjects()
     }
 
     fun onSwipeRefresh() {
+        Timber.i("Force refreshing the attendance summary")
         loadData(currentSubjectId, true)
     }
 
     fun onSubjectSelected(name: String) {
+        Timber.i("Select attendance summary subject $name")
         view?.run {
             showContent(false)
             showProgress(true)
+            enableSwipe(false)
             clearView()
         }
-        loadData(subjects.singleOrNull { it.name == name }?.realId ?: -1)
+        (subjects.singleOrNull { it.name == name }?.realId ?: -1).let {
+            if (it != currentSubjectId) loadData(it)
+        }
     }
 
     private fun loadData(subjectId: Int, forceRefresh: Boolean = false) {
+        Timber.i("Loading attendance summary data started")
         currentSubjectId = subjectId
         disposable.apply {
             clear()
@@ -67,16 +75,19 @@ class AttendanceSummaryPresenter @Inject constructor(
                     view?.run {
                         hideRefresh()
                         showProgress(false)
+                        enableSwipe(true)
                     }
                 }
                 .subscribe({
+                    Timber.i("Loading attendance summary result: Success")
                     view?.apply {
                         showEmpty(it.first.isEmpty())
                         showContent(it.first.isNotEmpty())
                         updateDataSet(it.first, it.second)
                     }
-                    analytics.logEvent("load_attendance_summary", mapOf("items" to it.first.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")
                     view?.run { showEmpty(isViewEmpty) }
                     errorHandler.dispatch(it)
                 }
@@ -85,6 +96,7 @@ class AttendanceSummaryPresenter @Inject constructor(
     }
 
     private fun loadSubjects() {
+        Timber.i("Loading attendance summary subjects started")
         disposable.add(studentRepository.getCurrentStudent()
             .flatMap { semesterRepository.getCurrentSemester(it) }
             .flatMap { subjectRepository.getSubjects(it) }
@@ -93,11 +105,15 @@ class AttendanceSummaryPresenter @Inject constructor(
             .subscribeOn(schedulers.backgroundThread)
             .observeOn(schedulers.mainThread)
             .subscribe({
+                Timber.i("Loading attendance summary subjects result: Success")
                 view?.run {
                     view?.updateSubjects(it)
                     showSubjects(true)
                 }
-            }, { errorHandler.dispatch(it) })
+            }, {
+                Timber.i("Loading attendance summary subjects result: An exception occurred")
+                errorHandler.dispatch(it)
+            })
         )
     }
 
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 af62a2ded..e4c36db7b 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
@@ -14,6 +14,8 @@ interface AttendanceSummaryView : BaseSessionView {
 
     fun showProgress(show: Boolean)
 
+    fun enableSwipe(enable: Boolean)
+
     fun showEmpty(show: Boolean)
 
     fun updateDataSet(data: List<AttendanceSummaryItem>, header: AttendanceSummaryScrollableHeader)
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 d39688d4f..8f9576f2a 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
@@ -8,11 +8,13 @@ import android.view.View.INVISIBLE
 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.data.db.entities.Exam
 import io.github.wulkanowy.ui.base.session.BaseSessionFragment
+import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.setOnItemClickListener
 import kotlinx.android.synthetic.main.fragment_exam.*
@@ -55,6 +57,10 @@ class ExamFragment : BaseSessionFragment(), ExamView, MainView.MainChildView, Ma
         examRecycler.run {
             layoutManager = SmoothScrollLinearLayoutManager(context)
             adapter = examAdapter
+            addItemDecoration(FlexibleItemDecoration(context)
+                .withDefaultDivider(R.layout.item_exam)
+                .withDrawDividerOnLastItem(false)
+            )
         }
         examSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
         examPreviousButton.setOnClickListener { presenter.onPreviousWeek() }
@@ -82,7 +88,7 @@ class ExamFragment : BaseSessionFragment(), ExamView, MainView.MainChildView, Ma
     }
 
     override fun onFragmentReselected() {
-        presenter.onViewReselected()
+        if (::presenter.isInitialized) presenter.onViewReselected()
     }
 
     override fun showEmpty(show: Boolean) {
@@ -93,6 +99,10 @@ class ExamFragment : BaseSessionFragment(), ExamView, MainView.MainChildView, Ma
         examProgress.visibility = if (show) VISIBLE else GONE
     }
 
+    override fun enableSwipe(enable: Boolean) {
+        examSwipe.isEnabled = enable
+    }
+
     override fun showContent(show: Boolean) {
         examRecycler.visibility = if (show) VISIBLE else GONE
     }
@@ -106,7 +116,7 @@ class ExamFragment : BaseSessionFragment(), ExamView, MainView.MainChildView, Ma
     }
 
     override fun showExamDialog(exam: Exam) {
-        ExamDialog.newInstance(exam).show(fragmentManager, exam.toString())
+        (activity as? MainActivity)?.showDialogFragment(ExamDialog.newInstance(exam))
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
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 318685e93..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
@@ -18,8 +18,7 @@ class ExamItem(header: ExamHeader, val exam: Exam) : AbstractSectionableItem<Exa
         return ViewHolder(view, adapter)
     }
 
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder,
-                                position: Int, payloads: MutableList<Any>?) {
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
         holder.run {
             examItemSubject.text = exam.subject
             examItemTeacher.text = exam.teacher
@@ -39,12 +38,12 @@ class ExamItem(header: ExamHeader, val exam: Exam) : AbstractSectionableItem<Exa
     }
 
     override fun hashCode(): Int {
-        return exam.hashCode()
+        var result = exam.hashCode()
+        result = 31 * result + exam.id.toInt()
+        return result
     }
 
-    class ViewHolder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter),
-            LayoutContainer {
-
+    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 88a0eaa53..a18f7b2a4 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
@@ -3,9 +3,9 @@ package io.github.wulkanowy.ui.modules.exam
 import com.google.firebase.analytics.FirebaseAnalytics.Param.START_DATE
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.db.entities.Exam
-import io.github.wulkanowy.data.repositories.ExamRepository
-import io.github.wulkanowy.data.repositories.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.data.repositories.exam.ExamRepository
+import io.github.wulkanowy.data.repositories.semester.SemesterRepository
+import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.session.BaseSessionPresenter
 import io.github.wulkanowy.ui.base.session.SessionErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
@@ -18,6 +18,7 @@ import io.github.wulkanowy.utils.toFormattedString
 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
 
@@ -36,6 +37,7 @@ class ExamPresenter @Inject constructor(
     fun onAttachView(view: ExamView, date: Long?) {
         super.onAttachView(view)
         view.initView()
+        Timber.i("Exam view was initialized")
         loadData(ofEpochDay(date ?: now().nextOrSameSchoolDay.toEpochDay()))
         reloadView()
     }
@@ -51,14 +53,19 @@ class ExamPresenter @Inject constructor(
     }
 
     fun onSwipeRefresh() {
+        Timber.i("Force refreshing the exam")
         loadData(currentDate, true)
     }
 
     fun onExamItemSelected(item: AbstractFlexibleItem<*>?) {
-        if (item is ExamItem) view?.showExamDialog(item.exam)
+        if (item is ExamItem) {
+            Timber.i("Select exam item ${item.exam.id}")
+            view?.showExamDialog(item.exam)
+        }
     }
 
     fun onViewReselected() {
+        Timber.i("Exam view is reselected")
         now().nextOrSameSchoolDay.also {
             if (currentDate != it) {
                 loadData(it)
@@ -68,6 +75,7 @@ class ExamPresenter @Inject constructor(
     }
 
     private fun loadData(date: LocalDate, forceRefresh: Boolean = false) {
+        Timber.i("Loading exam data started")
         currentDate = date
         disposable.apply {
             clear()
@@ -84,16 +92,19 @@ class ExamPresenter @Inject constructor(
                     view?.run {
                         hideRefresh()
                         showProgress(false)
+                        enableSwipe(true)
                     }
                 }
                 .subscribe({
+                    Timber.i("Loading exam result: Success")
                     view?.apply {
                         updateData(it)
                         showEmpty(it.isEmpty())
                         showContent(it.isNotEmpty())
                     }
-                    analytics.logEvent("load_exam", mapOf("items" to it.size, "force_refresh" to forceRefresh, START_DATE to currentDate.toFormattedString("yyyy-MM-dd")))
+                    analytics.logEvent("load_exam", "items" to it.size, "force_refresh" to forceRefresh, START_DATE to currentDate.toFormattedString("yyyy-MM-dd"))
                 }) {
+                    Timber.i("Loading exam result: An exception occurred")
                     view?.run { showEmpty(isViewEmpty) }
                     errorHandler.dispatch(it)
                 })
@@ -109,8 +120,10 @@ class ExamPresenter @Inject constructor(
     }
 
     private fun reloadView() {
+        Timber.i("Reload exam view with the date ${currentDate.toFormattedString()}")
         view?.apply {
             showProgress(true)
+            enableSwipe(false)
             showContent(false)
             showEmpty(false)
             clearData()
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 b6a926f3a..2ced3f2d4 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
@@ -23,6 +23,8 @@ interface ExamView : BaseSessionView {
 
     fun showProgress(show: Boolean)
 
+    fun enableSwipe(enable: Boolean)
+
     fun showContent(show: Boolean)
 
     fun showNextButton(show: Boolean)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/CustomTabLayout.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/CustomTabLayout.kt
new file mode 100644
index 000000000..e6f01497c
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/CustomTabLayout.kt
@@ -0,0 +1,34 @@
+package io.github.wulkanowy.ui.modules.grade
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.ViewGroup
+import com.google.android.material.tabs.TabLayout
+
+/**
+ * @see <a href="https://stackoverflow.com/a/50382854">Tabs don't fit to screen with tabmode=scrollable, Even with a Custom Tab Layout</a>
+ */
+class CustomTabLayout : TabLayout {
+
+    constructor(context: Context) : super(context)
+
+    constructor(context: Context, attrs: AttributeSet) : super(context, attrs)
+
+    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr)
+
+    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
+        setMeasuredDimension(widthMeasureSpec, heightMeasureSpec)
+        val tabLayout = getChildAt(0) as ViewGroup
+        val childCount = tabLayout.childCount
+
+        if (childCount == 0) return
+
+        val tabMinWidth = context.resources.displayMetrics.widthPixels / childCount
+
+        for (i in 0 until childCount) {
+            tabLayout.getChildAt(i).minimumWidth = tabMinWidth
+        }
+
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec)
+    }
+}
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
new file mode 100644
index 000000000..a76f3d5ac
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProvider.kt
@@ -0,0 +1,54 @@
+package io.github.wulkanowy.ui.modules.grade
+
+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.utils.calcAverage
+import io.github.wulkanowy.utils.changeModifier
+import io.reactivex.Single
+import javax.inject.Inject
+
+class GradeAverageProvider @Inject constructor(
+    private val preferencesRepository: PreferencesRepository,
+    private val gradeRepository: GradeRepository
+) {
+    fun getGradeAverage(student: Student, semesters: List<Semester>, selectedSemesterId: Int, forceRefresh: Boolean): Single<Map<String, Double>> {
+        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 getAllYearAverage(student: Student, semesters: List<Semester>, semesterId: Int, forceRefresh: Boolean): Single<Map<String, Double>> {
+        val selectedSemester = semesters.single { it.semesterId == semesterId }
+        val firstSemester = semesters.single { it.diaryId == selectedSemester.diaryId && it.semesterName == 1 }
+        val plusModifier = preferencesRepository.gradePlusModifier
+        val minusModifier = preferencesRepository.gradeMinusModifier
+
+        return gradeRepository.getGrades(student, selectedSemester, forceRefresh)
+            .flatMap { firstGrades ->
+                if (selectedSemester == firstSemester) Single.just(firstGrades)
+                else gradeRepository.getGrades(student, firstSemester)
+                    .map { secondGrades -> secondGrades + firstGrades }
+            }.map { grades ->
+                grades.map { it.changeModifier(plusModifier, minusModifier) }
+                    .groupBy { it.subject }
+                    .mapValues { it.value.calcAverage() }
+            }
+    }
+
+    private fun getOnlyOneSemesterAverage(student: Student, semesters: List<Semester>, semesterId: Int, forceRefresh: Boolean): Single<Map<String, Double>> {
+        val selectedSemester = semesters.single { it.semesterId == semesterId }
+        val plusModifier = preferencesRepository.gradePlusModifier
+        val minusModifier = preferencesRepository.gradeMinusModifier
+
+        return gradeRepository.getGrades(student, selectedSemester, forceRefresh)
+            .map { grades ->
+                grades.map { it.changeModifier(plusModifier, minusModifier) }
+                    .groupBy { it.subject }
+                    .mapValues { it.value.calcAverage() }
+            }
+    }
+}
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 a4d948a92..182258d14 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
@@ -11,9 +11,10 @@ import android.view.View.VISIBLE
 import android.view.ViewGroup
 import androidx.appcompat.app.AlertDialog
 import io.github.wulkanowy.R
-import io.github.wulkanowy.ui.base.BasePagerAdapter
+import io.github.wulkanowy.ui.base.BaseFragmentPagerAdapter
 import io.github.wulkanowy.ui.base.session.BaseSessionFragment
 import io.github.wulkanowy.ui.modules.grade.details.GradeDetailsFragment
+import io.github.wulkanowy.ui.modules.grade.statistics.GradeStatisticsFragment
 import io.github.wulkanowy.ui.modules.grade.summary.GradeSummaryFragment
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.setOnSelectPageListener
@@ -26,7 +27,9 @@ class GradeFragment : BaseSessionFragment(), GradeView, MainView.MainChildView,
     lateinit var presenter: GradePresenter
 
     @Inject
-    lateinit var pagerAdapter: BasePagerAdapter
+    lateinit var pagerAdapter: BaseFragmentPagerAdapter
+
+    private var semesterSwitchMenu: MenuItem? = null
 
     companion object {
         private const val SAVED_SEMESTER_KEY = "CURRENT_SEMESTER"
@@ -54,29 +57,38 @@ class GradeFragment : BaseSessionFragment(), GradeView, MainView.MainChildView,
         presenter.onAttachView(this, savedInstanceState?.getInt(SAVED_SEMESTER_KEY))
     }
 
-    override fun onCreateOptionsMenu(menu: Menu?, inflater: MenuInflater?) {
-        inflater?.inflate(R.menu.action_menu_grade, menu)
+    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+        inflater.inflate(R.menu.action_menu_grade, menu)
+        semesterSwitchMenu = menu.findItem(R.id.gradeMenuSemester)
+        presenter.onCreateMenu()
     }
 
     override fun initView() {
-        pagerAdapter.fragments.putAll(mapOf(
-            getString(R.string.all_details) to GradeDetailsFragment.newInstance(),
-            getString(R.string.grade_menu_summary) to GradeSummaryFragment.newInstance()
-        ))
+        pagerAdapter.apply {
+            containerId = gradeViewPager.id
+            addFragmentsWithTitle(mapOf(
+                GradeDetailsFragment.newInstance() to getString(R.string.all_details),
+                GradeSummaryFragment.newInstance() to getString(R.string.grade_menu_summary),
+                GradeStatisticsFragment.newInstance() to getString(R.string.grade_menu_statistics)
+            ))
+        }
+
         gradeViewPager.run {
             adapter = pagerAdapter
+            offscreenPageLimit = 3
             setOnSelectPageListener { presenter.onPageSelected(it) }
         }
         gradeTabLayout.setupWithViewPager(gradeViewPager)
+        gradeSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
     }
 
-    override fun onOptionsItemSelected(item: MenuItem?): Boolean {
-        return if (item?.itemId == R.id.gradeMenuSemester) presenter.onSemesterSwitch()
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        return if (item.itemId == R.id.gradeMenuSemester) presenter.onSemesterSwitch()
         else false
     }
 
     override fun onFragmentReselected() {
-        presenter.onViewReselected()
+        if (::presenter.isInitialized) presenter.onViewReselected()
     }
 
     override fun showContent(show: Boolean) {
@@ -88,8 +100,20 @@ class GradeFragment : BaseSessionFragment(), GradeView, MainView.MainChildView,
         gradeProgress.visibility = if (show) VISIBLE else INVISIBLE
     }
 
-    override fun showEmpty() {
-        gradeEmpty.visibility = VISIBLE
+    override fun showEmpty(show: Boolean) {
+        gradeEmpty.visibility = if (show) VISIBLE else INVISIBLE
+    }
+
+    override fun showRefresh(show: Boolean) {
+        gradeSwipe.isRefreshing = show
+    }
+
+    override fun showSemesterSwitch(show: Boolean) {
+        semesterSwitchMenu?.isVisible = show
+    }
+
+    override fun enableSwipe(enable: Boolean) {
+        gradeSwipe.isEnabled = enable
     }
 
     override fun showSemesterDialog(selectedIndex: Int) {
@@ -117,15 +141,15 @@ class GradeFragment : BaseSessionFragment(), GradeView, MainView.MainChildView,
     }
 
     override fun notifyChildLoadData(index: Int, semesterId: Int, forceRefresh: Boolean) {
-        (childFragmentManager.fragments[index] as GradeView.GradeChildView).onParentLoadData(semesterId, forceRefresh)
+        (pagerAdapter.getFragmentInstance(index) as? GradeView.GradeChildView)?.onParentLoadData(semesterId, forceRefresh)
     }
 
     override fun notifyChildParentReselected(index: Int) {
-        (pagerAdapter.registeredFragments[index] as? GradeView.GradeChildView)?.onParentReselected()
+        (pagerAdapter.getFragmentInstance(index) as? GradeView.GradeChildView)?.onParentReselected()
     }
 
     override fun notifyChildSemesterChange(index: Int) {
-        (pagerAdapter.registeredFragments[index] as? GradeView.GradeChildView)?.onParentChangeSemester()
+        (pagerAdapter.getFragmentInstance(index) as? GradeView.GradeChildView)?.onParentChangeSemester()
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
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 c47ddc574..46a923d9a 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
@@ -5,8 +5,9 @@ import dagger.Provides
 import dagger.android.ContributesAndroidInjector
 import io.github.wulkanowy.di.scopes.PerChildFragment
 import io.github.wulkanowy.di.scopes.PerFragment
-import io.github.wulkanowy.ui.base.BasePagerAdapter
+import io.github.wulkanowy.ui.base.BaseFragmentPagerAdapter
 import io.github.wulkanowy.ui.modules.grade.details.GradeDetailsFragment
+import io.github.wulkanowy.ui.modules.grade.statistics.GradeStatisticsFragment
 import io.github.wulkanowy.ui.modules.grade.summary.GradeSummaryFragment
 
 @Module
@@ -18,7 +19,7 @@ abstract class GradeModule {
         @JvmStatic
         @PerFragment
         @Provides
-        fun provideGradePagerAdapter(fragment: GradeFragment) = BasePagerAdapter(fragment.childFragmentManager)
+        fun provideGradeAdapter(fragment: GradeFragment) = BaseFragmentPagerAdapter(fragment.childFragmentManager)
     }
 
     @PerChildFragment
@@ -28,4 +29,8 @@ abstract class GradeModule {
     @PerChildFragment
     @ContributesAndroidInjector
     abstract fun binGradeSummaryFragment(): GradeSummaryFragment
+
+    @PerChildFragment
+    @ContributesAndroidInjector
+    abstract fun binGradeStatisticsFragment(): GradeStatisticsFragment
 }
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 d2dd8031e..6a8d4d580 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
@@ -1,14 +1,13 @@
 package io.github.wulkanowy.ui.modules.grade
 
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.repositories.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.data.repositories.semester.SemesterRepository
+import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.session.BaseSessionPresenter
 import io.github.wulkanowy.ui.base.session.SessionErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 import io.github.wulkanowy.utils.SchedulersProvider
-import io.reactivex.Completable
-import java.util.concurrent.TimeUnit.MILLISECONDS
+import timber.log.Timber
 import javax.inject.Inject
 
 class GradePresenter @Inject constructor(
@@ -28,15 +27,21 @@ class GradePresenter @Inject constructor(
 
     fun onAttachView(view: GradeView, savedIndex: Int?) {
         super.onAttachView(view)
-        disposable.add(Completable.timer(150, MILLISECONDS, schedulers.mainThread)
-            .subscribe {
-                selectedIndex = savedIndex ?: 0
-                view.initView()
-                loadData()
-            })
+        selectedIndex = savedIndex ?: 0
+        view.run {
+            initView()
+            enableSwipe(false)
+        }
+        Timber.i("Grade view was initialized with $selectedIndex index")
+        loadData()
+    }
+
+    fun onCreateMenu() {
+        if (semesters.isEmpty()) view?.showSemesterSwitch(false)
     }
 
     fun onViewReselected() {
+        Timber.i("Grade view is reselected")
         view?.run { notifyChildParentReselected(currentPageIndex) }
     }
 
@@ -47,13 +52,14 @@ class GradePresenter @Inject constructor(
 
     fun onSemesterSelected(index: Int) {
         if (selectedIndex != index - 1) {
+            Timber.i("Change semester in grade view to ${index + 1}")
             selectedIndex = index + 1
             loadedSemesterId.clear()
             view?.let {
                 notifyChildrenSemesterChange()
                 loadChild(it.currentPageIndex)
             }
-            analytics.logEvent("changed_semester", mapOf("number" to index + 1))
+            analytics.logEvent("changed_semester", "number" to index + 1)
         }
     }
 
@@ -65,15 +71,21 @@ class GradePresenter @Inject constructor(
         view?.apply {
             showContent(true)
             showProgress(false)
+            showEmpty(false)
             loadedSemesterId[currentPageIndex] = semesterId
         }
     }
 
     fun onPageSelected(index: Int) {
-        loadChild(index)
+        if (semesters.isNotEmpty()) loadChild(index)
+    }
+
+    fun onSwipeRefresh() {
+        loadData()
     }
 
     private fun loadData() {
+        Timber.i("Loading grade data started")
         disposable.add(studentRepository.getCurrentStudent()
             .flatMap { semesterRepository.getSemesters(it) }
             .doOnSuccess {
@@ -84,11 +96,21 @@ class GradePresenter @Inject constructor(
             }
             .subscribeOn(schedulers.backgroundThread)
             .observeOn(schedulers.mainThread)
-            .subscribe({ view?.run { loadChild(currentPageIndex) } }) {
+            .doFinally { view?.showRefresh(false) }
+            .subscribe({
+                view?.run {
+                    Timber.i("Loading grade result: Attempt load index $currentPageIndex")
+                    loadChild(currentPageIndex)
+                    enableSwipe(false)
+                    showSemesterSwitch(true)
+                }
+            }) {
+                Timber.i("Loading grade result: An exception occurred")
                 errorHandler.dispatch(it)
                 view?.run {
                     showProgress(false)
-                    showEmpty()
+                    showEmpty(true)
+                    enableSwipe(true)
                 }
             })
     }
@@ -96,12 +118,13 @@ class GradePresenter @Inject constructor(
     private fun loadChild(index: Int, forceRefresh: Boolean = false) {
         semesters.first { it.semesterName == selectedIndex }.semesterId.also {
             if (forceRefresh || loadedSemesterId[index] != it) {
+                Timber.i("Load grade child view index: $index")
                 view?.notifyChildLoadData(index, it, forceRefresh)
             }
         }
     }
 
     private fun notifyChildrenSemesterChange() {
-        for (i in 0..1) view?.notifyChildSemesterChange(i)
+        for (i in 0..2) view?.notifyChildSemesterChange(i)
     }
 }
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 3f1a197c4..9fdd46b16 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
@@ -12,10 +12,16 @@ interface GradeView : BaseSessionView {
 
     fun showProgress(show: Boolean)
 
-    fun showEmpty()
+    fun showEmpty(show: Boolean)
+
+    fun showRefresh(show: Boolean)
+
+    fun showSemesterSwitch(show: Boolean)
 
     fun showSemesterDialog(selectedIndex: Int)
 
+    fun enableSwipe(enable: Boolean)
+
     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/GradeDetailsDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsDialog.kt
index 19b462b1b..0abeaeea0 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
@@ -9,21 +9,26 @@ import androidx.fragment.app.DialogFragment
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Grade
 import io.github.wulkanowy.utils.colorStringId
+import io.github.wulkanowy.utils.getBackgroundColor
 import io.github.wulkanowy.utils.toFormattedString
-import io.github.wulkanowy.utils.valueColor
 import kotlinx.android.synthetic.main.dialog_grade.*
 
-
 class GradeDetailsDialog : DialogFragment() {
 
     private lateinit var grade: Grade
 
+    private lateinit var colorScheme: String
+
     companion object {
         private const val ARGUMENT_KEY = "Item"
+        private const val COLOR_SCHEME_KEY = "Scheme"
 
-        fun newInstance(grade: Grade): GradeDetailsDialog {
+        fun newInstance(grade: Grade, colorScheme: String): GradeDetailsDialog {
             return GradeDetailsDialog().apply {
-                arguments = Bundle().apply { putSerializable(ARGUMENT_KEY, grade) }
+                arguments = Bundle().apply {
+                    putSerializable(ARGUMENT_KEY, grade)
+                    putString(COLOR_SCHEME_KEY, colorScheme)
+                }
             }
         }
     }
@@ -33,6 +38,7 @@ class GradeDetailsDialog : DialogFragment() {
         setStyle(STYLE_NO_TITLE, 0)
         arguments?.run {
             grade = getSerializable(ARGUMENT_KEY) as Grade
+            colorScheme = getString(COLOR_SCHEME_KEY) ?: "default"
         }
     }
 
@@ -57,7 +63,7 @@ class GradeDetailsDialog : DialogFragment() {
 
         gradeDialogValue.run {
             text = grade.entry
-            setBackgroundResource(grade.valueColor)
+            setBackgroundResource(grade.getBackgroundColor(colorScheme))
         }
 
         gradeDialogTeacherValue.text = if (grade.teacher.isBlank()) {
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 e1bc1e9b2..65cd9262d 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
@@ -20,6 +20,7 @@ import io.github.wulkanowy.data.db.entities.Grade
 import io.github.wulkanowy.ui.base.session.BaseSessionFragment
 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
@@ -45,6 +46,9 @@ class GradeDetailsFragment : BaseSessionFragment(), GradeDetailsView, GradeView.
     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.isEmpty
 
@@ -63,8 +67,8 @@ class GradeDetailsFragment : BaseSessionFragment(), GradeDetailsView, GradeView.
         presenter.onAttachView(this)
     }
 
-    override fun onCreateOptionsMenu(menu: Menu?, inflater: MenuInflater?) {
-        inflater?.inflate(R.menu.action_menu_grade_details, menu)
+    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+        inflater.inflate(R.menu.action_menu_grade_details, menu)
     }
 
     override fun initView() {
@@ -77,12 +81,15 @@ class GradeDetailsFragment : BaseSessionFragment(), GradeDetailsView, GradeView.
         gradeDetailsRecycler.run {
             layoutManager = SmoothScrollLinearLayoutManager(context)
             adapter = gradeDetailsAdapter
+            addItemDecoration(GradeDetailsHeaderItemDecoration(context)
+                .withDefaultDivider(R.layout.header_grade_details)
+            )
         }
         gradeDetailsSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
     }
 
-    override fun onOptionsItemSelected(item: MenuItem?): Boolean {
-        return if (item?.itemId == R.id.gradeDetailsMenuRead) presenter.onMarkAsReadSelected()
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        return if (item.itemId == R.id.gradeDetailsMenuRead) presenter.onMarkAsReadSelected()
         else false
     }
 
@@ -118,6 +125,10 @@ class GradeDetailsFragment : BaseSessionFragment(), GradeDetailsView, GradeView.
         gradeDetailsProgress.visibility = if (show) VISIBLE else GONE
     }
 
+    override fun enableSwipe(enable: Boolean) {
+        gradeDetailsSwipe.isEnabled = enable
+    }
+
     override fun showContent(show: Boolean) {
         gradeDetailsRecycler.visibility = if (show) VISIBLE else INVISIBLE
     }
@@ -130,8 +141,8 @@ class GradeDetailsFragment : BaseSessionFragment(), GradeDetailsView, GradeView.
         gradeDetailsSwipe.isRefreshing = show
     }
 
-    override fun showGradeDialog(grade: Grade) {
-        GradeDetailsDialog.newInstance(grade).show(fragmentManager, grade.toString())
+    override fun showGradeDialog(grade: Grade, colorScheme: String) {
+        (activity as? MainActivity)?.showDialogFragment(GradeDetailsDialog.newInstance(grade, colorScheme))
     }
 
     override fun onParentLoadData(semesterId: Int, forceRefresh: Boolean) {
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
index 0515208eb..e5f6e8249 100644
--- 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
@@ -38,6 +38,7 @@ class GradeDetailsHeader(
             gradeHeaderAverage.text = average
             gradeHeaderNumber.text = number
             gradeHeaderNote.visibility = if (newGrades > 0) VISIBLE else GONE
+            gradeHeaderContainer.isEnabled = isExpandable
 
             isViewExpandable = isExpandable
         }
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 e522a7805..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
@@ -14,8 +14,12 @@ 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 weightString: String, private val valueColor: Int) :
-    AbstractFlexibleItem<GradeDetailsItem.ViewHolder>() {
+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
 
@@ -24,16 +28,17 @@ class GradeDetailsItem(val grade: Grade, private val weightString: String, priva
     }
 
     @SuppressLint("SetTextI18n")
-    override fun bindViewHolder(
-        adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder,
-        position: Int, payloads: MutableList<Any>?
-    ) {
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
         holder.run {
             gradeItemValue.run {
                 text = grade.entry
-                setBackgroundResource(valueColor)
+                setBackgroundResource(valueBgColor)
+            }
+            gradeItemDescription.text = when {
+                grade.description.isNotBlank() -> grade.description
+                grade.gradeSymbol.isNotBlank() -> grade.gradeSymbol
+                else -> noDescriptionString
             }
-            gradeItemDescription.text = if (grade.description.isNotBlank()) grade.description else grade.gradeSymbol
             gradeItemDate.text = grade.date.toFormattedString()
             gradeItemWeight.text = "$weightString: ${grade.weight}"
             gradeItemNote.visibility = if (!grade.isRead) VISIBLE else GONE
@@ -49,7 +54,7 @@ class GradeDetailsItem(val grade: Grade, private val weightString: String, priva
         if (grade != other.grade) return false
         if (grade.id != other.grade.id) return false
         if (weightString != other.weightString) return false
-        if (valueColor != other.valueColor) return false
+        if (valueBgColor != other.valueBgColor) return false
 
         return true
     }
@@ -58,13 +63,11 @@ class GradeDetailsItem(val grade: Grade, private val weightString: String, priva
         var result = grade.hashCode()
         result = 31 * result + grade.id.toInt()
         result = 31 * result + weightString.hashCode()
-        result = 31 * result + valueColor
+        result = 31 * result + valueBgColor
         return result
     }
 
-    class ViewHolder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter),
-        LayoutContainer {
-
+    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/details/GradeDetailsPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsPresenter.kt
index bc3b6c1e9..12e606873 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
@@ -2,17 +2,16 @@ 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.GradeRepository
-import io.github.wulkanowy.data.repositories.PreferencesRepository
-import io.github.wulkanowy.data.repositories.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.data.repositories.grade.GradeRepository
+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.ui.base.session.BaseSessionPresenter
 import io.github.wulkanowy.ui.base.session.SessionErrorHandler
+import io.github.wulkanowy.ui.modules.grade.GradeAverageProvider
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 import io.github.wulkanowy.utils.SchedulersProvider
-import io.github.wulkanowy.utils.calcAverage
-import io.github.wulkanowy.utils.changeModifier
-import io.github.wulkanowy.utils.valueColor
+import io.github.wulkanowy.utils.getBackgroundColor
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -23,6 +22,7 @@ class GradeDetailsPresenter @Inject constructor(
     private val studentRepository: StudentRepository,
     private val semesterRepository: SemesterRepository,
     private val preferencesRepository: PreferencesRepository,
+    private val averageProvider: GradeAverageProvider,
     private val analytics: FirebaseAnalyticsHelper
 ) : BaseSessionPresenter<GradeDetailsView>(errorHandler) {
 
@@ -40,8 +40,9 @@ class GradeDetailsPresenter @Inject constructor(
 
     fun onGradeItemSelected(item: AbstractFlexibleItem<*>?) {
         if (item is GradeDetailsItem) {
+            Timber.i("Select grade item ${item.grade.id}")
             view?.apply {
-                showGradeDialog(item.grade)
+                showGradeDialog(item.grade, preferencesRepository.gradeColorTheme)
                 if (!item.grade.isRead) {
                     item.grade.isRead = true
                     updateItem(item)
@@ -58,18 +59,29 @@ class GradeDetailsPresenter @Inject constructor(
     }
 
     fun onMarkAsReadSelected(): Boolean {
+        Timber.i("Select mark grades as read")
         disposable.add(studentRepository.getCurrentStudent()
             .flatMap { semesterRepository.getSemesters(it) }
-            .flatMap { gradeRepository.getNewGrades(it.first { item -> item.semesterId == currentSemesterId }) }
+            .flatMap { gradeRepository.getUnreadGrades(it.first { item -> item.semesterId == currentSemesterId }) }
             .map { it.map { grade -> grade.apply { isRead = true } } }
-            .flatMapCompletable { gradeRepository.updateGrades(it) }
+            .flatMapCompletable {
+                Timber.i("Mark as read ${it.size} grades")
+                gradeRepository.updateGrades(it)
+            }
             .subscribeOn(schedulers.backgroundThread)
             .observeOn(schedulers.mainThread)
-            .subscribe({ loadData(currentSemesterId, false) }, { errorHandler.dispatch(it) }))
+            .subscribe({
+                Timber.i("Mark as read result: Success")
+                loadData(currentSemesterId, false)
+            }, {
+                Timber.i("Mark as read result: An exception occurred")
+                errorHandler.dispatch(it)
+            }))
         return true
     }
 
     fun onSwipeRefresh() {
+        Timber.i("Force refreshing the grade details")
         view?.notifyParentRefresh()
     }
 
@@ -85,6 +97,7 @@ class GradeDetailsPresenter @Inject constructor(
     fun onParentViewChangeSemester() {
         view?.run {
             showProgress(true)
+            enableSwipe(false)
             showRefresh(false)
             showContent(false)
             showEmpty(false)
@@ -94,68 +107,86 @@ class GradeDetailsPresenter @Inject constructor(
     }
 
     private fun loadData(semesterId: Int, forceRefresh: Boolean) {
+        Timber.i("Loading grade details data started")
         disposable.add(studentRepository.getCurrentStudent()
-            .flatMap { semesterRepository.getSemesters(it) }
-            .flatMap { gradeRepository.getGrades(it.first { item -> item.semesterId == semesterId }, forceRefresh) }
-            .map { it.sortedByDescending { grade -> grade.date } }
-            .map { it.map { item -> item.changeModifier(preferencesRepository.gradePlusModifier, preferencesRepository.gradeMinusModifier) } }
-            .map { createGradeItems(it.groupBy { grade -> grade.subject }.toSortedMap()) }
+            .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 { semester -> semester.semesterId == semesterId })
+                            .map { it.sortedByDescending { grade -> grade.date } }
+                            .map { it.groupBy { grade -> grade.subject }.toSortedMap() }
+                            .map { createGradeItems(it, averages) }
+                    }
+            }
             .subscribeOn(schedulers.backgroundThread)
             .observeOn(schedulers.mainThread)
             .doFinally {
                 view?.run {
                     showRefresh(false)
                     showProgress(false)
+                    enableSwipe(true)
                     notifyParentDataLoaded(semesterId)
                 }
             }
             .subscribe({
+                Timber.i("Loading grade details result: Success")
                 view?.run {
                     showEmpty(it.isEmpty())
                     showContent(it.isNotEmpty())
                     updateData(it)
                 }
-                analytics.logEvent("load_grade_details", mapOf("items" to it.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")
                 view?.run { showEmpty(isViewEmpty) }
                 errorHandler.dispatch(it)
             })
     }
 
-    private fun createGradeItems(items: Map<String, List<Grade>>): List<GradeDetailsHeader> {
+    private fun createGradeItems(items: Map<String, List<Grade>>, averages: Map<String, Double>): List<GradeDetailsHeader> {
+        val isGradeExpandable = preferencesRepository.isGradeExpandable
+        val gradeColorTheme = preferencesRepository.gradeColorTheme
+
+        val noDescriptionString = view?.noDescriptionString.orEmpty()
+        val weightString = view?.weightString.orEmpty()
+
         return items.map {
-            it.value.calcAverage().let { average ->
-                GradeDetailsHeader(
-                    subject = it.key,
-                    average = formatAverage(average),
-                    number = view?.getGradeNumberString(it.value.size).orEmpty(),
-                    newGrades = it.value.filter { grade -> !grade.isRead }.size,
-                    isExpandable = preferencesRepository.isGradeExpandable
-                ).apply {
-                    subItems = it.value.map { item ->
-                        GradeDetailsItem(
-                            grade = item,
-                            weightString = view?.weightString.orEmpty(),
-                            valueColor = item.valueColor
-                        )
-                    }
+            GradeDetailsHeader(
+                subject = it.key,
+                average = formatAverage(averages[it.key]),
+                number = view?.getGradeNumberString(it.value.size).orEmpty(),
+                newGrades = it.value.filter { grade -> !grade.isRead }.size,
+                isExpandable = isGradeExpandable
+            ).apply {
+                subItems = it.value.map { item ->
+                    GradeDetailsItem(
+                        grade = item,
+                        valueBgColor = item.getBackgroundColor(gradeColorTheme),
+                        weightString = weightString,
+                        noDescriptionString = noDescriptionString
+                    )
                 }
             }
         }
     }
 
-    private fun formatAverage(average: Double): String {
+    private fun formatAverage(average: Double?): String {
         return view?.run {
-            if (average == 0.0) emptyAverageString
+            if (average == null || average == .0) emptyAverageString
             else averageString.format(average)
         }.orEmpty()
     }
 
     private fun updateGrade(grade: Grade) {
+        Timber.i("Attempt to update grade ${grade.id}")
         disposable.add(gradeRepository.updateGrade(grade)
             .subscribeOn(schedulers.backgroundThread)
             .observeOn(schedulers.mainThread)
-            .subscribe({}) { error -> errorHandler.dispatch(error) })
-        Timber.d("Grade ${grade.id} updated")
+            .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 242542600..1fb98216b 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
@@ -16,6 +16,8 @@ interface GradeDetailsView : BaseSessionView {
 
     val weightString: String
 
+    val noDescriptionString: String
+
     fun initView()
 
     fun updateData(data: List<GradeDetailsHeader>)
@@ -28,7 +30,7 @@ interface GradeDetailsView : BaseSessionView {
 
     fun collapseAllItems()
 
-    fun showGradeDialog(grade: Grade)
+    fun showGradeDialog(grade: Grade, colorScheme: String)
 
     fun showContent(show: Boolean)
 
@@ -36,6 +38,8 @@ interface GradeDetailsView : BaseSessionView {
 
     fun showProgress(show: Boolean)
 
+    fun enableSwipe(enable: Boolean)
+
     fun showRefresh(show: Boolean)
 
     fun notifyParentDataLoaded(semesterId: Int)
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
new file mode 100644
index 000000000..f27a13c83
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsFragment.kt
@@ -0,0 +1,214 @@
+package io.github.wulkanowy.ui.modules.grade.statistics
+
+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.core.content.ContextCompat
+import com.github.mikephil.charting.components.Legend
+import com.github.mikephil.charting.components.LegendEntry
+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.GradeStatistics
+import io.github.wulkanowy.ui.base.session.BaseSessionFragment
+import io.github.wulkanowy.ui.modules.grade.GradeFragment
+import io.github.wulkanowy.ui.modules.grade.GradeView
+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 : BaseSessionFragment(), GradeStatisticsView, GradeView.GradeChildView {
+
+    @Inject
+    lateinit var presenter: GradeStatisticsPresenter
+
+    private lateinit var subjectsAdapter: ArrayAdapter<String>
+
+    companion object {
+        private const val SAVED_CHART_TYPE = "CURRENT_TYPE"
+
+        fun newInstance() = GradeStatisticsFragment()
+    }
+
+    override val isViewEmpty
+        get() = gradeStatisticsChart.isEmpty
+
+    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 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 = gradeStatisticsChart
+        presenter.onAttachView(this, savedInstanceState?.getBoolean(SAVED_CHART_TYPE))
+    }
+
+    override fun initView() {
+        gradeStatisticsChart.run {
+            description.isEnabled = false
+            setHoleColor(context.getThemeAttrColor(android.R.attr.windowBackground))
+            setCenterTextColor(context.getThemeAttrColor(android.R.attr.textColorPrimary))
+            animateXY(1000, 1000)
+            minAngleForSlices = 25f
+            legend.apply {
+                textColor = context.getThemeAttrColor(android.R.attr.textColorPrimary)
+            }
+        }
+
+        context?.let {
+            subjectsAdapter = ArrayAdapter(it, android.R.layout.simple_spinner_item, ArrayList<String>())
+            subjectsAdapter.setDropDownViewResource(R.layout.item_attendance_summary_subject)
+        }
+
+        gradeStatisticsSubjects.run {
+            adapter = subjectsAdapter
+            setOnItemSelectedListener { presenter.onSubjectSelected((it as TextView).text.toString()) }
+        }
+
+        gradeStatisticsSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
+    }
+
+    override fun updateSubjects(data: ArrayList<String>) {
+        subjectsAdapter.run {
+            clear()
+            addAll(data)
+            notifyDataSetChanged()
+        }
+    }
+
+    override fun updateData(items: List<GradeStatistics>, theme: String) {
+        gradeColors = when (theme) {
+            "vulcan" -> vulcanGradeColors
+            else -> materialGradeColors
+        }
+
+        gradeStatisticsChart.run {
+            data = PieData(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)
+            }).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 showSubjects(show: Boolean) {
+        gradeStatisticsSubjectsContainer.visibility = if (show) View.VISIBLE else View.INVISIBLE
+        gradeStatisticsTypeSwitch.visibility = if (show) View.VISIBLE else View.INVISIBLE
+    }
+
+    override fun clearView() {
+        gradeStatisticsChart.clear()
+    }
+
+    override fun showContent(show: Boolean) {
+        gradeStatisticsChart.visibility = if (show) View.VISIBLE else View.GONE
+    }
+
+    override fun showEmpty(show: Boolean) {
+        gradeStatisticsEmpty.visibility = if (show) View.VISIBLE else View.INVISIBLE
+    }
+
+    override fun showProgress(show: Boolean) {
+        gradeStatisticsProgress.visibility = if (show) View.VISIBLE else View.GONE
+    }
+
+    override fun enableSwipe(enable: Boolean) {
+        gradeStatisticsSwipe.isEnabled = enable
+    }
+
+    override fun showRefresh(show: Boolean) {
+        gradeStatisticsSwipe.isRefreshing = show
+    }
+
+    override fun onParentLoadData(semesterId: Int, forceRefresh: Boolean) {
+        presenter.onParentViewLoadData(semesterId, forceRefresh)
+    }
+
+    override fun onParentReselected() {
+        //
+    }
+
+    override fun onParentChangeSemester() {
+        presenter.onParentViewChangeSemester()
+    }
+
+    override fun notifyParentDataLoaded(semesterId: Int) {
+        (parentFragment as? GradeFragment)?.onChildFragmentLoaded(semesterId)
+    }
+
+    override fun notifyParentRefresh() {
+        (parentFragment as? GradeFragment)?.onChildRefresh()
+    }
+
+    override fun onResume() {
+        super.onResume()
+        gradeStatisticsTypeSwitch.setOnCheckedChangeListener { _, checkedId ->
+            presenter.onTypeChange(checkedId == R.id.gradeStatisticsTypeSemester)
+        }
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        outState.putBoolean(GradeStatisticsFragment.SAVED_CHART_TYPE, presenter.currentIsSemester)
+    }
+
+    override fun onDestroyView() {
+        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
new file mode 100644
index 000000000..5dd485cd5
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsPresenter.kt
@@ -0,0 +1,147 @@
+package io.github.wulkanowy.ui.modules.grade.statistics
+
+import io.github.wulkanowy.data.db.entities.Subject
+import io.github.wulkanowy.data.repositories.gradestatistics.GradeStatisticsRepository
+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.subject.SubjectRepository
+import io.github.wulkanowy.ui.base.session.BaseSessionPresenter
+import io.github.wulkanowy.ui.base.session.SessionErrorHandler
+import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
+import io.github.wulkanowy.utils.SchedulersProvider
+import timber.log.Timber
+import javax.inject.Inject
+
+class GradeStatisticsPresenter @Inject constructor(
+    private val errorHandler: SessionErrorHandler,
+    private val gradeStatisticsRepository: GradeStatisticsRepository,
+    private val subjectRepository: SubjectRepository,
+    private val studentRepository: StudentRepository,
+    private val semesterRepository: SemesterRepository,
+    private val preferencesRepository: PreferencesRepository,
+    private val schedulers: SchedulersProvider,
+    private val analytics: FirebaseAnalyticsHelper
+) : BaseSessionPresenter<GradeStatisticsView>(errorHandler) {
+
+    private var subjects = emptyList<Subject>()
+
+    private var currentSemesterId = 0
+
+    private var currentSubjectName: String = "Wszystkie"
+
+    var currentIsSemester = false
+        private set
+
+    fun onAttachView(view: GradeStatisticsView, isSemester: Boolean?) {
+        super.onAttachView(view)
+        currentIsSemester = isSemester ?: false
+        view.initView()
+    }
+
+    fun onParentViewLoadData(semesterId: Int, forceRefresh: Boolean) {
+        currentSemesterId = semesterId
+        loadSubjects()
+        loadData(semesterId, currentSubjectName, currentIsSemester, forceRefresh)
+    }
+
+    fun onParentViewChangeSemester() {
+        view?.run {
+            showProgress(true)
+            enableSwipe(false)
+            showRefresh(false)
+            showContent(false)
+            showEmpty(false)
+            clearView()
+        }
+        disposable.clear()
+    }
+
+    fun onSwipeRefresh() {
+        Timber.i("Force refreshing the grade stats")
+        view?.notifyParentRefresh()
+    }
+
+    fun onSubjectSelected(name: String) {
+        Timber.i("Select grade stats subject $name")
+        view?.run {
+            showContent(false)
+            showProgress(true)
+            enableSwipe(false)
+            showEmpty(false)
+            clearView()
+        }
+        (subjects.singleOrNull { it.name == name }?.name).let {
+            if (it != currentSubjectName) loadData(currentSemesterId, name, currentIsSemester)
+        }
+    }
+
+    fun onTypeChange(isSemester: Boolean) {
+        Timber.i("Select grade stats semester: $isSemester")
+        disposable.clear()
+        view?.run {
+            showContent(false)
+            showProgress(true)
+            enableSwipe(false)
+            showEmpty(false)
+            clearView()
+        }
+        loadData(currentSemesterId, currentSubjectName, isSemester)
+    }
+
+    private fun loadSubjects() {
+        Timber.i("Loading grade stats subjects started")
+        disposable.add(studentRepository.getCurrentStudent()
+            .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?.run {
+                    updateSubjects(it)
+                    showSubjects(true)
+                }
+            }, {
+                Timber.e("Loading grade stats subjects result: An exception occurred")
+                errorHandler.dispatch(it)
+            })
+        )
+    }
+
+    private fun loadData(semesterId: Int, subjectName: String, isSemester: Boolean, forceRefresh: Boolean = false) {
+        Timber.i("Loading grade stats data started")
+        currentSubjectName = subjectName
+        currentIsSemester = isSemester
+        disposable.add(studentRepository.getCurrentStudent()
+            .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 {
+                view?.run {
+                    showRefresh(false)
+                    showProgress(false)
+                    enableSwipe(true)
+                    notifyParentDataLoaded(semesterId)
+                }
+            }
+            .subscribe({
+                Timber.i("Loading grade stats result: Success")
+                view?.run {
+                    showEmpty(it.isEmpty())
+                    showContent(it.isNotEmpty())
+                    updateData(it, preferencesRepository.gradeColorTheme)
+                }
+                analytics.logEvent("load_grade_statistics", "items" to it.size, "force_refresh" to forceRefresh)
+            }) {
+                Timber.e("Loading grade stats result: An exception occurred")
+                view?.run { showEmpty(isViewEmpty) }
+                errorHandler.dispatch(it)
+            })
+    }
+}
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
new file mode 100644
index 000000000..dbdde459e
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsView.kt
@@ -0,0 +1,33 @@
+package io.github.wulkanowy.ui.modules.grade.statistics
+
+import io.github.wulkanowy.data.db.entities.GradeStatistics
+import io.github.wulkanowy.ui.base.session.BaseSessionView
+
+interface GradeStatisticsView : BaseSessionView {
+
+    val isViewEmpty: Boolean
+
+    fun initView()
+
+    fun updateSubjects(data: ArrayList<String>)
+
+    fun updateData(items: List<GradeStatistics>, theme: String)
+
+    fun showSubjects(show: Boolean)
+
+    fun notifyParentDataLoaded(semesterId: Int)
+
+    fun notifyParentRefresh()
+
+    fun clearView()
+
+    fun showContent(show: Boolean)
+
+    fun showEmpty(show: Boolean)
+
+    fun showProgress(show: Boolean)
+
+    fun enableSwipe(enable: Boolean)
+
+    fun showRefresh(show: Boolean)
+}
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 67e7d4614..f174f96c2 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
@@ -86,6 +86,10 @@ class GradeSummaryFragment : BaseSessionFragment(), GradeSummaryView, GradeView.
         gradeSummaryProgress.visibility = if (show) VISIBLE else GONE
     }
 
+    override fun enableSwipe(enable: Boolean) {
+        gradeSummarySwipe.isEnabled = enable
+    }
+
     override fun showRefresh(show: Boolean) {
         gradeSummarySwipe.isRefreshing = show
     }
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
index 0daf06657..5737a832f 100644
--- 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
@@ -18,15 +18,12 @@ class GradeSummaryItem(
 
     override fun getLayoutRes() = R.layout.item_grade_summary
 
-    override fun createViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?): ViewHolder {
+    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 {
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
+        holder.run {
             gradeSummaryItemTitle.text = title
             gradeSummaryItemAverage.text = average
             gradeSummaryItemPredicted.text = predictedGrade
@@ -56,10 +53,8 @@ class GradeSummaryItem(
         return result
     }
 
-    class ViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?) : FlexibleViewHolder(view, adapter),
-        LayoutContainer {
-
-        override val containerView: View?
+    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 7920ca288..bab646326 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,17 +1,16 @@
 package io.github.wulkanowy.ui.modules.grade.summary
 
 import io.github.wulkanowy.data.db.entities.GradeSummary
-import io.github.wulkanowy.data.repositories.GradeRepository
-import io.github.wulkanowy.data.repositories.GradeSummaryRepository
-import io.github.wulkanowy.data.repositories.PreferencesRepository
-import io.github.wulkanowy.data.repositories.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
+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.session.BaseSessionPresenter
 import io.github.wulkanowy.ui.base.session.SessionErrorHandler
+import io.github.wulkanowy.ui.modules.grade.GradeAverageProvider
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 import io.github.wulkanowy.utils.SchedulersProvider
 import io.github.wulkanowy.utils.calcAverage
-import io.github.wulkanowy.utils.changeModifier
+import timber.log.Timber
 import java.lang.String.format
 import java.util.Locale.FRANCE
 import javax.inject.Inject
@@ -19,10 +18,9 @@ import javax.inject.Inject
 class GradeSummaryPresenter @Inject constructor(
     private val errorHandler: SessionErrorHandler,
     private val gradeSummaryRepository: GradeSummaryRepository,
-    private val gradeRepository: GradeRepository,
     private val studentRepository: StudentRepository,
     private val semesterRepository: SemesterRepository,
-    private val preferencesRepository: PreferencesRepository,
+    private val averageProvider: GradeAverageProvider,
     private val schedulers: SchedulersProvider,
     private val analytics: FirebaseAnalyticsHelper
 ) : BaseSessionPresenter<GradeSummaryView>(errorHandler) {
@@ -33,26 +31,15 @@ class GradeSummaryPresenter @Inject constructor(
     }
 
     fun onParentViewLoadData(semesterId: Int, forceRefresh: Boolean) {
+        Timber.i("Loading grade summary data started")
         disposable.add(studentRepository.getCurrentStudent()
-            .flatMap { semesterRepository.getSemesters(it) }
-            .map { semester -> semester.first { it.semesterId == semesterId } }
-            .flatMap {
-                gradeSummaryRepository.getGradesSummary(it, forceRefresh)
+            .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 ->
-                        gradeRepository.getGrades(it, forceRefresh)
-                            .map { grades ->
-                                grades.map { item -> item.changeModifier(preferencesRepository.gradePlusModifier, preferencesRepository.gradeMinusModifier) }
-                                    .groupBy { grade -> grade.subject }
-                                    .mapValues { entry -> entry.value.calcAverage() }
-                                    .filterValues { value -> value != 0.0 }
-                                    .let { averages ->
-                                        createGradeSummaryItems(gradesSummary, averages) to
-                                            GradeSummaryScrollableHeader(
-                                                formatAverage(gradesSummary.calcAverage()),
-                                                formatAverage(averages.values.average())
-                                            )
-                                    }
-                            }
+                        averageProvider.getGradeAverage(student, semesters, semesterId, forceRefresh)
+                            .map { averages -> createGradeSummaryItemsAndHeader(gradesSummary, averages) }
                     }
             }
             .subscribeOn(schedulers.backgroundThread)
@@ -61,22 +48,26 @@ class GradeSummaryPresenter @Inject constructor(
                 view?.run {
                     showRefresh(false)
                     showProgress(false)
+                    enableSwipe(true)
                     notifyParentDataLoaded(semesterId)
                 }
-            }.subscribe({
+            }.subscribe({ (gradeSummaryItems, gradeSummaryHeader) ->
+                Timber.i("Loading grade summary result: Success")
                 view?.run {
-                    showEmpty(it.first.isEmpty())
-                    showContent(it.first.isNotEmpty())
-                    updateData(it.first, it.second)
+                    showEmpty(gradeSummaryItems.isEmpty())
+                    showContent(gradeSummaryItems.isNotEmpty())
+                    updateData(gradeSummaryItems, gradeSummaryHeader)
                 }
-                analytics.logEvent("load_grade_summary", mapOf("items" to it.first.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")
                 view?.run { showEmpty(isViewEmpty) }
                 errorHandler.dispatch(it)
             })
     }
 
     fun onSwipeRefresh() {
+        Timber.i("Force refreshing the grade summary")
         view?.notifyParentRefresh()
     }
 
@@ -89,6 +80,7 @@ class GradeSummaryPresenter @Inject constructor(
     fun onParentViewChangeSemester() {
         view?.run {
             showProgress(true)
+            enableSwipe(false)
             showRefresh(false)
             showContent(false)
             showEmpty(false)
@@ -97,16 +89,24 @@ class GradeSummaryPresenter @Inject constructor(
         disposable.clear()
     }
 
-    private fun createGradeSummaryItems(gradesSummary: List<GradeSummary>, averages: Map<String, Double>)
-        : List<GradeSummaryItem> {
-        return gradesSummary.filter { !checkEmpty(it, averages) }.map { it ->
-            GradeSummaryItem(
-                title = it.subject,
-                average = formatAverage(averages.getOrElse(it.subject) { 0.0 }, ""),
-                predictedGrade = it.predictedGrade,
-                finalGrade = it.finalGrade
-            )
-        }
+    private fun createGradeSummaryItemsAndHeader(gradesSummary: List<GradeSummary>, averages: Map<String, Double>)
+        : Pair<List<GradeSummaryItem>, GradeSummaryScrollableHeader> {
+        return averages.filterValues { value -> value != 0.0 }
+            .let { filteredAverages ->
+                gradesSummary.filter { !checkEmpty(it, filteredAverages) }
+                    .map {
+                        GradeSummaryItem(
+                            title = it.subject,
+                            average = formatAverage(filteredAverages.getOrElse(it.subject) { 0.0 }, ""),
+                            predictedGrade = it.predictedGrade,
+                            finalGrade = it.finalGrade
+                        )
+                    }.let {
+                        it to GradeSummaryScrollableHeader(
+                            formatAverage(gradesSummary.calcAverage()),
+                            formatAverage(filteredAverages.values.average()))
+                    }
+            }
     }
 
     private fun checkEmpty(gradeSummary: GradeSummary, averages: Map<String, Double>): Boolean {
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 2602ec99e..5f7c7b168 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
@@ -20,6 +20,8 @@ interface GradeSummaryView : BaseSessionView {
 
     fun showProgress(show: Boolean)
 
+    fun enableSwipe(enable: Boolean)
+
     fun showRefresh(show: Boolean)
 
     fun showContent(show: Boolean)
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 135098fbd..7325e3ecd 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
@@ -5,11 +5,13 @@ import android.view.LayoutInflater
 import android.view.View
 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.ui.base.session.BaseSessionFragment
+import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.setOnItemClickListener
 import kotlinx.android.synthetic.main.fragment_homework.*
@@ -50,6 +52,10 @@ class HomeworkFragment : BaseSessionFragment(), HomeworkView, MainView.TitledVie
         homeworkRecycler.run {
             layoutManager = SmoothScrollLinearLayoutManager(context)
             adapter = homeworkAdapter
+            addItemDecoration(FlexibleItemDecoration(context)
+                .withDefaultDivider()
+                .withDrawDividerOnLastItem(false)
+            )
         }
         homeworkSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
         homeworkPreviousButton.setOnClickListener { presenter.onPreviousDay() }
@@ -64,7 +70,7 @@ class HomeworkFragment : BaseSessionFragment(), HomeworkView, MainView.TitledVie
         homeworkAdapter.clear()
     }
 
-    override fun updateNavigationDay(date: String) {
+    override fun updateNavigationWeek(date: String) {
         homeworkNavDate.text = date
     }
 
@@ -82,6 +88,10 @@ class HomeworkFragment : BaseSessionFragment(), HomeworkView, MainView.TitledVie
         homeworkProgress.visibility = if (show) View.VISIBLE else View.GONE
     }
 
+    override fun enableSwipe(enable: Boolean) {
+        homeworkSwipe.isEnabled = enable
+    }
+
     override fun showContent(show: Boolean) {
         homeworkRecycler.visibility = if (show) View.VISIBLE else View.GONE
     }
@@ -95,7 +105,7 @@ class HomeworkFragment : BaseSessionFragment(), HomeworkView, MainView.TitledVie
     }
 
     override fun showTimetableDialog(homework: Homework) {
-        HomeworkDialog.newInstance(homework).show(fragmentManager, homework.toString())
+        (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 97ff188ce..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,8 @@
 package io.github.wulkanowy.ui.modules.homework
 
-import android.annotation.SuppressLint
 import android.view.View
 import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import eu.davidea.flexibleadapter.items.AbstractSectionableItem
 import eu.davidea.flexibleadapter.items.IFlexible
 import eu.davidea.viewholders.FlexibleViewHolder
 import io.github.wulkanowy.R
@@ -11,19 +10,16 @@ import io.github.wulkanowy.data.db.entities.Homework
 import kotlinx.android.extensions.LayoutContainer
 import kotlinx.android.synthetic.main.item_homework.*
 
-class HomeworkItem(val homework: Homework) : AbstractFlexibleItem<HomeworkItem.ViewHolder>() {
+class HomeworkItem(header: HomeworkHeader, val homework: Homework) :
+    AbstractSectionableItem<HomeworkItem.ViewHolder, HomeworkHeader>(header) {
 
-    override fun getLayoutRes(): Int = R.layout.item_homework
+    override fun getLayoutRes() = R.layout.item_homework
 
     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>?
-    ) {
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
         holder.apply {
             homeworkItemSubject.text = homework.subject
             homeworkItemTeacher.text = homework.teacher
@@ -42,12 +38,12 @@ class HomeworkItem(val homework: Homework) : AbstractFlexibleItem<HomeworkItem.V
     }
 
     override fun hashCode(): Int {
-        return homework.hashCode()
+        var result = homework.hashCode()
+        result = 31 * result + homework.id.toInt()
+        return result
     }
 
-    class ViewHolder(val view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter),
-        LayoutContainer {
-
+    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 e4d427450..de85d8d11 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
@@ -2,19 +2,21 @@ package io.github.wulkanowy.ui.modules.homework
 
 import com.google.firebase.analytics.FirebaseAnalytics.Param.START_DATE
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
-import io.github.wulkanowy.data.repositories.HomeworkRepository
-import io.github.wulkanowy.data.repositories.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.data.db.entities.Homework
+import io.github.wulkanowy.data.repositories.homework.HomeworkRepository
+import io.github.wulkanowy.data.repositories.semester.SemesterRepository
+import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.session.BaseSessionPresenter
 import io.github.wulkanowy.ui.base.session.SessionErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 import io.github.wulkanowy.utils.SchedulersProvider
+import io.github.wulkanowy.utils.friday
 import io.github.wulkanowy.utils.isHolidays
+import io.github.wulkanowy.utils.monday
 import io.github.wulkanowy.utils.nextOrSameSchoolDay
-import io.github.wulkanowy.utils.nextSchoolDay
-import io.github.wulkanowy.utils.previousSchoolDay
 import io.github.wulkanowy.utils.toFormattedString
 import org.threeten.bp.LocalDate
+import timber.log.Timber
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
@@ -33,68 +35,89 @@ class HomeworkPresenter @Inject constructor(
     fun onAttachView(view: HomeworkView, date: Long?) {
         super.onAttachView(view)
         view.initView()
+        Timber.i("Homework view was initialized")
         loadData(LocalDate.ofEpochDay(date ?: LocalDate.now().nextOrSameSchoolDay.toEpochDay()))
         reloadView()
     }
 
     fun onPreviousDay() {
-        loadData(currentDate.previousSchoolDay)
+        loadData(currentDate.minusDays(7))
         reloadView()
     }
 
     fun onNextDay() {
-        loadData(currentDate.nextSchoolDay)
+        loadData(currentDate.plusDays(7))
         reloadView()
     }
 
     fun onSwipeRefresh() {
+        Timber.i("Force refreshing the homework")
         loadData(currentDate, true)
     }
 
     fun onHomeworkItemSelected(item: AbstractFlexibleItem<*>?) {
-        if (item is HomeworkItem) view?.showTimetableDialog(item.homework)
+        if (item is HomeworkItem) {
+            Timber.i("Select homework item ${item.homework.id}")
+            view?.showTimetableDialog(item.homework)
+        }
     }
 
     private fun loadData(date: LocalDate, forceRefresh: Boolean = false) {
+        Timber.i("Loading homework data started")
         currentDate = date
         disposable.apply {
             clear()
             add(studentRepository.getCurrentStudent()
                 .delay(200, TimeUnit.MILLISECONDS)
                 .flatMap { semesterRepository.getCurrentSemester(it) }
-                .flatMap { homeworkRepository.getHomework(it, currentDate, forceRefresh) }
-                .map { items -> items.map { HomeworkItem(it) } }
+                .flatMap { homeworkRepository.getHomework(it, currentDate, currentDate, forceRefresh) }
+                .map { it.groupBy { homework -> homework.date }.toSortedMap() }
+                .map { createHomeworkItem(it) }
                 .subscribeOn(schedulers.backgroundThread)
                 .observeOn(schedulers.mainThread)
                 .doFinally {
                     view?.run {
                         hideRefresh()
                         showProgress(false)
+                        enableSwipe(true)
                     }
                 }
                 .subscribe({
+                    Timber.i("Loading homework result: Success")
                     view?.apply {
                         updateData(it)
                         showEmpty(it.isEmpty())
                         showContent(it.isNotEmpty())
                     }
-                    analytics.logEvent("load_homework", mapOf("items" to it.size, "force_refresh" to forceRefresh, START_DATE to currentDate.toFormattedString("yyyy-MM-dd")))
+                    analytics.logEvent("load_homework", "items" to it.size, "force_refresh" to forceRefresh, START_DATE to currentDate.toFormattedString("yyyy-MM-dd"))
                 }) {
+                    Timber.i("Loading homework result: An exception occurred")
                     view?.run { showEmpty(isViewEmpty()) }
                     errorHandler.dispatch(it)
                 })
         }
     }
 
+    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) }
+            }
+        }
+    }
+
     private fun reloadView() {
+        Timber.i("Reload homework view with the date ${currentDate.toFormattedString()}")
         view?.apply {
             showProgress(true)
+            enableSwipe(false)
             showContent(false)
             showEmpty(false)
             clearData()
-            showNextButton(!currentDate.plusDays(1).isHolidays)
-            showPreButton(!currentDate.minusDays(1).isHolidays)
-            updateNavigationDay(currentDate.toFormattedString("EEEE \n dd.MM.YYYY").capitalize())
+            showNextButton(!currentDate.plusDays(7).isHolidays)
+            showPreButton(!currentDate.minusDays(7).isHolidays)
+            updateNavigationWeek("${currentDate.monday.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 521020e61..546d0526f 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
@@ -11,7 +11,7 @@ interface HomeworkView : BaseSessionView {
 
     fun clearData()
 
-    fun updateNavigationDay(date: String)
+    fun updateNavigationWeek(date: String)
 
     fun isViewEmpty(): Boolean
 
@@ -21,6 +21,8 @@ interface HomeworkView : BaseSessionView {
 
     fun showProgress(show: Boolean)
 
+    fun enableSwipe(enable: Boolean)
+
     fun showContent(show: Boolean)
 
     fun showPreButton(show: 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 c9c1aeb41..da054bb52 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,10 +4,12 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.ui.base.BaseActivity
-import io.github.wulkanowy.ui.base.BasePagerAdapter
+import io.github.wulkanowy.ui.base.BaseFragmentPagerAdapter
 import io.github.wulkanowy.ui.modules.login.form.LoginFormFragment
-import io.github.wulkanowy.ui.modules.login.options.LoginOptionsFragment
+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
@@ -18,7 +20,7 @@ class LoginActivity : BaseActivity(), LoginView {
     lateinit var presenter: LoginPresenter
 
     @Inject
-    lateinit var loginAdapter: BasePagerAdapter
+    lateinit var loginAdapter: BaseFragmentPagerAdapter
 
     companion object {
         fun getStartIntent(context: Context) = Intent(context, LoginActivity::class.java)
@@ -36,14 +38,19 @@ class LoginActivity : BaseActivity(), LoginView {
     }
 
     override fun initAdapter() {
-        loginAdapter.fragments.putAll(mapOf(
-            "1" to LoginFormFragment.newInstance(),
-            "2" to LoginOptionsFragment.newInstance()
-        ))
+        loginAdapter.apply {
+            containerId = loginViewpager.id
+            addFragments(listOf(
+                LoginFormFragment.newInstance(),
+                LoginSymbolFragment.newInstance(),
+                LoginStudentSelectFragment.newInstance()
+            ))
+        }
 
         loginViewpager.run {
+            offscreenPageLimit = 2
             adapter = loginAdapter
-            setOnSelectPageListener { presenter.onPageSelected(it) }
+            setOnSelectPageListener { presenter.onViewSelected(it) }
         }
     }
 
@@ -51,22 +58,30 @@ class LoginActivity : BaseActivity(), LoginView {
         loginViewpager.setCurrentItem(index, false)
     }
 
-    override fun notifyOptionsViewLoadData() {
-        (supportFragmentManager.fragments[1] as? LoginOptionsFragment)?.onParentLoadData()
-    }
-
-    fun onChildFragmentSwitchOptions() {
-        presenter.onChildViewSwitchOptions()
-    }
-
-    override fun hideActionBar() {
-        supportActionBar?.hide()
+    override fun showActionBar(show: Boolean) {
+        supportActionBar?.apply { if (show) show() else hide() }
     }
 
     override fun onBackPressed() {
         presenter.onBackPressed { super.onBackPressed() }
     }
 
+    override fun notifyInitSymbolFragment(loginData: Triple<String, String, String>) {
+        (loginAdapter.getFragmentInstance(1) as? LoginSymbolFragment)?.onParentInitSymbolFragment(loginData)
+    }
+
+    override fun notifyInitStudentSelectFragment(students: List<Student>) {
+        (loginAdapter.getFragmentInstance(2) as? LoginStudentSelectFragment)?.onParentInitStudentSelectFragment(students)
+    }
+
+    fun onFormFragmentAccountLogged(students: List<Student>, loginData: Triple<String, String, String>) {
+        presenter.onFormViewAccountLogged(students, loginData)
+    }
+
+    fun onSymbolFragmentAccountLogged(students: List<Student>) {
+        presenter.onSymbolViewAccountLogged(students)
+    }
+
     public override fun onDestroy() {
         presenter.onDetachView()
         super.onDestroy()
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 18c3a422a..a70ff2d65 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
@@ -8,7 +8,10 @@ import io.github.wulkanowy.api.login.BadCredentialsException
 import io.github.wulkanowy.ui.base.ErrorHandler
 import javax.inject.Inject
 
-class LoginErrorHandler @Inject constructor(resources: Resources, chuckCollector: ChuckCollector) : ErrorHandler(resources, chuckCollector) {
+class LoginErrorHandler @Inject constructor(
+    resources: Resources,
+    chuckCollector: ChuckCollector
+) : ErrorHandler(resources, chuckCollector) {
 
     var onBadCredentials: () -> Unit = {}
 
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 3cdf83679..7c3e7bace 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
@@ -5,9 +5,10 @@ import dagger.Provides
 import dagger.android.ContributesAndroidInjector
 import io.github.wulkanowy.di.scopes.PerActivity
 import io.github.wulkanowy.di.scopes.PerFragment
-import io.github.wulkanowy.ui.base.BasePagerAdapter
+import io.github.wulkanowy.ui.base.BaseFragmentPagerAdapter
 import io.github.wulkanowy.ui.modules.login.form.LoginFormFragment
-import io.github.wulkanowy.ui.modules.login.options.LoginOptionsFragment
+import io.github.wulkanowy.ui.modules.login.studentselect.LoginStudentSelectFragment
+import io.github.wulkanowy.ui.modules.login.symbol.LoginSymbolFragment
 
 @Module
 internal abstract class LoginModule {
@@ -18,14 +19,18 @@ internal abstract class LoginModule {
         @JvmStatic
         @PerActivity
         @Provides
-        fun provideLoginAdapter(activity: LoginActivity) = BasePagerAdapter(activity.supportFragmentManager)
+        fun provideLoginAdapter(activity: LoginActivity) = BaseFragmentPagerAdapter(activity.supportFragmentManager)
     }
 
     @PerFragment
-    @ContributesAndroidInjector()
+    @ContributesAndroidInjector
     abstract fun bindLoginFormFragment(): LoginFormFragment
 
     @PerFragment
-    @ContributesAndroidInjector()
-    abstract fun bindLoginOptionsFragment(): LoginOptionsFragment
+    @ContributesAndroidInjector
+    abstract fun bindLoginSymbolFragment(): LoginSymbolFragment
+
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindLoginSelectStudentFragment(): LoginStudentSelectFragment
 }
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 0687e2f21..00242a7dc 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
@@ -1,7 +1,9 @@
 package io.github.wulkanowy.ui.modules.login
 
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
+import timber.log.Timber
 import javax.inject.Inject
 
 class LoginPresenter @Inject constructor(errorHandler: ErrorHandler) : BasePresenter<LoginView>(errorHandler) {
@@ -10,24 +12,49 @@ class LoginPresenter @Inject constructor(errorHandler: ErrorHandler) : BasePrese
         super.onAttachView(view)
         view.run {
             initAdapter()
-            hideActionBar()
+            showActionBar(false)
+        }
+        Timber.i("Login view was initialized")
+    }
+
+    fun onFormViewAccountLogged(students: List<Student>, loginData: Triple<String, String, String>) {
+        view?.apply {
+            if (students.isEmpty()) {
+                Timber.i("Switch to symbol form")
+                notifyInitSymbolFragment(loginData)
+                switchView(1)
+            } else {
+                Timber.i("Switch to student select")
+                notifyInitStudentSelectFragment(students)
+                switchView(2)
+            }
         }
     }
 
-    fun onPageSelected(index: Int) {
-        if (index == 1) view?.notifyOptionsViewLoadData()
+    fun onSymbolViewAccountLogged(students: List<Student>) {
+        view?.apply {
+            Timber.i("Switch to student select")
+            notifyInitStudentSelectFragment(students)
+            switchView(2)
+        }
     }
 
-    fun onChildViewSwitchOptions() {
-        view?.switchView(1)
+    fun onViewSelected(index: Int) {
+        view?.apply {
+            when (index) {
+                0, 1 -> showActionBar(false)
+                2 -> showActionBar(true)
+            }
+        }
     }
 
     fun onBackPressed(default: () -> Unit) {
-        view?.run {
-            if (currentViewIndex == 1) {
-                switchView(0)
-                hideActionBar()
-            } else default()
+        Timber.i("Back pressed in login view")
+        view?.apply {
+            when (currentViewIndex) {
+                1, 2 -> switchView(0)
+                else -> default()
+            }
         }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginView.kt
index 52cb91807..58d356bbd 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginView.kt
@@ -1,5 +1,6 @@
 package io.github.wulkanowy.ui.modules.login
 
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.ui.base.BaseView
 
 interface LoginView : BaseView {
@@ -8,9 +9,11 @@ interface LoginView : BaseView {
 
     fun initAdapter()
 
-    fun hideActionBar()
-
     fun switchView(index: Int)
 
-    fun notifyOptionsViewLoadData()
+    fun showActionBar(show: Boolean)
+
+    fun notifyInitSymbolFragment(loginData: Triple<String, String, String>)
+
+    fun notifyInitStudentSelectFragment(students: List<Student>)
 }
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 7985ef6e4..b17a1205c 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
@@ -10,12 +10,15 @@ import android.view.ViewGroup
 import android.view.inputmethod.EditorInfo.IME_ACTION_DONE
 import android.view.inputmethod.EditorInfo.IME_NULL
 import android.widget.ArrayAdapter
-import io.github.wulkanowy.BuildConfig.DEBUG
 import io.github.wulkanowy.BuildConfig.VERSION_NAME
 import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.utils.hideSoftInput
+import io.github.wulkanowy.utils.openInternetBrowser
+import io.github.wulkanowy.utils.setOnItemSelectedListener
+import io.github.wulkanowy.utils.setOnTextChangedListener
 import io.github.wulkanowy.utils.showSoftInput
 import kotlinx.android.synthetic.main.fragment_login_form.*
 import javax.inject.Inject
@@ -29,7 +32,14 @@ class LoginFormFragment : BaseFragment(), LoginFormView {
         fun newInstance() = LoginFormFragment()
     }
 
-    override val isDebug = DEBUG
+    override val formNameValue: String
+        get() = loginFormName.text.toString()
+
+    override val formPassValue: String
+        get() = loginFormPass.text.toString()
+
+    override val formHostValue: String?
+        get() = resources.getStringArray(R.array.endpoints_values)[loginFormHost.selectedItemPosition]
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         return inflater.inflate(R.layout.fragment_login_form, container, false)
@@ -41,93 +51,61 @@ class LoginFormFragment : BaseFragment(), LoginFormView {
     }
 
     override fun initView() {
-        loginSignButton.setOnClickListener {
-            presenter.attemptLogin(
-                loginNicknameEdit.text.toString(),
-                loginPassEdit.text.toString(),
-                loginSymbolEdit.text.toString(),
-                resources.getStringArray(R.array.endpoints_values)[loginHostEdit.selectedItemPosition]
-            )
+        loginFormName.setOnTextChangedListener { presenter.onNameTextChanged() }
+        loginFormPass.setOnTextChangedListener { presenter.onPassTextChanged() }
+        loginFormHost.setOnItemSelectedListener { presenter.onHostSelected() }
+        loginFormSignIn.setOnClickListener { presenter.onSignInClick() }
+        loginFormPrivacyLink.setOnClickListener { presenter.onPrivacyLinkClick() }
+
+        loginFormPass.setOnEditorActionListener { _, id, _ ->
+            if (id == IME_ACTION_DONE || id == IME_NULL) loginFormSignIn.callOnClick() else false
         }
 
-        loginPassEdit.setOnEditorActionListener { _, id, _ -> onEditAction(id) }
-
-        loginHostEdit.apply {
-            adapter = ArrayAdapter.createFromResource(context, R.array.endpoints_keys, android.R.layout.simple_spinner_item)
+        context?.let {
+            loginFormHost.adapter = ArrayAdapter.createFromResource(it, R.array.endpoints_keys, android.R.layout.simple_spinner_item)
                 .apply { setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) }
         }
-
-        loginSymbolEdit.run {
-            setAdapter(ArrayAdapter(context, android.R.layout.simple_list_item_1, resources.getStringArray(R.array.symbols_values)))
-            setOnEditorActionListener { _, id, _ -> onEditAction(id) }
-        }
     }
 
-    override fun showSymbolInput() {
-        loginHeader.text = getString(R.string.login_header_symbol)
-        loginMainForm.visibility = GONE
-        loginSymbolInput.visibility = VISIBLE
-        loginSymbolEdit.requestFocus()
-        showSoftKeyboard()
+    override fun setDefaultCredentials(name: String, pass: String) {
+        loginFormName.setText(name)
+        loginFormPass.setText(pass)
     }
 
-    @SuppressLint("SetTextI18n")
-    override fun showVersion() {
-        loginVersion.apply {
-            visibility = VISIBLE
-            text = "${getString(R.string.app_name)} $VERSION_NAME"
-        }
-    }
-
-    override fun switchOptionsView() {
-        (activity as? LoginActivity)?.onChildFragmentSwitchOptions()
-    }
-
-    override fun setErrorNicknameRequired() {
-        loginNicknameEdit.run {
+    override fun setErrorNameRequired() {
+        loginFormNameLayout.run {
             requestFocus()
             error = getString(R.string.login_field_required)
         }
     }
 
     override fun setErrorPassRequired(focus: Boolean) {
-        loginPassEdit.run {
+        loginFormPassLayout.run {
             if (focus) requestFocus()
             error = getString(R.string.login_field_required)
         }
     }
 
     override fun setErrorPassInvalid(focus: Boolean) {
-        loginPassEdit.run {
+        loginFormPassLayout.run {
             if (focus) requestFocus()
             error = getString(R.string.login_invalid_password)
         }
     }
 
-    override fun setErrorSymbolRequire() {
-        loginSymbolEdit.run {
-            requestFocus()
-            error = getString(R.string.login_field_required)
-        }
-    }
-
     override fun setErrorPassIncorrect() {
-        loginPassEdit.run {
+        loginFormPassLayout.run {
             requestFocus()
             error = getString(R.string.login_incorrect_password)
         }
     }
 
-    override fun setErrorSymbolIncorrect() {
-        loginSymbolEdit.run {
-            requestFocus()
-            error = getString(R.string.login_incorrect_symbol)
-        }
+    override fun clearNameError() {
+        loginFormNameLayout.error = null
     }
 
-    override fun resetViewErrors() {
-        loginNicknameEdit.error = null
-        loginPassEdit.error = null
+    override fun clearPassError() {
+        loginFormPassLayout.error = null
     }
 
     override fun showSoftKeyboard() {
@@ -139,20 +117,37 @@ class LoginFormFragment : BaseFragment(), LoginFormView {
     }
 
     override fun showProgress(show: Boolean) {
-        loginFormProgressContainer.visibility = if (show) VISIBLE else GONE
+        loginFormProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showContent(show: Boolean) {
         loginFormContainer.visibility = if (show) VISIBLE else GONE
     }
 
-    private fun onEditAction(actionId: Int): Boolean {
-        return when (actionId) {
-            IME_ACTION_DONE, IME_NULL -> loginSignButton.callOnClick()
-            else -> false
+    @SuppressLint("SetTextI18n")
+    override fun showVersion() {
+        loginFormVersion.apply {
+            visibility = VISIBLE
+            text = "${getString(R.string.app_name)} $VERSION_NAME"
         }
     }
 
+    override fun showPrivacyPolicy() {
+        loginFormPrivacyLink.visibility = VISIBLE
+    }
+
+    override fun notifyParentAccountLogged(students: List<Student>) {
+        (activity as? LoginActivity)?.onFormFragmentAccountLogged(students, Triple(
+            loginFormName.text.toString(),
+            loginFormPass.text.toString(),
+            resources.getStringArray(R.array.endpoints_values)[loginFormHost.selectedItemPosition]
+        ))
+    }
+
+    override fun openPrivacyPolicyPage() {
+        context?.openInternetBrowser("https://wulkanowy.github.io/polityka-prywatnosci.html", ::showMessage)
+    }
+
     override fun onDestroyView() {
         super.onDestroyView()
         presenter.onDetachView()
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 a1bbc1f05..3ab47c29b 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
@@ -1,30 +1,29 @@
 package io.github.wulkanowy.ui.modules.login.form
 
-import com.google.firebase.analytics.FirebaseAnalytics.Event.SIGN_UP
-import com.google.firebase.analytics.FirebaseAnalytics.Param.GROUP_ID
 import com.google.firebase.analytics.FirebaseAnalytics.Param.SUCCESS
-import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.modules.login.LoginErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 import io.github.wulkanowy.utils.SchedulersProvider
 import timber.log.Timber
 import javax.inject.Inject
+import javax.inject.Named
 
 class LoginFormPresenter @Inject constructor(
     private val schedulers: SchedulersProvider,
     private val errorHandler: LoginErrorHandler,
     private val studentRepository: StudentRepository,
-    private val analytics: FirebaseAnalyticsHelper
+    private val analytics: FirebaseAnalyticsHelper,
+    @param:Named("isDebug") private val isDebug: Boolean
 ) : BasePresenter<LoginFormView>(errorHandler) {
 
-    private var wasEmpty = false
-
     override fun onAttachView(view: LoginFormView) {
         super.onAttachView(view)
         view.run {
             initView()
-            if (isDebug) showVersion()
+            if (isDebug) showVersion() else showPrivacyPolicy()
+
             errorHandler.onBadCredentials = {
                 setErrorPassIncorrect()
                 showSoftKeyboard()
@@ -33,10 +32,34 @@ class LoginFormPresenter @Inject constructor(
         }
     }
 
-    fun attemptLogin(email: String, password: String, symbol: String, endpoint: String) {
-        if (!validateCredentials(email, password, symbol)) return
+    fun onPrivacyLinkClick() {
+        view?.openPrivacyPolicyPage()
+    }
 
-        disposable.add(studentRepository.getStudents(email, password, symbol, endpoint)
+    fun onHostSelected() {
+        view?.apply {
+            clearPassError()
+            clearNameError()
+            if (formHostValue?.contains("fakelog") == true) setDefaultCredentials("jan@fakelog.cf", "jan123")
+        }
+    }
+
+    fun onPassTextChanged() {
+        view?.clearPassError()
+    }
+
+    fun onNameTextChanged() {
+        view?.clearNameError()
+    }
+
+    fun onSignInClick() {
+        val email = view?.formNameValue.orEmpty()
+        val password = view?.formPassValue.orEmpty()
+        val endpoint = view?.formHostValue.orEmpty()
+
+        if (!validateCredentials(email, password)) return
+
+        disposable.add(studentRepository.getStudents(email, password, endpoint)
             .subscribeOn(schedulers.backgroundThread)
             .observeOn(schedulers.mainThread)
             .doOnSubscribe {
@@ -45,6 +68,7 @@ class LoginFormPresenter @Inject constructor(
                     showProgress(true)
                     showContent(false)
                 }
+                Timber.i("Login started")
             }
             .doFinally {
                 view?.apply {
@@ -53,31 +77,21 @@ class LoginFormPresenter @Inject constructor(
                 }
             }
             .subscribe({
-                view?.run {
-                    if (it.isEmpty() && !wasEmpty) {
-                        showSymbolInput()
-                        wasEmpty = true
-                        analytics.logEvent("sign_up_send", mapOf(SUCCESS to false, "students" to 0, "endpoint" to endpoint, GROUP_ID to symbol.ifEmpty { "null" }))
-                    } else if (it.isEmpty() && wasEmpty) {
-                        showSymbolInput()
-                        setErrorSymbolIncorrect()
-                        analytics.logEvent("sign_up_send", mapOf(SUCCESS to false, "students" to it.size, "endpoint" to endpoint, GROUP_ID to symbol.ifEmpty { "nil" }))
-                    } else {
-                        analytics.logEvent("sign_up_send", mapOf(SUCCESS to true, "students" to it.size, "endpoint" to endpoint, GROUP_ID to symbol))
-                        switchOptionsView()
-                    }
-                }
+                Timber.i("Login result: Success")
+                analytics.logEvent("registration_form", SUCCESS to true, "students" to it.size, "endpoint" to endpoint, "error" to "No error")
+                view?.notifyParentAccountLogged(it)
             }, {
-                analytics.logEvent(SIGN_UP, mapOf(SUCCESS to false, "endpoint" to endpoint, "message" to it.localizedMessage, GROUP_ID to symbol.ifEmpty { "nil" }))
+                Timber.i("Login result: An exception occurred")
+                analytics.logEvent("registration_form", SUCCESS to false, "students" to -1, "endpoint" to endpoint, "error" to it.localizedMessage)
                 errorHandler.dispatch(it)
             }))
     }
 
-    private fun validateCredentials(login: String, password: String, symbol: String): Boolean {
+    private fun validateCredentials(login: String, password: String): Boolean {
         var isCorrect = true
 
         if (login.isEmpty()) {
-            view?.setErrorNicknameRequired()
+            view?.setErrorNameRequired()
             isCorrect = false
         }
 
@@ -86,11 +100,6 @@ class LoginFormPresenter @Inject constructor(
             isCorrect = false
         }
 
-        if (symbol.isEmpty() && wasEmpty) {
-            view?.setErrorSymbolRequire()
-            isCorrect = false
-        }
-
         if (password.length < 6 && password.isNotEmpty()) {
             view?.setErrorPassInvalid(focus = isCorrect)
             isCorrect = false
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 4d5402267..80a7b5e9c 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
@@ -1,30 +1,31 @@
 package io.github.wulkanowy.ui.modules.login.form
 
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.ui.base.BaseView
 
 interface LoginFormView : BaseView {
 
-    val isDebug: Boolean
-
     fun initView()
 
-    fun switchOptionsView()
+    val formNameValue: String
 
-    fun setErrorNicknameRequired()
+    val formPassValue: String
+
+    val formHostValue: String?
+
+    fun setDefaultCredentials(name: String, pass: String)
+
+    fun setErrorNameRequired()
 
     fun setErrorPassRequired(focus: Boolean)
 
-    fun setErrorSymbolRequire()
-
     fun setErrorPassInvalid(focus: Boolean)
 
     fun setErrorPassIncorrect()
 
-    fun setErrorSymbolIncorrect()
+    fun clearNameError()
 
-    fun resetViewErrors()
-
-    fun showVersion()
+    fun clearPassError()
 
     fun showSoftKeyboard()
 
@@ -34,5 +35,11 @@ interface LoginFormView : BaseView {
 
     fun showContent(show: Boolean)
 
-    fun showSymbolInput()
+    fun showVersion()
+
+    fun showPrivacyPolicy()
+
+    fun notifyParentAccountLogged(students: List<Student>)
+
+    fun openPrivacyPolicyPage()
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/options/LoginOptionsFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/options/LoginOptionsFragment.kt
deleted file mode 100644
index 3e306b196..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/options/LoginOptionsFragment.kt
+++ /dev/null
@@ -1,83 +0,0 @@
-package io.github.wulkanowy.ui.modules.login.options
-
-import android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK
-import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
-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.AppCompatActivity
-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.ui.base.BaseFragment
-import io.github.wulkanowy.ui.modules.main.MainActivity
-import io.github.wulkanowy.utils.setOnItemClickListener
-import kotlinx.android.synthetic.main.fragment_login_options.*
-import javax.inject.Inject
-
-class LoginOptionsFragment : BaseFragment(), LoginOptionsView {
-
-    @Inject
-    lateinit var presenter: LoginOptionsPresenter
-
-    @Inject
-    lateinit var loginAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
-
-    companion object {
-        fun newInstance() = LoginOptionsFragment()
-    }
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_login_options, container, false)
-    }
-
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
-        presenter.onAttachView(this)
-    }
-
-    override fun initView() {
-        loginAdapter.apply { setOnItemClickListener { presenter.onItemSelected(it) } }
-
-        loginOptionsRecycler.apply {
-            adapter = loginAdapter
-            layoutManager = SmoothScrollLinearLayoutManager(context)
-        }
-    }
-
-    fun onParentLoadData() {
-        presenter.onParentViewLoadData()
-    }
-
-    override fun updateData(data: List<LoginOptionsItem>) {
-        loginAdapter.updateDataSet(data, true)
-    }
-
-    override fun openMainView() {
-        activity?.let {
-            startActivity(MainActivity.getStartIntent(it)
-                .apply { addFlags(FLAG_ACTIVITY_CLEAR_TASK or FLAG_ACTIVITY_NEW_TASK) })
-        }
-    }
-
-    override fun showProgress(show: Boolean) {
-        loginOptionsProgressContainer.visibility = if (show) VISIBLE else GONE
-    }
-
-    override fun showContent(show: Boolean) {
-        loginOptionsRecycler.visibility = if (show) VISIBLE else GONE
-    }
-
-    override fun showActionBar(show: Boolean) {
-        (activity as? AppCompatActivity)?.supportActionBar?.run { if (show) show() else hide() }
-    }
-
-    override fun onDestroyView() {
-        presenter.onDetachView()
-        super.onDestroyView()
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/options/LoginOptionsItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/options/LoginOptionsItem.kt
deleted file mode 100644
index 2d4de4754..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/options/LoginOptionsItem.kt
+++ /dev/null
@@ -1,54 +0,0 @@
-package io.github.wulkanowy.ui.modules.login.options
-
-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_options.view.*
-
-class LoginOptionsItem(val student: Student) : AbstractFlexibleItem<LoginOptionsItem.ItemViewHolder>() {
-
-    override fun getLayoutRes(): Int = R.layout.item_login_options
-
-    override fun createViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?): ItemViewHolder {
-        return ItemViewHolder(view, adapter)
-    }
-
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>?, holder: ItemViewHolder?,
-                                position: Int, payloads: MutableList<Any>?) {
-        holder?.bind(student)
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as LoginOptionsItem
-
-        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
-
-        fun bind(item: Student) {
-            itemView.run {
-                loginItemName.text = item.studentName
-                loginItemSchool.text = item.schoolName
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/options/LoginOptionsPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/options/LoginOptionsPresenter.kt
deleted file mode 100644
index 6740d0582..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/options/LoginOptionsPresenter.kt
+++ /dev/null
@@ -1,74 +0,0 @@
-package io.github.wulkanowy.ui.modules.login.options
-
-import com.google.firebase.analytics.FirebaseAnalytics.Event.SIGN_UP
-import com.google.firebase.analytics.FirebaseAnalytics.Param.GROUP_ID
-import com.google.firebase.analytics.FirebaseAnalytics.Param.SUCCESS
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.repositories.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
-import io.github.wulkanowy.ui.base.BasePresenter
-import io.github.wulkanowy.ui.modules.login.LoginErrorHandler
-import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.SchedulersProvider
-import io.reactivex.Single
-import javax.inject.Inject
-
-class LoginOptionsPresenter @Inject constructor(
-    private val errorHandler: LoginErrorHandler,
-    private val studentRepository: StudentRepository,
-    private val semesterRepository: SemesterRepository,
-    private val schedulers: SchedulersProvider,
-    private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<LoginOptionsView>(errorHandler) {
-
-    override fun onAttachView(view: LoginOptionsView) {
-        super.onAttachView(view)
-        view.run {
-            initView()
-            errorHandler.onStudentDuplicate = { showMessage(it) }
-        }
-    }
-
-    fun onParentViewLoadData() {
-        disposable.add(studentRepository.cachedStudents
-            .observeOn(schedulers.mainThread)
-            .subscribeOn(schedulers.backgroundThread)
-            .doOnSubscribe { view?.showActionBar(true) }
-            .subscribe({ view?.updateData(it.map { student -> LoginOptionsItem(student) }) }, { errorHandler.dispatch(it) }))
-    }
-
-    fun onItemSelected(item: AbstractFlexibleItem<*>?) {
-        if (item is LoginOptionsItem) {
-            registerStudent(item.student)
-        }
-    }
-
-    private fun registerStudent(student: Student) {
-        disposable.add(studentRepository.saveStudent(student)
-            .map { student.apply { id = it } }
-            .flatMap { semesterRepository.getSemesters(student, true) }
-            .onErrorResumeNext { studentRepository.logoutStudent(student).andThen(Single.error(it)) }
-            .flatMapCompletable { studentRepository.switchStudent(student) }
-            .subscribeOn(schedulers.backgroundThread)
-            .observeOn(schedulers.mainThread)
-            .doOnSubscribe {
-                view?.apply {
-                    showProgress(true)
-                    showContent(false)
-                    showActionBar(false)
-                }
-            }
-            .subscribe({
-                analytics.logEvent(SIGN_UP, mapOf(SUCCESS to true, "endpoint" to student.endpoint, "message" to "Success", GROUP_ID to student.symbol))
-                view?.openMainView()
-            }, {
-                errorHandler.dispatch(it)
-                view?.apply {
-                    showProgress(false)
-                    showContent(true)
-                    showActionBar(true)
-                }
-            }))
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/options/LoginOptionsView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/options/LoginOptionsView.kt
deleted file mode 100644
index e20912ae3..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/options/LoginOptionsView.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package io.github.wulkanowy.ui.modules.login.options
-
-import io.github.wulkanowy.ui.base.BaseView
-
-interface LoginOptionsView : BaseView {
-
-    fun initView()
-
-    fun updateData(data: List<LoginOptionsItem>)
-
-    fun openMainView()
-
-    fun showProgress(show: Boolean)
-
-    fun showContent(show: Boolean)
-
-    fun showActionBar(show: Boolean)
-}
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
new file mode 100644
index 000000000..5c48cf2fb
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectFragment.kt
@@ -0,0 +1,87 @@
+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 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.ui.base.BaseFragment
+import io.github.wulkanowy.ui.modules.main.MainActivity
+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(), LoginStudentSelectView {
+
+    @Inject
+    lateinit var presenter: LoginStudentSelectPresenter
+
+    @Inject
+    lateinit var loginAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
+
+    companion object {
+        const val SAVED_STUDENTS = "STUDENTS"
+
+        fun newInstance() = LoginStudentSelectFragment()
+    }
+
+    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() {
+        loginStudentSelectSignIn.setOnClickListener { presenter.onSignIn() }
+        loginAdapter.apply { setOnItemClickListener { presenter.onItemSelected(it) } }
+
+        loginStudentSelectRecycler.apply {
+            adapter = loginAdapter
+            layoutManager = SmoothScrollLinearLayoutManager(context)
+        }
+    }
+
+    override fun updateData(data: List<LoginStudentSelectItem>) {
+        loginAdapter.updateDataSet(data)
+    }
+
+    override fun openMainView() {
+        activity?.let { startActivity(MainActivity.getStartIntent(context = it, clear = true)) }
+    }
+
+    override fun showProgress(show: Boolean) {
+        loginStudentSelectProgress.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun showContent(show: Boolean) {
+        loginStudentSelectContent.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun enableSignIn(enable: Boolean) {
+        loginStudentSelectSignIn.isEnabled = enable
+    }
+
+    fun onParentInitStudentSelectFragment(students: List<Student>) {
+        presenter.onParentInitStudentSelectView(students)
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        outState.putSerializable(SAVED_STUDENTS, presenter.students as Serializable)
+    }
+
+    override fun onDestroyView() {
+        presenter.onDetachView()
+        super.onDestroyView()
+    }
+}
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..27723c538
--- /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.setOnClickListener { super.onClick(loginItemContainer) }
+        }
+
+        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
new file mode 100644
index 000000000..21dde7b86
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenter.kt
@@ -0,0 +1,94 @@
+package io.github.wulkanowy.ui.modules.login.studentselect
+
+import com.google.firebase.analytics.FirebaseAnalytics.Param.SUCCESS
+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
+import io.github.wulkanowy.ui.modules.login.LoginErrorHandler
+import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
+import io.github.wulkanowy.utils.SchedulersProvider
+import timber.log.Timber
+import java.io.Serializable
+import javax.inject.Inject
+
+class LoginStudentSelectPresenter @Inject constructor(
+    private val errorHandler: LoginErrorHandler,
+    private val studentRepository: StudentRepository,
+    private val schedulers: SchedulersProvider,
+    private val analytics: FirebaseAnalyticsHelper
+) : BasePresenter<LoginStudentSelectView>(errorHandler) {
+
+    var students = emptyList<Student>()
+
+    var selectedStudents = mutableListOf<Student>()
+
+    fun onAttachView(view: LoginStudentSelectView, students: Serializable?) {
+        super.onAttachView(view)
+        view.run {
+            initView()
+            enableSignIn(false)
+            errorHandler.onStudentDuplicate = {
+                showMessage(it)
+                Timber.i("The student already registered in the app was selected")
+            }
+        }
+
+        if (students is List<*> && students.isNotEmpty()) {
+            loadData(students.filterIsInstance<Student>())
+        }
+    }
+
+    fun onSignIn() {
+        registerStudents(selectedStudents)
+    }
+
+    fun onParentInitStudentSelectView(students: List<Student>) {
+        loadData(students)
+        if (students.size == 1) registerStudents(students)
+    }
+
+    fun onItemSelected(item: AbstractFlexibleItem<*>?) {
+        if (item is LoginStudentSelectItem) {
+            selectedStudents.removeAll { it == item.student }
+                .let { if (!it) selectedStudents.add(item.student) }
+
+            view?.enableSignIn(selectedStudents.isNotEmpty())
+        }
+    }
+
+    private fun loadData(students: List<Student>) {
+        this.students = students
+        view?.apply {
+            updateData(students.map { LoginStudentSelectItem(it) })
+        }
+    }
+
+    private fun registerStudents(students: List<Student>) {
+        disposable.add(studentRepository.saveStudents(students)
+            .map { students.first().apply { id = it.first() } }
+            .flatMapCompletable { studentRepository.switchStudent(it) }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doOnSubscribe {
+                view?.apply {
+                    showProgress(true)
+                    showContent(false)
+                }
+                Timber.i("Registration started")
+            }
+            .subscribe({
+                students.forEach { analytics.logEvent("registration_student_select", SUCCESS to true, "endpoint" to it.endpoint, "symbol" to it.symbol, "error" to "No error") }
+                Timber.i("Registration result: Success")
+                view?.openMainView()
+            }, { error ->
+                students.forEach { analytics.logEvent("registration_student_select", SUCCESS to false, "endpoint" to it.endpoint, "symbol" to it.symbol, "error" to error.localizedMessage) }
+                Timber.i("Registration result: An exception occurred ")
+                errorHandler.dispatch(error)
+                view?.apply {
+                    showProgress(false)
+                    showContent(true)
+                }
+            }))
+    }
+}
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
new file mode 100644
index 000000000..3967313c3
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectView.kt
@@ -0,0 +1,18 @@
+package io.github.wulkanowy.ui.modules.login.studentselect
+
+import io.github.wulkanowy.ui.base.BaseView
+
+interface LoginStudentSelectView : BaseView {
+
+    fun initView()
+
+    fun updateData(data: List<LoginStudentSelectItem>)
+
+    fun openMainView()
+
+    fun showProgress(show: Boolean)
+
+    fun showContent(show: Boolean)
+
+    fun enableSignIn(enable: Boolean)
+}
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
new file mode 100644
index 000000000..87de0a818
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolFragment.kt
@@ -0,0 +1,116 @@
+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 io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.ui.base.BaseFragment
+import io.github.wulkanowy.ui.modules.login.LoginActivity
+import io.github.wulkanowy.utils.hideSoftInput
+import io.github.wulkanowy.utils.setOnTextChangedListener
+import io.github.wulkanowy.utils.showSoftInput
+import kotlinx.android.synthetic.main.fragment_login_symbol.*
+import javax.inject.Inject
+
+class LoginSymbolFragment : BaseFragment(), LoginSymbolView {
+
+    @Inject
+    lateinit var presenter: LoginSymbolPresenter
+
+    companion object {
+        private const val SAVED_LOGIN_DATA = "LOGIN_DATA"
+
+        fun newInstance() = LoginSymbolFragment()
+    }
+
+    override val symbolNameError: CharSequence?
+        get() = loginSymbolNameLayout.error
+
+    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() {
+        loginSymbolSignIn.setOnClickListener { presenter.attemptLogin(loginSymbolName.text.toString()) }
+
+        loginSymbolName.setOnTextChangedListener { 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)))
+        }
+    }
+
+    fun onParentInitSymbolFragment(loginData: Triple<String, String, String>) {
+        presenter.onParentInitSymbolView(loginData)
+    }
+
+    override fun setErrorSymbolIncorrect() {
+        loginSymbolNameLayout.apply {
+            requestFocus()
+            error = getString(R.string.login_incorrect_symbol)
+        }
+    }
+
+    override fun setErrorSymbolRequire() {
+        loginSymbolNameLayout.apply {
+            requestFocus()
+            error = getString(R.string.login_field_required)
+        }
+    }
+
+    override fun clearSymbolError() {
+        loginSymbolNameLayout.error = null
+    }
+
+    override fun clearAndFocusSymbol() {
+        loginSymbolNameLayout.apply {
+            editText?.text = null
+            requestFocus()
+        }
+    }
+
+    override fun showSoftKeyboard() {
+        activity?.showSoftInput()
+    }
+
+    override fun hideSoftKeyboard() {
+        activity?.hideSoftInput()
+    }
+
+    override fun showProgress(show: Boolean) {
+        loginSymbolProgress.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun showContent(show: Boolean) {
+        loginSymbolContainer.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun notifyParentAccountLogged(students: List<Student>) {
+        (activity as? LoginActivity)?.onSymbolFragmentAccountLogged(students)
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        outState.putSerializable(SAVED_LOGIN_DATA, presenter.loginData)
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        presenter.onDetachView()
+    }
+}
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
new file mode 100644
index 000000000..0adb9e16f
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolPresenter.kt
@@ -0,0 +1,86 @@
+package io.github.wulkanowy.ui.modules.login.symbol
+
+import com.google.firebase.analytics.FirebaseAnalytics.Param.SUCCESS
+import io.github.wulkanowy.data.repositories.student.StudentRepository
+import io.github.wulkanowy.ui.base.BasePresenter
+import io.github.wulkanowy.ui.modules.login.LoginErrorHandler
+import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
+import io.github.wulkanowy.utils.SchedulersProvider
+import io.reactivex.Single
+import timber.log.Timber
+import java.io.Serializable
+import javax.inject.Inject
+
+class LoginSymbolPresenter @Inject constructor(
+    private val studentRepository: StudentRepository,
+    private val errorHandler: LoginErrorHandler,
+    private val schedulers: SchedulersProvider,
+    private val analytics: FirebaseAnalyticsHelper
+) : BasePresenter<LoginSymbolView>(errorHandler) {
+
+    var loginData: Triple<String, String, String>? = null
+
+    @Suppress("UNCHECKED_CAST")
+    fun onAttachView(view: LoginSymbolView, savedLoginData: Serializable?) {
+        super.onAttachView(view)
+        view.initView()
+        if (savedLoginData is Triple<*, *, *>) {
+            loginData = savedLoginData as Triple<String, String, String>
+        }
+    }
+
+    fun onSymbolTextChanged() {
+        view?.apply { if (symbolNameError != null) clearSymbolError() }
+    }
+
+    fun attemptLogin(symbol: String) {
+        if (symbol.isBlank()) {
+            view?.setErrorSymbolRequire()
+            return
+        }
+
+        disposable.add(
+            Single.fromCallable { if (loginData == null) throw IllegalArgumentException("Login data is null") else loginData }
+                .flatMap { studentRepository.getStudents(it.first, it.second, it.third, symbol) }
+                .subscribeOn(schedulers.backgroundThread)
+                .observeOn(schedulers.mainThread)
+                .doOnSubscribe {
+                    view?.apply {
+                        hideSoftKeyboard()
+                        showProgress(true)
+                        showContent(false)
+                    }
+                    Timber.i("Login with symbol started")
+                }
+                .doFinally {
+                    view?.apply {
+                        showProgress(false)
+                        showContent(true)
+                    }
+                }
+                .subscribe({
+                    analytics.logEvent("registration_symbol", SUCCESS to true, "students" to it.size, "endpoint" to loginData?.third, "symbol" to symbol, "error" to "No error")
+                    view?.apply {
+                        if (it.isEmpty()) {
+                            Timber.i("Login with symbol result: Empty student list")
+                            setErrorSymbolIncorrect()
+                        } else {
+                            Timber.i("Login with symbol result: Success")
+                            notifyParentAccountLogged(it)
+                        }
+                    }
+                }, {
+                    Timber.i("Login with symbol result: An exception occurred")
+                    analytics.logEvent("registration_symbol", SUCCESS to false, "students" to -1, "endpoint" to loginData?.third, "symbol" to symbol, "error" to it.localizedMessage)
+                    errorHandler.dispatch(it)
+                }))
+    }
+
+    fun onParentInitSymbolView(loginData: Triple<String, String, String>) {
+        this.loginData = loginData
+        view?.apply {
+            clearAndFocusSymbol()
+            showSoftKeyboard()
+        }
+    }
+}
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
new file mode 100644
index 000000000..2e5143ef1
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolView.kt
@@ -0,0 +1,29 @@
+package io.github.wulkanowy.ui.modules.login.symbol
+
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.ui.base.BaseView
+
+interface LoginSymbolView : BaseView {
+
+    val symbolNameError: CharSequence?
+
+    fun initView()
+
+    fun setErrorSymbolIncorrect()
+
+    fun setErrorSymbolRequire()
+
+    fun clearSymbolError()
+
+    fun clearAndFocusSymbol()
+
+    fun showSoftKeyboard()
+
+    fun hideSoftKeyboard()
+
+    fun showProgress(show: Boolean)
+
+    fun showContent(show: Boolean)
+
+    fun notifyParentAccountLogged(students: List<Student>)
+}
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
new file mode 100644
index 000000000..cff6175c0
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberFragment.kt
@@ -0,0 +1,71 @@
+package io.github.wulkanowy.ui.modules.luckynumber
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.LuckyNumber
+import io.github.wulkanowy.ui.base.session.BaseSessionFragment
+import io.github.wulkanowy.ui.modules.main.MainView
+import kotlinx.android.synthetic.main.fragment_lucky_number.*
+import javax.inject.Inject
+
+class LuckyNumberFragment : BaseSessionFragment(), LuckyNumberView, MainView.TitledView {
+
+    @Inject
+    lateinit var presenter: LuckyNumberPresenter
+
+    companion object {
+        fun newInstance() = LuckyNumberFragment()
+    }
+
+    override val titleStringId: Int
+        get() = R.string.lucky_number_title
+
+    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)
+        presenter.onAttachView(this)
+    }
+
+    override fun initView() {
+        luckyNumberSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
+    }
+
+    override fun updateData(data: LuckyNumber) {
+        luckyNumberText.text = data.luckyNumber.toString()
+    }
+
+    override fun hideRefresh() {
+        luckyNumberSwipe.isRefreshing = false
+    }
+
+    override fun showEmpty(show: Boolean) {
+        luckyNumberEmpty.visibility = if (show) View.VISIBLE else View.GONE
+    }
+
+    override fun showProgress(show: Boolean) {
+        luckyNumberProgress.visibility = if (show) View.VISIBLE else View.GONE
+    }
+
+    override fun enableSwipe(enable: Boolean) {
+        luckyNumberSwipe.isEnabled = enable
+    }
+
+    override fun showContent(show: Boolean) {
+        luckyNumberContent.visibility = if (show) View.VISIBLE else View.GONE
+    }
+
+    override fun isViewEmpty(): Boolean {
+        return luckyNumberText.text.isBlank()
+    }
+
+    override fun onDestroyView() {
+        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
new file mode 100644
index 000000000..8ef638db7
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberPresenter.kt
@@ -0,0 +1,76 @@
+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.session.SessionErrorHandler
+import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
+import io.github.wulkanowy.utils.SchedulersProvider
+import timber.log.Timber
+import javax.inject.Inject
+
+class LuckyNumberPresenter @Inject constructor(
+    private val errorHandler: SessionErrorHandler,
+    private val schedulers: SchedulersProvider,
+    private val luckyNumberRepository: LuckyNumberRepository,
+    private val studentRepository: StudentRepository,
+    private val semesterRepository: SemesterRepository,
+    private val analytics: FirebaseAnalyticsHelper
+) : BasePresenter<LuckyNumberView>(errorHandler) {
+
+    override fun onAttachView(view: LuckyNumberView) {
+        super.onAttachView(view)
+        view.run {
+            initView()
+            showContent(false)
+            enableSwipe(false)
+        }
+        Timber.i("Lucky number view was initialized")
+        loadData()
+    }
+
+    private fun loadData(forceRefresh: Boolean = false) {
+        Timber.i("Loading lucky number started")
+        disposable.apply {
+            clear()
+            add(studentRepository.getCurrentStudent()
+                .flatMap { semesterRepository.getCurrentSemester(it) }
+                .flatMapMaybe { luckyNumberRepository.getLuckyNumber(it, forceRefresh) }
+                .subscribeOn(schedulers.backgroundThread)
+                .observeOn(schedulers.mainThread)
+                .doFinally {
+                    view?.run {
+                        hideRefresh()
+                        showProgress(false)
+                        enableSwipe(true)
+                    }
+                }
+                .subscribe({
+                    Timber.i("Loading lucky number result: Success")
+                    view?.apply {
+                        updateData(it)
+                        showContent(true)
+                        showEmpty(false)
+                    }
+                    analytics.logEvent("load_lucky_number", "lucky_number" to it.luckyNumber, "force_refresh" to forceRefresh)
+                }, {
+                    Timber.i("Loading lucky number result: An exception occurred")
+                    view?.run { showEmpty(isViewEmpty()) }
+                    errorHandler.dispatch(it)
+                }, {
+                    Timber.i("Loading lucky number result: No lucky number found")
+                    view?.run {
+                        showContent(false)
+                        showEmpty(true)
+                    }
+                })
+            )
+        }
+    }
+
+    fun onSwipeRefresh() {
+        Timber.i("Force refreshing the lucky number")
+        loadData(true)
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberView.kt
new file mode 100644
index 000000000..5c19142c5
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberView.kt
@@ -0,0 +1,23 @@
+package io.github.wulkanowy.ui.modules.luckynumber
+
+import io.github.wulkanowy.data.db.entities.LuckyNumber
+import io.github.wulkanowy.ui.base.session.BaseSessionView
+
+interface LuckyNumberView : BaseSessionView {
+
+    fun initView()
+
+    fun updateData(data: LuckyNumber)
+
+    fun hideRefresh()
+
+    fun showEmpty(show: Boolean)
+
+    fun showProgress(show: Boolean)
+
+    fun enableSwipe(enable: Boolean)
+
+    fun showContent(show: Boolean)
+
+    fun isViewEmpty(): Boolean
+}
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
new file mode 100644
index 000000000..7e3eeb56b
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureActivity.kt
@@ -0,0 +1,77 @@
+package io.github.wulkanowy.ui.modules.luckynumberwidget
+
+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.Bundle
+import android.widget.Toast
+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.ui.base.BaseActivity
+import io.github.wulkanowy.ui.modules.login.LoginActivity
+import io.github.wulkanowy.utils.setOnItemClickListener
+import kotlinx.android.synthetic.main.activity_widget_configure.*
+import javax.inject.Inject
+
+class LuckyNumberWidgetConfigureActivity : BaseActivity(), LuckyNumberWidgetConfigureView {
+
+    @Inject
+    lateinit var configureAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
+
+    @Inject
+    lateinit var presenter: LuckyNumberWidgetConfigurePresenter
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setResult(RESULT_CANCELED)
+        setContentView(R.layout.activity_widget_configure)
+
+        intent.extras.let {
+            presenter.onAttachView(this, it?.getInt(EXTRA_APPWIDGET_ID))
+        }
+    }
+
+    override fun initView() {
+        widgetConfigureRecycler.apply {
+            adapter = configureAdapter
+            layoutManager = SmoothScrollLinearLayoutManager(context)
+        }
+        configureAdapter.setOnItemClickListener { presenter.onItemSelect(it) }
+    }
+
+    override fun updateData(data: List<LuckyNumberWidgetConfigureItem>) {
+        configureAdapter.updateDataSet(data)
+    }
+
+    override fun updateLuckyNumberWidget(widgetId: Int) {
+        sendBroadcast(Intent(this, LuckyNumberWidgetProvider::class.java)
+            .apply {
+                action = ACTION_APPWIDGET_UPDATE
+                putExtra(EXTRA_APPWIDGET_IDS, intArrayOf(widgetId))
+            })
+    }
+
+    override fun setSuccessResult(widgetId: Int) {
+        setResult(RESULT_OK, Intent().apply { putExtra(EXTRA_APPWIDGET_ID, widgetId) })
+    }
+
+    override fun showError(text: String, error: Throwable) {
+        Toast.makeText(this, text, Toast.LENGTH_LONG).show()
+    }
+
+    override fun finishView() {
+        finish()
+    }
+
+    override fun openLoginView() {
+        startActivity(LoginActivity.getStartIntent(this))
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        presenter.onDetachView()
+    }
+}
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..bba0974b6
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureItem.kt
@@ -0,0 +1,54 @@
+package io.github.wulkanowy.ui.modules.luckynumberwidget
+
+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 io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetConfigureItem
+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 {
+        return ViewHolder(view, adapter)
+    }
+
+    @SuppressLint("SetTextI18n")
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>) {
+        holder.apply {
+            accountItemName.text = "${student.studentName} ${student.className}"
+            accountItemSchool.text = student.schoolName
+            accountItemImage.setBackgroundResource(if (isCurrent) R.drawable.ic_account_circular_border else 0)
+        }
+    }
+
+    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
new file mode 100644
index 000000000..4fd81e960
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigurePresenter.kt
@@ -0,0 +1,62 @@
+package io.github.wulkanowy.ui.modules.luckynumberwidget
+
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import io.github.wulkanowy.data.db.SharedPrefHelper
+import io.github.wulkanowy.data.db.entities.Student
+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.luckynumberwidget.LuckyNumberWidgetProvider.Companion.getStudentWidgetKey
+import io.github.wulkanowy.utils.SchedulersProvider
+import javax.inject.Inject
+
+class LuckyNumberWidgetConfigurePresenter @Inject constructor(
+    private val errorHandler: ErrorHandler,
+    private val schedulers: SchedulersProvider,
+    private val studentRepository: StudentRepository,
+    private val sharedPref: SharedPrefHelper
+) : BasePresenter<LuckyNumberWidgetConfigureView>(errorHandler) {
+
+    private var appWidgetId: Int? = null
+
+    fun onAttachView(view: LuckyNumberWidgetConfigureView, appWidgetId: Int?) {
+        super.onAttachView(view)
+        this.appWidgetId = appWidgetId
+        view.initView()
+        loadData()
+    }
+
+    fun onItemSelect(item: AbstractFlexibleItem<*>) {
+        if (item is LuckyNumberWidgetConfigureItem) {
+            registerStudent(item.student)
+        }
+    }
+
+    private fun loadData() {
+        disposable.add(studentRepository.getSavedStudents(false)
+            .map { it to appWidgetId?.let { id -> sharedPref.getLong(getStudentWidgetKey(id), 0) } }
+            .map { (students, currentStudentId) ->
+                students.map { student -> LuckyNumberWidgetConfigureItem(student, student.id == currentStudentId) }
+            }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                when {
+                    it.isEmpty() -> view?.openLoginView()
+                    it.size == 1 -> registerStudent(it.single().student)
+                    else -> view?.updateData(it)
+                }
+            }, { errorHandler.dispatch(it) }))
+    }
+
+    private fun registerStudent(student: Student) {
+        appWidgetId?.also {
+            sharedPref.putLong(getStudentWidgetKey(it), student.id)
+            view?.apply {
+                updateLuckyNumberWidget(it)
+                setSuccessResult(it)
+            }
+        }
+        view?.finishView()
+    }
+}
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
new file mode 100644
index 000000000..49c3f1dcd
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureView.kt
@@ -0,0 +1,19 @@
+package io.github.wulkanowy.ui.modules.luckynumberwidget
+
+import io.github.wulkanowy.ui.base.BaseView
+import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetConfigureItem
+
+interface LuckyNumberWidgetConfigureView : BaseView {
+
+    fun initView()
+
+    fun updateData(data: List<LuckyNumberWidgetConfigureItem>)
+
+    fun updateLuckyNumberWidget(widgetId: Int)
+
+    fun setSuccessResult(widgetId: Int)
+
+    fun finishView()
+
+    fun openLoginView()
+}
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
new file mode 100644
index 000000000..66141c913
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetProvider.kt
@@ -0,0 +1,183 @@
+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_MAX_WIDTH
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.os.Build
+import android.view.View.GONE
+import android.view.View.VISIBLE
+import android.widget.RemoteViews
+import dagger.android.AndroidInjection
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.SharedPrefHelper
+import io.github.wulkanowy.data.db.entities.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.modules.main.MainActivity
+import io.github.wulkanowy.ui.modules.main.MainView.MenuView
+import io.github.wulkanowy.utils.SchedulersProvider
+import io.reactivex.Maybe
+import timber.log.Timber
+import javax.inject.Inject
+
+class LuckyNumberWidgetProvider : BroadcastReceiver() {
+
+    @Inject
+    lateinit var studentRepository: StudentRepository
+
+    @Inject
+    lateinit var semesterRepository: SemesterRepository
+
+    @Inject
+    lateinit var luckyNumberRepository: LuckyNumberRepository
+
+    @Inject
+    lateinit var schedulers: SchedulersProvider
+
+    @Inject
+    lateinit var appWidgetManager: AppWidgetManager
+
+    @Inject
+    lateinit var sharedPref: SharedPrefHelper
+
+    companion object {
+        fun getStudentWidgetKey(appWidgetId: Int) = "lucky_number_widget_student_$appWidgetId"
+    }
+
+    @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
+    override fun onReceive(context: Context, intent: Intent) {
+        AndroidInjection.inject(this, context)
+        when (intent.action) {
+            ACTION_APPWIDGET_UPDATE -> onUpdate(context, intent)
+            ACTION_APPWIDGET_DELETED -> onDelete(intent)
+            ACTION_APPWIDGET_OPTIONS_CHANGED -> onOptionsChange(context, intent)
+        }
+    }
+
+    private fun onUpdate(context: Context, intent: Intent) {
+        intent.getIntArrayExtra(EXTRA_APPWIDGET_IDS)?.forEach { appWidgetId ->
+            RemoteViews(context.packageName, R.layout.widget_luckynumber).apply {
+                setTextViewText(R.id.luckyNumberWidgetNumber,
+                    getLuckyNumber(sharedPref.getLong(getStudentWidgetKey(appWidgetId), 0), appWidgetId)?.luckyNumber?.toString() ?: "#"
+                )
+                setOnClickPendingIntent(R.id.luckyNumberWidgetContainer,
+                    PendingIntent.getActivity(context, MenuView.LUCKY_NUMBER.id,
+                        MainActivity.getStartIntent(context, MenuView.LUCKY_NUMBER, true), FLAG_UPDATE_CURRENT))
+            }.also {
+                setStyles(it, intent)
+                appWidgetManager.updateAppWidget(appWidgetId, it)
+            }
+        }
+    }
+
+    private fun onDelete(intent: Intent) {
+        intent.getIntExtra(EXTRA_APPWIDGET_ID, 0).let {
+            if (it != 0) sharedPref.delete(getStudentWidgetKey(it))
+        }
+    }
+
+    private fun getLuckyNumber(studentId: Long, appWidgetId: Int): LuckyNumber? {
+        return try {
+            studentRepository.isStudentSaved()
+                .filter { true }
+                .flatMap { studentRepository.getSavedStudents().toMaybe() }
+                .flatMap { students ->
+                    students.singleOrNull { student -> student.id == studentId }
+                        .let { student ->
+                            when {
+                                student != null -> Maybe.just(student)
+                                studentId != 0L -> {
+                                    studentRepository.isCurrentStudentSet()
+                                        .filter { true }
+                                        .flatMap { studentRepository.getCurrentStudent(false).toMaybe() }
+                                        .doOnSuccess { sharedPref.putLong(getStudentWidgetKey(appWidgetId), it.id) }
+                                }
+                                else -> Maybe.empty()
+                            }
+                        }
+                }
+                .flatMap { semesterRepository.getCurrentSemester(it).toMaybe() }
+                .flatMap { luckyNumberRepository.getLuckyNumber(it) }
+                .subscribeOn(schedulers.backgroundThread)
+                .blockingGet()
+        } catch (e: Exception) {
+            Timber.e(e, "An error has occurred in lucky number provider")
+            null
+        }
+    }
+
+    private fun onOptionsChange(context: Context, intent: Intent) {
+        intent.extras?.let { extras ->
+            RemoteViews(context.packageName, R.layout.widget_luckynumber).apply {
+                setStyles(this, intent)
+                appWidgetManager.updateAppWidget(extras.getInt(EXTRA_APPWIDGET_ID), this)
+            }
+        }
+    }
+
+    @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")
+                views.run {
+                    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")
+                views.run {
+                    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")
+                views.run {
+                    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")
+                views.run {
+                    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 58c2f7c95..5ca41b711 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
@@ -2,25 +2,31 @@ package io.github.wulkanowy.ui.modules.main
 
 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.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
+import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.Fragment
 import com.aurelhubert.ahbottomnavigation.AHBottomNavigation.TitleState.ALWAYS_SHOW
 import com.aurelhubert.ahbottomnavigation.AHBottomNavigationItem
 import com.ncapdevi.fragnav.FragNavController
 import com.ncapdevi.fragnav.FragNavController.Companion.HIDE
 import io.github.wulkanowy.R
-import io.github.wulkanowy.services.notification.GradeNotification
 import io.github.wulkanowy.ui.base.BaseActivity
 import io.github.wulkanowy.ui.modules.account.AccountDialog
 import io.github.wulkanowy.ui.modules.attendance.AttendanceFragment
 import io.github.wulkanowy.ui.modules.exam.ExamFragment
 import io.github.wulkanowy.ui.modules.grade.GradeFragment
+import io.github.wulkanowy.ui.modules.homework.HomeworkFragment
 import io.github.wulkanowy.ui.modules.login.LoginActivity
+import io.github.wulkanowy.ui.modules.luckynumber.LuckyNumberFragment
+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.getThemeAttrColor
 import io.github.wulkanowy.utils.safelyPopFragment
@@ -37,9 +43,15 @@ class MainActivity : BaseActivity(), MainView {
     lateinit var navController: FragNavController
 
     companion object {
-        const val EXTRA_START_MENU_INDEX = "extraStartMenuIndex"
+        const val EXTRA_START_MENU = "extraStartMenu"
 
-        fun getStartIntent(context: Context) = Intent(context, MainActivity::class.java)
+        fun getStartIntent(context: Context, startMenu: MainView.MenuView? = null, clear: Boolean = false): Intent {
+            return Intent(context, MainActivity::class.java)
+                .apply {
+                    if (clear) flags = FLAG_ACTIVITY_NEW_TASK or FLAG_ACTIVITY_CLEAR_TASK
+                    startMenu?.let { putExtra(EXTRA_START_MENU, it) }
+                }
+        }
     }
 
     override val isRootView: Boolean
@@ -53,14 +65,27 @@ class MainActivity : BaseActivity(), MainView {
 
     override var startMenuIndex = 0
 
+    override var startMenuMoreIndex = -1
+
+    private val moreMenuFragments = listOf<Fragment>(
+        MessageFragment.newInstance(),
+        HomeworkFragment.newInstance(),
+        NoteFragment.newInstance(),
+        LuckyNumberFragment.newInstance()
+    )
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
         setSupportActionBar(mainToolbar)
         messageContainer = mainFragmentContainer
 
-        presenter.onAttachView(this, intent.getIntExtra(EXTRA_START_MENU_INDEX, -1))
-        navController.initialize(startMenuIndex, savedInstanceState)
+        presenter.onAttachView(this, intent.getSerializableExtra(EXTRA_START_MENU) as? MainView.MenuView)
+
+        navController.run {
+            initialize(startMenuIndex, savedInstanceState)
+            pushFragment(moreMenuFragments.getOrNull(startMenuMoreIndex))
+        }
     }
 
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {
@@ -68,15 +93,10 @@ class MainActivity : BaseActivity(), MainView {
         return true
     }
 
-    override fun onStart() {
-        super.onStart()
-        presenter.onViewStart()
-    }
-
     override fun initView() {
         mainBottomNav.run {
             addItems(
-                mutableListOf(
+                listOf(
                     AHBottomNavigationItem(R.string.grade_title, R.drawable.ic_menu_main_grade_26dp, 0),
                     AHBottomNavigationItem(R.string.attendance_title, R.drawable.ic_menu_main_attendance_24dp, 0),
                     AHBottomNavigationItem(R.string.exam_title, R.drawable.ic_menu_main_exam_24dp, 0),
@@ -97,7 +117,7 @@ class MainActivity : BaseActivity(), MainView {
         }
 
         navController.run {
-            setOnViewChangeListener { presenter.onViewStart() }
+            setOnViewChangeListener { presenter.onViewChange() }
             fragmentHideStrategy = HIDE
             rootFragments = listOf(
                 GradeFragment.newInstance(),
@@ -144,7 +164,11 @@ class MainActivity : BaseActivity(), MainView {
     }
 
     override fun notifyMenuViewReselected() {
-        (navController.currentStack?.get(0) as? MainView.MainChildView)?.onFragmentReselected()
+        (navController.currentStack?.getOrNull(0) as? MainView.MainChildView)?.onFragmentReselected()
+    }
+
+    fun showDialogFragment(dialog: DialogFragment) {
+        navController.showDialogFragment(dialog)
     }
 
     fun pushView(fragment: Fragment) {
@@ -159,18 +183,15 @@ class MainActivity : BaseActivity(), MainView {
         presenter.onBackPressed { super.onBackPressed() }
     }
 
-    override fun cancelNotifications() {
-        GradeNotification(applicationContext).cancelAll()
-    }
-
     override fun openLoginView() {
         startActivity(LoginActivity.getStartIntent(this)
-            .apply { addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK) })
+            .apply { addFlags(FLAG_ACTIVITY_CLEAR_TASK or FLAG_ACTIVITY_NEW_TASK) })
     }
 
-    override fun onSaveInstanceState(outState: Bundle?) {
+    override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
         navController.onSaveInstanceState(outState)
+        intent.removeExtra(EXTRA_START_MENU)
     }
 
     override fun onDestroy() {
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 9d1c44c07..de4405b74 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
@@ -5,7 +5,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.android.ContributesAndroidInjector
 import io.github.wulkanowy.R
-import io.github.wulkanowy.di.scopes.PerActivity
 import io.github.wulkanowy.di.scopes.PerFragment
 import io.github.wulkanowy.ui.modules.about.AboutFragment
 import io.github.wulkanowy.ui.modules.about.AboutModule
@@ -16,6 +15,7 @@ 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.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
@@ -23,6 +23,7 @@ import io.github.wulkanowy.ui.modules.more.MoreFragment
 import io.github.wulkanowy.ui.modules.note.NoteFragment
 import io.github.wulkanowy.ui.modules.settings.SettingsFragment
 import io.github.wulkanowy.ui.modules.timetable.TimetableFragment
+import io.github.wulkanowy.ui.modules.timetable.completed.CompletedLessonsFragment
 
 @Module
 abstract class MainModule {
@@ -31,7 +32,6 @@ abstract class MainModule {
     companion object {
 
         @JvmStatic
-        @PerActivity
         @Provides
         fun provideFragNavController(activity: MainActivity): FragNavController {
             return FragNavController(activity.supportFragmentManager, R.id.mainFragmentContainer)
@@ -88,5 +88,13 @@ abstract class MainModule {
 
     @PerFragment
     @ContributesAndroidInjector
-    abstract fun bindsAccountDialog(): AccountDialog
+    abstract fun bindLuckyNumberFragment(): LuckyNumberFragment
+
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindCompletedLessonsFragment(): CompletedLessonsFragment
+
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindAccountDialog(): AccountDialog
 }
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 f18bd9eb0..12f2bb048 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
@@ -2,43 +2,42 @@ package io.github.wulkanowy.ui.modules.main
 
 import com.google.firebase.analytics.FirebaseAnalytics.Event.APP_OPEN
 import com.google.firebase.analytics.FirebaseAnalytics.Param.DESTINATION
-import io.github.wulkanowy.data.repositories.PreferencesRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
-import io.github.wulkanowy.services.job.ServiceHelper
+import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
+import io.github.wulkanowy.data.repositories.student.StudentRepository
+import io.github.wulkanowy.services.sync.SyncManager
 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.reactivex.Completable
+import timber.log.Timber
 import javax.inject.Inject
 
 class MainPresenter @Inject constructor(
     private val errorHandler: ErrorHandler,
     private val studentRepository: StudentRepository,
     private val prefRepository: PreferencesRepository,
+    private val syncManager: SyncManager,
     private val schedulers: SchedulersProvider,
-    private val serviceHelper: ServiceHelper,
     private val analytics: FirebaseAnalyticsHelper
 ) : BasePresenter<MainView>(errorHandler) {
 
-    fun onAttachView(view: MainView, initMenuIndex: Int) {
+    fun onAttachView(view: MainView, initMenu: MainView.MenuView?) {
         super.onAttachView(view)
-        view.run {
-            cancelNotifications()
-            startMenuIndex = if (initMenuIndex != -1) initMenuIndex else prefRepository.startMenuIndex
+        view.apply {
+            getProperViewIndexes(initMenu).let { (main, more) ->
+                startMenuIndex = main
+                startMenuMoreIndex = more
+            }
             initView()
+            Timber.i("Main view was initialized with $startMenuIndex menu index and $startMenuMoreIndex more index")
         }
-        serviceHelper.startFullSyncService()
 
-        analytics.logEvent(APP_OPEN, mapOf(DESTINATION to when (initMenuIndex) {
-            1 -> "Grades"
-            3 -> "Timetable"
-            4 -> "More"
-            else -> "User action"
-        }))
+        syncManager.startSyncWorker()
+        analytics.logEvent(APP_OPEN, DESTINATION to initMenu?.name)
     }
 
-    fun onViewStart() {
+    fun onViewChange() {
         view?.apply {
             currentViewTitle?.let { setViewTitle(it) }
             currentStackSize?.let {
@@ -49,16 +48,19 @@ class MainPresenter @Inject constructor(
     }
 
     fun onAccountManagerSelected(): Boolean {
+        Timber.i("Select account manager")
         view?.showAccountPicker()
         return true
     }
 
     fun onUpNavigate(): Boolean {
+        Timber.i("Up navigate pressed")
         view?.popView()
         return true
     }
 
     fun onBackPressed(default: () -> Unit) {
+        Timber.i("Back pressed in main view")
         view?.run {
             if (isRootView) default()
             else popView()
@@ -67,6 +69,7 @@ class MainPresenter @Inject constructor(
 
     fun onTabSelected(index: Int, wasSelected: Boolean): Boolean {
         return view?.run {
+            Timber.i("Switch main tab index: $index, reselected: $wasSelected")
             if (wasSelected) {
                 notifyMenuViewReselected()
                 false
@@ -78,15 +81,32 @@ class MainPresenter @Inject constructor(
     }
 
     fun onLoginSelected() {
+        Timber.i("Attempt to switch the student after the session expires")
         disposable.add(studentRepository.getCurrentStudent(false)
             .flatMapCompletable { studentRepository.logoutStudent(it) }
             .andThen(studentRepository.getSavedStudents(false))
             .flatMapCompletable {
-                if (it.isNotEmpty()) studentRepository.switchStudent(it[0])
-                else Completable.complete()
+                if (it.isNotEmpty()) {
+                    Timber.i("Switching current student")
+                    studentRepository.switchStudent(it[0])
+                } else Completable.complete()
             }
             .subscribeOn(schedulers.backgroundThread)
             .observeOn(schedulers.mainThread)
-            .subscribe({ view?.openLoginView() }, { errorHandler.dispatch(it) }))
+            .subscribe({
+                Timber.i("Switch student result: Open login view")
+                view?.openLoginView()
+            }, {
+                Timber.i("Switch student result: An exception occurred")
+                errorHandler.dispatch(it)
+            }))
+    }
+
+    private fun getProperViewIndexes(initMenu: MainView.MenuView?): Pair<Int, Int> {
+        return when {
+            initMenu?.id in 0..3 -> initMenu!!.id to -1
+            (initMenu?.id ?: 0) > 3 -> 4 to initMenu!!.id - 4
+            else -> prefRepository.startMenuIndex to -1
+        }
     }
 }
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 112f3f4e2..a786a3c33 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
@@ -6,6 +6,8 @@ interface MainView : BaseView {
 
     var startMenuIndex: Int
 
+    var startMenuMoreIndex: Int
+
     val isRootView: Boolean
 
     val currentViewTitle: String?
@@ -26,8 +28,6 @@ interface MainView : BaseView {
 
     fun popView()
 
-    fun cancelNotifications()
-
     fun openLoginView()
 
     interface MainChildView {
@@ -39,4 +39,15 @@ interface MainView : BaseView {
 
         val titleStringId: Int
     }
+
+    enum class MenuView(val id: Int) {
+        GRADE(0),
+        ATTENDANCE(1),
+        EXAM(2),
+        TIMETABLE(3),
+        MESSAGE(4),
+        HOMEWORK(5),
+        NOTE(6),
+        LUCKY_NUMBER(7),
+    }
 }
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 f75c6131d..7bd35f2d2 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
@@ -7,12 +7,14 @@ import android.view.View.INVISIBLE
 import android.view.View.VISIBLE
 import android.view.ViewGroup
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.repositories.MessagesRepository.MessageFolder.RECEIVED
-import io.github.wulkanowy.data.repositories.MessagesRepository.MessageFolder.SENT
-import io.github.wulkanowy.data.repositories.MessagesRepository.MessageFolder.TRASHED
+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.ui.base.BaseFragment
-import io.github.wulkanowy.ui.base.BasePagerAdapter
+import io.github.wulkanowy.ui.base.BaseFragmentPagerAdapter
 import io.github.wulkanowy.ui.modules.main.MainView
+import io.github.wulkanowy.ui.modules.message.send.SendMessageActivity
 import io.github.wulkanowy.ui.modules.message.tab.MessageTabFragment
 import io.github.wulkanowy.utils.setOnSelectPageListener
 import kotlinx.android.synthetic.main.fragment_message.*
@@ -24,7 +26,7 @@ class MessageFragment : BaseFragment(), MessageView, MainView.TitledView {
     lateinit var presenter: MessagePresenter
 
     @Inject
-    lateinit var pagerAdapter: BasePagerAdapter
+    lateinit var pagerAdapter: BaseFragmentPagerAdapter
 
     companion object {
         fun newInstance() = MessageFragment()
@@ -46,17 +48,23 @@ class MessageFragment : BaseFragment(), MessageView, MainView.TitledView {
     }
 
     override fun initView() {
-        pagerAdapter.fragments.putAll(mapOf(
-            getString(R.string.message_inbox) to MessageTabFragment.newInstance(RECEIVED),
-            getString(R.string.message_sent) to MessageTabFragment.newInstance(SENT),
-            getString(R.string.message_trash) to MessageTabFragment.newInstance(TRASHED)
-        ))
+        pagerAdapter.apply {
+            containerId = messageViewPager.id
+            addFragmentsWithTitle(mapOf(
+                MessageTabFragment.newInstance(RECEIVED) to getString(R.string.message_inbox),
+                MessageTabFragment.newInstance(SENT) to getString(R.string.message_sent),
+                MessageTabFragment.newInstance(TRASHED) to getString(R.string.message_trash)
+            ))
+        }
+
         messageViewPager.run {
             adapter = pagerAdapter
             offscreenPageLimit = 2
             setOnSelectPageListener { presenter.onPageSelected(it) }
         }
         messageTabLayout.setupWithViewPager(messageViewPager)
+
+        openSendMessageButton.setOnClickListener { presenter.onSendMessageButtonClicked() }
     }
 
     override fun showContent(show: Boolean) {
@@ -68,12 +76,24 @@ class MessageFragment : BaseFragment(), MessageView, MainView.TitledView {
         messageProgress.visibility = if (show) VISIBLE else INVISIBLE
     }
 
+    fun onDeleteMessage(message: Message) {
+        presenter.onDeleteMessage(message)
+    }
+
     fun onChildFragmentLoaded() {
         presenter.onChildViewLoaded()
     }
 
+    override fun notifyChildMessageDeleted(tabId: Int) {
+        (pagerAdapter.getFragmentInstance(tabId) as? MessageTabFragment)?.onParentDeleteMessage()
+    }
+
     override fun notifyChildLoadData(index: Int, forceRefresh: Boolean) {
-        (childFragmentManager.fragments[index] as MessageView.MessageChildView).onParentLoadData(forceRefresh)
+        (pagerAdapter.getFragmentInstance(index) as? MessageTabFragment)?.onParentLoadData(forceRefresh)
+    }
+
+    override fun openSendMessage() {
+        context?.let { it.startActivity(SendMessageActivity.getStartIntent(it)) }
     }
 
     override fun onDestroyView() {
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
index e9aa242d6..26568e22f 100644
--- 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
@@ -20,17 +20,14 @@ class MessageItem(val message: Message, private val noSubjectString: String) :
         return ViewHolder(view, adapter)
     }
 
-    override fun getLayoutRes(): Int = R.layout.item_message
+    override fun getLayoutRes() = R.layout.item_message
 
-    override fun bindViewHolder(
-        adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder,
-        position: Int, payloads: MutableList<Any>?
-    ) {
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
         holder.apply {
-            val style = if (message.unread == true) BOLD else NORMAL
+            val style = if (message.unread) BOLD else NORMAL
 
             messageItemAuthor.run {
-                text = if (message.recipient?.isNotBlank() == true) message.recipient else message.sender
+                text = if (message.recipient.isNotBlank()) message.recipient else message.sender
                 setTypeface(null, style)
             }
             messageItemSubject.run {
@@ -38,7 +35,7 @@ class MessageItem(val message: Message, private val noSubjectString: String) :
                 setTypeface(null, style)
             }
             messageItemDate.run {
-                text = message.date?.toFormattedString()
+                text = message.date.toFormattedString()
                 setTypeface(null, style)
             }
         }
@@ -58,9 +55,7 @@ class MessageItem(val message: Message, private val noSubjectString: String) :
         return message.hashCode()
     }
 
-    class ViewHolder(val view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter),
-        LayoutContainer {
-
+    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 dd7a22ae8..e4c202d9f 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
@@ -5,7 +5,7 @@ import dagger.Provides
 import dagger.android.ContributesAndroidInjector
 import io.github.wulkanowy.di.scopes.PerChildFragment
 import io.github.wulkanowy.di.scopes.PerFragment
-import io.github.wulkanowy.ui.base.BasePagerAdapter
+import io.github.wulkanowy.ui.base.BaseFragmentPagerAdapter
 import io.github.wulkanowy.ui.modules.message.tab.MessageTabFragment
 
 @Module
@@ -17,7 +17,7 @@ abstract class MessageModule {
         @JvmStatic
         @PerFragment
         @Provides
-        fun provideGradePagerAdapter(fragment: MessageFragment) = BasePagerAdapter(fragment.childFragmentManager)
+        fun provideMessageAdapter(fragment: MessageFragment) = BaseFragmentPagerAdapter(fragment.childFragmentManager)
     }
 
     @PerChildFragment
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessagePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessagePresenter.kt
index 360b9bfc1..888df0400 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessagePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessagePresenter.kt
@@ -1,9 +1,11 @@
 package io.github.wulkanowy.ui.modules.message
 
+import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.SchedulersProvider
 import io.reactivex.Completable
+import timber.log.Timber
 import java.util.concurrent.TimeUnit.MILLISECONDS
 import javax.inject.Inject
 
@@ -17,6 +19,7 @@ class MessagePresenter @Inject constructor(
         disposable.add(Completable.timer(150, MILLISECONDS, schedulers.mainThread)
             .subscribe {
                 view.initView()
+                Timber.i("Message view was initialized")
                 loadData()
             })
     }
@@ -30,6 +33,7 @@ class MessagePresenter @Inject constructor(
     }
 
     private fun loadChild(index: Int, forceRefresh: Boolean = false) {
+        Timber.i("Load message child view index: $index")
         view?.notifyChildLoadData(index, forceRefresh)
     }
 
@@ -39,4 +43,17 @@ class MessagePresenter @Inject constructor(
             showProgress(false)
         }
     }
+
+    fun onDeleteMessage(message: Message) {
+        view?.notifyChildMessageDeleted(
+            when (message.removed) {
+                true -> 2
+                else -> message.folderId - 1
+            }
+        )
+    }
+
+    fun onSendMessageButtonClicked() {
+        view?.openSendMessage()
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageView.kt
index b0bb8aa7c..2aa4d78ec 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageView.kt
@@ -14,8 +14,7 @@ interface MessageView : BaseView {
 
     fun notifyChildLoadData(index: Int, forceRefresh: Boolean)
 
-    interface MessageChildView {
+    fun notifyChildMessageDeleted(tabId: Int)
 
-        fun onParentLoadData(forceRefresh: Boolean)
-    }
+    fun openSendMessage()
 }
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 f104d87a8..057d81dc6 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,77 +1,153 @@
 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 android.view.ViewGroup
 import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.ui.base.session.BaseSessionFragment
+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
 
+@SuppressLint("SetTextI18n")
 class MessagePreviewFragment : BaseSessionFragment(), MessagePreviewView, MainView.TitledView {
 
     @Inject
     lateinit var presenter: MessagePreviewPresenter
 
+    private var menuReplyButton: MenuItem? = null
+
+    private var menuForwardButton: MenuItem? = null
+
+    private var menuDeleteButton: MenuItem? = null
+
     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(messageId: Int?): MessagePreviewFragment {
+        fun newInstance(messageId: Long): MessagePreviewFragment {
             return MessagePreviewFragment().apply {
-                arguments = Bundle().apply { putInt(MESSAGE_ID_KEY, messageId ?: 0) }
+                arguments = Bundle().apply { putLong(MESSAGE_ID_KEY, messageId) }
             }
         }
     }
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setHasOptionsMenu(true)
+    }
+
     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 = message
-        presenter.onAttachView(this, (savedInstanceState ?: arguments)?.getInt(MESSAGE_ID_KEY) ?: 0)
+        messageContainer = messagePreviewContainer
+        presenter.onAttachView(this, (savedInstanceState ?: arguments)?.getLong(MESSAGE_ID_KEY) ?: 0L)
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+        inflater.inflate(R.menu.action_menu_message_preview, menu)
+        menuReplyButton = menu.findItem(R.id.messagePreviewMenuReply)
+        menuForwardButton = menu.findItem(R.id.messagePreviewMenuForward)
+        menuDeleteButton = menu.findItem(R.id.messagePreviewMenuDelete)
+        presenter.onCreateOptionsMenu()
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        return when (item.itemId) {
+            R.id.messagePreviewMenuReply -> presenter.onReply()
+            R.id.messagePreviewMenuForward -> presenter.onForward()
+            R.id.messagePreviewMenuDelete -> presenter.onMessageDelete()
+            else -> false
+        }
     }
 
     override fun setSubject(subject: String) {
-        messageSubject.text = subject
+        messagePreviewSubject.text = subject
     }
 
-    override fun setRecipient(recipient: String?) {
-        messageAuthor.text = getString(R.string.message_to, recipient)
+    override fun setRecipient(recipient: String) {
+        messagePreviewAuthor.text = "${getString(R.string.message_to)} $recipient"
     }
 
-    override fun setSender(sender: String?) {
-        messageAuthor.text = getString(R.string.message_from, sender)
+    override fun setSender(sender: String) {
+        messagePreviewAuthor.text = "${getString(R.string.message_from)} $sender"
     }
 
-    override fun setDate(date: String?) {
-        messageDate.text = getString(R.string.message_date, date)
+    override fun setDate(date: String) {
+        messagePreviewDate.text = getString(R.string.message_date, date)
     }
 
-    override fun setContent(content: String?) {
-        messageContent.text = content
+    override fun setContent(content: String) {
+        messagePreviewContent.text = content
     }
 
     override fun showProgress(show: Boolean) {
-        messageProgress.visibility = if (show) View.VISIBLE else View.GONE
+        messagePreviewProgress.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun showContent(show: Boolean) {
+        messagePreviewContentContainer.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun showOptions(show: Boolean) {
+        menuReplyButton?.isVisible = show
+        menuForwardButton?.isVisible = show
+        menuDeleteButton?.isVisible = show
+    }
+
+    override fun setDeletedOptionsLabels() {
+        menuDeleteButton?.setTitle(R.string.message_delete_forever)
+    }
+
+    override fun setNotDeletedOptionsLabels() {
+        menuDeleteButton?.setTitle(R.string.message_move_to_bin)
     }
 
     override fun showMessageError() {
-        messageError.visibility = View.VISIBLE
+        messagePreviewError.visibility = VISIBLE
+    }
+
+    override fun openMessageReply(message: Message?) {
+        context?.let { it.startActivity(SendMessageActivity.getStartIntent(it, message, true)) }
+    }
+
+    override fun openMessageForward(message: Message?) {
+        context?.let { it.startActivity(SendMessageActivity.getStartIntent(it, message)) }
+    }
+
+    override fun popView() {
+        (activity as MainActivity).popView()
+    }
+
+    override fun notifyParentMessageDeleted(message: Message) {
+        fragmentManager?.fragments?.forEach { if (it is MessageFragment) it.onDeleteMessage(message) }
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
-        outState.putInt(MESSAGE_ID_KEY, presenter.messageId)
+        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 3197e9914..31641d754 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,55 +1,131 @@
 package io.github.wulkanowy.ui.modules.message.preview
 
 import com.google.firebase.analytics.FirebaseAnalytics.Param.START_DATE
-import io.github.wulkanowy.data.repositories.MessagesRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.data.db.entities.Message
+import io.github.wulkanowy.data.repositories.message.MessageRepository
+import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.session.BaseSessionPresenter
 import io.github.wulkanowy.ui.base.session.SessionErrorHandler
 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
 
 class MessagePreviewPresenter @Inject constructor(
     private val errorHandler: SessionErrorHandler,
     private val schedulers: SchedulersProvider,
-    private val messagesRepository: MessagesRepository,
+    private val messageRepository: MessageRepository,
     private val studentRepository: StudentRepository,
     private val analytics: FirebaseAnalyticsHelper
 ) : BaseSessionPresenter<MessagePreviewView>(errorHandler) {
 
-    var messageId: Int = 0
+    var messageId = 0L
 
-    fun onAttachView(view: MessagePreviewView, id: Int) {
+    private var message: Message? = null
+
+    fun onAttachView(view: MessagePreviewView, id: Long) {
         super.onAttachView(view)
         loadData(id)
     }
 
-    private fun loadData(id: Int) {
+    private fun loadData(id: Long) {
+        Timber.i("Loading message $id preview started")
         messageId = id
         disposable.apply {
             clear()
             add(studentRepository.getCurrentStudent()
-                .flatMap { messagesRepository.getMessage(it.studentId, messageId, true) }
+                .flatMap { messageRepository.getMessage(it, messageId, true) }
                 .subscribeOn(schedulers.backgroundThread)
                 .observeOn(schedulers.mainThread)
                 .doFinally { view?.showProgress(false) }
                 .subscribe({ message ->
+                    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)
+                            setDate(it.date.toFormattedString("yyyy-MM-dd HH:mm:ss"))
+                            setContent(it.content.orEmpty())
+                            initOptions()
 
-                            if (it.recipient?.isNotBlank() == true) setRecipient(it.recipient)
+                            if (it.recipient.isNotBlank()) setRecipient(it.recipient)
                             else setSender(it.sender)
                         }
                     }
-                    analytics.logEvent("load_attendance", mapOf(START_DATE to message.date?.toFormattedString("yyyy.MM.dd"), "lenght" to message.content?.length))
+                    analytics.logEvent("load_message_preview", START_DATE to message.date.toFormattedString("yyyy.MM.dd"), "length" to message.content?.length)
                 }) {
+                    Timber.i("Loading message $id preview result: An exception occurred ")
                     view?.showMessageError()
                     errorHandler.dispatch(it)
                 })
         }
     }
+
+    fun onReply(): Boolean {
+        return if (message != null) {
+            view?.openMessageReply(message)
+            true
+        } else false
+    }
+
+    fun onForward(): Boolean {
+        return if (message != null) {
+            view?.openMessageForward(message)
+            true
+        } else false
+    }
+
+    private fun deleteMessage() {
+        message?.let { message ->
+            disposable.add(messageRepository.deleteMessage(message)
+                .subscribeOn(schedulers.backgroundThread)
+                .observeOn(schedulers.mainThread)
+                .doOnSubscribe {
+                    view?.run {
+                        showContent(false)
+                        showProgress(true)
+                        showOptions(false)
+                    }
+                }
+                .doFinally {
+                    view?.showProgress(false)
+                }
+                .subscribe({
+                    view?.run {
+                        notifyParentMessageDeleted(message)
+                        showMessage(deleteMessageSuccessString)
+                        popView()
+                    }
+                }, { error ->
+                    view?.showMessageError()
+                    errorHandler.dispatch(error)
+                }, {
+                    view?.showMessageError()
+                })
+            )
+        }
+    }
+
+    fun onMessageDelete(): Boolean {
+        deleteMessage()
+        return true
+    }
+
+    private fun initOptions() {
+        view?.apply {
+            showOptions(message != null)
+            message?.let {
+                when (it.removed) {
+                    true -> setDeletedOptionsLabels()
+                    false -> setNotDeletedOptionsLabels()
+                }
+            }
+
+        }
+    }
+
+    fun onCreateOptionsMenu() {
+        initOptions()
+    }
 }
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 d8dd89655..8bc528a3d 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,22 +1,41 @@
 package io.github.wulkanowy.ui.modules.message.preview
 
+import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.ui.base.session.BaseSessionView
 
 interface MessagePreviewView : BaseSessionView {
 
     val noSubjectString: String
 
+    val deleteMessageSuccessString: String
+
     fun setSubject(subject: String)
 
-    fun setRecipient(recipient: String?)
+    fun setRecipient(recipient: String)
 
-    fun setSender(sender: String?)
+    fun setSender(sender: String)
 
-    fun setDate(date: String?)
+    fun setDate(date: String)
 
-    fun setContent(content: String?)
+    fun setContent(content: String)
 
     fun showProgress(show: Boolean)
 
+    fun showContent(show: Boolean)
+
+    fun showOptions(show: Boolean)
+
+    fun setDeletedOptionsLabels()
+
+    fun setNotDeletedOptionsLabels()
+
     fun showMessageError()
+
+    fun openMessageReply(message: Message?)
+
+    fun openMessageForward(message: Message?)
+
+    fun popView()
+
+    fun notifyParentMessageDeleted(message: Message)
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/RecipientChip.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/RecipientChip.kt
new file mode 100644
index 000000000..be433b008
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/RecipientChip.kt
@@ -0,0 +1,30 @@
+package io.github.wulkanowy.ui.modules.message.send
+
+import android.graphics.drawable.Drawable
+import android.net.Uri
+import com.pchmn.materialchips.model.ChipInterface
+import io.github.wulkanowy.data.db.entities.Recipient
+
+class RecipientChip(var recipient: Recipient) : ChipInterface {
+
+    override fun getAvatarDrawable(): Drawable? = null
+
+    override fun getAvatarUri(): Uri? = null
+
+    override fun getId(): Any = recipient.id
+
+    override fun getLabel(): String = recipient.name
+
+    override fun getInfo(): String {
+        return recipient.realName.run {
+            substringBeforeLast("-").let { sub ->
+                when {
+                    (sub == this) -> this
+                    (sub.indexOf('(') != -1) -> indexOf("(").let { substring(if (it != -1) it else 0) }
+                    (sub.indexOf('[') != -1) -> indexOf("[").let { substring(if (it != -1) it else 0) }
+                    else -> substringAfter('-')
+                }
+            }.trim()
+        }
+    }
+}
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
new file mode 100644
index 000000000..3a44ea86f
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageActivity.kt
@@ -0,0 +1,134 @@
+package io.github.wulkanowy.ui.modules.message.send
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import android.view.Menu
+import android.view.MenuItem
+import android.view.View.GONE
+import android.view.View.VISIBLE
+import android.widget.Toast
+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.Recipient
+import io.github.wulkanowy.data.db.entities.ReportingUnit
+import io.github.wulkanowy.ui.base.BaseActivity
+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(), SendMessageView {
+
+    @Inject
+    lateinit var presenter: SendMessagePresenter
+
+    companion object {
+        private const val EXTRA_MESSAGE = "EXTRA_MESSAGE"
+        private const val EXTRA_REPLY = "EXTRA_REPLY"
+
+        fun getStartIntent(context: Context) = Intent(context, SendMessageActivity::class.java)
+
+        fun getStartIntent(context: Context, message: Message?, reply: Boolean = false): Intent {
+            return getStartIntent(context)
+                .putExtra(EXTRA_MESSAGE, message)
+                .putExtra(EXTRA_REPLY, reply)
+        }
+    }
+
+    override val formRecipientsData: List<Recipient>
+        get() = (sendMessageRecipientsInput.selectedChipList).map { (it as RecipientChip).recipient }
+
+    override val formSubjectValue: String
+        get() = sendMessageSubjectInput.text.toString()
+
+    override val formContentValue: String
+        get() = sendMessageContentInput.text.toString()
+
+    override val messageRequiredRecipients: String
+        get() = getString(R.string.message_required_recipients)
+
+    override val messageContentMinLength: String
+        get() = getString(R.string.message_content_min_length)
+
+    override val messageSuccess: String
+        get() = getString(R.string.message_send_successful)
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_send_message)
+        setSupportActionBar(sendMessageToolbar)
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        messageContainer = sendMessageContainer
+
+        presenter.onAttachView(this, intent.getSerializableExtra(EXTRA_MESSAGE) as? Message, intent.getSerializableExtra(EXTRA_REPLY) as? Boolean)
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+        menuInflater.inflate(R.menu.action_menu_send_message, menu)
+        return true
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem?): Boolean {
+        return if (item?.itemId == R.id.sendMessageMenuSend) presenter.onSend()
+        else false
+    }
+
+    override fun onSupportNavigateUp(): Boolean {
+        return presenter.onUpNavigate()
+    }
+
+    override fun setReportingUnit(unit: ReportingUnit) {
+        sendMessageFromTextView.setText(unit.senderName)
+    }
+
+    override fun setRecipients(recipients: List<Recipient>) {
+        sendMessageRecipientsInput.filterableList = recipients.map { RecipientChip(it) }
+    }
+
+    override fun setSelectedRecipients(recipients: List<Recipient>) {
+        recipients.map { sendMessageRecipientsInput.addChip(RecipientChip(it)) }
+    }
+
+    override fun showProgress(show: Boolean) {
+        sendMessageProgress.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun showContent(show: Boolean) {
+        sendMessageContent.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun showEmpty(show: Boolean) {
+        sendMessageEmpty.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun showActionBar(show: Boolean) {
+        supportActionBar?.apply { if (show) show() else hide() }
+    }
+
+    override fun setSubject(subject: String) {
+        sendMessageSubjectInput.setText(subject)
+    }
+
+    override fun setContent(content: String) {
+        sendMessageContentInput.setText(content)
+    }
+
+    override fun showMessage(text: String) {
+        Toast.makeText(this, text, LENGTH_LONG).show()
+    }
+
+    override fun showSoftInput(show: Boolean) {
+        if (show) showSoftInput() else hideSoftInput()
+    }
+
+    override fun popView() {
+        onBackPressed()
+    }
+
+    override fun onDestroy() {
+        presenter.onDetachView()
+        super.onDestroy()
+    }
+}
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
new file mode 100644
index 000000000..8dedaba01
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessagePresenter.kt
@@ -0,0 +1,165 @@
+package io.github.wulkanowy.ui.modules.message.send
+
+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.repositories.message.MessageRepository
+import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
+import io.github.wulkanowy.data.repositories.recipient.RecipientRepository
+import io.github.wulkanowy.data.repositories.reportingunit.ReportingUnitRepository
+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.utils.FirebaseAnalyticsHelper
+import io.github.wulkanowy.utils.SchedulersProvider
+import io.github.wulkanowy.utils.toFormattedString
+import io.reactivex.Completable
+import timber.log.Timber
+import javax.inject.Inject
+
+class SendMessagePresenter @Inject constructor(
+    private val errorHandler: ErrorHandler,
+    private val schedulers: SchedulersProvider,
+    private val studentRepository: StudentRepository,
+    private val semesterRepository: SemesterRepository,
+    private val messageRepository: MessageRepository,
+    private val reportingUnitRepository: ReportingUnitRepository,
+    private val recipientRepository: RecipientRepository,
+    private val preferencesRepository: PreferencesRepository,
+    private val analytics: FirebaseAnalyticsHelper
+) : BasePresenter<SendMessageView>(errorHandler) {
+
+    fun onAttachView(view: SendMessageView, message: Message?, reply: Boolean?) {
+        super.onAttachView(view)
+        Timber.i("Send message view was initialized")
+        loadData(message, reply)
+        view.apply {
+            message?.let {
+                setSubject(when (reply) {
+                    true -> "RE: "
+                    else -> "FW: "
+                } + message.subject)
+                if (preferencesRepository.fillMessageContent || reply != true) {
+                    setContent(
+                        when (reply) {
+                            true -> "\n\n"
+                            else -> ""
+                        } + when (message.sender.isNotEmpty()) {
+                            true -> "Od: ${message.sender}\n"
+                            false -> "Do: ${message.recipient}\n"
+                        } + "Data: ${message.date.toFormattedString("yyyy-MM-dd HH:mm:ss")}\n\n${message.content}")
+                }
+            }
+        }
+    }
+
+    fun onUpNavigate(): Boolean {
+        view?.popView()
+        return true
+    }
+
+    private fun loadData(message: Message?, reply: Boolean?) {
+        var reportingUnit: ReportingUnit? = null
+        var recipients: List<Recipient> = emptyList()
+        var selectedRecipient: List<Recipient> = emptyList()
+
+        Timber.i("Loading recipients started")
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { semesterRepository.getCurrentSemester(it).map { semester -> it to semester } }
+            .flatMapCompletable { (student, semester) ->
+                reportingUnitRepository.getReportingUnit(student, semester.unitId)
+                    .doOnSuccess { reportingUnit = it }
+                    .flatMap { recipientRepository.getRecipients(student, 2, it).toMaybe() }
+                    .doOnSuccess {
+                        Timber.i("Loading recipients result: Success, fetched %d recipients", it.size)
+                        recipients = it
+                    }
+                    .flatMapCompletable {
+                        if (message == null || reply != true) Completable.complete()
+                        else recipientRepository.getMessageRecipients(student, message)
+                            .doOnSuccess {
+                                Timber.i("Loaded message recipients to reply result: Success, fetched %d recipients", it.size)
+                                selectedRecipient = it
+                            }
+                            .ignoreElement()
+                    }
+            }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doOnSubscribe {
+                view?.run {
+                    showProgress(true)
+                    showContent(false)
+                }
+            }
+            .doFinally { view?.run { showProgress(false) } }
+            .subscribe({
+                view?.apply {
+                    if (reportingUnit !== null) {
+                        reportingUnit?.let { setReportingUnit(it) }
+                        setRecipients(recipients)
+                        if (selectedRecipient.isNotEmpty()) setSelectedRecipients(selectedRecipient)
+                        showContent(true)
+                    } else {
+                        Timber.e("Loading recipients result: Can't find the reporting unit")
+                        view?.showEmpty(true)
+                    }
+                }
+            }, {
+                Timber.e("Loading recipients result: An exception occurred")
+                view?.showContent(true)
+                errorHandler.dispatch(it)
+            }))
+    }
+
+    private fun sendMessage(subject: String, content: String, recipients: List<Recipient>) {
+        Timber.i("Sending message started")
+        disposable.add(messageRepository.sendMessage(subject, content, recipients)
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doOnSubscribe {
+                view?.run {
+                    showSoftInput(false)
+                    showContent(false)
+                    showProgress(true)
+                    showActionBar(false)
+                }
+            }
+            .subscribe({
+                Timber.i("Sending message result: Success")
+                analytics.logEvent("send_message", "recipients" to recipients.size)
+                view?.run {
+                    showMessage(messageSuccess)
+                    popView()
+                }
+            }, {
+                Timber.i("Sending message result: An exception occurred")
+                view?.run {
+                    showContent(true)
+                    showProgress(false)
+                    showActionBar(true)
+                }
+                errorHandler.dispatch(it)
+            })
+        )
+    }
+
+    fun onSend(): Boolean {
+        view?.run {
+            when {
+                formRecipientsData.isEmpty() -> showMessage(messageRequiredRecipients)
+                formContentValue.length < 3 -> showMessage(messageContentMinLength)
+                else -> {
+                    sendMessage(
+                        subject = formSubjectValue,
+                        content = formContentValue,
+                        recipients = formRecipientsData
+                    )
+                    return true
+                }
+            }
+        }
+        return false
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageView.kt
new file mode 100644
index 000000000..8a2cb4f61
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageView.kt
@@ -0,0 +1,42 @@
+package io.github.wulkanowy.ui.modules.message.send
+
+import io.github.wulkanowy.data.db.entities.Recipient
+import io.github.wulkanowy.data.db.entities.ReportingUnit
+import io.github.wulkanowy.ui.base.BaseView
+
+interface SendMessageView : BaseView {
+
+    val formRecipientsData: List<Recipient>
+
+    val formSubjectValue: String
+
+    val formContentValue: String
+
+    val messageRequiredRecipients: String
+
+    val messageContentMinLength: String
+
+    val messageSuccess: String
+
+    fun setReportingUnit(unit: ReportingUnit)
+
+    fun setRecipients(recipients: List<Recipient>)
+
+    fun setSelectedRecipients(recipients: List<Recipient>)
+
+    fun showProgress(show: Boolean)
+
+    fun showContent(show: Boolean)
+
+    fun showEmpty(show: Boolean)
+
+    fun showActionBar(show: Boolean)
+
+    fun setSubject(subject: String)
+
+    fun setContent(content: String)
+
+    fun showSoftInput(show: Boolean)
+
+    fun popView()
+}
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 d3e2f471c..3859853fc 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
@@ -8,21 +8,21 @@ import android.view.View.INVISIBLE
 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.data.repositories.MessagesRepository
+import io.github.wulkanowy.data.repositories.message.MessageFolder
 import io.github.wulkanowy.ui.base.session.BaseSessionFragment
 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.MessageView
 import io.github.wulkanowy.ui.modules.message.preview.MessagePreviewFragment
 import io.github.wulkanowy.utils.setOnItemClickListener
 import kotlinx.android.synthetic.main.fragment_message_tab.*
 import javax.inject.Inject
 
-class MessageTabFragment : BaseSessionFragment(), MessageTabView, MessageView.MessageChildView {
+class MessageTabFragment : BaseSessionFragment(), MessageTabView {
 
     @Inject
     lateinit var presenter: MessageTabPresenter
@@ -33,7 +33,7 @@ class MessageTabFragment : BaseSessionFragment(), MessageTabView, MessageView.Me
     companion object {
         const val MESSAGE_TAB_FOLDER_ID = "message_tab_folder_id"
 
-        fun newInstance(folder: MessagesRepository.MessageFolder): MessageTabFragment {
+        fun newInstance(folder: MessageFolder): MessageTabFragment {
             return MessageTabFragment().apply {
                 arguments = Bundle().apply {
                     putString(MESSAGE_TAB_FOLDER_ID, folder.name)
@@ -55,8 +55,8 @@ class MessageTabFragment : BaseSessionFragment(), MessageTabView, MessageView.Me
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
         messageContainer = messageTabRecycler
-        presenter.onAttachView(this, MessagesRepository.MessageFolder.valueOf(
-            (savedInstanceState ?: arguments)?.getString(MessageTabFragment.MESSAGE_TAB_FOLDER_ID) ?: ""
+        presenter.onAttachView(this, MessageFolder.valueOf(
+            (savedInstanceState ?: arguments)?.getString(MESSAGE_TAB_FOLDER_ID).orEmpty()
         ))
     }
 
@@ -66,12 +66,16 @@ class MessageTabFragment : BaseSessionFragment(), MessageTabView, MessageView.Me
         messageTabRecycler.run {
             layoutManager = SmoothScrollLinearLayoutManager(context)
             adapter = tabAdapter
+            addItemDecoration(FlexibleItemDecoration(context)
+                .withDefaultDivider()
+                .withDrawDividerOnLastItem(false)
+            )
         }
         messageTabSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
     }
 
     override fun updateData(data: List<MessageItem>) {
-        tabAdapter.updateDataSet(data, true)
+        tabAdapter.updateDataSet(data)
     }
 
     override fun updateItem(item: AbstractFlexibleItem<*>) {
@@ -86,6 +90,10 @@ class MessageTabFragment : BaseSessionFragment(), MessageTabView, MessageView.Me
         messageTabProgress.visibility = if (show) VISIBLE else GONE
     }
 
+    override fun enableSwipe(enable: Boolean) {
+        messageTabSwipe.isEnabled = enable
+    }
+
     override fun showContent(show: Boolean) {
         messageTabRecycler.visibility = if (show) VISIBLE else INVISIBLE
     }
@@ -98,7 +106,7 @@ class MessageTabFragment : BaseSessionFragment(), MessageTabView, MessageView.Me
         messageTabSwipe.isRefreshing = show
     }
 
-    override fun openMessage(messageId: Int?) {
+    override fun openMessage(messageId: Long) {
         (activity as? MainActivity)?.pushView(MessagePreviewFragment.newInstance(messageId))
     }
 
@@ -106,13 +114,17 @@ class MessageTabFragment : BaseSessionFragment(), MessageTabView, MessageView.Me
         (parentFragment as? MessageFragment)?.onChildFragmentLoaded()
     }
 
-    override fun onParentLoadData(forceRefresh: Boolean) {
+    fun onParentLoadData(forceRefresh: Boolean) {
         presenter.onParentViewLoadData(forceRefresh)
     }
 
+    fun onParentDeleteMessage() {
+        presenter.onDeleteMessage()
+    }
+
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
-        outState.putString(MessageTabFragment.MESSAGE_TAB_FOLDER_ID, presenter.folder.name)
+        outState.putString(MESSAGE_TAB_FOLDER_ID, presenter.folder.name)
     }
 
     override fun onDestroyView() {
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 0e1a9d84f..2173c951d 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
@@ -2,8 +2,9 @@ package io.github.wulkanowy.ui.modules.message.tab
 
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.db.entities.Message
-import io.github.wulkanowy.data.repositories.MessagesRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
+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.session.BaseSessionPresenter
 import io.github.wulkanowy.ui.base.session.SessionErrorHandler
 import io.github.wulkanowy.ui.modules.message.MessageItem
@@ -15,57 +16,38 @@ import javax.inject.Inject
 class MessageTabPresenter @Inject constructor(
     private val errorHandler: SessionErrorHandler,
     private val schedulers: SchedulersProvider,
-    private val messagesRepository: MessagesRepository,
+    private val messageRepository: MessageRepository,
     private val studentRepository: StudentRepository,
     private val analytics: FirebaseAnalyticsHelper
 ) : BaseSessionPresenter<MessageTabView>(errorHandler) {
 
-    lateinit var folder: MessagesRepository.MessageFolder
+    lateinit var folder: MessageFolder
 
-    fun onAttachView(view: MessageTabView, folder: MessagesRepository.MessageFolder) {
+    fun onAttachView(view: MessageTabView, folder: MessageFolder) {
         super.onAttachView(view)
         view.initView()
         this.folder = folder
     }
 
     fun onSwipeRefresh() {
+        Timber.i("Force refreshing the $folder message")
         onParentViewLoadData(true)
     }
 
+    fun onDeleteMessage() {
+        loadData(false)
+    }
+
     fun onParentViewLoadData(forceRefresh: Boolean) {
-        disposable.apply {
-            clear()
-            add(studentRepository.getCurrentStudent()
-                .flatMap { messagesRepository.getMessages(it.studentId, folder, forceRefresh) }
-                .map { items -> items.map { MessageItem(it, view?.noSubjectString.orEmpty()) } }
-                .subscribeOn(schedulers.backgroundThread)
-                .observeOn(schedulers.mainThread)
-                .doFinally {
-                    view?.run {
-                        showRefresh(false)
-                        showProgress(false)
-                        notifyParentDataLoaded()
-                    }
-                }
-                .subscribe({
-                    view?.run {
-                        showEmpty(it.isEmpty())
-                        showContent(it.isNotEmpty())
-                        updateData(it)
-                    }
-                    analytics.logEvent("load_messages", mapOf("items" to it.size, "folder" to folder.name))
-                }) {
-                    view?.run { showEmpty(isViewEmpty) }
-                    errorHandler.dispatch(it)
-                })
-        }
+        loadData(forceRefresh)
     }
 
     fun onMessageItemSelected(item: AbstractFlexibleItem<*>) {
         if (item is MessageItem) {
+            Timber.i("Select message ${item.message.id} item")
             view?.run {
-                openMessage(item.message.realId)
-                if (item.message.unread == true) {
+                openMessage(item.message.id)
+                if (item.message.unread) {
                     item.message.unread = false
                     updateItem(item)
                     updateMessage(item.message)
@@ -74,13 +56,48 @@ class MessageTabPresenter @Inject constructor(
         }
     }
 
+    private fun loadData(forceRefresh: Boolean) {
+        Timber.i("Loading $folder message data started")
+        disposable.apply {
+            clear()
+            add(studentRepository.getCurrentStudent()
+                .flatMap { messageRepository.getMessages(it, folder, forceRefresh) }
+                .map { items -> items.map { MessageItem(it, view?.noSubjectString.orEmpty()) } }
+                .subscribeOn(schedulers.backgroundThread)
+                .observeOn(schedulers.mainThread)
+                .doFinally {
+                    view?.run {
+                        showRefresh(false)
+                        showProgress(false)
+                        enableSwipe(true)
+                        notifyParentDataLoaded()
+                    }
+                }
+                .subscribe({
+                    Timber.i("Loading $folder message result: Success")
+                    view?.run {
+                        showEmpty(it.isEmpty())
+                        showContent(it.isNotEmpty())
+                        updateData(it)
+                    }
+                    analytics.logEvent("load_messages", "items" to it.size, "folder" to folder.name)
+                }) {
+                    Timber.i("Loading $folder message result: An exception occurred")
+                    view?.run { showEmpty(isViewEmpty) }
+                    errorHandler.dispatch(it)
+                })
+        }
+    }
+
     private fun updateMessage(message: Message) {
-        disposable.add(messagesRepository.updateMessage(message)
+        Timber.i("Attempt to update message ${message.id}")
+        disposable.add(messageRepository.updateMessage(message)
             .subscribeOn(schedulers.backgroundThread)
             .observeOn(schedulers.mainThread)
-            .subscribe({
-                Timber.d("Message ${message.realId} updated")
-            }) { error -> errorHandler.dispatch(error) }
-        )
+            .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 309e2766f..01a188e75 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
@@ -20,13 +20,15 @@ interface MessageTabView : BaseSessionView {
 
     fun showProgress(show: Boolean)
 
+    fun enableSwipe(enable: Boolean)
+
     fun showContent(show: Boolean)
 
     fun showEmpty(show: Boolean)
 
     fun showRefresh(show: Boolean)
 
-    fun openMessage(messageId: Int?)
+    fun openMessage(messageId: Long)
 
     fun notifyParentDataLoaded()
 }
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 226fccd6d..4823dedf3 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
@@ -13,6 +13,7 @@ import io.github.wulkanowy.R
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.about.AboutFragment
 import io.github.wulkanowy.ui.modules.homework.HomeworkFragment
+import io.github.wulkanowy.ui.modules.luckynumber.LuckyNumberFragment
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.ui.modules.message.MessageFragment
@@ -60,6 +61,14 @@ class MoreFragment : BaseFragment(), MoreView, MainView.TitledView, MainView.Mai
             }
         }
 
+    override val luckyNumberRes: Pair<String, Drawable?>?
+        get() {
+            return context?.run {
+                getString(R.string.lucky_number_title) to
+                    ContextCompat.getDrawable(this, R.drawable.ic_more_lucky_number_24dp)
+            }
+        }
+
     override val settingsRes: Pair<String, Drawable?>?
         get() {
             return context?.run {
@@ -95,7 +104,7 @@ class MoreFragment : BaseFragment(), MoreView, MainView.TitledView, MainView.Mai
     }
 
     override fun onFragmentReselected() {
-        presenter.onViewReselected()
+        if (::presenter.isInitialized) presenter.onViewReselected()
     }
 
     override fun updateData(data: List<MoreItem>) {
@@ -114,6 +123,10 @@ class MoreFragment : BaseFragment(), MoreView, MainView.TitledView, MainView.Mai
         (activity as? MainActivity)?.pushView(NoteFragment.newInstance())
     }
 
+    override fun openLuckyNumberView() {
+        (activity as? MainActivity)?.pushView(LuckyNumberFragment.newInstance())
+    }
+
     override fun openSettingsView() {
         (activity as? MainActivity)?.pushView(SettingsFragment.newInstance())
     }
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
index e8571a8c6..85b604e77 100644
--- 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
@@ -14,12 +14,12 @@ class MoreItem(val title: String, private val drawable: Drawable?) : AbstractFle
 
     override fun getLayoutRes() = R.layout.item_more
 
-    override fun createViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?): ViewHolder {
+    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 {
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
+        holder.apply {
             moreItemTitle.text = title
             moreItemImage.setImageDrawable(drawable)
         }
@@ -40,9 +40,8 @@ class MoreItem(val title: String, private val drawable: Drawable?) : AbstractFle
         return title.hashCode()
     }
 
-    class ViewHolder(view: View?, adapter: FlexibleAdapter<*>?) : FlexibleViewHolder(view, adapter), LayoutContainer {
-
-        override val containerView: View?
+    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 61b187f1b..a7626ec0d 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
@@ -3,6 +3,7 @@ package io.github.wulkanowy.ui.modules.more
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
+import timber.log.Timber
 import javax.inject.Inject
 
 class MorePresenter @Inject constructor(errorHandler: ErrorHandler) : BasePresenter<MoreView>(errorHandler) {
@@ -10,16 +11,19 @@ class MorePresenter @Inject constructor(errorHandler: ErrorHandler) : BasePresen
     override fun onAttachView(view: MoreView) {
         super.onAttachView(view)
         view.initView()
+        Timber.i("More view was initialized")
         loadData()
     }
 
     fun onItemSelected(item: AbstractFlexibleItem<*>?) {
         if (item is MoreItem) {
+            Timber.i("Select more item \"${item.title}\"")
             view?.run {
                 when (item.title) {
                     messagesRes?.first -> openMessagesView()
                     homeworkRes?.first -> openHomeworkView()
                     noteRes?.first -> openNoteView()
+                    luckyNumberRes?.first -> openLuckyNumberView()
                     settingsRes?.first -> openSettingsView()
                     aboutRes?.first -> openAboutView()
                 }
@@ -28,15 +32,18 @@ class MorePresenter @Inject constructor(errorHandler: ErrorHandler) : BasePresen
     }
 
     fun onViewReselected() {
+        Timber.i("More view is reselected")
         view?.popView()
     }
 
     private fun loadData() {
+        Timber.i("Load items for more view")
         view?.run {
             updateData(listOfNotNull(
                 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) },
                 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 08ff82adb..333edc5df 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
@@ -11,6 +11,8 @@ interface MoreView : BaseView {
 
     val noteRes: Pair<String, Drawable?>?
 
+    val luckyNumberRes: Pair<String, Drawable?>?
+
     val settingsRes: Pair<String, Drawable?>?
 
     val aboutRes: Pair<String, Drawable?>?
@@ -30,4 +32,6 @@ interface MoreView : BaseView {
     fun openHomeworkView()
 
     fun openNoteView()
+
+    fun openLuckyNumberView()
 }
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 243f25757..fc773e10b 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
@@ -7,11 +7,13 @@ 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.data.db.entities.Note
 import io.github.wulkanowy.ui.base.session.BaseSessionFragment
+import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.setOnItemClickListener
 import kotlinx.android.synthetic.main.fragment_note.*
@@ -52,12 +54,16 @@ class NoteFragment : BaseSessionFragment(), NoteView, MainView.TitledView {
         noteRecycler.run {
             layoutManager = SmoothScrollLinearLayoutManager(context)
             adapter = noteAdapter
+            addItemDecoration(FlexibleItemDecoration(context)
+                .withDefaultDivider()
+                .withDrawDividerOnLastItem(false)
+            )
         }
         noteSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
     }
 
     override fun showNoteDialog(note: Note) {
-        NoteDialog.newInstance(note).show(fragmentManager, note.toString())
+        (activity as? MainActivity)?.showDialogFragment(NoteDialog.newInstance(note))
     }
 
     override fun updateData(data: List<NoteItem>) {
@@ -80,6 +86,10 @@ class NoteFragment : BaseSessionFragment(), NoteView, MainView.TitledView {
         noteProgress.visibility = if (show) VISIBLE else GONE
     }
 
+    override fun enableSwipe(enable: Boolean) {
+        noteSwipe.isEnabled = enable
+    }
+
     override fun showContent(show: Boolean) {
         noteRecycler.visibility = if (show) VISIBLE else GONE
     }
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
index 97635a2c8..dabeef74a 100644
--- 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
@@ -15,16 +15,13 @@ 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 getLayoutRes(): Int = R.layout.item_note
-
-    override fun bindViewHolder(
-        adapter: FlexibleAdapter<IFlexible<*>>,
-        holder: NoteItem.ViewHolder, position: Int, payloads: MutableList<Any>?
-    ) {
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: NoteItem.ViewHolder, position: Int, payloads: MutableList<Any>?) {
         holder.apply {
             noteItemDate.apply {
                 text = note.date.toFormattedString()
@@ -46,15 +43,17 @@ class NoteItem(val note: Note) : AbstractFlexibleItem<NoteItem.ViewHolder>() {
         other as NoteItem
 
         if (note != other.note) return false
+        if (note.id != other.note.id) return false
         return true
     }
 
     override fun hashCode(): Int {
-        return note.hashCode()
+        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 c388a3f78..136a44135 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
@@ -2,9 +2,9 @@ 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.NoteRepository
-import io.github.wulkanowy.data.repositories.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.data.repositories.note.NoteRepository
+import io.github.wulkanowy.data.repositories.semester.SemesterRepository
+import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.session.BaseSessionPresenter
 import io.github.wulkanowy.ui.base.session.SessionErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
@@ -24,17 +24,20 @@ class NotePresenter @Inject constructor(
     override fun onAttachView(view: NoteView) {
         super.onAttachView(view)
         view.initView()
+        Timber.i("Note view was initialized")
         loadData()
     }
 
     fun onSwipeRefresh() {
+        Timber.i("Force refreshing the note")
         loadData(true)
     }
 
     private fun loadData(forceRefresh: Boolean = false) {
+        Timber.i("Loading note data started")
         disposable.add(studentRepository.getCurrentStudent()
-            .flatMap { semesterRepository.getCurrentSemester(it) }
-            .flatMap { noteRepository.getNotes(it, forceRefresh) }
+            .flatMap { semesterRepository.getCurrentSemester(it).map { semester -> semester to it } }
+            .flatMap { noteRepository.getNotes(it.second, it.first, forceRefresh) }
             .map { items -> items.map { NoteItem(it) } }
             .map { items -> items.sortedByDescending { it.note.date } }
             .subscribeOn(schedulers.backgroundThread)
@@ -43,15 +46,18 @@ class NotePresenter @Inject constructor(
                 view?.run {
                     hideRefresh()
                     showProgress(false)
+                    enableSwipe(true)
                 }
             }.subscribe({
+                Timber.i("Loading note result: Success")
                 view?.apply {
                     updateData(it)
                     showEmpty(it.isEmpty())
                     showContent(it.isNotEmpty())
                 }
-                analytics.logEvent("load_note", mapOf("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")
                 view?.run { showEmpty(isViewEmpty) }
                 errorHandler.dispatch(it)
             })
@@ -60,6 +66,7 @@ class NotePresenter @Inject constructor(
 
     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) {
@@ -72,12 +79,14 @@ class NotePresenter @Inject constructor(
     }
 
     private fun updateNote(note: Note) {
+        Timber.i("Attempt to update note ${note.id}")
         disposable.add(noteRepository.updateNote(note)
             .subscribeOn(schedulers.backgroundThread)
             .observeOn(schedulers.mainThread)
-            .subscribe({
-                Timber.d("Note ${note.id} updated")
-            }) { error -> errorHandler.dispatch(error) }
-        )
+            .subscribe({ Timber.i("Update note result: Success") })
+            { error ->
+                Timber.i("Update note result: An exception occurred")
+                errorHandler.dispatch(error)
+            })
     }
 }
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 c060c8ed0..38e6c94fd 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
@@ -20,6 +20,8 @@ interface NoteView : BaseSessionView {
 
     fun showProgress(show: Boolean)
 
+    fun enableSwipe(enable: Boolean)
+
     fun showContent(show: Boolean)
 
     fun hideRefresh()
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 57fcea099..2baad0eb7 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,10 +3,9 @@ package io.github.wulkanowy.ui.modules.settings
 import android.content.Context
 import android.content.SharedPreferences
 import android.os.Bundle
-import androidx.appcompat.app.AppCompatDelegate
 import com.takisoft.preferencex.PreferenceFragmentCompat
 import dagger.android.support.AndroidSupportInjection
-import io.github.wulkanowy.BuildConfig
+import io.github.wulkanowy.BuildConfig.DEBUG
 import io.github.wulkanowy.R
 import io.github.wulkanowy.ui.base.BaseActivity
 import io.github.wulkanowy.ui.modules.main.MainView
@@ -37,15 +36,14 @@ class SettingsFragment : PreferenceFragmentCompat(), SharedPreferences.OnSharedP
 
     override fun onCreatePreferencesFix(savedInstanceState: Bundle?, rootKey: String?) {
         addPreferencesFromResource(R.xml.scheme_preferences)
-        findPreference(getString(R.string.pref_key_debug_chucker_notification)).isVisible = BuildConfig.DEBUG
+        findPreference(getString(R.string.pref_key_notification_debug)).isVisible = DEBUG
     }
 
     override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
         presenter.onSharedPreferenceChanged(key)
     }
 
-    override fun setTheme(theme: Int) {
-        AppCompatDelegate.setDefaultNightMode(theme)
+    override fun recreateView() {
         activity?.recreate()
     }
 
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 6a2087558..c25198d56 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,50 +1,40 @@
 package io.github.wulkanowy.ui.modules.settings
 
 import com.readystatesoftware.chuck.api.ChuckCollector
-import io.github.wulkanowy.data.RepositoryModule_ProvideChuckCollectorFactory
-import io.github.wulkanowy.data.repositories.PreferencesRepository
-import io.github.wulkanowy.services.job.ServiceHelper
+import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
+import io.github.wulkanowy.services.sync.SyncManager
 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.isHolidays
 import org.threeten.bp.LocalDate.now
+import timber.log.Timber
 import javax.inject.Inject
 
 class SettingsPresenter @Inject constructor(
     errorHandler: ErrorHandler,
     private val preferencesRepository: PreferencesRepository,
-    private val serviceHelper: ServiceHelper,
     private val analytics: FirebaseAnalyticsHelper,
+    private val syncManager: SyncManager,
     private val chuckCollector: ChuckCollector
 ) : BasePresenter<SettingsView>(errorHandler) {
 
     override fun onAttachView(view: SettingsView) {
         super.onAttachView(view)
-
-        view.run {
-            setServicesSuspended(preferencesRepository.serviceEnablesKey, now().isHolidays)
-        }
+        Timber.i("Settings view was initialized")
+        view.setServicesSuspended(preferencesRepository.serviceEnableKey, now().isHolidays)
     }
 
     fun onSharedPreferenceChanged(key: String) {
-        when (key) {
-            preferencesRepository.serviceEnablesKey -> {
-                if (preferencesRepository.isServiceEnabled) serviceHelper.startFullSyncService()
-                else serviceHelper.stopFullSyncService()
-            }
-            preferencesRepository.servicesIntervalKey,
-            preferencesRepository.servicesOnlyWifiKey -> {
-                serviceHelper.reloadFullSyncService()
-            }
-            preferencesRepository.currentThemeKey -> {
-                view?.setTheme(preferencesRepository.currentTheme)
-            }
-            preferencesRepository.isShowChuckerNotificationKey -> {
-                chuckCollector.showNotification(preferencesRepository.isShowChuckerNotification)
+        Timber.i("Change settings $key")
+        preferencesRepository.apply {
+            when (key) {
+                serviceEnableKey -> syncManager.run { if (isServiceEnabled) startSyncWorker() else stopSyncWorker() }
+                servicesIntervalKey, servicesOnlyWifiKey -> syncManager.startSyncWorker(true)
+                isDebugNotificationEnableKey -> chuckCollector.showNotification(isDebugNotificationEnable)
+                appThemeKey -> view?.recreateView()
             }
         }
-
-        analytics.logEvent("setting_changed", mapOf("name" to key))
+        analytics.logEvent("setting_changed", "name" to key)
     }
 }
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 0b3c2f70c..1c4bf3b0b 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,7 +4,7 @@ import io.github.wulkanowy.ui.base.BaseView
 
 interface SettingsView : BaseView {
 
-    fun setTheme(theme: Int)
+    fun recreateView()
 
     fun setServicesSuspended(serviceEnablesKey: String, isHolidays: Boolean)
 }
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 223d7abe6..2bd625332 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
@@ -1,6 +1,8 @@
 package io.github.wulkanowy.ui.modules.splash
 
 import android.os.Bundle
+import android.widget.Toast
+import android.widget.Toast.LENGTH_LONG
 import io.github.wulkanowy.ui.base.BaseActivity
 import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.ui.modules.main.MainActivity
@@ -26,6 +28,10 @@ class SplashActivity : BaseActivity(), SplashView {
         finish()
     }
 
+    override fun showError(text: String, error: Throwable) {
+        Toast.makeText(this, text, LENGTH_LONG).show()
+    }
+
     override fun onDestroy() {
         presenter.onDetachView()
         super.onDestroy()
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashPresenter.kt
index 5f8ba16e8..e6a9d7b3e 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashPresenter.kt
@@ -1,20 +1,27 @@
 package io.github.wulkanowy.ui.modules.splash
 
-import io.github.wulkanowy.data.repositories.StudentRepository
+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 javax.inject.Inject
 
 class SplashPresenter @Inject constructor(
     private val studentRepository: StudentRepository,
-    errorHandler: ErrorHandler
+    private val errorHandler: ErrorHandler,
+    private val schedulers: SchedulersProvider
 ) : BasePresenter<SplashView>(errorHandler) {
 
     override fun onAttachView(view: SplashView) {
         super.onAttachView(view)
-        view.run {
-            if (studentRepository.isStudentSaved) openMainView()
-            else openLoginView()
-        }
+        disposable.add(studentRepository.isCurrentStudentSet()
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                view.apply {
+                    if (it) openMainView()
+                    else openLoginView()
+                }
+            }, { errorHandler.dispatch(it) }))
     }
 }
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 743f37e59..7e286c923 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
@@ -1,16 +1,19 @@
 package io.github.wulkanowy.ui.modules.timetable
 
 import android.annotation.SuppressLint
+import android.graphics.Paint.STRIKE_THRU_TEXT_FLAG
 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.fragment.app.DialogFragment
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Timetable
 import io.github.wulkanowy.utils.toFormattedString
 import kotlinx.android.synthetic.main.dialog_timetable.*
+import org.threeten.bp.LocalDateTime
 
 class TimetableDialog : DialogFragment() {
 
@@ -38,41 +41,110 @@ class TimetableDialog : DialogFragment() {
         return inflater.inflate(R.layout.dialog_timetable, container, false)
     }
 
-    @SuppressLint("SetTextI18n")
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
-        timetableDialogSubject.text = lesson.subject
-        timetableDialogTime.text = "${lesson.start.toFormattedString("HH:mm")} - ${lesson.end.toFormattedString("HH:mm")}"
-
-        lesson.group.let {
-            if (it.isBlank()) {
-                timetableDialogGroupTitle.visibility = GONE
-                timetableDialogGroup.visibility = GONE
-            } else timetableDialogGroup.text = it
-        }
-
-        lesson.room.let {
-            if (it.isBlank()) {
-                timetableDialogRoomTitle.visibility = GONE
-                timetableDialogRoom.visibility = GONE
-            } else timetableDialogRoom.text = it
-        }
-
-        lesson.teacher.let {
-            if (it.isBlank()) {
-                timetableDialogTeacherTitle.visibility = GONE
-                timetableDialogTeacher.visibility = GONE
-            } else timetableDialogTeacher.text = it
-        }
-
-        lesson.info.let {
-            if (it.isBlank()) {
-                timetableDialogChangesTitle.visibility = GONE
-                timetableDialogChanges.visibility = GONE
-            } else timetableDialogChanges.text = it
+        lesson.run {
+            setInfo(info, teacher, canceled, changes)
+            setSubject(subject, subjectOld)
+            setTeacher(teacher, teacherOld)
+            setGroup(group)
+            setRoom(room, roomOld)
+            setTime(start, end)
         }
 
         timetableDialogClose.setOnClickListener { dismiss() }
     }
+
+    private fun setSubject(subject: String, subjectOld: String) {
+        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) {
+        when {
+            info.isNotBlank() -> 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) {
+        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
+                        text = teacher
+                    }
+                }
+            }
+            teacher.isNotBlank() -> timetableDialogTeacher.text = teacher
+            else -> {
+                timetableDialogTeacherTitle.visibility = GONE
+                timetableDialogTeacher.visibility = GONE
+            }
+        }
+    }
+
+    private fun setGroup(group: String) {
+        group.let {
+            when {
+                it.isNotBlank() -> timetableDialogGroup.text = it
+                else -> {
+                    timetableDialogGroupTitle.visibility = GONE
+                    timetableDialogGroup.visibility = GONE
+                }
+            }
+        }
+    }
+
+    private fun setRoom(room: String, roomOld: String) {
+        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
+                        text = room
+                    }
+                }
+            }
+            room.isNotBlank() -> timetableDialogRoom.text = room
+            else -> {
+                timetableDialogRoomTitle.visibility = GONE
+                timetableDialogRoom.visibility = GONE
+            }
+        }
+    }
+
+    @SuppressLint("SetTextI18n")
+    private fun setTime(start: LocalDateTime, end: LocalDateTime) {
+        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 faf17665a..26eaef271 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
@@ -2,15 +2,21 @@ 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.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.Timetable
 import io.github.wulkanowy.ui.base.session.BaseSessionFragment
+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.utils.setOnItemClickListener
 import kotlinx.android.synthetic.main.fragment_timetable.*
 import javax.inject.Inject
@@ -38,6 +44,14 @@ class TimetableFragment : BaseSessionFragment(), TimetableView, MainView.MainChi
     override val isViewEmpty: Boolean
         get() = timetableAdapter.isEmpty
 
+    override val currentStackSize: Int?
+        get() = (activity as? MainActivity)?.currentStackSize
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setHasOptionsMenu(true)
+    }
+
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         return inflater.inflate(R.layout.fragment_timetable, container, false)
     }
@@ -56,12 +70,25 @@ class TimetableFragment : BaseSessionFragment(), TimetableView, MainView.MainChi
         timetableRecycler.run {
             layoutManager = SmoothScrollLinearLayoutManager(context)
             adapter = timetableAdapter
+            addItemDecoration(FlexibleItemDecoration(context)
+                .withDefaultDivider()
+                .withDrawDividerOnLastItem(false)
+            )
         }
         timetableSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
         timetablePreviousButton.setOnClickListener { presenter.onPreviousDay() }
         timetableNextButton.setOnClickListener { presenter.onNextDay() }
     }
 
+    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+        inflater.inflate(R.menu.action_menu_timetable, menu)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        return if (item.itemId == R.id.timetableMenuCompletedLessons) presenter.onCompletedLessonsSwitchSelected()
+        else false
+    }
+
     override fun updateData(data: List<TimetableItem>) {
         timetableAdapter.updateDataSet(data, true)
     }
@@ -83,7 +110,11 @@ class TimetableFragment : BaseSessionFragment(), TimetableView, MainView.MainChi
     }
 
     override fun onFragmentReselected() {
-        presenter.onViewReselected()
+        if (::presenter.isInitialized) presenter.onViewReselected()
+    }
+
+    override fun popView() {
+        (activity as? MainActivity)?.popView()
     }
 
     override fun showEmpty(show: Boolean) {
@@ -94,6 +125,10 @@ class TimetableFragment : BaseSessionFragment(), TimetableView, MainView.MainChi
         timetableProgress.visibility = if (show) View.VISIBLE else View.GONE
     }
 
+    override fun enableSwipe(enable: Boolean) {
+        timetableSwipe.isEnabled = enable
+    }
+
     override fun showContent(show: Boolean) {
         timetableRecycler.visibility = if (show) View.VISIBLE else View.GONE
     }
@@ -107,7 +142,11 @@ class TimetableFragment : BaseSessionFragment(), TimetableView, MainView.MainChi
     }
 
     override fun showTimetableDialog(lesson: Timetable) {
-        TimetableDialog.newInstance(lesson).show(fragmentManager, lesson.toString())
+        (activity as? MainActivity)?.showDialogFragment(TimetableDialog.newInstance(lesson))
+    }
+
+    override fun openCompletedLessonsView() {
+        (activity as? MainActivity)?.pushView(CompletedLessonsFragment.newInstance())
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
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
index f37c0f515..c721401f3 100644
--- 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
@@ -15,18 +15,17 @@ import io.github.wulkanowy.utils.toFormattedString
 import kotlinx.android.extensions.LayoutContainer
 import kotlinx.android.synthetic.main.item_timetable.*
 
-class TimetableItem(val lesson: Timetable, private val roomText: String)
-    : AbstractFlexibleItem<TimetableItem.ViewHolder>() {
+class TimetableItem(val lesson: Timetable, private val roomText: String) :
+    AbstractFlexibleItem<TimetableItem.ViewHolder>() {
 
-    override fun getLayoutRes(): Int = R.layout.item_timetable
+    override fun getLayoutRes() = 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>?) {
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
         holder.apply {
             timetableItemNumber.text = lesson.number.toString()
             timetableItemSubject.text = lesson.subject
@@ -34,8 +33,8 @@ class TimetableItem(val lesson: Timetable, private val roomText: String)
             timetableItemTime.text = "${lesson.start.toFormattedString("HH:mm")} - ${lesson.end.toFormattedString("HH:mm")}"
             timetableItemAlert.visibility = if (lesson.changes || lesson.canceled) VISIBLE else GONE
             timetableItemSubject.paintFlags =
-                    if (lesson.canceled) timetableItemSubject.paintFlags or Paint.STRIKE_THRU_TEXT_FLAG
-                    else timetableItemSubject.paintFlags and Paint.STRIKE_THRU_TEXT_FLAG.inv()
+                if (lesson.canceled) timetableItemSubject.paintFlags or Paint.STRIKE_THRU_TEXT_FLAG
+                else timetableItemSubject.paintFlags and Paint.STRIKE_THRU_TEXT_FLAG.inv()
         }
     }
 
@@ -50,12 +49,12 @@ class TimetableItem(val lesson: Timetable, private val roomText: String)
     }
 
     override fun hashCode(): Int {
-        return lesson.hashCode()
+        var result = lesson.hashCode()
+        result = 31 * result + lesson.id.toInt()
+        return result
     }
 
-    class ViewHolder(val view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter),
-            LayoutContainer {
-
+    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 27a9db998..5b837f076 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
@@ -2,9 +2,9 @@ package io.github.wulkanowy.ui.modules.timetable
 
 import com.google.firebase.analytics.FirebaseAnalytics.Param.START_DATE
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
-import io.github.wulkanowy.data.repositories.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
-import io.github.wulkanowy.data.repositories.TimetableRepository
+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.base.session.BaseSessionPresenter
 import io.github.wulkanowy.ui.base.session.SessionErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
@@ -17,6 +17,7 @@ import io.github.wulkanowy.utils.toFormattedString
 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
 
@@ -35,6 +36,7 @@ class TimetablePresenter @Inject constructor(
     fun onAttachView(view: TimetableView, date: Long?) {
         super.onAttachView(view)
         view.initView()
+        Timber.i("Timetable was initialized")
         loadData(ofEpochDay(date ?: now().nextOrSameSchoolDay.toEpochDay()))
         reloadView()
     }
@@ -50,23 +52,38 @@ class TimetablePresenter @Inject constructor(
     }
 
     fun onSwipeRefresh() {
+        Timber.i("Force refreshing the timetable")
         loadData(currentDate, true)
     }
 
     fun onViewReselected() {
-        now().nextOrSameSchoolDay.also {
-            if (currentDate != it) {
-                loadData(it)
-                reloadView()
-            } else if (view?.isViewEmpty == false) view?.resetView()
+        Timber.i("Timetable view is reselected")
+        view?.also { view ->
+            if (view.currentStackSize == 1) {
+                now().nextOrSameSchoolDay.also {
+                    if (currentDate != it) {
+                        loadData(it)
+                        reloadView()
+                    } else if (!view.isViewEmpty) view.resetView()
+                }
+            } else view.popView()
         }
     }
 
     fun onTimetableItemSelected(item: AbstractFlexibleItem<*>?) {
-        if (item is TimetableItem) view?.showTimetableDialog(item.lesson)
+        if (item is TimetableItem) {
+            Timber.i("Select exam item ${item.lesson.id}")
+            view?.showTimetableDialog(item.lesson)
+        }
+    }
+
+    fun onCompletedLessonsSwitchSelected(): Boolean {
+        view?.openCompletedLessonsView()
+        return true
     }
 
     private fun loadData(date: LocalDate, forceRefresh: Boolean = false) {
+        Timber.i("Loading timetable data started")
         currentDate = date
         disposable.apply {
             clear()
@@ -82,16 +99,19 @@ class TimetablePresenter @Inject constructor(
                     view?.run {
                         hideRefresh()
                         showProgress(false)
+                        enableSwipe(true)
                     }
                 }
                 .subscribe({
+                    Timber.i("Loading timetable result: Success")
                     view?.apply {
                         updateData(it)
                         showEmpty(it.isEmpty())
                         showContent(it.isNotEmpty())
                     }
-                    analytics.logEvent("load_attendance", mapOf("items" to it.size, "force_refresh" to forceRefresh, START_DATE to currentDate.toFormattedString("yyyy-MM-dd")))
+                    analytics.logEvent("load_timetable", "items" to it.size, "force_refresh" to forceRefresh, START_DATE to currentDate.toFormattedString("yyyy-MM-dd"))
                 }) {
+                    Timber.i("Loading timetable result: An exception occurred")
                     view?.run { showEmpty(isViewEmpty) }
                     errorHandler.dispatch(it)
                 })
@@ -99,14 +119,16 @@ class TimetablePresenter @Inject constructor(
     }
 
     private fun reloadView() {
+        Timber.i("Reload timetable view with the date ${currentDate.toFormattedString()}")
         view?.apply {
             showProgress(true)
+            enableSwipe(false)
             showContent(false)
             showEmpty(false)
             clearData()
             showNextButton(!currentDate.plusDays(1).isHolidays)
             showPreButton(!currentDate.minusDays(1).isHolidays)
-            updateNavigationDay(currentDate.toFormattedString("EEEE \n dd.MM.YYYY").capitalize())
+            updateNavigationDay(currentDate.toFormattedString("EEEE\ndd.MM.YYYY").capitalize())
         }
     }
 }
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 0ad0eaeb5..c08961c36 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
@@ -9,6 +9,8 @@ interface TimetableView : BaseSessionView {
 
     val isViewEmpty: Boolean
 
+    val currentStackSize: Int?
+
     fun initView()
 
     fun updateData(data: List<TimetableItem>)
@@ -25,6 +27,8 @@ interface TimetableView : BaseSessionView {
 
     fun showProgress(show: Boolean)
 
+    fun enableSwipe(enable: Boolean)
+
     fun showContent(show: Boolean)
 
     fun showPreButton(show: Boolean)
@@ -32,4 +36,8 @@ interface TimetableView : BaseSessionView {
     fun showNextButton(show: Boolean)
 
     fun showTimetableDialog(lesson: Timetable)
+
+    fun popView()
+
+    fun openCompletedLessonsView()
 }
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
new file mode 100644
index 000000000..8f7b1ec5b
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonDialog.kt
@@ -0,0 +1,73 @@
+package io.github.wulkanowy.ui.modules.timetable.completed
+
+import android.annotation.SuppressLint
+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.CompletedLesson
+import kotlinx.android.synthetic.main.dialog_lesson_completed.*
+
+class CompletedLessonDialog : DialogFragment() {
+
+    private lateinit var completedLesson: CompletedLesson
+
+    companion object {
+        private const val ARGUMENT_KEY = "Item"
+
+        fun newInstance(exam: CompletedLesson): CompletedLessonDialog {
+            return CompletedLessonDialog().apply {
+                arguments = Bundle().apply { putSerializable(ARGUMENT_KEY, exam) }
+            }
+        }
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setStyle(STYLE_NO_TITLE, 0)
+        arguments?.run {
+            completedLesson = getSerializable(CompletedLessonDialog.ARGUMENT_KEY) as CompletedLesson
+        }
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.dialog_lesson_completed, container, false)
+    }
+
+    @SuppressLint("SetTextI18n")
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+
+        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()) {
+                completedLessonDialogChangesTitle.visibility = View.GONE
+                completedLessonDialogChanges.visibility = View.GONE
+            } else completedLessonDialogChanges.text = it
+        }
+
+        completedLesson.absence.let {
+            if (it.isBlank()) {
+                completedLessonDialogAbsenceTitle.visibility = View.GONE
+                completedLessonDialogAbsence.visibility = View.GONE
+            } else completedLessonDialogAbsence.text = it
+        }
+
+        completedLesson.resources.let {
+            if (it.isBlank()) {
+                completedLessonDialogResourcesTitle.visibility = View.GONE
+                completedLessonDialogResources.visibility = View.GONE
+            } else completedLessonDialogResources.text = it
+        }
+
+        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..716903f55
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonItem.kt
@@ -0,0 +1,53 @@
+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 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()
+            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/CompletedLessonsErrorHandler.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsErrorHandler.kt
new file mode 100644
index 000000000..50d556859
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsErrorHandler.kt
@@ -0,0 +1,27 @@
+package io.github.wulkanowy.ui.modules.timetable.completed
+
+import android.content.res.Resources
+import com.readystatesoftware.chuck.api.ChuckCollector
+import io.github.wulkanowy.api.interceptor.FeatureDisabledException
+import io.github.wulkanowy.ui.base.session.SessionErrorHandler
+import javax.inject.Inject
+
+class CompletedLessonsErrorHandler @Inject constructor(
+    resources: Resources,
+    chuckCollector: ChuckCollector
+) : SessionErrorHandler(resources, chuckCollector) {
+
+    var onFeatureDisabled: () -> Unit = {}
+
+    override fun proceed(error: Throwable) {
+        when (error) {
+            is FeatureDisabledException -> onFeatureDisabled()
+            else -> super.proceed(error)
+        }
+    }
+
+    override fun clear() {
+        super.clear()
+        onFeatureDisabled = {}
+    }
+}
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
new file mode 100644
index 000000000..bb328c414
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsFragment.kt
@@ -0,0 +1,124 @@
+package io.github.wulkanowy.ui.modules.timetable.completed
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.content.ContextCompat
+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.ui.base.session.BaseSessionFragment
+import io.github.wulkanowy.ui.modules.main.MainActivity
+import io.github.wulkanowy.ui.modules.main.MainView
+import io.github.wulkanowy.utils.setOnItemClickListener
+import kotlinx.android.synthetic.main.fragment_timetable_completed.*
+import javax.inject.Inject
+
+class CompletedLessonsFragment : BaseSessionFragment(), CompletedLessonsView, MainView.TitledView {
+
+    @Inject
+    lateinit var presenter: CompletedLessonsPresenter
+
+    @Inject
+    lateinit var completedLessonsAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
+
+    companion object {
+        private const val SAVED_DATE_KEY = "CURRENT_DATE"
+
+        fun newInstance() = CompletedLessonsFragment()
+    }
+
+    override val titleStringId: Int
+        get() = R.string.completed_lessons_title
+
+    override val isViewEmpty
+        get() = completedLessonsAdapter.isEmpty
+
+    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.run {
+            setOnItemClickListener { presenter.onCompletedLessonsItemSelected(it) }
+        }
+
+        completedLessonsRecycler.run {
+            layoutManager = SmoothScrollLinearLayoutManager(context)
+            adapter = completedLessonsAdapter
+        }
+        completedLessonsSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
+        completedLessonsPreviousButton.setOnClickListener { presenter.onPreviousDay() }
+        completedLessonsNextButton.setOnClickListener { presenter.onNextDay() }
+    }
+
+    override fun updateData(data: List<CompletedLessonItem>) {
+        completedLessonsAdapter.updateDataSet(data, true)
+    }
+
+    override fun clearData() {
+        completedLessonsAdapter.clear()
+    }
+
+    override fun updateNavigationDay(date: String) {
+        completedLessonsNavDate.text = date
+    }
+
+    override fun hideRefresh() {
+        completedLessonsSwipe.isRefreshing = false
+    }
+
+    override fun showEmpty(show: Boolean) {
+        completedLessonsEmpty.visibility = if (show) View.VISIBLE else View.GONE
+    }
+
+    override fun showFeatureDisabled() {
+        context?.let {
+            completedLessonsInfo.text = getString(R.string.error_feature_disabled)
+            completedLessonsInfoImage.setImageDrawable(ContextCompat.getDrawable(it, R.drawable.ic_all_close_circle_24dp))
+        }
+    }
+
+    override fun showProgress(show: Boolean) {
+        completedLessonsProgress.visibility = if (show) View.VISIBLE else View.GONE
+    }
+
+    override fun enableSwipe(enable: Boolean) {
+        completedLessonsSwipe.isEnabled = enable
+    }
+
+    override fun showContent(show: Boolean) {
+        completedLessonsRecycler.visibility = if (show) View.VISIBLE else View.GONE
+    }
+
+    override fun showPreButton(show: Boolean) {
+        completedLessonsPreviousButton.visibility = if (show) View.VISIBLE else View.INVISIBLE
+    }
+
+    override fun showNextButton(show: Boolean) {
+        completedLessonsNextButton.visibility = if (show) View.VISIBLE else View.INVISIBLE
+    }
+
+    override fun showCompletedLessonDialog(completedLesson: CompletedLesson) {
+        (activity as? MainActivity)?.showDialogFragment(CompletedLessonDialog.newInstance(completedLesson))
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        outState.putLong(CompletedLessonsFragment.SAVED_DATE_KEY, presenter.currentDate.toEpochDay())
+    }
+
+    override fun onDestroyView() {
+        presenter.onDetachView()
+        super.onDestroyView()
+    }
+}
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
new file mode 100644
index 000000000..6a14acda5
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsPresenter.kt
@@ -0,0 +1,118 @@
+package io.github.wulkanowy.ui.modules.timetable.completed
+
+import com.google.firebase.analytics.FirebaseAnalytics.Param.START_DATE
+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
+import io.github.wulkanowy.ui.base.session.BaseSessionPresenter
+import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
+import io.github.wulkanowy.utils.SchedulersProvider
+import io.github.wulkanowy.utils.isHolidays
+import io.github.wulkanowy.utils.nextOrSameSchoolDay
+import io.github.wulkanowy.utils.nextSchoolDay
+import io.github.wulkanowy.utils.previousSchoolDay
+import io.github.wulkanowy.utils.toFormattedString
+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(
+    private val schedulers: SchedulersProvider,
+    private val errorHandler: CompletedLessonsErrorHandler,
+    private val studentRepository: StudentRepository,
+    private val semesterRepository: SemesterRepository,
+    private val completedLessonsRepository: CompletedLessonsRepository,
+    private val analytics: FirebaseAnalyticsHelper
+) : BaseSessionPresenter<CompletedLessonsView>(errorHandler) {
+
+    lateinit var currentDate: LocalDate
+        private set
+
+    fun onAttachView(view: CompletedLessonsView, date: Long?) {
+        super.onAttachView(view)
+        Timber.i("Completed lessons is attached")
+        view.initView()
+        loadData(ofEpochDay(date ?: now().nextOrSameSchoolDay.toEpochDay()))
+        reloadView()
+        errorHandler.onFeatureDisabled = {
+            this.view?.showFeatureDisabled()
+            Timber.i("Completed lessons feature disabled by school")
+        }
+    }
+
+    fun onPreviousDay() {
+        loadData(currentDate.previousSchoolDay)
+        reloadView()
+    }
+
+    fun onNextDay() {
+        loadData(currentDate.nextSchoolDay)
+        reloadView()
+    }
+
+    fun onSwipeRefresh() {
+        Timber.i("Force refreshing the completed lessons")
+        loadData(currentDate, true)
+    }
+
+    fun onCompletedLessonsItemSelected(item: AbstractFlexibleItem<*>?) {
+        if (item is CompletedLessonItem) {
+            Timber.i("Select completed lessons item ${item.completedLesson.id}")
+            view?.showCompletedLessonDialog(item.completedLesson)
+        }
+    }
+
+    private fun loadData(date: LocalDate, forceRefresh: Boolean = false) {
+        Timber.i("Loading completed lessons data started")
+        currentDate = date
+        disposable.apply {
+            clear()
+            add(studentRepository.getCurrentStudent()
+                .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 {
+                    view?.run {
+                        hideRefresh()
+                        showProgress(false)
+                        enableSwipe(true)
+                    }
+                }
+                .subscribe({
+                    Timber.i("Loading completed lessons lessons result: Success")
+                    view?.apply {
+                        updateData(it)
+                        showEmpty(it.isEmpty())
+                        showContent(it.isNotEmpty())
+                    }
+                    analytics.logEvent("load_completed_lessons", "items" to it.size, "force_refresh" to forceRefresh, START_DATE to currentDate.toFormattedString("yyyy-MM-dd"))
+                }) {
+                    Timber.i("Loading completed lessons result: An exception occurred")
+                    view?.run { showEmpty(isViewEmpty) }
+                    errorHandler.dispatch(it)
+                })
+        }
+    }
+
+    private fun reloadView() {
+        Timber.i("Reload completed lessons view with the date ${currentDate.toFormattedString()}")
+        view?.apply {
+            showProgress(true)
+            enableSwipe(false)
+            showContent(false)
+            showEmpty(false)
+            clearData()
+            showNextButton(!currentDate.plusDays(1).isHolidays)
+            showPreButton(!currentDate.minusDays(1).isHolidays)
+            updateNavigationDay(currentDate.toFormattedString("EEEE\ndd.MM.YYYY").capitalize())
+        }
+    }
+}
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
new file mode 100644
index 000000000..9607cc476
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsView.kt
@@ -0,0 +1,35 @@
+package io.github.wulkanowy.ui.modules.timetable.completed
+
+import io.github.wulkanowy.data.db.entities.CompletedLesson
+import io.github.wulkanowy.ui.base.session.BaseSessionView
+
+interface CompletedLessonsView : BaseSessionView {
+
+    val isViewEmpty: Boolean
+
+    fun initView()
+
+    fun updateData(data: List<CompletedLessonItem>)
+
+    fun clearData()
+
+    fun updateNavigationDay(date: String)
+
+    fun hideRefresh()
+
+    fun showEmpty(show: Boolean)
+
+    fun showFeatureDisabled()
+
+    fun showProgress(show: Boolean)
+
+    fun enableSwipe(enable: Boolean)
+
+    fun showContent(show: Boolean)
+
+    fun showPreButton(show: Boolean)
+
+    fun showNextButton(show: Boolean)
+
+    fun showCompletedLessonDialog(completedLesson: CompletedLesson)
+}
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
new file mode 100644
index 000000000..468567f18
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureActivity.kt
@@ -0,0 +1,79 @@
+package io.github.wulkanowy.ui.modules.timetablewidget
+
+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.Bundle
+import android.widget.Toast
+import android.widget.Toast.LENGTH_LONG
+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.ui.base.BaseActivity
+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.setOnItemClickListener
+import kotlinx.android.synthetic.main.activity_widget_configure.*
+import javax.inject.Inject
+
+class TimetableWidgetConfigureActivity : BaseActivity(), TimetableWidgetConfigureView {
+
+    @Inject
+    lateinit var configureAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
+
+    @Inject
+    lateinit var presenter: TimetableWidgetConfigurePresenter
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setResult(RESULT_CANCELED)
+        setContentView(R.layout.activity_widget_configure)
+
+        intent.extras.let {
+            presenter.onAttachView(this, it?.getInt(EXTRA_APPWIDGET_ID), it?.getBoolean(EXTRA_FROM_PROVIDER))
+        }
+    }
+
+    override fun initView() {
+        widgetConfigureRecycler.apply {
+            adapter = configureAdapter
+            layoutManager = SmoothScrollLinearLayoutManager(context)
+        }
+        configureAdapter.setOnItemClickListener { presenter.onItemSelect(it) }
+    }
+
+    override fun updateData(data: List<TimetableWidgetConfigureItem>) {
+        configureAdapter.updateDataSet(data)
+    }
+
+    override fun updateTimetableWidget(widgetId: Int) {
+        sendBroadcast(Intent(this, TimetableWidgetProvider::class.java)
+            .apply {
+                action = ACTION_APPWIDGET_UPDATE
+                putExtra(EXTRA_APPWIDGET_IDS, intArrayOf(widgetId))
+            })
+    }
+
+    override fun setSuccessResult(widgetId: Int) {
+        setResult(RESULT_OK, Intent().apply { putExtra(EXTRA_APPWIDGET_ID, widgetId) })
+    }
+
+    override fun showError(text: String, error: Throwable) {
+        Toast.makeText(this, text, LENGTH_LONG).show()
+    }
+
+    override fun finishView() {
+        finish()
+    }
+
+    override fun openLoginView() {
+        startActivity(LoginActivity.getStartIntent(this))
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        presenter.onDetachView()
+    }
+}
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..f6ec1519f
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureItem.kt
@@ -0,0 +1,53 @@
+package io.github.wulkanowy.ui.modules.timetablewidget
+
+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_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 {
+        return ViewHolder(view, adapter)
+    }
+
+    @SuppressLint("SetTextI18n")
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>) {
+        holder.apply {
+            accountItemName.text = "${student.studentName} ${student.className}"
+            accountItemSchool.text = student.schoolName
+            accountItemImage.setBackgroundResource(if (isCurrent) R.drawable.ic_account_circular_border else 0)
+        }
+    }
+
+    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
new file mode 100644
index 000000000..5a7bdd7c0
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigurePresenter.kt
@@ -0,0 +1,65 @@
+package io.github.wulkanowy.ui.modules.timetablewidget
+
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import io.github.wulkanowy.data.db.SharedPrefHelper
+import io.github.wulkanowy.data.db.entities.Student
+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.timetablewidget.TimetableWidgetProvider.Companion.getStudentWidgetKey
+import io.github.wulkanowy.utils.SchedulersProvider
+import javax.inject.Inject
+
+class TimetableWidgetConfigurePresenter @Inject constructor(
+    private val errorHandler: ErrorHandler,
+    private val schedulers: SchedulersProvider,
+    private val studentRepository: StudentRepository,
+    private val sharedPref: SharedPrefHelper
+) : BasePresenter<TimetableWidgetConfigureView>(errorHandler) {
+
+    private var appWidgetId: Int? = null
+
+    private var isFromProvider = false
+
+    fun onAttachView(view: TimetableWidgetConfigureView, appWidgetId: Int?, isFromProvider: Boolean?) {
+        super.onAttachView(view)
+        this.appWidgetId = appWidgetId
+        this.isFromProvider = isFromProvider ?: false
+        view.initView()
+        loadData()
+    }
+
+    fun onItemSelect(item: AbstractFlexibleItem<*>) {
+        if (item is TimetableWidgetConfigureItem) {
+            registerStudent(item.student)
+        }
+    }
+
+    private fun loadData() {
+        disposable.add(studentRepository.getSavedStudents(false)
+            .map { it to appWidgetId?.let { id -> sharedPref.getLong(getStudentWidgetKey(id), 0) } }
+            .map { (students, currentStudentId) ->
+                students.map { student -> TimetableWidgetConfigureItem(student, student.id == currentStudentId) }
+            }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                when {
+                    it.isEmpty() -> view?.openLoginView()
+                    it.size == 1 && !isFromProvider -> registerStudent(it.single().student)
+                    else -> view?.updateData(it)
+                }
+            }, { errorHandler.dispatch(it) }))
+    }
+
+    private fun registerStudent(student: Student) {
+        appWidgetId?.also {
+            sharedPref.putLong(getStudentWidgetKey(it), student.id)
+            view?.apply {
+                updateTimetableWidget(it)
+                setSuccessResult(it)
+            }
+        }
+        view?.finishView()
+    }
+}
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
new file mode 100644
index 000000000..98c800d4c
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureView.kt
@@ -0,0 +1,18 @@
+package io.github.wulkanowy.ui.modules.timetablewidget
+
+import io.github.wulkanowy.ui.base.BaseView
+
+interface TimetableWidgetConfigureView : BaseView {
+
+    fun initView()
+
+    fun updateData(data: List<TimetableWidgetConfigureItem>)
+
+    fun updateTimetableWidget(widgetId: Int)
+
+    fun setSuccessResult(widgetId: Int)
+
+    fun finishView()
+
+    fun openLoginView()
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/widgets/timetable/TimetableWidgetFactory.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetFactory.kt
similarity index 51%
rename from app/src/main/java/io/github/wulkanowy/ui/widgets/timetable/TimetableWidgetFactory.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetFactory.kt
index fecdc42e8..b288f7b79 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/widgets/timetable/TimetableWidgetFactory.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetFactory.kt
@@ -1,5 +1,6 @@
-package io.github.wulkanowy.ui.widgets.timetable
+package io.github.wulkanowy.ui.modules.timetablewidget
 
+import android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_ID
 import android.content.Context
 import android.content.Intent
 import android.graphics.Paint.ANTI_ALIAS_FLAG
@@ -12,11 +13,14 @@ import android.widget.RemoteViewsService
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.SharedPrefHelper
 import io.github.wulkanowy.data.db.entities.Timetable
-import io.github.wulkanowy.data.repositories.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
-import io.github.wulkanowy.data.repositories.TimetableRepository
+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.getDateWidgetKey
+import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider.Companion.getStudentWidgetKey
+import io.github.wulkanowy.utils.SchedulersProvider
 import io.github.wulkanowy.utils.toFormattedString
-import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.Maybe
 import org.threeten.bp.LocalDate
 import timber.log.Timber
 
@@ -25,12 +29,11 @@ class TimetableWidgetFactory(
     private val studentRepository: StudentRepository,
     private val semesterRepository: SemesterRepository,
     private val sharedPref: SharedPrefHelper,
+    private val schedulers: SchedulersProvider,
     private val context: Context,
     private val intent: Intent?
 ) : RemoteViewsService.RemoteViewsFactory {
 
-    private val disposable: CompositeDisposable = CompositeDisposable()
-
     private var lessons = emptyList<Timetable>()
 
     override fun getLoadingView() = null
@@ -45,22 +48,40 @@ class TimetableWidgetFactory(
 
     override fun onCreate() {}
 
+    override fun onDestroy() {}
+
     override fun onDataSetChanged() {
-        intent?.action?.let { LocalDate.ofEpochDay(sharedPref.getLong(it, 0)) }
-            ?.let { date ->
-                if (studentRepository.isStudentSaved) {
-                    disposable.add(studentRepository.getCurrentStudent()
-                        .flatMap { semesterRepository.getCurrentSemester(it) }
-                        .flatMap { timetableRepository.getTimetable(it, date, date) }
-                        .map { item -> item.sortedBy { it.number } }
-                        .subscribe({ lessons = it })
-                        { Timber.e(it, "An error has occurred while downloading data for the widget") })
-                }
+        intent?.extras?.getInt(EXTRA_APPWIDGET_ID)?.let { appWidgetId ->
+            val date = LocalDate.ofEpochDay(sharedPref.getLong(getDateWidgetKey(appWidgetId), 0))
+            val studentId = sharedPref.getLong(getStudentWidgetKey(appWidgetId), 0)
+
+            lessons = try {
+                studentRepository.isStudentSaved()
+                    .filter { true }
+                    .flatMap { studentRepository.getSavedStudents().toMaybe() }
+                    .flatMap {
+                        if (studentId == 0L) throw IllegalArgumentException("Student id is 0")
+
+                        it.singleOrNull { student -> student.id == studentId }
+                            .let { student ->
+                                if (student != null) Maybe.just(student)
+                                else Maybe.empty()
+                            }
+                    }
+                    .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) {
+                Timber.e(e, "An error has occurred in timetable widget factory")
+                emptyList()
             }
+        }
     }
 
     override fun getViewAt(position: Int): RemoteViews? {
-        if (position == INVALID_POSITION) return null
+        if (position == INVALID_POSITION || lessons.getOrNull(position) == null) return null
 
         return RemoteViews(context.packageName, R.layout.item_widget_timetable).apply {
             lessons[position].let {
@@ -75,7 +96,14 @@ class TimetableWidgetFactory(
 
                 if (it.info.isNotBlank()) {
                     setViewVisibility(R.id.timetableWidgetItemDescription, VISIBLE)
-                    setTextViewText(R.id.timetableWidgetItemDescription, it.info.capitalize())
+                    setTextViewText(R.id.timetableWidgetItemDescription, it.run {
+                        when (true) {
+                            canceled && !changes -> "Lekcja odwołana: $info"
+                            changes && teacher.isNotBlank() -> "Zastępstwo: $teacher"
+                            changes && teacher.isBlank() -> "Zastępstwo, ${info.decapitalize()}"
+                            else -> it.info.capitalize()
+                        }
+                    })
                 } else setViewVisibility(R.id.timetableWidgetItemDescription, GONE)
 
                 if (it.canceled) {
@@ -88,8 +116,4 @@ class TimetableWidgetFactory(
             setOnClickFillInIntent(R.id.timetableWidgetItemContainer, Intent())
         }
     }
-
-    override fun onDestroy() {
-        disposable.clear()
-    }
 }
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
new file mode 100644
index 000000000..a462ca7b5
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetProvider.kt
@@ -0,0 +1,180 @@
+package io.github.wulkanowy.ui.modules.timetablewidget
+
+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_UPDATE
+import android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_ID
+import android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_IDS
+import android.content.BroadcastReceiver
+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.widget.RemoteViews
+import dagger.android.AndroidInjection
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.SharedPrefHelper
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.repositories.student.StudentRepository
+import io.github.wulkanowy.services.widgets.TimetableWidgetService
+import io.github.wulkanowy.ui.modules.main.MainActivity
+import io.github.wulkanowy.ui.modules.main.MainView.MenuView
+import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
+import io.github.wulkanowy.utils.SchedulersProvider
+import io.github.wulkanowy.utils.nextOrSameSchoolDay
+import io.github.wulkanowy.utils.nextSchoolDay
+import io.github.wulkanowy.utils.previousSchoolDay
+import io.github.wulkanowy.utils.shortcutWeekDayName
+import io.github.wulkanowy.utils.toFormattedString
+import io.reactivex.Maybe
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDate.now
+import timber.log.Timber
+import javax.inject.Inject
+
+class TimetableWidgetProvider : BroadcastReceiver() {
+
+    @Inject
+    lateinit var appWidgetManager: AppWidgetManager
+
+    @Inject
+    lateinit var studentRepository: StudentRepository
+
+    @Inject
+    lateinit var sharedPref: SharedPrefHelper
+
+    @Inject
+    lateinit var schedulers: SchedulersProvider
+
+    @Inject
+    lateinit var analytics: FirebaseAnalyticsHelper
+
+    companion object {
+        const val EXTRA_FROM_PROVIDER = "extraFromProvider"
+
+        const val EXTRA_TOGGLED_WIDGET_ID = "extraToggledWidget"
+
+        const val EXTRA_BUTTON_TYPE = "extraButtonType"
+
+        const val BUTTON_NEXT = "buttonNext"
+
+        const val BUTTON_PREV = "buttonPrev"
+
+        const val BUTTON_RESET = "buttonReset"
+
+        fun getDateWidgetKey(appWidgetId: Int) = "timetable_widget_date_$appWidgetId"
+
+        fun getStudentWidgetKey(appWidgetId: Int) = "timetable_widget_student_$appWidgetId"
+    }
+
+    override fun onReceive(context: Context, intent: Intent) {
+        AndroidInjection.inject(this, context)
+        when (intent.action) {
+            ACTION_APPWIDGET_UPDATE -> onUpdate(context, intent)
+            ACTION_APPWIDGET_DELETED -> onDelete(intent)
+        }
+    }
+
+    private fun onUpdate(context: Context, intent: Intent) {
+        if (intent.getStringExtra(EXTRA_BUTTON_TYPE) === null) {
+            intent.getIntArrayExtra(EXTRA_APPWIDGET_IDS)?.forEach { appWidgetId ->
+                val student = getStudent(sharedPref.getLong(getStudentWidgetKey(appWidgetId), 0), appWidgetId)
+                updateWidget(context, appWidgetId, now().nextOrSameSchoolDay, student)
+            }
+        } else {
+            val buttonType = intent.getStringExtra(EXTRA_BUTTON_TYPE)
+            val toggledWidgetId = intent.getIntExtra(EXTRA_TOGGLED_WIDGET_ID, 0)
+            val student = getStudent(sharedPref.getLong(getStudentWidgetKey(toggledWidgetId), 0), toggledWidgetId)
+            val savedDate = LocalDate.ofEpochDay(sharedPref.getLong(getDateWidgetKey(toggledWidgetId), 0))
+            val date = when (buttonType) {
+                BUTTON_RESET -> now().nextOrSameSchoolDay
+                BUTTON_NEXT -> savedDate.nextSchoolDay
+                BUTTON_PREV -> savedDate.previousSchoolDay
+                else -> now().nextOrSameSchoolDay
+            }
+            if (!buttonType.isNullOrBlank()) analytics.logEvent("changed_timetable_widget_day", "button" to buttonType)
+            updateWidget(context, toggledWidgetId, date, student)
+        }
+    }
+
+    private fun onDelete(intent: Intent) {
+        intent.getIntExtra(EXTRA_APPWIDGET_ID, 0).let {
+            if (it != 0) {
+                sharedPref.apply {
+                    delete(getStudentWidgetKey(it))
+                    delete(getDateWidgetKey(it))
+                }
+            }
+        }
+    }
+
+    private fun updateWidget(context: Context, appWidgetId: Int, date: LocalDate, student: Student?) {
+        RemoteViews(context.packageName, R.layout.widget_timetable).apply {
+            setEmptyView(R.id.timetableWidgetList, R.id.timetableWidgetEmpty)
+            setTextViewText(R.id.timetableWidgetDate, "${date.shortcutWeekDayName.capitalize()} ${date.toFormattedString()}")
+            setTextViewText(R.id.timetableWidgetName, student?.studentName ?: context.getString(R.string.all_no_data))
+            setRemoteAdapter(R.id.timetableWidgetList, Intent(context, TimetableWidgetService::class.java)
+                .apply { putExtra(EXTRA_APPWIDGET_ID, appWidgetId) })
+            setOnClickPendingIntent(R.id.timetableWidgetNext, createNavIntent(context, appWidgetId, appWidgetId, BUTTON_NEXT))
+            setOnClickPendingIntent(R.id.timetableWidgetPrev, createNavIntent(context, -appWidgetId, appWidgetId, BUTTON_PREV))
+            createNavIntent(context, Int.MAX_VALUE - appWidgetId, appWidgetId, BUTTON_RESET).let {
+                setOnClickPendingIntent(R.id.timetableWidgetDate, it)
+                setOnClickPendingIntent(R.id.timetableWidgetName, it)
+            }
+            setOnClickPendingIntent(R.id.timetableWidgetAccount, PendingIntent.getActivity(context, -Int.MAX_VALUE + appWidgetId,
+                Intent(context, TimetableWidgetConfigureActivity::class.java).apply {
+                    addFlags(FLAG_ACTIVITY_NEW_TASK or FLAG_ACTIVITY_CLEAR_TASK)
+                    putExtra(EXTRA_APPWIDGET_ID, appWidgetId)
+                    putExtra(EXTRA_FROM_PROVIDER, true)
+                }, FLAG_UPDATE_CURRENT))
+            setPendingIntentTemplate(R.id.timetableWidgetList,
+                PendingIntent.getActivity(context, MenuView.TIMETABLE.id,
+                    MainActivity.getStartIntent(context, MenuView.TIMETABLE, true), FLAG_UPDATE_CURRENT))
+        }.also {
+            sharedPref.putLong(getDateWidgetKey(appWidgetId), date.toEpochDay(), true)
+            appWidgetManager.apply {
+                notifyAppWidgetViewDataChanged(appWidgetId, R.id.timetableWidgetList)
+                updateAppWidget(appWidgetId, it)
+            }
+        }
+    }
+
+    private fun createNavIntent(context: Context, code: Int, appWidgetId: Int, buttonType: String): PendingIntent {
+        return PendingIntent.getBroadcast(context, code,
+            Intent(context, TimetableWidgetProvider::class.java).apply {
+                action = ACTION_APPWIDGET_UPDATE
+                putExtra(EXTRA_BUTTON_TYPE, buttonType)
+                putExtra(EXTRA_TOGGLED_WIDGET_ID, appWidgetId)
+            }, FLAG_UPDATE_CURRENT)
+    }
+
+    private fun getStudent(studentId: Long, appWidgetId: Int): Student? {
+        return try {
+            studentRepository.isStudentSaved()
+                .filter { true }
+                .flatMap { studentRepository.getSavedStudents(false).toMaybe() }
+                .flatMap { students ->
+                    students.singleOrNull { student -> student.id == studentId }
+                        .let { student ->
+                            when {
+                                student != null -> Maybe.just(student)
+                                studentId != 0L -> {
+                                    studentRepository.isCurrentStudentSet()
+                                        .filter { true }
+                                        .flatMap { studentRepository.getCurrentStudent(false).toMaybe() }
+                                        .doOnSuccess { sharedPref.putLong(getStudentWidgetKey(appWidgetId), it.id) }
+                                }
+                                else -> Maybe.empty()
+                            }
+                        }
+                }
+                .subscribeOn(schedulers.backgroundThread)
+                .blockingGet()
+        } catch (e: Exception) {
+            Timber.e(e, "An error has occurred in timetable widget provider")
+            null
+        }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/widgets/timetable/TimetableWidgetProvider.kt b/app/src/main/java/io/github/wulkanowy/ui/widgets/timetable/TimetableWidgetProvider.kt
deleted file mode 100644
index a8ead8fb9..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/widgets/timetable/TimetableWidgetProvider.kt
+++ /dev/null
@@ -1,130 +0,0 @@
-package io.github.wulkanowy.ui.widgets.timetable
-
-import android.app.PendingIntent
-import android.app.PendingIntent.FLAG_UPDATE_CURRENT
-import android.appwidget.AppWidgetManager
-import android.appwidget.AppWidgetManager.ACTION_APPWIDGET_UPDATE
-import android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_IDS
-import android.appwidget.AppWidgetProvider
-import android.content.Context
-import android.content.Intent
-import android.widget.RemoteViews
-import dagger.android.AndroidInjection
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.SharedPrefHelper
-import io.github.wulkanowy.services.widgets.TimetableWidgetService
-import io.github.wulkanowy.ui.modules.main.MainActivity
-import io.github.wulkanowy.ui.modules.main.MainActivity.Companion.EXTRA_START_MENU_INDEX
-import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.nextOrSameSchoolDay
-import io.github.wulkanowy.utils.nextSchoolDay
-import io.github.wulkanowy.utils.previousSchoolDay
-import io.github.wulkanowy.utils.toFormattedString
-import io.github.wulkanowy.utils.weekDayName
-import org.threeten.bp.LocalDate
-import javax.inject.Inject
-
-class TimetableWidgetProvider : AppWidgetProvider() {
-
-    @Inject
-    lateinit var sharedPref: SharedPrefHelper
-
-    @Inject
-    lateinit var analytics: FirebaseAnalyticsHelper
-
-    companion object {
-        const val EXTRA_TOGGLED_WIDGET_ID = "extraToggledWidget"
-
-        const val EXTRA_BUTTON_TYPE = "extraButtonType"
-
-        const val BUTTON_NEXT = "buttonNext"
-
-        const val BUTTON_PREV = "buttonPrev"
-
-        const val BUTTON_RESET = "buttonReset"
-    }
-
-    override fun onUpdate(context: Context?, appWidgetManager: AppWidgetManager?, appWidgetIds: IntArray?) {
-        appWidgetIds?.forEach {
-            val widgetKey = "timetable_widget_$it"
-            checkSavedWidgetDate(widgetKey)
-
-            val savedDate = LocalDate.ofEpochDay(sharedPref.getLong(widgetKey, 0))
-            context?.run {
-                RemoteViews(packageName, R.layout.widget_timetable).apply {
-                    setTextViewText(R.id.timetableWidgetDay, savedDate.weekDayName.capitalize())
-                    setTextViewText(R.id.timetableWidgetDate, savedDate.toFormattedString())
-                    setEmptyView(R.id.timetableWidgetList, R.id.timetableWidgetEmpty)
-                    setRemoteAdapter(R.id.timetableWidgetList, Intent(context, TimetableWidgetService::class.java)
-                        .apply { action = widgetKey })
-                    setOnClickPendingIntent(R.id.timetableWidgetNext, createNavIntent(context, it, it, appWidgetIds, BUTTON_NEXT))
-                    setOnClickPendingIntent(R.id.timetableWidgetPrev, createNavIntent(context, -it, it, appWidgetIds, BUTTON_PREV))
-                    createNavIntent(context, Int.MAX_VALUE, it, appWidgetIds, BUTTON_RESET).let { intent ->
-                        setOnClickPendingIntent(R.id.timetableWidgetDate, intent)
-                        setOnClickPendingIntent(R.id.timetableWidgetDay, intent)
-                    }
-                    setPendingIntentTemplate(R.id.timetableWidgetList,
-                        PendingIntent.getActivity(context, 1, MainActivity.getStartIntent(context).apply {
-                            putExtra(EXTRA_START_MENU_INDEX, 3)
-                        }, FLAG_UPDATE_CURRENT))
-
-                }.also { view ->
-                    appWidgetManager?.apply {
-                        notifyAppWidgetViewDataChanged(it, R.id.timetableWidgetList)
-                        updateAppWidget(it, view)
-                    }
-                }
-            }
-        }
-    }
-
-    override fun onReceive(context: Context?, intent: Intent?) {
-        AndroidInjection.inject(this, context)
-        intent?.let {
-            val widgetKey = "timetable_widget_${it.getIntExtra(EXTRA_TOGGLED_WIDGET_ID, 0)}"
-            it.getStringExtra(EXTRA_BUTTON_TYPE).let { button ->
-                when (button) {
-                    BUTTON_NEXT -> {
-                        LocalDate.ofEpochDay(sharedPref.getLong(widgetKey, 0)).nextSchoolDay
-                            .let { date -> sharedPref.putLong(widgetKey, date.toEpochDay(), true) }
-                    }
-                    BUTTON_PREV -> {
-                        LocalDate.ofEpochDay(sharedPref.getLong(widgetKey, 0)).previousSchoolDay
-                            .let { date -> sharedPref.putLong(widgetKey, date.toEpochDay(), true) }
-                    }
-                    BUTTON_RESET -> sharedPref.putLong(widgetKey, LocalDate.now().nextOrSameSchoolDay.toEpochDay(), true)
-                }
-                button?.also { btn ->
-                    if (btn.isNotBlank()) {
-                        analytics.logEvent("changed_timetable_widget_day", mapOf("button" to button))
-                    }
-                }
-            }
-        }
-        super.onReceive(context, intent)
-    }
-
-    override fun onDeleted(context: Context?, appWidgetIds: IntArray?) {
-        appWidgetIds?.forEach {
-            sharedPref.delete("timetable_widget_$it")
-        }
-    }
-
-    private fun createNavIntent(context: Context, code: Int, widgetId: Int, widgetIds: IntArray, buttonType: String): PendingIntent {
-        return PendingIntent.getBroadcast(context, code,
-            Intent(context, TimetableWidgetProvider::class.java).apply {
-                action = ACTION_APPWIDGET_UPDATE
-                putExtra(EXTRA_APPWIDGET_IDS, widgetIds)
-                putExtra(EXTRA_BUTTON_TYPE, buttonType)
-                putExtra(EXTRA_TOGGLED_WIDGET_ID, widgetId)
-            }, FLAG_UPDATE_CURRENT)
-    }
-
-    private fun checkSavedWidgetDate(widgetKey: String) {
-        sharedPref.run {
-            if (getLong(widgetKey, -1) == -1L) {
-                putLong(widgetKey, LocalDate.now().nextOrSameSchoolDay.toEpochDay(), true)
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/utils/ActivityExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/ActivityExtension.kt
index c0314d02e..93781a9fe 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/ActivityExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/ActivityExtension.kt
@@ -4,7 +4,6 @@ import android.app.Activity
 import android.content.Context.INPUT_METHOD_SERVICE
 import android.view.inputmethod.InputMethodManager
 
-
 fun Activity.showSoftInput() {
     (getSystemService(INPUT_METHOD_SERVICE) as InputMethodManager?)?.run {
         if (currentFocus != null) showSoftInput(currentFocus, 0)
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 e056bf7ea..c367ecd07 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/ContextExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/ContextExtension.kt
@@ -1,15 +1,28 @@
 package io.github.wulkanowy.utils
 
 import android.content.Context
+import android.content.Intent
 import androidx.annotation.AttrRes
 import androidx.annotation.ColorInt
+import androidx.annotation.ColorRes
+import androidx.core.content.ContextCompat
 
 @ColorInt
 fun Context.getThemeAttrColor(@AttrRes colorAttr: Int): Int {
-    val array = this.obtainStyledAttributes(null, intArrayOf(colorAttr))
-    try {
-        return array.getColor(0, 0)
+    val array = obtainStyledAttributes(null, intArrayOf(colorAttr))
+    return try {
+        array.getColor(0, 0)
     } finally {
         array.recycle()
     }
 }
+
+@ColorInt
+fun Context.getCompatColor(@ColorRes colorRes: Int) = ContextCompat.getColor(this, colorRes)
+
+fun Context.openInternetBrowser(uri: String, onActivityNotFound: (uri: String) -> Unit) {
+    Intent.parseUri(uri, 0).let {
+        if (it.resolveActivity(packageManager) != null) startActivity(it)
+        else onActivityNotFound(uri)
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/utils/EditTextExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/EditTextExtension.kt
new file mode 100644
index 000000000..caa977ec3
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/utils/EditTextExtension.kt
@@ -0,0 +1,16 @@
+package io.github.wulkanowy.utils
+
+import android.text.Editable
+import android.text.TextWatcher
+import android.widget.EditText
+
+inline fun EditText.setOnTextChangedListener(crossinline listener: () -> Unit) {
+    addTextChangedListener(object : TextWatcher {
+        override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+            listener()
+        }
+
+        override fun afterTextChanged(s: Editable?) {}
+        override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
+    })
+}
diff --git a/app/src/main/java/io/github/wulkanowy/utils/FirebaseAnalyticsHelper.kt b/app/src/main/java/io/github/wulkanowy/utils/FirebaseAnalyticsHelper.kt
index 53f9197fb..e7ac9c99f 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/FirebaseAnalyticsHelper.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/FirebaseAnalyticsHelper.kt
@@ -2,19 +2,20 @@ package io.github.wulkanowy.utils
 
 import android.os.Bundle
 import com.google.firebase.analytics.FirebaseAnalytics
+import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class FirebaseAnalyticsHelper(private val analytics: FirebaseAnalytics) {
+class FirebaseAnalyticsHelper @Inject constructor(private val analytics: FirebaseAnalytics) {
 
-    fun logEvent(name: String, params: Map<String, Any?>) {
+    fun logEvent(name: String, vararg params: Pair<String, Any?>) {
         Bundle().apply {
             params.forEach {
-                if (it.value == null) return@forEach
-                when (it.value) {
-                    is String, is String? -> putString(it.key, it.value as String)
-                    is Int, is Int? -> putInt(it.key, it.value as Int)
-                    is Boolean, is Boolean? -> putBoolean(it.key, it.value as Boolean)
+                if (it.second == null) return@forEach
+                when (it.second) {
+                    is String, is String? -> putString(it.first, it.second as String)
+                    is Int, is Int? -> putInt(it.first, it.second as Int)
+                    is Boolean, is Boolean? -> putBoolean(it.first, it.second as Boolean)
                 }
             }
             analytics.logEvent(name, this)
diff --git a/app/src/main/java/io/github/wulkanowy/utils/GradeExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/GradeExtension.kt
index 638bf364f..c863b030f 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/GradeExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/GradeExtension.kt
@@ -22,18 +22,36 @@ fun List<GradeSummary>.calcAverage(): Double {
     }.average().let { if (it.isNaN()) 0.0 else it }
 }
 
-inline val Grade.valueColor: Int
-    get() {
-        return when (value) {
-            6 -> R.color.grade_six
-            5 -> R.color.grade_five
-            4 -> R.color.grade_four
-            3 -> R.color.grade_three
-            2 -> R.color.grade_two
-            1 -> R.color.grade_one
-            else -> R.color.grade_default
+fun Grade.getBackgroundColor(theme: String): Int {
+    return when (theme) {
+        "grade_color" -> when (color) {
+            "000000" -> R.color.grade_black
+            "F04C4C" -> R.color.grade_red
+            "20A4F7" -> R.color.grade_blue
+            "6ECD07" -> R.color.grade_green
+            "B16CF1" -> R.color.grade_purple
+            else -> R.color.grade_material_default
+        }
+        "material" -> when (value) {
+            6 -> R.color.grade_material_six
+            5 -> R.color.grade_material_five
+            4 -> R.color.grade_material_four
+            3 -> R.color.grade_material_three
+            2 -> R.color.grade_material_two
+            1 -> R.color.grade_material_one
+            else -> R.color.grade_material_default
+        }
+        else -> when (value) {
+            6 -> R.color.grade_vulcan_six
+            5 -> R.color.grade_vulcan_five
+            4 -> R.color.grade_vulcan_four
+            3 -> R.color.grade_vulcan_three
+            2 -> R.color.grade_vulcan_two
+            1 -> R.color.grade_vulcan_one
+            else -> R.color.grade_vulcan_default
         }
     }
+}
 
 inline val Grade.colorStringId: Int
     get() {
@@ -48,13 +66,9 @@ inline val Grade.colorStringId: Int
     }
 
 fun Grade.changeModifier(plusModifier: Double, minusModifier: Double): Grade {
-    if (modifier != 0.0) {
-        if (plusModifier != 0.0 && modifier > 0) {
-            modifier = plusModifier
-        }
-        if (minusModifier != .0 && modifier < 0) {
-            modifier = -minusModifier
-        }
+    return when {
+        modifier != .0 && plusModifier != .0 && modifier > 0 -> copy(modifier = plusModifier)
+        modifier != .0 && minusModifier != .0 && modifier < 0 -> copy(modifier = -minusModifier)
+        else -> this
     }
-    return this
 }
diff --git a/app/src/main/java/io/github/wulkanowy/utils/ListExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/ListExtension.kt
new file mode 100644
index 000000000..4374aeb41
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/utils/ListExtension.kt
@@ -0,0 +1,9 @@
+package io.github.wulkanowy.utils
+
+infix fun <T> List<T>.uniqueSubtract(other: List<T>): List<T> {
+    val list = toMutableList()
+    other.forEach {
+        list.remove(it)
+    }
+    return list.toList()
+}
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 565374130..5a6cc2bfd 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/LoggerUtils.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/LoggerUtils.kt
@@ -1,7 +1,16 @@
 package io.github.wulkanowy.utils
 
+import android.app.Activity
+import android.app.Application
+import android.content.Context
+import android.os.Bundle
+import android.view.View
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
 import com.crashlytics.android.Crashlytics
 import timber.log.Timber
+import javax.inject.Inject
+import javax.inject.Singleton
 
 class DebugLogTree : Timber.DebugTree() {
 
@@ -20,3 +29,88 @@ class CrashlyticsTree : Timber.Tree() {
         else Crashlytics.logException(t)
     }
 }
+
+class ActivityLifecycleLogger : Application.ActivityLifecycleCallbacks {
+
+    override fun onActivityPaused(activity: Activity?) {
+        activity?.let { Timber.d("${it::class.java.simpleName} PAUSED") }
+    }
+
+    override fun onActivityResumed(activity: Activity?) {
+        activity?.let { Timber.d("${it::class.java.simpleName} RESUMED") }
+    }
+
+    override fun onActivityStarted(activity: Activity?) {
+        activity?.let { Timber.d("${it::class.java.simpleName} STARTED") }
+    }
+
+    override fun onActivityDestroyed(activity: Activity?) {
+        activity?.let { Timber.d("${it::class.java.simpleName} DESTROYED") }
+    }
+
+    override fun onActivitySaveInstanceState(activity: Activity?, outState: Bundle?) {
+        activity?.let { Timber.d("${it::class.java.simpleName} SAVED INSTANCE STATE") }
+    }
+
+    override fun onActivityStopped(activity: Activity?) {
+        activity?.let { Timber.d("${it::class.java.simpleName} STOPPED") }
+    }
+
+    override fun onActivityCreated(activity: Activity?, savedInstanceState: Bundle?) {
+        activity?.let { Timber.d("${it::class.java.simpleName} CREATED ${checkSavedState(savedInstanceState)}") }
+    }
+}
+
+@Singleton
+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 ${checkSavedState(savedInstanceState)}")
+    }
+
+    override fun onFragmentStopped(fm: FragmentManager, f: Fragment) {
+        Timber.d("${f::class.java.simpleName} STOPPED")
+    }
+
+    override fun onFragmentCreated(fm: FragmentManager, f: Fragment, savedInstanceState: Bundle?) {
+        Timber.d("${f::class.java.simpleName} CREATED ${checkSavedState(savedInstanceState)}")
+    }
+
+    override fun onFragmentResumed(fm: FragmentManager, f: Fragment) {
+        Timber.d("${f::class.java.simpleName} RESUMED")
+    }
+
+    override fun onFragmentAttached(fm: FragmentManager, f: Fragment, context: Context) {
+        Timber.d("${f::class.java.simpleName} ATTACHED")
+    }
+
+    override fun onFragmentDestroyed(fm: FragmentManager, f: Fragment) {
+        Timber.d("${f::class.java.simpleName} DESTROYED")
+    }
+
+    override fun onFragmentSaveInstanceState(fm: FragmentManager, f: Fragment, outState: Bundle) {
+        Timber.d("${f::class.java.simpleName} SAVED INSTANCE STATE")
+    }
+
+    override fun onFragmentStarted(fm: FragmentManager, f: Fragment) {
+        Timber.d("${f::class.java.simpleName} STARTED")
+    }
+
+    override fun onFragmentViewDestroyed(fm: FragmentManager, f: Fragment) {
+        Timber.d("${f::class.java.simpleName} VIEW DESTROYED")
+    }
+
+    override fun onFragmentActivityCreated(fm: FragmentManager, f: Fragment, savedInstanceState: Bundle?) {
+        Timber.d("${f::class.java.simpleName} ACTIVITY CREATED ${checkSavedState(savedInstanceState)}")
+    }
+
+    override fun onFragmentPaused(fm: FragmentManager, f: Fragment) {
+        Timber.d("${f::class.java.simpleName} PAUSED")
+    }
+
+    override fun onFragmentDetached(fm: FragmentManager, f: Fragment) {
+        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/SpinnerExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/SpinnerExtension.kt
index bea2bd3dc..d9e34e87c 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/SpinnerExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/SpinnerExtension.kt
@@ -4,11 +4,19 @@ import android.view.View
 import android.widget.AdapterView
 import android.widget.Spinner
 
+/**
+ * @see <a href="https://stackoverflow.com/a/29602298">How to keep onItemSelected from firing off on a newly instantiated Spinner?</a>
+ */
 inline fun Spinner.setOnItemSelectedListener(crossinline listener: (view: View?) -> Unit) {
     onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
         override fun onNothingSelected(parent: AdapterView<*>?) {}
         override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
-            listener(view)
+            onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+                override fun onNothingSelected(parent: AdapterView<*>?) {}
+                override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
+                    listener(view)
+                }
+            }
         }
     }
 }
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 3cd38c732..426816f44 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/TimeExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/TimeExtension.kt
@@ -1,5 +1,6 @@
 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
@@ -36,6 +37,8 @@ fun LocalDate.toFormattedString(format: String = DATE_PATTERN): String = this.fo
 
 fun LocalDateTime.toFormattedString(format: String = DATE_PATTERN): String = this.format(ofPattern(format))
 
+fun LocalDateTime.toDate(): Date = DateTimeUtils.toDate(atZone(ZoneId.systemDefault()).toInstant())
+
 /**
  * https://github.com/ThreeTen/threetenbp/issues/55
  */
@@ -96,6 +99,9 @@ inline val LocalDate.previousOrSameSchoolDay: LocalDate
 inline val LocalDate.weekDayName: String
     get() = this.format(ofPattern("EEEE", Locale.getDefault()))
 
+inline val LocalDate.shortcutWeekDayName: String
+    get() = this.format(ofPattern("EEE", Locale.getDefault()))
+
 inline val LocalDate.monday: LocalDate
     get() = this.with(MONDAY)
 
diff --git a/app/src/main/play/contactEmail b/app/src/main/play/contact-email.txt
similarity index 100%
rename from app/src/main/play/contactEmail
rename to app/src/main/play/contact-email.txt
diff --git a/app/src/main/play/contactPhone b/app/src/main/play/contact-phone.txt
similarity index 100%
rename from app/src/main/play/contactPhone
rename to app/src/main/play/contact-phone.txt
diff --git a/app/src/main/play/contactWebsite b/app/src/main/play/contact-website.txt
similarity index 100%
rename from app/src/main/play/contactWebsite
rename to app/src/main/play/contact-website.txt
diff --git a/app/src/main/play/defaultLanguage b/app/src/main/play/default-language.txt
similarity index 100%
rename from app/src/main/play/defaultLanguage
rename to app/src/main/play/default-language.txt
diff --git a/app/src/main/play/pl-PL/listing/fulldescription b/app/src/main/play/listings/pl-PL/full-description.txt
similarity index 80%
rename from app/src/main/play/pl-PL/listing/fulldescription
rename to app/src/main/play/listings/pl-PL/full-description.txt
index 7c1f99fdf..d33cb56f2 100644
--- a/app/src/main/play/pl-PL/listing/fulldescription
+++ b/app/src/main/play/listings/pl-PL/full-description.txt
@@ -1,13 +1,14 @@
 Aplikacja jest we wczesnej fazie rozwoju, ciągle pracujemy nad kolejnymi funkcjami.
 
 Wyróżnione cechy i funkcje:
-- brak reklam,
-- tryb offline,
-- powiadomienia,
 - obliczanie średniej ważonej,
 - procentowy podgląd frekwencji,
+- szczęśliwy numerek,
+- podgląd lekcji zrealizowanych,
 - ciemny motyw.
+- brak reklam,
+- tryb offline,
+- powiadomienia.
 
 GitHub: https://github.com/wulkanowy/wulkanowy
 Discord: https://discord.gg/vccAQBr
-Trello: https://trello.com/b/A97NUM1s/wulkanowy
diff --git a/app/src/main/play/pl-PL/listing/featureGraphic/feature.png b/app/src/main/play/listings/pl-PL/graphics/feature-graphic/feature.png
similarity index 100%
rename from app/src/main/play/pl-PL/listing/featureGraphic/feature.png
rename to app/src/main/play/listings/pl-PL/graphics/feature-graphic/feature.png
diff --git a/app/src/main/play/listings/pl-PL/graphics/icon/icon.png b/app/src/main/play/listings/pl-PL/graphics/icon/icon.png
new file mode 100644
index 000000000..8c33c2f92
Binary files /dev/null and b/app/src/main/play/listings/pl-PL/graphics/icon/icon.png differ
diff --git a/app/src/main/play/pl-PL/listing/phoneScreenshots/account-switcher.png b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/account-switcher.png
similarity index 100%
rename from app/src/main/play/pl-PL/listing/phoneScreenshots/account-switcher.png
rename to app/src/main/play/listings/pl-PL/graphics/phone-screenshots/account-switcher.png
diff --git a/app/src/main/play/pl-PL/listing/phoneScreenshots/attendance-dialog.png b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/attendance-dialog.png
similarity index 100%
rename from app/src/main/play/pl-PL/listing/phoneScreenshots/attendance-dialog.png
rename to app/src/main/play/listings/pl-PL/graphics/phone-screenshots/attendance-dialog.png
diff --git a/app/src/main/play/pl-PL/listing/phoneScreenshots/attendance-statistics.png b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/attendance-statistics.png
similarity index 100%
rename from app/src/main/play/pl-PL/listing/phoneScreenshots/attendance-statistics.png
rename to app/src/main/play/listings/pl-PL/graphics/phone-screenshots/attendance-statistics.png
diff --git a/app/src/main/play/pl-PL/listing/phoneScreenshots/grades.png b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/grades.png
similarity index 100%
rename from app/src/main/play/pl-PL/listing/phoneScreenshots/grades.png
rename to app/src/main/play/listings/pl-PL/graphics/phone-screenshots/grades.png
diff --git a/app/src/main/play/pl-PL/listing/phoneScreenshots/more.png b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/more.png
similarity index 100%
rename from app/src/main/play/pl-PL/listing/phoneScreenshots/more.png
rename to app/src/main/play/listings/pl-PL/graphics/phone-screenshots/more.png
diff --git a/app/src/main/play/pl-PL/listing/phoneScreenshots/timetable-dialog.png b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/timetable-dialog.png
similarity index 100%
rename from app/src/main/play/pl-PL/listing/phoneScreenshots/timetable-dialog.png
rename to app/src/main/play/listings/pl-PL/graphics/phone-screenshots/timetable-dialog.png
diff --git a/app/src/main/play/pl-PL/listing/phoneScreenshots/timetable-widget.png b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/timetable-widget.png
similarity index 100%
rename from app/src/main/play/pl-PL/listing/phoneScreenshots/timetable-widget.png
rename to app/src/main/play/listings/pl-PL/graphics/phone-screenshots/timetable-widget.png
diff --git a/app/src/main/play/pl-PL/listing/shortdescription b/app/src/main/play/listings/pl-PL/short-description.txt
similarity index 100%
rename from app/src/main/play/pl-PL/listing/shortdescription
rename to app/src/main/play/listings/pl-PL/short-description.txt
diff --git a/app/src/main/play/pl-PL/listing/title b/app/src/main/play/listings/pl-PL/title.txt
similarity index 100%
rename from app/src/main/play/pl-PL/listing/title
rename to app/src/main/play/listings/pl-PL/title.txt
diff --git a/app/src/main/play/pl-PL/listing/icon/icon.png b/app/src/main/play/pl-PL/listing/icon/icon.png
deleted file mode 100644
index de216d36b..000000000
Binary files a/app/src/main/play/pl-PL/listing/icon/icon.png and /dev/null differ
diff --git a/app/src/main/play/pl-PL/listing/video b/app/src/main/play/pl-PL/listing/video
deleted file mode 100644
index e69de29bb..000000000
diff --git a/app/src/main/play/pl-PL/whatsnew b/app/src/main/play/pl-PL/whatsnew
deleted file mode 100644
index 81ff753b0..000000000
--- a/app/src/main/play/pl-PL/whatsnew
+++ /dev/null
@@ -1,7 +0,0 @@
-Wersja 0.6.3
-
-- naprawiono problem ze stabilnością przy odczytywaniu ocen
-- poprawiono komunikat o błędzie podczas przerwy technicznej dziennika
-- (ponownie) naprawiono logowanie w systemach Resman Rzeszów i podobnych
-
-Pełna lista zmian: https://github.com/wulkanowy/wulkanowy/releases/tag/0.6.3
diff --git a/app/src/main/play/release-notes/pl-PL/default.txt b/app/src/main/play/release-notes/pl-PL/default.txt
new file mode 100644
index 000000000..d1f8f1e7f
--- /dev/null
+++ b/app/src/main/play/release-notes/pl-PL/default.txt
@@ -0,0 +1,10 @@
+Wersja 0.8.3
+
+Naprawiliśmy:
+- rzadkie problemy z wczytywaniem treści wiadomości
+- rzadkie problemy z wyświetlaniem poprawnego nauczyciela przy zastępstwach
+
+Zmieniliśmy:
+- tekst wskazówki przy wprowadzaniu symbolu w formularzu logowania
+
+Pełna lista zmian: https://github.com/wulkanowy/wulkanowy/releases
diff --git a/app/src/main/res/drawable-anydpi-v24/ic_stat_notify_lucky_number.xml b/app/src/main/res/drawable-anydpi-v24/ic_stat_notify_lucky_number.xml
new file mode 100644
index 000000000..00538168f
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi-v24/ic_stat_notify_lucky_number.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="26.086956"
+    android:viewportHeight="26.086956"
+    android:tint="#FFFFFF">
+    <group
+        android:translateX="1.0434783"
+        android:translateY="1.0434783">
+        <path
+            android:fillColor="#FFFFFF"
+            android:pathData="M12,11.18C15.3,8.18 17,6.64 17,4.69C17,3.19 15.75,2 14.25,2C13.39,2 12.57,2.36 12,3C11.43,2.36 10.61,2 9.69,2C8.19,2 7,3.25 7,4.75C7,6.64 8.7,8.18 12,11.18M11.18,12C8.18,8.7 6.64,7 4.69,7C3.19,7 2,8.25 2,9.75C2,10.61 2.36,11.43 3,12C2.36,12.57 2,13.39 2,14.31C2,15.81 3.25,17 4.75,17C6.64,17 8.18,15.3 11.18,12M12.83,12C15.82,15.3 17.36,17 19.31,17C20.81,17 22,15.75 22,14.25C22,13.39 21.64,12.57 21,12C21.64,11.43 22,10.61 22,9.69C22,8.19 20.75,7 19.25,7C17.36,7 15.82,8.7 12.83,12M12,12.82C8.7,15.82 7,17.36 7,19.31C7,20.81 8.25,22 9.75,22C10.61,22 11.43,21.64 12,21C12.57,21.64 13.39,22 14.31,22C15.81,22 17,20.75 17,19.25C17,17.36 15.3,15.82 12,12.82Z" />
+    </group>
+</vector>
diff --git a/app/src/main/res/drawable-hdpi/ic_stat_notify_lucky_number.png b/app/src/main/res/drawable-hdpi/ic_stat_notify_lucky_number.png
new file mode 100644
index 000000000..b91c4ae6c
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_stat_notify_lucky_number.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_widget_account.png b/app/src/main/res/drawable-hdpi/ic_widget_account.png
new file mode 100644
index 000000000..4cb5ac89e
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_widget_account.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_stat_notify_lucky_number.png b/app/src/main/res/drawable-mdpi/ic_stat_notify_lucky_number.png
new file mode 100644
index 000000000..bfced4eb0
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_stat_notify_lucky_number.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_widget_account.png b/app/src/main/res/drawable-mdpi/ic_widget_account.png
new file mode 100644
index 000000000..237a6b6c2
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_widget_account.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_stat_notify_lucky_number.png b/app/src/main/res/drawable-xhdpi/ic_stat_notify_lucky_number.png
new file mode 100644
index 000000000..49e502ac0
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_stat_notify_lucky_number.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_widget_account.png b/app/src/main/res/drawable-xhdpi/ic_widget_account.png
new file mode 100644
index 000000000..0ea798a8a
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_widget_account.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_stat_notify_lucky_number.png b/app/src/main/res/drawable-xxhdpi/ic_stat_notify_lucky_number.png
new file mode 100644
index 000000000..9bab13731
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_stat_notify_lucky_number.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_widget_account.png b/app/src/main/res/drawable-xxhdpi/ic_widget_account.png
new file mode 100644
index 000000000..0f8933b17
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_widget_account.png differ
diff --git a/app/src/main/res/drawable/background_rounded_corner.xml b/app/src/main/res/drawable/background_rounded_corner.xml
new file mode 100644
index 000000000..116973b54
--- /dev/null
+++ b/app/src/main/res/drawable/background_rounded_corner.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#ffffffff" />
+    <corners android:radius="5dp" />
+</shape>
diff --git a/app/src/main/res/drawable/ic_all_close_circle_24dp.xml b/app/src/main/res/drawable/ic_all_close_circle_24dp.xml
new file mode 100644
index 000000000..3809c7979
--- /dev/null
+++ b/app/src/main/res/drawable/ic_all_close_circle_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M12,20C7.59,20 4,16.41 4,12C4,7.59 7.59,4 12,4C16.41,4 20,7.59 20,12C20,16.41 16.41,20 12,20M12,2C6.47,2 2,6.47 2,12C2,17.53 6.47,22 12,22C17.53,22 22,17.53 22,12C22,6.47 17.53,2 12,2M14.59,8L12,10.59L9.41,8L8,9.41L10.59,12L8,14.59L9.41,16L12,13.41L14.59,16L16,14.59L13.41,12L16,9.41L14.59,8Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_login_outlined_border.xml b/app/src/main/res/drawable/ic_login_outlined_border.xml
new file mode 100644
index 000000000..c5d3c6867
--- /dev/null
+++ b/app/src/main/res/drawable/ic_login_outlined_border.xml
@@ -0,0 +1,12 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@null" />
+    <stroke
+        android:width="1dip"
+        android:color="@color/spinner_stroke" />
+    <corners android:radius="4dip" />
+    <padding
+        android:bottom="0dip"
+        android:left="0dip"
+        android:right="0dip"
+        android:top="0dip" />
+</shape>
diff --git a/app/src/main/res/drawable/ic_menu_grade_semester_24dp.xml b/app/src/main/res/drawable/ic_menu_grade_semester_24dp.xml
index dbc32c27d..2a03f6300 100644
--- a/app/src/main/res/drawable/ic_menu_grade_semester_24dp.xml
+++ b/app/src/main/res/drawable/ic_menu_grade_semester_24dp.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0">
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M10,18h4v-2h-4v2zM3,6v2h18L21,6L3,6zM6,13h12v-2L6,11v2z" />
+        android:pathData="M21,17V8H7V17H21M21,3A2,2 0,0 1,23 5V17A2,2 0,0 1,21 19H7C5.89,19 5,18.1 5,17V5A2,2 0,0 1,7 3H8V1H10V3H18V1H20V3H21M3,21H17V23H3C1.89,23 1,22.1 1,21V9H3V21M19,15H15V11H19V15Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_menu_main_lessons_completed_24dp.xml b/app/src/main/res/drawable/ic_menu_main_lessons_completed_24dp.xml
new file mode 100644
index 000000000..c0664c370
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu_main_lessons_completed_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M19,19H5V8H19M19,3H18V1H16V3H8V1H6V3H5C3.89,3 3,3.9 3,5V19A2,2 0,0 0,5 21H19A2,2 0,0 0,21 19V5A2,2 0,0 0,19 3M16.53,11.06L15.47,10L10.59,14.88L8.47,12.76L7.41,13.82L10.59,17L16.53,11.06Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_menu_send_message_24dp.xml b/app/src/main/res/drawable/ic_menu_send_message_24dp.xml
new file mode 100644
index 000000000..fcc5acfb0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu_send_message_24dp.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_message_delete_24dp.xml b/app/src/main/res/drawable/ic_message_delete_24dp.xml
new file mode 100644
index 000000000..3760de238
--- /dev/null
+++ b/app/src/main/res/drawable/ic_message_delete_24dp.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_message_forward_24dp.xml b/app/src/main/res/drawable/ic_message_forward_24dp.xml
new file mode 100644
index 000000000..2b7c32c75
--- /dev/null
+++ b/app/src/main/res/drawable/ic_message_forward_24dp.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,8V4l8,8 -8,8v-4H4V8z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_message_reply_24dp.xml b/app/src/main/res/drawable/ic_message_reply_24dp.xml
new file mode 100644
index 000000000..010cb250b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_message_reply_24dp.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M10,9V5l-7,7 7,7v-4.1c5,0 8.5,1.6 11,5.1 -1,-5 -4,-10 -11,-11z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_more_lucky_number_24dp.xml b/app/src/main/res/drawable/ic_more_lucky_number_24dp.xml
new file mode 100644
index 000000000..f2e6152d8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_more_lucky_number_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M12,11.18C15.3,8.18 17,6.64 17,4.69C17,3.19 15.75,2 14.25,2C13.39,2 12.57,2.36 12,3C11.43,2.36 10.61,2 9.69,2C8.19,2 7,3.25 7,4.75C7,6.64 8.7,8.18 12,11.18M11.18,12C8.18,8.7 6.64,7 4.69,7C3.19,7 2,8.25 2,9.75C2,10.61 2.36,11.43 3,12C2.36,12.57 2,13.39 2,14.31C2,15.81 3.25,17 4.75,17C6.64,17 8.18,15.3 11.18,12M12.83,12C15.82,15.3 17.36,17 19.31,17C20.81,17 22,15.75 22,14.25C22,13.39 21.64,12.57 21,12C21.64,11.43 22,10.61 22,9.69C22,8.19 20.75,7 19.25,7C17.36,7 15.82,8.7 12.83,12M12,12.82C8.7,15.82 7,17.36 7,19.31C7,20.81 8.25,22 9.75,22C10.61,22 11.43,21.64 12,21C12.57,21.64 13.39,22 14.31,22C15.81,22 17,20.75 17,19.25C17,17.36 15.3,15.82 12,12.82Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_send_message_24dp.xml b/app/src/main/res/drawable/ic_send_message_24dp.xml
new file mode 100644
index 000000000..0d82394be
--- /dev/null
+++ b/app/src/main/res/drawable/ic_send_message_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M20.71,7.04C21.1,6.65 21.1,6 20.71,5.63L18.37,3.29C18,2.9 17.35,2.9 16.96,3.29L15.12,5.12L18.87,8.87M3,17.25V21H6.75L17.81,9.93L14.06,6.18L3,17.25Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_widget_clover_24dp.png b/app/src/main/res/drawable/ic_widget_clover_24dp.png
new file mode 100644
index 000000000..b1a7832a2
Binary files /dev/null and b/app/src/main/res/drawable/ic_widget_clover_24dp.png differ
diff --git a/app/src/main/res/drawable/img_luckynumber_widget_preview.png b/app/src/main/res/drawable/img_luckynumber_widget_preview.png
new file mode 100644
index 000000000..539b0a598
Binary files /dev/null and b/app/src/main/res/drawable/img_luckynumber_widget_preview.png differ
diff --git a/app/src/main/res/drawable/img_timetable_widget_preview.png b/app/src/main/res/drawable/img_timetable_widget_preview.png
index 60a35ab6a..550260258 100644
Binary files a/app/src/main/res/drawable/img_timetable_widget_preview.png and b/app/src/main/res/drawable/img_timetable_widget_preview.png differ
diff --git a/app/src/main/res/layout/activity_send_message.xml b/app/src/main/res/layout/activity_send_message.xml
new file mode 100644
index 000000000..00b0e77ce
--- /dev/null
+++ b/app/src/main/res/layout/activity_send_message.xml
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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"
+    android:id="@+id/sendMessageContainer"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/sendMessageAppBarContainer"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="@style/WulkanowyTheme.ActionBar"
+        app:elevation="0dp">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/sendMessageToolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize" />
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <LinearLayout
+        android:id="@+id/sendMessageContent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/sendMessageAppBarContainer"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="14dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="10dp"
+                android:layout_marginRight="10dp"
+                android:text="@string/message_from"
+                android:textColor="@android:color/darker_gray"
+                android:textSize="18sp" />
+
+            <androidx.appcompat.widget.AppCompatEditText
+                android:id="@+id/sendMessageFromTextView"
+                android:layout_width="match_parent"
+                android:layout_height="30dp"
+                android:background="@android:color/transparent"
+                android:enabled="false"
+                android:textColor="?android:attr/textColorPrimaryNoDisable"
+                tools:text="Jan Kowalski" />
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="?attr/dividerColor" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="58dp"
+            android:paddingStart="14dp"
+            android:paddingLeft="14dp"
+            tools:ignore="RtlSymmetry">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginEnd="10dp"
+                android:layout_marginRight="10dp"
+                android:text="@string/message_to"
+                android:textAlignment="center"
+                android:textColor="@android:color/darker_gray"
+                android:textSize="18sp" />
+
+            <com.pchmn.materialchips.ChipsInput
+                android:id="@+id/sendMessageRecipientsInput"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:background="@android:color/transparent"
+                app:horizontalScroll="true"
+                tools:layout_height="30dp">
+
+            </com.pchmn.materialchips.ChipsInput>
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="?attr/dividerColor" />
+
+        <androidx.appcompat.widget.AppCompatEditText
+            android:id="@+id/sendMessageSubjectInput"
+            android:layout_width="match_parent"
+            android:layout_height="58dp"
+            android:background="@android:color/transparent"
+            android:hint="@string/message_subject"
+            android:inputType="text"
+            android:maxLines="1"
+            android:padding="14dp" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="?attr/dividerColor" />
+
+        <androidx.appcompat.widget.AppCompatEditText
+            android:id="@+id/sendMessageContentInput"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@android:color/transparent"
+            android:gravity="top|start"
+            android:hint="@string/message_content"
+            android:inputType="textMultiLine"
+            android:paddingStart="14dp"
+            android:paddingLeft="14dp"
+            android:paddingTop="18dp"
+            android:paddingEnd="14dp"
+            android:paddingRight="14dp"
+            android:singleLine="false" />
+    </LinearLayout>
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/sendMessageAppBarContainer">
+
+        <LinearLayout
+            android:id="@+id/sendMessageEmpty"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:orientation="vertical"
+            android:visibility="gone">
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:minWidth="100dp"
+                android:minHeight="100dp"
+                app:srcCompat="@drawable/ic_more_messages_24dp" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:text="@string/error_unknown"
+                android:textSize="20sp" />
+        </LinearLayout>
+
+        <ProgressBar
+            android:id="@+id/sendMessageProgress"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:visibility="gone" />
+    </FrameLayout>
+</RelativeLayout>
diff --git a/app/src/main/res/layout/activity_widget_configure.xml b/app/src/main/res/layout/activity_widget_configure.xml
new file mode 100644
index 000000000..192776e63
--- /dev/null
+++ b/app/src/main/res/layout/activity_widget_configure.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="280dp"
+    android:layout_height="wrap_content">
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/widgetConfigureTitle"
+        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:textColor="?android:textColorPrimary"
+        android:textSize="20sp"
+        android:textStyle="bold"
+        app:firstBaselineToTopHeight="40dp" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/widgetConfigureRecycler"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/widgetConfigureTitle"
+        android:layout_marginBottom="16dp"
+        android:overScrollMode="never"
+        tools:itemCount="3"
+        tools:listitem="@layout/item_account" />
+</RelativeLayout>
diff --git a/app/src/main/res/layout/dialog_grade.xml b/app/src/main/res/layout/dialog_grade.xml
index 13224afb3..7a670878d 100644
--- a/app/src/main/res/layout/dialog_grade.xml
+++ b/app/src/main/res/layout/dialog_grade.xml
@@ -2,7 +2,8 @@
 <ScrollView 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">
+    android:layout_height="match_parent"
+    tools:context=".ui.modules.grade.details.GradeDetailsDialog">
 
     <LinearLayout
         android:layout_width="wrap_content"
@@ -24,11 +25,11 @@
                 android:layout_alignParentEnd="true"
                 android:layout_alignParentRight="true"
                 android:layout_gravity="end"
-                android:background="@color/grade_default"
+                android:background="@color/grade_material_default"
                 android:gravity="center"
-                android:text="@string/app_name"
                 android:textColor="@color/grade_text"
-                android:textSize="30sp" />
+                android:textSize="30sp"
+                tools:text="6" />
 
             <TextView
                 android:id="@+id/gradeDialogSubject"
diff --git a/app/src/main/res/layout/dialog_lesson_completed.xml b/app/src/main/res/layout/dialog_lesson_completed.xml
new file mode 100644
index 000000000..161eb4c5b
--- /dev/null
+++ b/app/src/main/res/layout/dialog_lesson_completed.xml
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView 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"
+    tools:context=".ui.modules.timetable.completed.CompletedLessonDialog">
+
+    <LinearLayout
+        android:layout_width="300dp"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:padding="20dp">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            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/timetable_lesson"
+            android:textSize="17sp" />
+
+        <TextView
+            android:id="@+id/completedLessonDialogSubject"
+            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/completed_lessons_topic"
+            android:textSize="17sp" />
+
+        <TextView
+            android:id="@+id/completedLessonDialogTopic"
+            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:id="@+id/completedLessonDialogTeacherTitle"
+            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/completedLessonDialogTeacher"
+            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:id="@+id/completedLessonDialogChangesTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:text="@string/timetable_changes"
+            android:textColor="@color/colorPrimary"
+            android:textSize="17sp" />
+
+        <TextView
+            android:id="@+id/completedLessonDialogChanges"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="3dp"
+            android:text="@string/all_no_data"
+            android:textColor="@color/colorPrimary"
+            android:textIsSelectable="true"
+            android:textSize="12sp" />
+
+        <TextView
+            android:id="@+id/completedLessonDialogAbsenceTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:text="@string/completed_lessons_absence"
+            android:textColor="@color/colorPrimary"
+            android:textSize="17sp" />
+
+        <TextView
+            android:id="@+id/completedLessonDialogAbsence"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="3dp"
+            android:text="@string/all_no_data"
+            android:textColor="@color/colorPrimary"
+            android:textIsSelectable="true"
+            android:textSize="12sp" />
+
+        <TextView
+            android:id="@+id/completedLessonDialogResourcesTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:text="@string/completed_lessons_resources"
+            android:textSize="17sp" />
+
+        <TextView
+            android:id="@+id/completedLessonDialogResources"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="3dp"
+            android:autoLink="web"
+            android:text="@string/all_no_data"
+            android:textIsSelectable="true"
+            android:textSize="12sp" />
+
+        <Button
+            android:id="@+id/completedLessonDialogClose"
+            style="@style/Widget.AppCompat.Button.Borderless"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end"
+            android:layout_marginTop="15dp"
+            android:text="@string/all_close"
+            android:textAllCaps="true"
+            android:textSize="15sp" />
+
+    </LinearLayout>
+</ScrollView>
diff --git a/app/src/main/res/layout/dialog_timetable.xml b/app/src/main/res/layout/dialog_timetable.xml
index c9c8ec061..1cb650260 100644
--- a/app/src/main/res/layout/dialog_timetable.xml
+++ b/app/src/main/res/layout/dialog_timetable.xml
@@ -51,6 +51,17 @@
             android:textIsSelectable="true"
             android:textSize="12sp" />
 
+        <TextView
+            android:id="@+id/timetableDialogSubjectNew"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="3dp"
+            android:text="@string/all_no_data"
+            android:textColor="@color/colorPrimary"
+            android:textIsSelectable="true"
+            android:textSize="12sp"
+            android:visibility="gone" />
+
         <TextView
             android:id="@+id/timetableDialogTeacherTitle"
             android:layout_width="wrap_content"
@@ -68,6 +79,17 @@
             android:textIsSelectable="true"
             android:textSize="12sp" />
 
+        <TextView
+            android:id="@+id/timetableDialogTeacherNew"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="3dp"
+            android:text="@string/all_no_data"
+            android:textColor="@color/colorPrimary"
+            android:textIsSelectable="true"
+            android:textSize="12sp"
+            android:visibility="gone" />
+
         <TextView
             android:id="@+id/timetableDialogGroupTitle"
             android:layout_width="wrap_content"
@@ -102,6 +124,17 @@
             android:textIsSelectable="true"
             android:textSize="12sp" />
 
+        <TextView
+            android:id="@+id/timetableDialogRoomNew"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="3dp"
+            android:text="@string/all_no_data"
+            android:textColor="@color/colorPrimary"
+            android:textIsSelectable="true"
+            android:textSize="12sp"
+            android:visibility="gone" />
+
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_grade.xml b/app/src/main/res/layout/fragment_grade.xml
index 522312a28..bf8051753 100644
--- a/app/src/main/res/layout/fragment_grade.xml
+++ b/app/src/main/res/layout/fragment_grade.xml
@@ -5,32 +5,39 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.google.android.material.tabs.TabLayout
+    <io.github.wulkanowy.ui.modules.grade.CustomTabLayout
         android:id="@+id/gradeTabLayout"
         android:layout_width="match_parent"
         android:layout_height="48dp"
         android:background="@color/colorPrimary"
         android:elevation="5dp"
         android:visibility="invisible"
-        app:tabGravity="fill"
         app:tabIndicatorColor="@android:color/white"
-        app:tabMaxWidth="0dp"
-        app:tabMode="fixed"
-        app:tabTextColor="@android:color/white" />
+        app:tabMode="scrollable"
+        app:tabTextColor="@android:color/white"
+        tools:visibility="visible" />
 
-    <androidx.viewpager.widget.ViewPager
-        android:id="@+id/gradeViewPager"
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+        android:id="@+id/gradeSwipe"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="48dp"
-        android:visibility="invisible" />
+        android:layout_marginTop="48dp">
+
+        <androidx.viewpager.widget.ViewPager
+            android:id="@+id/gradeViewPager"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:visibility="invisible"
+            tools:visibility="visible" />
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
     <ProgressBar
         android:id="@+id/gradeProgress"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:indeterminate="true" />
+        android:indeterminate="true"
+        tools:visibility="invisible" />
 
     <LinearLayout
         android:id="@+id/gradeEmpty"
@@ -38,7 +45,8 @@
         android:layout_height="match_parent"
         android:gravity="center"
         android:orientation="vertical"
-        android:visibility="invisible">
+        android:visibility="invisible"
+        tools:visibility="visible">
 
         <androidx.appcompat.widget.AppCompatImageView
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/fragment_grade_details.xml b/app/src/main/res/layout/fragment_grade_details.xml
index aab810752..610006e17 100644
--- a/app/src/main/res/layout/fragment_grade_details.xml
+++ b/app/src/main/res/layout/fragment_grade_details.xml
@@ -2,7 +2,8 @@
     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:layout_height="match_parent"
+    tools:context=".ui.modules.grade.details.GradeDetailsFragment">
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/gradeDetailsSwipe"
@@ -20,7 +21,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:indeterminate="true" />
+        android:indeterminate="true"
+        tools:visibility="gone" />
 
     <LinearLayout
         android:id="@+id/gradeDetailsEmpty"
diff --git a/app/src/main/res/layout/fragment_grade_statistics.xml b/app/src/main/res/layout/fragment_grade_statistics.xml
new file mode 100644
index 000000000..9c7f37952
--- /dev/null
+++ b/app/src/main/res/layout/fragment_grade_statistics.xml
@@ -0,0 +1,130 @@
+<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="match_parent"
+    android:orientation="vertical"
+    tools:context=".ui.modules.grade.statistics.GradeStatisticsFragment">
+
+    <LinearLayout
+        android:id="@+id/gradeStatisticsSubjectsContainer"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?android:attr/windowBackground"
+        android:elevation="5dp"
+        android:padding="5dp"
+        android:visibility="invisible"
+        tools:listitem="@layout/item_attendance_summary"
+        tools:targetApi="lollipop"
+        tools:visibility="visible">
+
+        <androidx.appcompat.widget.AppCompatSpinner
+            android:id="@+id/gradeStatisticsSubjects"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ellipsize="middle"
+            android:entries="@array/endpoints_keys"
+            android:paddingStart="10dp"
+            android:paddingLeft="10dp"
+            android:paddingTop="10dp"
+            android:paddingEnd="30dp"
+            android:paddingRight="30dp"
+            android:paddingBottom="10dp"
+            android:spinnerMode="dialog" />
+    </LinearLayout>
+
+
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+        android:id="@+id/gradeStatisticsSwipe"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:fillViewport="true">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <RadioGroup
+                    android:id="@+id/gradeStatisticsTypeSwitch"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:gravity="center"
+                    android:orientation="horizontal"
+                    android:paddingTop="5dp"
+                    android:visibility="invisible"
+                    tools:visibility="visible">
+
+                    <RadioButton
+                        android:id="@+id/gradeStatisticsTypePartial"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:checked="true"
+                        android:tag="partial"
+                        android:text="@string/grade_statistics_partial" />
+
+                    <RadioButton
+                        android:id="@+id/gradeStatisticsTypeSemester"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:tag="annual"
+                        android:text="@string/grade_statistics_semester" />
+                </RadioGroup>
+
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
+
+                    <com.github.mikephil.charting.charts.PieChart
+                        android:id="@+id/gradeStatisticsChart"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_margin="10dp"
+                        android:background="?android:attr/windowBackground"
+                        android:minHeight="400dp"
+                        android:visibility="gone"
+                        tools:visibility="visible" />
+
+                    <ProgressBar
+                        android:id="@+id/gradeStatisticsProgress"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:indeterminate="true"
+                        tools:visibility="gone" />
+
+                    <LinearLayout
+                        android:id="@+id/gradeStatisticsEmpty"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:gravity="center"
+                        android:orientation="vertical"
+                        android:visibility="invisible">
+
+                        <androidx.appcompat.widget.AppCompatImageView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:minWidth="100dp"
+                            android:minHeight="100dp"
+                            app:srcCompat="@drawable/ic_menu_main_grade_26dp"
+                            app:tint="?android:attr/textColorPrimary"
+                            tools:ignore="contentDescription" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="20dp"
+                            android:gravity="center"
+                            android:text="@string/grade_no_items"
+                            android:textSize="20sp" />
+                    </LinearLayout>
+                </FrameLayout>
+            </LinearLayout>
+        </ScrollView>
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_grade_summary.xml b/app/src/main/res/layout/fragment_grade_summary.xml
index 37b970287..92a34f71c 100644
--- a/app/src/main/res/layout/fragment_grade_summary.xml
+++ b/app/src/main/res/layout/fragment_grade_summary.xml
@@ -2,7 +2,8 @@
     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:layout_height="match_parent"
+    tools:context=".ui.modules.grade.summary.GradeSummaryFragment">
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/gradeSummarySwipe"
@@ -20,7 +21,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:indeterminate="true" />
+        android:indeterminate="true"
+        tools:visibility="gone" />
 
     <LinearLayout
         android:id="@+id/gradeSummaryEmpty"
diff --git a/app/src/main/res/layout/fragment_login_form.xml b/app/src/main/res/layout/fragment_login_form.xml
index a2ee86474..553c87260 100644
--- a/app/src/main/res/layout/fragment_login_form.xml
+++ b/app/src/main/res/layout/fragment_login_form.xml
@@ -1,147 +1,201 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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">
 
-    <RelativeLayout
-        android:id="@+id/loginFormProgressContainer"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentTop="true"
-        android:gravity="center"
-        android:visibility="gone">
-
-        <ProgressBar
-            style="?android:attr/progressBarStyleHorizontal"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/loginFormProgressText"
-            android:layout_centerHorizontal="true"
-            android:indeterminate="true"
-            android:minWidth="220dp"
-            android:minHeight="30dp" />
-
-        <TextView
-            android:id="@+id/loginFormProgressText"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:layout_marginBottom="15dp"
-            android:text="@string/login_progress" />
-    </RelativeLayout>
-
-    <ScrollView
-        android:id="@+id/loginScroll"
+    <ProgressBar
+        android:id="@+id/loginFormProgress"
+        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">
 
-        <LinearLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/loginFormContainer"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="16dp"
-            android:layout_marginTop="16dp"
-            android:layout_marginRight="16dp"
-            android:orientation="vertical">
+            android:layout_height="wrap_content">
 
             <TextView
-                android:id="@+id/loginHeader"
+                android:id="@+id/loginFormHeader"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="20dp"
-                android:layout_marginBottom="24dp"
+                android:layout_marginStart="32dp"
+                android:layout_marginLeft="32dp"
+                android:layout_marginTop="32dp"
+                android:layout_marginEnd="32dp"
+                android:layout_marginRight="32dp"
+                android:gravity="center_horizontal"
                 android:text="@string/login_header_default"
-                android:textSize="16sp" />
+                android:textSize="16sp"
+                app:fontFamily="sans-serif-light"
+                app:layout_constraintBottom_toTopOf="@+id/loginFormNameLayout"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintVertical_chainStyle="packed" />
 
-            <LinearLayout
-                android:id="@+id/loginMainForm"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <com.google.android.material.textfield.TextInputLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="15dp"
-                    android:hint="@string/login_nickname_hint">
-
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:id="@+id/loginNicknameEdit"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:inputType="textEmailAddress"
-                        android:maxLines="1" />
-
-                </com.google.android.material.textfield.TextInputLayout>
-
-                <com.google.android.material.textfield.TextInputLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="15dp"
-                    android:hint="@string/login_password_hint">
-
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:id="@+id/loginPassEdit"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:imeActionLabel="@string/login_sign_in"
-                        android:imeOptions="actionDone"
-                        android:inputType="textPassword"
-                        android:maxLines="1"
-                        app:fontFamily="sans-serif" />
-
-                </com.google.android.material.textfield.TextInputLayout>
-
-                <androidx.appcompat.widget.AppCompatSpinner
-                    android:id="@+id/loginHostEdit"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/login_host_hint" />
-            </LinearLayout>
 
             <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/loginSymbolInput"
+                android:id="@+id/loginFormNameLayout"
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:hint="@string/login_symbol_hint"
-                android:visibility="gone">
+                android:layout_marginStart="24dp"
+                android:layout_marginLeft="24dp"
+                android:layout_marginTop="48dp"
+                android:layout_marginEnd="24dp"
+                android:layout_marginRight="24dp"
+                android:hint="@string/login_nickname_hint"
+                app:errorEnabled="true"
+                app:layout_constraintBottom_toTopOf="@+id/loginFormPassLayout"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/loginFormHeader">
 
-                <AutoCompleteTextView
-                    android:id="@+id/loginSymbolEdit"
+                <androidx.appcompat.widget.AppCompatEditText
+                    android:id="@+id/loginFormName"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:inputType="textEmailAddress"
+                    android:maxLines="1" />
+
+                <requestFocus />
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/loginFormPassLayout"
+                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="8dp"
+                android:layout_marginEnd="24dp"
+                android:layout_marginRight="24dp"
+                android:hint="@string/login_password_hint"
+                app:errorEnabled="true"
+                app:layout_constraintBottom_toTopOf="@+id/loginFormHostLayout"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/loginFormNameLayout"
+                app:passwordToggleEnabled="true">
+
+                <androidx.appcompat.widget.AppCompatEditText
+                    android:id="@+id/loginFormPass"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:imeActionLabel="@string/login_sign_in"
                     android:imeOptions="actionDone"
-                    android:inputType="textAutoComplete"
+                    android:inputType="textPassword"
                     android:maxLines="1"
-                    tools:ignore="LabelFor" />
+                    app:fontFamily="sans-serif" />
+
             </com.google.android.material.textfield.TextInputLayout>
 
-            <androidx.appcompat.widget.AppCompatButton
-                android:id="@+id/loginSignButton"
-                style="?android:textAppearanceSmall"
+            <LinearLayout
+                android:id="@+id/loginFormHostLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="20dp"
-                android:layout_marginBottom="30dp"
-                android:text="@string/login_sign_in"
-                android:textColor="@android:color/white"
-                android:textStyle="bold"
-                app:backgroundTint="@color/colorPrimary" />
+                android:layout_marginStart="24dp"
+                android:layout_marginLeft="24dp"
+                android:layout_marginTop="16dp"
+                android:layout_marginEnd="24dp"
+                android:layout_marginRight="24dp"
+                android:background="@drawable/ic_login_outlined_border"
+                android:orientation="vertical"
+                app:layout_constraintBottom_toTopOf="@+id/loginFormSignIn"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/loginFormPassLayout">
+
+                <androidx.appcompat.widget.AppCompatSpinner
+                    android:id="@+id/loginFormHost"
+                    android:layout_width="match_parent"
+                    android:layout_height="56dp"
+                    android:entries="@array/endpoints_keys" />
+            </LinearLayout>
 
             <TextView
-                android:id="@+id/loginVersion"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginBottom="30dp"
-                android:text="@string/app_name"
-                android:textColor="@color/second_text"
-                android:visibility="gone" />
-        </LinearLayout>
-    </ScrollView>
-</RelativeLayout>
+                android:layout_marginStart="7dp"
+                android:layout_marginLeft="7dp"
+                android:layout_marginBottom="48dp"
+                android:background="?android:windowBackground"
+                android:paddingLeft="4dp"
+                android:paddingRight="4dp"
+                android:text="@string/login_host_hint"
+                android:textColor="?android:textColorHint"
+                android:textSize="12sp"
+                app:layout_constraintBottom_toBottomOf="@+id/loginFormHostLayout"
+                app:layout_constraintEnd_toEndOf="@+id/loginFormHostLayout"
+                app:layout_constraintHorizontal_bias="0.0"
+                app:layout_constraintStart_toStartOf="@+id/loginFormHostLayout" />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/loginFormSignIn"
+                style="@style/Widget.MaterialComponents.Button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                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"
+                android:textAppearance="?android:textAppearanceSmall"
+                android:textColor="@android:color/white"
+                android:textStyle="bold"
+                app:backgroundTint="@color/colorPrimary"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/loginFormHostLayout" />
+
+            <TextView
+                android:id="@+id/loginFormVersion"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="24dp"
+                android:layout_marginLeft="24dp"
+                android:layout_marginEnd="16dp"
+                android:layout_marginRight="16dp"
+                android:maxLines="2"
+                android:textColor="?android:textColorSecondary"
+                android:textSize="12sp"
+                android:visibility="invisible"
+                app:layout_constraintBottom_toBottomOf="@id/loginFormSignIn"
+                app:layout_constraintEnd_toStartOf="@+id/loginFormSignIn"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="@+id/loginFormSignIn"
+                tools:text="Version 1.0.0" />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/loginFormPrivacyLink"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="16dp"
+                android:layout_marginRight="16dp"
+                android:text="@string/login_privacy_policy"
+                android:textAppearance="?android:textAppearance"
+                android:textColor="@color/colorPrimary"
+                android:visibility="invisible"
+                app:backgroundTint="?android:windowBackground"
+                app:fontFamily="sans-serif-medium"
+                app:layout_constraintBottom_toBottomOf="@id/loginFormSignIn"
+                app:layout_constraintEnd_toStartOf="@+id/loginFormSignIn"
+                app:layout_constraintHorizontal_bias="0.0"
+                app:layout_constraintStart_toStartOf="@id/loginFormHostLayout"
+                app:layout_constraintTop_toTopOf="@+id/loginFormSignIn"
+                tools:visibility="visible" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.core.widget.NestedScrollView>
+</FrameLayout>
diff --git a/app/src/main/res/layout/fragment_login_options.xml b/app/src/main/res/layout/fragment_login_options.xml
deleted file mode 100644
index 45636ad8e..000000000
--- a/app/src/main/res/layout/fragment_login_options.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <RelativeLayout
-        android:id="@+id/loginOptionsProgressContainer"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:visibility="gone">
-
-        <ProgressBar
-            style="?android:attr/progressBarStyleHorizontal"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/loginOptionsProgressText"
-            android:layout_centerHorizontal="true"
-            android:indeterminate="true"
-            android:minHeight="30dp"
-            android:minWidth="220dp" />
-
-        <TextView
-            android:id="@+id/loginOptionsProgressText"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:layout_marginBottom="15dp"
-            android:text="@string/login_sync" />
-    </RelativeLayout>
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/loginOptionsRecycler"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_login_student_select.xml b/app/src/main/res/layout/fragment_login_student_select.xml
new file mode 100644
index 000000000..a94978bbf
--- /dev/null
+++ b/app/src/main/res/layout/fragment_login_student_select.xml
@@ -0,0 +1,72 @@
+<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"
+    android:orientation="vertical">
+
+    <ProgressBar
+        android:id="@+id/loginStudentSelectProgress"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:indeterminate="true"
+        android:visibility="gone" />
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/loginStudentSelectContent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <TextView
+            android:id="@+id/loginStudentSelectHeader"
+            android:layout_width="match_parent"
+            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_marginBottom="32dp"
+            android:gravity="center_horizontal"
+            android:text="@string/login_select_student"
+            android:textSize="16sp"
+            app:fontFamily="sans-serif-light"
+            app:layout_constraintBottom_toTopOf="@id/loginStudentSelectRecycler"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_chainStyle="packed" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/loginStudentSelectRecycler"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="144dp"
+            app:layout_constrainedHeight="true"
+            app:layout_constraintBottom_toTopOf="@id/loginStudentSelectSignIn"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHeight_max="432dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/loginStudentSelectHeader"
+            tools:itemCount="6"
+            tools:listitem="@layout/item_login_student_select" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/loginStudentSelectSignIn"
+            style="@style/Widget.MaterialComponents.Button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="32dp"
+            android:layout_marginEnd="24dp"
+            android:layout_marginRight="24dp"
+            android:layout_marginBottom="32dp"
+            android:text="@string/login_sign_in"
+            android:textAppearance="?android:textAppearanceSmall"
+            android:textColor="@android:color/white"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/loginStudentSelectRecycler" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</FrameLayout>
diff --git a/app/src/main/res/layout/fragment_login_symbol.xml b/app/src/main/res/layout/fragment_login_symbol.xml
new file mode 100644
index 000000000..6c820889f
--- /dev/null
+++ b/app/src/main/res/layout/fragment_login_symbol.xml
@@ -0,0 +1,96 @@
+<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">
+
+    <ProgressBar
+        android:id="@+id/loginSymbolProgress"
+        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:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fillViewport="true"
+        android:scrollbars="none">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/loginSymbolContainer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:id="@+id/loginSymbolHeader"
+                android:layout_width="match_parent"
+                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:gravity="center_horizontal"
+                android:text="@string/login_header_symbol"
+                android:textSize="16sp"
+                app:fontFamily="sans-serif-light"
+                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_toTopOf="parent"
+                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_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/loginSymbolHeader">
+
+                <androidx.appcompat.widget.AppCompatAutoCompleteTextView
+                    android:id="@+id/loginSymbolName"
+                    style="@style/Widget.MaterialComponents.TextInputEditText.OutlinedBox"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:imeActionLabel="@string/login_sign_in"
+                    android:imeOptions="actionDone"
+                    android:inputType="textAutoComplete"
+                    android:maxLines="1"
+                    tools:ignore="LabelFor" />
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/loginSymbolSignIn"
+                style="@style/Widget.MaterialComponents.Button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="48dp"
+                android:layout_marginEnd="24dp"
+                android:layout_marginRight="24dp"
+                android:layout_marginBottom="16dp"
+                android:text="@string/login_sign_in"
+                android:textAppearance="?android:textAppearanceSmall"
+                android:textColor="@android:color/white"
+                android:textStyle="bold"
+                app:backgroundTint="@color/colorPrimary"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/loginSymbolNameLayout" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.core.widget.NestedScrollView>
+</FrameLayout>
diff --git a/app/src/main/res/layout/fragment_lucky_number.xml b/app/src/main/res/layout/fragment_lucky_number.xml
new file mode 100644
index 000000000..b881f1bda
--- /dev/null
+++ b/app/src/main/res/layout/fragment_lucky_number.xml
@@ -0,0 +1,73 @@
+<?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"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ProgressBar
+        android:id="@+id/luckyNumberProgress"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:indeterminate="true"
+        tools:visibility="invisible" />
+
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+        android:id="@+id/luckyNumberSwipe"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <LinearLayout
+            android:id="@+id/luckyNumberContent"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="300dp"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="@string/lucky_number_header"
+                android:textSize="24sp" />
+
+            <TextView
+                android:id="@+id/luckyNumberText"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="52sp"
+                tools:text="14" />
+
+        </LinearLayout>
+
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+
+    <LinearLayout
+        android:id="@+id/luckyNumberEmpty"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:padding="10dp"
+        android:visibility="gone">
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:minWidth="100dp"
+            android:minHeight="100dp"
+            app:srcCompat="@drawable/ic_more_lucky_number_24dp"
+            app:tint="?android:attr/textColorPrimary" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:gravity="center"
+            android:text="@string/lucky_number_empty"
+            android:textSize="20sp" />
+
+    </LinearLayout>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index 53920bb2b..78edbb037 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -24,10 +24,22 @@
         android:layout_marginTop="48dp"
         android:visibility="invisible" />
 
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/openSendMessageButton"
+        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:tint="#FFFFFF"
+        app:srcCompat="@drawable/ic_send_message_24dp" />
+
     <ProgressBar
         android:id="@+id/messageProgress"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:indeterminate="true" />
+
 </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 c0f960457..962d94ac2 100644
--- a/app/src/main/res/layout/fragment_message_preview.xml
+++ b/app/src/main/res/layout/fragment_message_preview.xml
@@ -1,22 +1,23 @@
 <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:id="@+id/messagePreviewContainer"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <ScrollView
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
         <LinearLayout
-            android:id="@+id/message"
+            android:id="@+id/messagePreviewContentContainer"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
             android:padding="16dp">
 
             <TextView
-                android:id="@+id/messageSubject"
+                android:id="@+id/messagePreviewSubject"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="15dp"
@@ -25,7 +26,7 @@
                 tools:text="@tools:sample/lorem" />
 
             <TextView
-                android:id="@+id/messageAuthor"
+                android:id="@+id/messagePreviewAuthor"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="4dp"
@@ -34,7 +35,7 @@
                 tools:text="@tools:sample/full_names" />
 
             <TextView
-                android:id="@+id/messageDate"
+                android:id="@+id/messagePreviewDate"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="15dp"
@@ -43,7 +44,7 @@
                 tools:text="@tools:sample/date/ddmmyy" />
 
             <TextView
-                android:id="@+id/messageContent"
+                android:id="@+id/messagePreviewContent"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:autoLink="web"
@@ -51,11 +52,10 @@
                 android:textIsSelectable="true"
                 tools:text="@tools:sample/lorem" />
         </LinearLayout>
-
-    </ScrollView>
+    </androidx.core.widget.NestedScrollView>
 
     <LinearLayout
-        android:id="@+id/messageError"
+        android:id="@+id/messagePreviewError"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:gravity="center"
@@ -82,7 +82,7 @@
     </LinearLayout>
 
     <ProgressBar
-        android:id="@+id/messageProgress"
+        android:id="@+id/messagePreviewProgress"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/app/src/main/res/layout/fragment_timetable_completed.xml b/app/src/main/res/layout/fragment_timetable_completed.xml
new file mode 100644
index 000000000..381ae36c0
--- /dev/null
+++ b/app/src/main/res/layout/fragment_timetable_completed.xml
@@ -0,0 +1,99 @@
+<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.timetable.completed.CompletedLessonsFragment">
+
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginBottom="50dp">
+
+        <ProgressBar
+            android:id="@+id/completedLessonsProgress"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:indeterminate="true" />
+
+        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+            android:id="@+id/completedLessonsSwipe"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/completedLessonsRecycler"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+
+        <LinearLayout
+            android:id="@+id/completedLessonsEmpty"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:orientation="vertical"
+            android:padding="10dp"
+            android:visibility="gone">
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:minWidth="100dp"
+                android:minHeight="100dp"
+                android:id="@+id/completedLessonsInfoImage"
+                app:srcCompat="@drawable/ic_menu_main_lessons_completed_24dp"
+                app:tint="?android:attr/textColorPrimary"
+                tools:ignore="contentDescription" />
+
+            <TextView
+                android:id="@+id/completedLessonsInfo"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
+                android:gravity="center"
+                android:text="@string/completed_lessons_no_items"
+                android:textSize="20sp" />
+        </LinearLayout>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:layout_gravity="bottom"
+        android:background="?android:attr/windowBackground"
+        android:elevation="10dp"
+        android:orientation="horizontal">
+
+        <Button
+            android:id="@+id/completedLessonsPreviousButton"
+            style="@style/Widget.AppCompat.Button.Borderless"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:drawablePadding="4dp"
+            android:gravity="start|center"
+            android:text="@string/all_prev"
+            android:textAlignment="gravity" />
+
+        <TextView
+            android:id="@+id/completedLessonsNavDate"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:text="@string/app_name" />
+
+        <Button
+            android:id="@+id/completedLessonsNextButton"
+            style="@style/Widget.AppCompat.Button.Borderless"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end"
+            android:layout_weight="1"
+            android:drawablePadding="4dp"
+            android:gravity="end|center"
+            android:text="@string/all_next"
+            android:textAlignment="gravity" />
+    </LinearLayout>
+</FrameLayout>
diff --git a/app/src/main/res/layout/header_exam.xml b/app/src/main/res/layout/header_exam.xml
index 25faab325..e5b5af3d7 100644
--- a/app/src/main/res/layout/header_exam.xml
+++ b/app/src/main/res/layout/header_exam.xml
@@ -1,5 +1,6 @@
 <?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:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?colorControlHighlight"
@@ -8,7 +9,8 @@
     android:paddingLeft="20dp"
     android:paddingTop="10dp"
     android:paddingRight="20dp"
-    android:paddingBottom="10dp">
+    android:paddingBottom="10dp"
+    tools:context=".ui.modules.exam.ExamHeader">
 
     <TextView
         android:id="@+id/examHeaderDay"
diff --git a/app/src/main/res/layout/header_grade_details.xml b/app/src/main/res/layout/header_grade_details.xml
index f92aec62f..75e8388a9 100644
--- a/app/src/main/res/layout/header_grade_details.xml
+++ b/app/src/main/res/layout/header_grade_details.xml
@@ -1,14 +1,15 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tool="http://schemas.android.com/tools"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/gradeHeaderContainer"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/ic_all_divider"
-    android:foreground="?attr/selectableItemBackgroundBorderless"
+    android:background="?attr/selectableItemBackground"
     android:paddingLeft="16dp"
     android:paddingTop="10dp"
     android:paddingRight="16dp"
-    android:paddingBottom="10dp">
+    android:paddingBottom="10dp"
+    tools:context=".ui.modules.grade.details.GradeDetailsHeader">
 
     <TextView
         android:id="@+id/gradeHeaderSubject"
@@ -55,5 +56,5 @@
         android:layout_alignParentRight="true"
         android:layout_marginTop="10dp"
         app:srcCompat="@drawable/ic_all_round_note_24dp"
-        tool:ignore="contentDescription" />
+        tools:ignore="contentDescription" />
 </RelativeLayout>
diff --git a/app/src/main/res/layout/header_homework.xml b/app/src/main/res/layout/header_homework.xml
new file mode 100644
index 000000000..526e8150a
--- /dev/null
+++ b/app/src/main/res/layout/header_homework.xml
@@ -0,0 +1,33 @@
+<?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:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?colorControlHighlight"
+    android:minHeight="40dp"
+    android:orientation="horizontal"
+    android:paddingLeft="20dp"
+    android:paddingTop="10dp"
+    android:paddingRight="20dp"
+    android:paddingBottom="10dp"
+    tools:context=".ui.modules.homework.HomeworkHeader">
+
+    <TextView
+        android:id="@+id/homeworkHeaderDay"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:textSize="18sp"
+        tools:text="@tools:sample/date/day_of_week" />
+
+    <TextView
+        android:id="@+id/homeworkHeaderDate"
+        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="@tools:sample/date/ddmmyy" />
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/item_account.xml b/app/src/main/res/layout/item_account.xml
index bd844b5fa..5f76dded7 100644
--- a/app/src/main/res/layout/item_account.xml
+++ b/app/src/main/res/layout/item_account.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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"
     android:layout_height="56dp"
     android:background="?attr/selectableItemBackground"
@@ -8,7 +9,8 @@
     android:paddingStart="24dp"
     android:paddingLeft="24dp"
     android:paddingEnd="24dp"
-    android:paddingRight="24dp">
+    android:paddingRight="24dp"
+    tools:context=".ui.modules.account.AccountItem">
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/accountItemImage"
@@ -28,8 +30,11 @@
         android:layout_marginLeft="20dp"
         android:layout_toEndOf="@id/accountItemImage"
         android:layout_toRightOf="@id/accountItemImage"
-        android:text="@string/app_name"
-        android:textSize="16sp" />
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textSize="16sp"
+        tools:text="@tools:sample/lorem/random"
+        android:textColor="?android:textColorSecondary"/>
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/accountItemSchool"
@@ -43,6 +48,7 @@
         android:layout_toRightOf="@id/accountItemImage"
         android:ellipsize="end"
         android:maxLines="1"
-        android:text="@string/app_name"
-        android:textSize="12sp" />
+        android:textColor="?android:textColorSecondary"
+        android:textSize="12sp"
+        tools:text="@tools:sample/lorem/random" />
 </RelativeLayout>
diff --git a/app/src/main/res/layout/item_attendance.xml b/app/src/main/res/layout/item_attendance.xml
index 3195b21fa..be54b91b3 100644
--- a/app/src/main/res/layout/item_attendance.xml
+++ b/app/src/main/res/layout/item_attendance.xml
@@ -1,17 +1,17 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tool="http://schemas.android.com/tools"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/attendanceItemContainer"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/ic_all_divider"
-    android:foreground="?attr/selectableItemBackgroundBorderless"
+    android:background="?attr/selectableItemBackground"
     android:paddingStart="12dp"
     android:paddingLeft="12dp"
     android:paddingTop="7dp"
     android:paddingEnd="12dp"
     android:paddingRight="12dp"
-    android:paddingBottom="7dp">
+    android:paddingBottom="7dp"
+    tools:context=".ui.modules.attendance.AttendanceItem">
 
     <TextView
         android:id="@+id/attendanceItemNumber"
@@ -22,7 +22,7 @@
         android:maxLength="2"
         android:text="0"
         android:textSize="32sp"
-        tool:ignore="all" />
+        tools:ignore="all" />
 
     <TextView
         android:id="@+id/attendanceItemSubject"
@@ -39,7 +39,7 @@
         android:maxLines="1"
         android:text="@string/app_name"
         android:textSize="17sp"
-        tool:ignore="all" />
+        tools:ignore="all" />
 
     <TextView
         android:id="@+id/attendanceItemDescription"
@@ -61,6 +61,6 @@
         android:layout_alignParentRight="true"
         android:layout_marginTop="10dp"
         app:srcCompat="@drawable/ic_all_note_24dp"
-        tool:ignore="contentDescription" />
+        tools:ignore="contentDescription" />
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/item_completed_lesson.xml b/app/src/main/res/layout/item_completed_lesson.xml
new file mode 100644
index 000000000..a437bf8cc
--- /dev/null
+++ b/app/src/main/res/layout/item_completed_lesson.xml
@@ -0,0 +1,72 @@
+<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/completedLesson_subitem_container"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/ic_all_divider"
+    android:foreground="?attr/selectableItemBackgroundBorderless"
+    android:paddingStart="12dp"
+    android:paddingLeft="12dp"
+    android:paddingTop="7dp"
+    android:paddingEnd="12dp"
+    android:paddingRight="12dp"
+    android:paddingBottom="7dp"
+    tools:context=".ui.modules.timetable.completed.CompletedLessonItem">
+
+    <TextView
+        android:id="@+id/completedLessonItemNumber"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_centerVertical="true"
+        android:gravity="center"
+        android:maxLength="2"
+        android:textSize="32sp"
+        tools:ignore="all"
+        tools:text="1" />
+
+    <TextView
+        android:id="@+id/completedLessonItemSubject"
+        android:layout_width="wrap_content"
+        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_toEndOf="@+id/completedLessonItemNumber"
+        android:layout_toRightOf="@+id/completedLessonItemNumber"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textSize="17sp"
+        tools:ignore="RelativeOverlap"
+        tools:text="@tools:sample/lorem" />
+
+    <TextView
+        android:id="@+id/completedLessonItemTopic"
+        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:attr/android:textColorSecondary"
+        android:textSize="12sp"
+        tools:text="@tools:sample/lorem" />
+
+    <ImageView
+        android:id="@+id/completedLessonItemAlert"
+        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_timetable_swap_30dp"
+        tools:ignore="contentDescription" />
+
+</RelativeLayout>
diff --git a/app/src/main/res/layout/item_exam.xml b/app/src/main/res/layout/item_exam.xml
index cd44fb334..801e1dea2 100644
--- a/app/src/main/res/layout/item_exam.xml
+++ b/app/src/main/res/layout/item_exam.xml
@@ -1,9 +1,10 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/exams_subitem_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/ic_all_divider"
-    android:foreground="?attr/selectableItemBackgroundBorderless">
+    android:background="?attr/selectableItemBackground"
+    tools:context=".ui.modules.exam.ExamItem">
 
     <TextView
         android:id="@+id/examItemSubject"
diff --git a/app/src/main/res/layout/item_grade_details.xml b/app/src/main/res/layout/item_grade_details.xml
index 79a5e11de..36632d04f 100644
--- a/app/src/main/res/layout/item_grade_details.xml
+++ b/app/src/main/res/layout/item_grade_details.xml
@@ -1,42 +1,43 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tool="http://schemas.android.com/tools"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/grade_subitem_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:foreground="?attr/selectableItemBackgroundBorderless"
-    android:paddingBottom="7dp"
-    android:paddingEnd="12dp"
-    android:paddingLeft="12dp"
-    android:paddingRight="12dp"
+    android:background="?attr/selectableItemBackground"
     android:paddingStart="12dp"
-    android:paddingTop="7dp">
+    android:paddingLeft="12dp"
+    android:paddingTop="7dp"
+    android:paddingEnd="12dp"
+    android:paddingRight="12dp"
+    android:paddingBottom="7dp"
+    tools:context=".ui.modules.grade.details.GradeDetailsItem">
 
     <TextView
         android:id="@+id/gradeItemValue"
         android:layout_width="45dp"
         android:layout_height="40dp"
         android:layout_centerVertical="true"
-        android:background="@color/grade_default"
+        android:background="@color/grade_material_default"
         android:gravity="center"
         android:maxLength="5"
-        android:text="@string/app_name"
         android:textColor="@color/grade_text"
-        android:textSize="16sp" />
+        android:textSize="16sp"
+        tools:text="6" />
 
     <TextView
         android:id="@+id/gradeItemDescription"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
-        android:layout_marginEnd="20dp"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="20dp"
         android:layout_marginStart="10dp"
-        android:layout_toEndOf="@+id/gradeItemValue"
-        android:layout_toLeftOf="@id/gradeItemNote"
-        android:layout_toRightOf="@+id/gradeItemValue"
+        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:text="@string/all_description"
@@ -46,9 +47,9 @@
         android:id="@+id/gradeItemDate"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignBottom="@+id/gradeItemValue"
-        android:layout_alignLeft="@+id/gradeItemDescription"
         android:layout_alignStart="@+id/gradeItemDescription"
+        android:layout_alignLeft="@+id/gradeItemDescription"
+        android:layout_alignBottom="@+id/gradeItemValue"
         android:text="@string/all_date"
         android:textSize="12sp" />
 
@@ -57,14 +58,14 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignBottom="@+id/gradeItemValue"
-        android:layout_marginEnd="20dp"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="20dp"
         android:layout_marginStart="10dp"
-        android:layout_toEndOf="@+id/gradeItemDate"
-        android:layout_toLeftOf="@id/gradeItemNote"
-        android:layout_toRightOf="@+id/gradeItemDate"
+        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:text="@string/grade_weight"
         android:textSize="12sp" />
 
@@ -76,5 +77,5 @@
         android:layout_alignParentRight="true"
         android:layout_marginTop="10dp"
         app:srcCompat="@drawable/ic_all_round_note_24dp"
-        tool:ignore="contentDescription" />
+        tools:ignore="contentDescription" />
 </RelativeLayout>
diff --git a/app/src/main/res/layout/item_grade_summary.xml b/app/src/main/res/layout/item_grade_summary.xml
index a650e9dc5..726a4d9c2 100644
--- a/app/src/main/res/layout/item_grade_summary.xml
+++ b/app/src/main/res/layout/item_grade_summary.xml
@@ -3,7 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    tools:context=".ui.modules.grade.summary.GradeSummaryItem">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -79,7 +80,7 @@
             android:layout_marginStart="20dp"
             android:layout_marginLeft="20dp"
             android:layout_weight="1"
-            android:text="@string/grade_summary_final_average"
+            android:text="@string/grade_summary_final_grade"
             android:textSize="14sp" />
 
         <TextView
diff --git a/app/src/main/res/layout/item_homework.xml b/app/src/main/res/layout/item_homework.xml
index 5aac81503..4e90a5828 100644
--- a/app/src/main/res/layout/item_homework.xml
+++ b/app/src/main/res/layout/item_homework.xml
@@ -1,9 +1,10 @@
 <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="@drawable/ic_all_divider"
-    android:foreground="?attr/selectableItemBackgroundBorderless">
+    android:background="?attr/selectableItemBackground"
+    tools:context=".ui.modules.homework.HomeworkItem">
 
     <TextView
         android:id="@+id/homeworkItemSubject"
diff --git a/app/src/main/res/layout/item_login_options.xml b/app/src/main/res/layout/item_login_options.xml
deleted file mode 100644
index c19d5a667..000000000
--- a/app/src/main/res/layout/item_login_options.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="72dp"
-    android:clickable="true"
-    android:focusable="true"
-    android:foreground="?attr/selectableItemBackgroundBorderless"
-    android:padding="16dp">
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/loginItemImage"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp"
-        android:tint="@android:color/black"
-        app:srcCompat="@drawable/ic_all_account_24dp" />
-
-    <TextView
-        android:id="@+id/loginItemName"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_toEndOf="@id/loginItemImage"
-        android:layout_toRightOf="@id/loginItemImage"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:text="@string/app_name"
-        android:textSize="16sp"
-        app:firstBaselineToTopHeight="16dp" />
-
-    <TextView
-        android:id="@+id/loginItemSchool"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_toEndOf="@id/loginItemImage"
-        android:layout_toRightOf="@id/loginItemImage"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:text="@string/app_name"
-        android:textSize="12sp"
-        app:firstBaselineToTopHeight="36dp" />
-
-</RelativeLayout>
diff --git a/app/src/main/res/layout/item_login_student_select.xml b/app/src/main/res/layout/item_login_student_select.xml
new file mode 100644
index 000000000..f896d99fb
--- /dev/null
+++ b/app/src/main/res/layout/item_login_student_select.xml
@@ -0,0 +1,48 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/loginItemContainer"
+    android:layout_width="match_parent"
+    android:layout_height="72dp"
+    android:background="?selectableItemBackground"
+    android:orientation="horizontal">
+
+    <CheckBox
+        android:id="@+id/loginItemCheck"
+        android:layout_width="32dp"
+        android:layout_height="24dp"
+        android:layout_marginStart="12dp"
+        android:layout_marginLeft="12dp"
+        android:layout_marginTop="24dp"
+        android:layout_marginEnd="28dp"
+        android:layout_marginRight="28dp"
+        android:layout_marginBottom="24dp"
+        tools:text=" " />
+
+    <TextView
+        android:id="@+id/loginItemName"
+        android:layout_width="wrap_content"
+        android:layout_height="34dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_toEndOf="@id/loginItemCheck"
+        android:layout_toRightOf="@id/loginItemCheck"
+        android:gravity="bottom"
+        android:textSize="16sp"
+        tools:text="@tools:sample/full_names" />
+
+    <TextView
+        android:id="@+id/loginItemSchool"
+        android:layout_width="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="1"
+        android:textColor="?android:textColorSecondary"
+        android:textSize="12sp"
+        tools:text="@tools:sample/lorem/random" />
+</RelativeLayout>
diff --git a/app/src/main/res/layout/item_message.xml b/app/src/main/res/layout/item_message.xml
index cfa03786b..e7322afac 100644
--- a/app/src/main/res/layout/item_message.xml
+++ b/app/src/main/res/layout/item_message.xml
@@ -1,13 +1,13 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tool="http://schemas.android.com/tools"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/ic_all_divider"
-    android:foreground="?attr/selectableItemBackgroundBorderless"
+    android:background="?attr/selectableItemBackground"
     android:paddingLeft="16dp"
     android:paddingTop="10dp"
     android:paddingRight="16dp"
-    android:paddingBottom="10dp">
+    android:paddingBottom="10dp"
+    tools:context=".ui.modules.message.MessageItem">
 
     <TextView
         android:id="@+id/messageItemAuthor"
@@ -19,7 +19,7 @@
         android:ellipsize="end"
         android:maxLines="1"
         android:textSize="15sp"
-        tool:text="@tools:sample/full_names" />
+        tools:text="@tools:sample/full_names" />
 
     <TextView
         android:id="@+id/messageItemDate"
@@ -33,7 +33,7 @@
         android:layout_toRightOf="@id/messageItemAuthor"
         android:gravity="end"
         android:textSize="13sp"
-        tool:text="@tools:sample/date/mmddyy" />
+        tools:text="@tools:sample/date/mmddyy" />
 
     <TextView
         android:id="@+id/messageItemSubject"
@@ -47,6 +47,6 @@
         android:maxLines="1"
         android:textColor="?android:attr/android:textColorSecondary"
         android:textSize="12sp"
-        tool:text="@tools:sample/lorem" />
+        tools:text="@tools:sample/lorem" />
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/item_more.xml b/app/src/main/res/layout/item_more.xml
index 0324c1f0d..07eb3344f 100644
--- a/app/src/main/res/layout/item_more.xml
+++ b/app/src/main/res/layout/item_more.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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="56dp"
     android:background="?attr/selectableItemBackground"
@@ -8,7 +9,8 @@
     android:paddingLeft="16dp"
     android:paddingTop="8dp"
     android:paddingRight="16dp"
-    android:paddingBottom="8dp">
+    android:paddingBottom="8dp"
+    tools:context=".ui.modules.more.MoreItem">
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/moreItemImage"
diff --git a/app/src/main/res/layout/item_note.xml b/app/src/main/res/layout/item_note.xml
index 86e8bc762..76fb6a8c3 100644
--- a/app/src/main/res/layout/item_note.xml
+++ b/app/src/main/res/layout/item_note.xml
@@ -1,9 +1,10 @@
 <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="@drawable/ic_all_divider"
-    android:foreground="?attr/selectableItemBackgroundBorderless">
+    android:background="?attr/selectableItemBackground"
+    tools:context=".ui.modules.note.NoteItem">
 
     <TextView
         android:id="@+id/noteItemDate"
diff --git a/app/src/main/res/layout/item_timetable.xml b/app/src/main/res/layout/item_timetable.xml
index aee4707b7..6afc41536 100644
--- a/app/src/main/res/layout/item_timetable.xml
+++ b/app/src/main/res/layout/item_timetable.xml
@@ -1,17 +1,17 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tool="http://schemas.android.com/tools"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/timetable_subitem_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/ic_all_divider"
-    android:foreground="?attr/selectableItemBackgroundBorderless"
+    android:background="?attr/selectableItemBackground"
     android:paddingStart="12dp"
     android:paddingLeft="12dp"
     android:paddingTop="7dp"
     android:paddingEnd="12dp"
     android:paddingRight="12dp"
-    android:paddingBottom="7dp">
+    android:paddingBottom="7dp"
+    tools:context=".ui.modules.timetable.TimetableItem">
 
     <TextView
         android:id="@+id/timetableItemNumber"
@@ -22,7 +22,7 @@
         android:maxLength="2"
         android:text="0"
         android:textSize="32sp"
-        tool:ignore="all" />
+        tools:ignore="all" />
 
     <TextView
         android:id="@+id/timetableItemSubject"
@@ -39,7 +39,7 @@
         android:maxLines="1"
         android:text="@string/app_name"
         android:textSize="17sp"
-        tool:ignore="RelativeOverlap" />
+        tools:ignore="RelativeOverlap" />
 
     <TextView
         android:id="@+id/timetableItemTime"
@@ -68,7 +68,7 @@
         android:text="@string/app_name"
         android:textColor="?android:attr/android:textColorSecondary"
         android:textSize="12sp"
-        tool:ignore="RelativeOverlap" />
+        tools:ignore="RelativeOverlap" />
 
     <ImageView
         android:id="@+id/timetableItemAlert"
@@ -78,6 +78,6 @@
         android:layout_alignParentRight="true"
         android:layout_marginTop="10dp"
         app:srcCompat="@drawable/ic_timetable_swap_30dp"
-        tool:ignore="contentDescription" />
+        tools:ignore="contentDescription" />
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/item_widget_timetable.xml b/app/src/main/res/layout/item_widget_timetable.xml
index 2007b323d..aa8088640 100644
--- a/app/src/main/res/layout/item_widget_timetable.xml
+++ b/app/src/main/res/layout/item_widget_timetable.xml
@@ -6,7 +6,8 @@
     android:layout_height="wrap_content"
     android:background="@drawable/ic_all_divider"
     android:minHeight="45dp"
-    android:orientation="horizontal">
+    android:orientation="horizontal"
+    tools:context=".ui.modules.timetablewidget.TimetableWidgetFactory">
 
     <TextView
         android:id="@+id/timetableWidgetItemNumber"
@@ -19,7 +20,7 @@
         android:maxLines="1"
         android:textColor="@android:color/black"
         android:textSize="25sp"
-        tools:text="0" />
+        tools:text="1" />
 
     <TextView
         android:id="@+id/timetableWidgetItemTime"
@@ -31,9 +32,9 @@
         android:layout_marginTop="10dp"
         android:layout_toEndOf="@id/timetableWidgetItemNumber"
         android:layout_toRightOf="@id/timetableWidgetItemNumber"
-        android:text="@string/app_name"
-        android:textColor="@color/second_text"
-        android:textSize="13sp" />
+        android:textColor="@android:color/secondary_text_light"
+        android:textSize="13sp"
+        tools:text="08:00 - 08:45" />
 
     <TextView
         android:id="@+id/timetableWidgetItemSubject"
@@ -46,9 +47,9 @@
         android:layout_marginRight="25dp"
         android:layout_toEndOf="@id/timetableWidgetItemTime"
         android:layout_toRightOf="@id/timetableWidgetItemTime"
-        android:text="@string/app_name"
-        android:textColor="@color/second_text"
-        android:textSize="13sp" />
+        android:textColor="@android:color/secondary_text_light"
+        android:textSize="13sp"
+        tools:text="Język polski" />
 
     <TextView
         android:id="@+id/timetableWidgetItemDescription"
@@ -63,9 +64,9 @@
         android:layout_marginBottom="5dp"
         android:layout_toEndOf="@id/timetableWidgetItemTime"
         android:layout_toRightOf="@id/timetableWidgetItemTime"
-        android:text="@string/app_name"
         android:textColor="@color/colorPrimaryDark"
-        android:textSize="12sp" />
+        android:textSize="12sp"
+        tools:text="Lekcja odwołana: uczniowie zwolnieni do domu" />
 
     <TextView
         android:id="@+id/timetableWidgetItemRoom"
@@ -78,7 +79,7 @@
         android:layout_marginBottom="5dp"
         android:layout_toEndOf="@id/timetableWidgetItemNumber"
         android:layout_toRightOf="@id/timetableWidgetItemNumber"
-        android:text="@string/app_name"
-        android:textColor="@color/second_text"
-        android:textSize="12sp" />
+        android:textColor="@android:color/secondary_text_light"
+        android:textSize="12sp"
+        tools:text="Sala 25" />
 </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_luckynumber.xml b/app/src/main/res/layout/widget_luckynumber.xml
new file mode 100644
index 000000000..026ac953b
--- /dev/null
+++ b/app/src/main/res/layout/widget_luckynumber.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/luckyNumberWidgetContainer"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:background="@drawable/background_rounded_corner"
+    android:gravity="center"
+    android:padding="10dp"
+    tools:context=".ui.modules.luckynumberwidget.LuckyNumberWidgetProvider">
+
+    <ImageView
+        android:id="@+id/luckyNumberWidgetImageTop"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_above="@id/luckyNumberWidgetNumber"
+        android:layout_centerHorizontal="true"
+        android:layout_marginBottom="20dp"
+        android:contentDescription="@string/lucky_number_title"
+        android:gravity="center"
+        android:src="@drawable/ic_widget_clover_24dp"
+        android:visibility="gone"
+        tools:visibility="visible" />
+
+    <TextView
+        android:id="@+id/luckyNumberWidgetTitle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="0dp"
+        android:gravity="center"
+        android:labelFor="@id/luckyNumberWidgetImageTop"
+        android:text="@string/lucky_number_title"
+        android:textAlignment="center"
+        android:textColor="#8c8c8c"
+        android:textSize="22sp"
+        android:visibility="gone"
+        tools:visibility="visible" />
+
+    <ImageView
+        android:id="@+id/luckyNumberWidgetImageLeft"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@id/luckyNumberWidgetNumber"
+        android:contentDescription="@string/lucky_number_title"
+        android:src="@drawable/ic_widget_clover_24dp"
+        android:visibility="gone"
+        tools:visibility="visible" />
+
+    <TextView
+        android:id="@+id/luckyNumberWidgetNumber"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/luckyNumberWidgetTitle"
+        android:layout_toEndOf="@id/luckyNumberWidgetImageLeft"
+        android:layout_toRightOf="@id/luckyNumberWidgetImageLeft"
+        android:gravity="center"
+        android:text="#"
+        android:textAlignment="center"
+        android:textColor="#404040"
+        android:textSize="34sp"
+        tools:ignore="HardcodedText"
+        tools:text="13" />
+</RelativeLayout>
diff --git a/app/src/main/res/layout/widget_timetable.xml b/app/src/main/res/layout/widget_timetable.xml
index 8d415f66e..52469699d 100644
--- a/app/src/main/res/layout/widget_timetable.xml
+++ b/app/src/main/res/layout/widget_timetable.xml
@@ -1,79 +1,91 @@
 <?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"
-    android:background="@android:color/white">
+    android:background="@android:color/white"
+    tools:context=".ui.modules.timetablewidget.TimetableWidgetProvider">
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="@dimen/timetable_widget_bar_height"
+        android:layout_height="56dp"
         android:background="@color/colorPrimary">
 
+        <LinearLayout
+            android:layout_width="wrap_content"
+            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
+                android:id="@+id/timetableWidgetDate"
+                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="Pon. 30.03.2019" />
+
+            <TextView
+                android:id="@+id/timetableWidgetName"
+                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"
+                tools:text="Jan Kowalski" />
+        </LinearLayout>
+
+        <ImageButton
+            android:id="@+id/timetableWidgetAccount"
+            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" />
+
         <ImageButton
             android:id="@+id/timetableWidgetPrev"
-            android:layout_width="70dp"
+            android:layout_width="50dp"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
-            android:layout_marginStart="5dp"
-            android:layout_marginLeft="5dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginLeft="10dp"
             android:backgroundTint="@color/colorPrimaryDark"
             android:contentDescription="@string/all_prev"
-            android:src="@drawable/ic_widget_chevron_24dp" />
-
-        <TextView
-            android:id="@+id/timetableWidgetDay"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignTop="@+id/timetableWidgetPrev"
-            android:layout_centerHorizontal="true"
-            android:layout_toStartOf="@id/timetableWidgetNext"
-            android:layout_toLeftOf="@id/timetableWidgetNext"
-            android:layout_toEndOf="@id/timetableWidgetPrev"
-            android:layout_toRightOf="@id/timetableWidgetPrev"
-            android:gravity="center_horizontal"
-            android:maxLines="1"
-            android:text="@string/app_name"
-            android:textColor="@android:color/white"
-            android:textSize="15sp" />
-
-        <TextView
-            android:id="@+id/timetableWidgetDate"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/timetableWidgetDay"
-            android:layout_centerInParent="true"
-            android:layout_marginTop="3dp"
-            android:layout_toStartOf="@id/timetableWidgetNext"
-            android:layout_toLeftOf="@id/timetableWidgetNext"
-            android:layout_toEndOf="@id/timetableWidgetPrev"
-            android:layout_toRightOf="@id/timetableWidgetPrev"
-            android:gravity="center_horizontal"
-            android:maxLines="1"
-            android:text="@string/app_name"
-            android:textColor="@android:color/white"
-            android:textSize="14sp" />
+            android:src="@drawable/ic_widget_chevron_24dp"
+            tools:targetApi="lollipop" />
 
         <ImageButton
             android:id="@+id/timetableWidgetNext"
-            android:layout_width="70dp"
+            android:layout_width="50dp"
             android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
-            android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
-            android:layout_marginEnd="5dp"
-            android:layout_marginRight="5dp"
+            android:layout_toEndOf="@id/timetableWidgetPrev"
+            android:layout_toRightOf="@id/timetableWidgetPrev"
             android:backgroundTint="@color/colorPrimaryDark"
             android:contentDescription="@string/all_next"
             android:rotation="180"
-            android:src="@drawable/ic_widget_chevron_24dp" />
-
+            android:src="@drawable/ic_widget_chevron_24dp"
+            tools:targetApi="lollipop" />
     </RelativeLayout>
 
     <ListView
         android:id="@+id/timetableWidgetList"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="@dimen/timetable_widget_bar_height" />
+        android:layout_marginTop="56dp"
+        tools:listitem="@layout/item_widget_timetable" />
 
     <TextView
         android:id="@+id/timetableWidgetEmpty"
@@ -82,5 +94,6 @@
         android:layout_gravity="center"
         android:text="@string/widget_timetable_no_items"
         android:textColor="@android:color/black"
-        android:textSize="20sp" />
+        android:textSize="20sp"
+        tools:visibility="invisible" />
 </FrameLayout>
diff --git a/app/src/main/res/menu/action_menu_message_preview.xml b/app/src/main/res/menu/action_menu_message_preview.xml
new file mode 100644
index 000000000..c3272aa20
--- /dev/null
+++ b/app/src/main/res/menu/action_menu_message_preview.xml
@@ -0,0 +1,22 @@
+<?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/messagePreviewMenuReply"
+        android:icon="@drawable/ic_message_reply_24dp"
+        android:orderInCategory="1"
+        android:title="@string/message_reply"
+        app:showAsAction="ifRoom" />
+    <item
+        android:id="@+id/messagePreviewMenuForward"
+        android:icon="@drawable/ic_message_forward_24dp"
+        android:orderInCategory="1"
+        android:title="@string/message_forward"
+        app:showAsAction="ifRoom" />
+    <item
+        android:id="@+id/messagePreviewMenuDelete"
+        android:icon="@drawable/ic_message_delete_24dp"
+        android:orderInCategory="1"
+        android:title="@string/message_delete"
+        app:showAsAction="ifRoom" />
+</menu>
diff --git a/app/src/main/res/menu/action_menu_send_message.xml b/app/src/main/res/menu/action_menu_send_message.xml
new file mode 100644
index 000000000..d512fc763
--- /dev/null
+++ b/app/src/main/res/menu/action_menu_send_message.xml
@@ -0,0 +1,10 @@
+<?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/sendMessageMenuSend"
+        android:icon="@drawable/ic_menu_send_message_24dp"
+        android:orderInCategory="1"
+        android:title="@string/send_message_title"
+        app:showAsAction="ifRoom" />
+</menu>
diff --git a/app/src/main/res/menu/action_menu_timetable.xml b/app/src/main/res/menu/action_menu_timetable.xml
new file mode 100644
index 000000000..0a13494ab
--- /dev/null
+++ b/app/src/main/res/menu/action_menu_timetable.xml
@@ -0,0 +1,10 @@
+<?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/timetableMenuCompletedLessons"
+        android:icon="@drawable/ic_menu_main_lessons_completed_24dp"
+        android:orderInCategory="1"
+        android:title="@string/completed_lessons_button"
+        app:showAsAction="ifRoom" />
+</menu>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
new file mode 100644
index 000000000..31a481591
--- /dev/null
+++ b/app/src/main/res/values-night/colors.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="spinner_stroke">#61FFFFFF</color>
+</resources>
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
index 0e082ecb4..342329dc6 100644
--- a/app/src/main/res/values-night/styles.xml
+++ b/app/src/main/res/values-night/styles.xml
@@ -1,12 +1,20 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
-    <style name="WulkanowyTheme" parent="@style/Theme.AppCompat.DayNight">
+    <style name="WulkanowyTheme" parent="@style/Theme.MaterialComponents.Bridge">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorPrimary</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
+        <item name="android:windowBackground">@color/bottom_nav_background</item>
         <item name="bottomNavBackground">@color/bottom_nav_background</item>
         <item name="android:navigationBarColor" tools:targetApi="21">@color/bottom_nav_background</item>
+        <item name="dividerColor">@color/divider_inverse</item>
+        <item name="chip_backgroundColor">@color/chip_backgroundColor_inverse</item>
+        <item name="android:textColorTertiary">?android:textColorPrimary</item>
+        <item name="chip_labelColor">@color/chip_labelColor_inverse</item>
+        <item name="chip_detailed_backgroundColor">@color/chip_backgroundColor_inverse</item>
+        <item name="filterable_list_backgroundColor">@color/filterable_list_backgroundColor_inverse</item>
+        <item name="filterable_list_textColor">@color/filterable_list_textColor_inverse</item>
 
         <!--AboutLibraries specific values-->
         <item name="about_libraries_window_background">@color/about_libraries_window_background_dark</item>
@@ -19,8 +27,9 @@
         <item name="about_libraries_dividerLight_openSource">@color/about_libraries_dividerLight_openSource_dark</item>
     </style>
 
-    <style name="WulkanowyTheme.NoActionBar" parent="WulkanowyTheme">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
+    <style name="WulkanowyTheme.Black" parent="WulkanowyTheme.NoActionBar">
+        <item name="android:windowBackground">@android:color/black</item>
+        <item name="android:navigationBarColor" tools:targetApi="21">@android:color/black</item>
+        <item name="bottomNavBackground">@android:color/black</item>
     </style>
 </resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 3c4a4ebba..b12ece137 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -1,8 +1,9 @@
 <resources>
     <string name="app_name">Wulkanowy</string>
 
+
     <!--Activity/Fragment title-->
-    <string name="login_title">Wybierz ucznia</string>
+    <string name="login_title">Logowanie</string>
     <string name="main_title">Wulkanowy</string>
     <string name="grade_title">Oceny</string>
     <string name="attendance_title">Frekwencja</string>
@@ -12,6 +13,7 @@
     <string name="more_title">Więcej</string>
     <string name="about_title">O aplikacji</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>
@@ -19,19 +21,20 @@
 
     <!--Login-->
     <string name="login_header_default">Zaloguj się za pomocą konta ucznia lub rodzica</string>
-    <string name="login_header_symbol">Podaj symbol dziennika VULCAN</string>
+    <string name="login_header_symbol">Podaj symbol</string>
     <string name="login_nickname_hint">Email lub nick</string>
     <string name="login_password_hint">Hasło</string>
     <string name="login_host_hint">Dziennik</string>
     <string name="login_symbol_hint">Symbol</string>
     <string name="login_sign_in">Zaloguj</string>
-    <string name="login_progress">Logowanie&#8230;</string>
-    <string name="login_sync">Synchronizacja</string>
     <string name="login_invalid_password">To hasło jest za krótkie</string>
-    <string name="login_incorrect_password">To hasło jest niepoprawne</string>
-    <string name="login_incorrect_symbol">Nie znaleziono ucznia. Sprwadź symbol</string>
+    <string name="login_incorrect_password">Dane logowania są niepoprawne</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">Ten student jest już zalogowany</string>
+    <string name="login_duplicate_student">Wybrany uczeń jest już zalogowany</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_privacy_policy">Polityka prywatności</string>
 
 
     <!--Main-->
@@ -59,24 +62,22 @@
     <string name="grade_summary_calculated_average">Obliczona średnia</string>
     <string name="grade_summary_final_average">Końcowa średnia</string>
     <string name="grade_menu_summary">Podsumowanie</string>
+    <string name="grade_menu_statistics">Klasa</string>
     <string name="grade_menu_read">Oznacz jako przeczytane</string>
+    <string name="grade_statistics_partial">Oceny cząstkowe</string>
+    <string name="grade_statistics_semester">Oceny semestralne</string>
     <plurals name="grade_number_item">
         <item quantity="one">%d ocena</item>
         <item quantity="few">%d oceny</item>
         <item quantity="many">%d ocen</item>
         <item quantity="other">%d ocen</item>
     </plurals>
-
     <plurals name="grade_new_items">
         <item quantity="one">Nowa ocena</item>
         <item quantity="few">Nowe oceny</item>
         <item quantity="many">Nowe oceny</item>
     </plurals>
-
-
-    <!--Grade notify-->
-    <string name="notify_grade_channel">Nowe oceny</string>
-    <plurals name="notify_grade_new_items">
+    <plurals name="grade_notify_new_items">
         <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>
@@ -84,16 +85,6 @@
     </plurals>
 
 
-    <!--Note notify-->
-    <string name="notify_note_channel">Nowe uwagi</string>
-    <plurals name="notify_note_new_items">
-        <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>
-
-
     <!--Timetable-->
     <string name="timetable_lesson">Lekcja</string>
     <string name="timetable_room">Sala</string>
@@ -103,6 +94,15 @@
     <string name="timetable_no_items">Brak lekcji w tym dniu</string>
 
 
+    <!--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">Nieobecny z przyczyn szkolnych</string>
@@ -120,9 +120,11 @@
         <item quantity="many">%1$d nieobecności</item>
     </plurals>
 
+
     <!--Attendance summary-->
     <string name="attendance_summary_final">Frekwencja</string>
 
+
     <!--Exam-->
     <string name="exam_no_items">Brak sprawdzianów w tym tygodniu</string>
     <string name="exam_type">Typ</string>
@@ -136,33 +138,36 @@
     <string name="message_no_subject">(brak tematu)</string>
     <string name="message_no_items">Brak wiadomości</string>
     <string name="message_preview_error">Wystąpił błąd podczas pobierania treści wiadomości</string>
-    <string name="message_from">Od: %s</string>
-    <string name="message_to">Do: %s</string>
+    <string name="message_from">Od:</string>
+    <string name="message_to">Do:</string>
     <string name="message_date">Data: %s</string>
+    <string name="message_reply">Odpowiedz</string>
+    <string name="message_forward">Prześlij dalej</string>
+    <string name="message_delete">Usuń</string>
+    <string name="message_move_to_bin">Przenieś do kosza</string>
+    <string name="message_delete_forever">Usuń trwale</string>
+    <string name="message_delete_success">Wiadomość usunięta pomyślnie</string>
+    <string name="message_subject">Temat</string>
+    <string name="message_content">Treść</string>
+    <string name="message_send_successful">Wiadomość wysłana pomyślnie</string>
+    <string name="message_required_recipients">Musisz wybrać co najmniej 1 adresata</string>
+    <string name="message_content_min_length">Treść wiadomości musi zawierać co najmniej 3 znaki</string>
     <plurals name="message_number_item">
         <item quantity="one">%d wiadomość</item>
         <item quantity="few">%d wiadomości</item>
         <item quantity="many">%d wiadomości</item>
     </plurals>
-
     <plurals name="message_new_items">
         <item quantity="one">Nowa wiadomość</item>
         <item quantity="few">Nowe wiadomości</item>
         <item quantity="many">Nowe wiadomości</item>
     </plurals>
-
-
-    <!--Message notify-->
-    <string name="notify_message_channel">Nowe wiadomości</string>
-    <plurals name="notify_message_new_items">
+    <plurals name="message_notify_new_items">
         <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>
     </plurals>
 
-    <!--About-->
-    <string name="about_source_code">Kod źródłowy</string>
-    <string name="about_feedback">Zgłoś błąd</string>
 
     <!--Note-->
     <string name="note_no_items">Brak informacji o uwagach</string>
@@ -172,19 +177,32 @@
         <item quantity="many">%d uwag</item>
         <item quantity="other">%d uwag</item>
     </plurals>
-
     <plurals name="note_new_items">
         <item quantity="one">Nowa uwaga</item>
         <item quantity="few">Nowe uwagi</item>
         <item quantity="many">Nowych uwag</item>
         <item quantity="other">Nowych uwag</item>
     </plurals>
+    <plurals name="note_notify_new_items">
+        <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>
 
 
+    <!--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>
+
+
     <!--Account-->
     <string name="account_add_new">Dodaj konto</string>
     <string name="account_logout">Wyloguj</string>
@@ -192,6 +210,12 @@
     <string name="account_logout_student">Wylogowanie ucznia</string>
 
 
+    <!--About-->
+    <string name="about_discord_invite">Discord</string>
+    <string name="about_feedback">Zgłoś błąd</string>
+    <string name="about_homepage">Strona domowa</string>
+
+
     <!--Generic-->
     <string name="all_content">Treść</string>
     <string name="all_description">Opis</string>
@@ -211,23 +235,20 @@
 
     <!--Timetable Widget-->
     <string name="widget_timetable_no_items">Brak lekcji</string>
-    <string name="widget_timetable_today">Dziś</string>
-    <string name="widget_timetable_tomorrow">Jutro</string>
 
 
     <!--Preferences-->
-    <string name="pref_view_header">Widok</string>
+    <string name="pref_view_header">Wygląd</string>
     <string name="pref_view_list">Domyślny widok</string>
-    <string name="pref_view_summary">Pokazuj podsumowanie w ocenach</string>
+    <string name="pref_view_grade_average_mode">Obliczanie średniej końcoworocznej</string>
     <string name="pref_view_present">Pokazuj obecność we frekwencji</string>
-    <string name="pref_view_theme_dark">Ciemny motyw (Beta)</string>
-    <string name="pref_view_grade_modifier_plus">Wartość plusa</string>
-    <string name="pref_view_grade_modifier_minus">Wartość minusa</string>
+    <string name="pref_view_app_theme">Motyw aplikacji</string>
     <string name="pref_view_expand_grade">Rozwiń oceny</string>
+    <string name="pref_view_grade_color_scheme">Schemat kolorów ocen</string>
 
     <string name="pref_notify_header">Powiadomienia</string>
     <string name="pref_notify_switch">Pokazuj powiadomienia</string>
-    <string name="pref_debug_notify_switch">Pokazuj powiadomienia debugowania</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>
@@ -235,6 +256,16 @@
     <string name="pref_services_interval">Interwał aktualizacji</string>
     <string name="pref_services_wifi">Tylko WiFi</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_debug">Debugowanie</string>
+
 
     <!--Colors-->
     <string name="all_black">Czarny</string>
@@ -248,10 +279,12 @@
     <!--Others-->
     <string name="all_copied">Skopiowano</string>
 
+
     <!--Errors-->
     <string name="error_no_internet">Brak połączenia z internetem</string>
     <string name="error_timeout">Zbyt długie oczekiwanie na połączenie</string>
     <string name="error_login_failed">Logowanie nie powiodło się. Spróbuj ponownie lub zrestartuj aplikację</string>
     <string name="error_service_unavailable">Dziennik jest niedostępny. 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>
 </resources>
diff --git a/app/src/main/res/values-pl/value_prefernces.xml b/app/src/main/res/values-pl/value_prefernces.xml
index c15fa89eb..19268ef18 100644
--- a/app/src/main/res/values-pl/value_prefernces.xml
+++ b/app/src/main/res/values-pl/value_prefernces.xml
@@ -9,16 +9,29 @@
         <item>12 godzin</item>
         <item>24 godzin</item>
     </string-array>
-    <string-array name="theme_entries">
-        <item>Wyłączony</item>
-        <item>Włączony</item>
-        <item>Automatyczny</item>
-        <item>Używaj ustawień systemowych</item>
+
+    <string-array name="app_theme_entries">
+        <item>Jasny</item>
+        <item>Ciemny</item>
+        <item>Czarny (AMOLED)</item>
     </string-array>
+
     <string-array name="grade_modifier_entries">
         <item>Domyślna</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>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>
 </resources>
diff --git a/app/src/main/res/values/api_endpoints.xml b/app/src/main/res/values/api_endpoints.xml
index b6fd6a3b1..e07f2b4b5 100644
--- a/app/src/main/res/values/api_endpoints.xml
+++ b/app/src/main/res/values/api_endpoints.xml
@@ -7,7 +7,6 @@
         <item>EduNet Miasta Tarnowa</item>
         <item>ResMan Rzeszów</item>
         <item>Fakelog</item>
-        <item>Fakelog lokalnie</item>
     </string-array>
     <string-array name="endpoints_values">
         <item>https://vulcan.net.pl</item>
@@ -15,7 +14,6 @@
         <item>https://edu.gdansk.pl</item>
         <item>https://umt.tarnow.pl</item>
         <item>https://resman.pl</item>
-        <item>https://fakelog.cf</item>
-        <item>http://fakelog.localhost:3000</item>
+        <item>http://fakelog.cf</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 3593e29e6..eef7eab48 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <attr name="bottomNavBackground" format="reference" />
+    <attr name="dividerColor" format="reference" />
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index db5139764..1b1fc7a06 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -6,16 +6,40 @@
     <color name="colorBackgroundBottomNav">#f0f0f0</color>
 
     <color name="grade_text">#ffffff</color>
-    <color name="grade_six">#91b43c</color>
-    <color name="grade_five">#2cbd92</color>
-    <color name="grade_four">#50b6d6</color>
-    <color name="grade_three">#d2ab24</color>
-    <color name="grade_two">#9071b3</color>
-    <color name="grade_one">#d65757</color>
-    <color name="grade_default">#3d5f9c</color>
 
-    <color name="second_text">#474747</color>
+    <color name="grade_black">#424242</color>
+    <color name="grade_red">#F44336</color>
+    <color name="grade_blue">#2196F3</color>
+    <color name="grade_green">#8BC34A</color>
+    <color name="grade_purple">#7E57C2</color>
+
+    <color name="grade_material_six">#03a9f4</color>
+    <color name="grade_material_five">#4caf50</color>
+    <color name="grade_material_four">#92c400</color>
+    <color name="grade_material_three">#ffa000</color>
+    <color name="grade_material_two">#ff5722</color>
+    <color name="grade_material_one">#d32f2f</color>
+    <color name="grade_material_default">#607d8b</color>
+
+    <color name="grade_vulcan_six">#91b43c</color>
+    <color name="grade_vulcan_five">#2cbd92</color>
+    <color name="grade_vulcan_four">#50b6d6</color>
+    <color name="grade_vulcan_three">#d2ab24</color>
+    <color name="grade_vulcan_two">#9071b3</color>
+    <color name="grade_vulcan_one">#d65757</color>
+    <color name="grade_vulcan_default">#3d5f9c</color>
 
     <color name="bottom_nav_background">#303030</color>
     <color name="bottom_nav_background_inverse">#ffffff</color>
+
+    <color name="chip_backgroundColor_inverse">#595959</color>
+    <color name="chip_labelColor_inverse">#fefefe</color>
+    <color name="chip_detailed_backgroundColor">#fefefe</color>
+    <color name="filterable_list_backgroundColor_inverse">#393939</color>
+    <color name="filterable_list_textColor_inverse">#fefefe</color>
+
+    <color name="divider">#cccccc</color>
+    <color name="divider_inverse">#777777</color>
+
+    <color name="spinner_stroke">#61000000</color>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index e0708095e..a4bf80ed6 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -2,7 +2,4 @@
     <!--BottomNav-->
     <dimen name="bottom_navigation_margin_top_active" tools:override="true">8dp</dimen>
     <dimen name="bottom_navigation_margin_top_inactive" tools:override="true">8dp</dimen>
-
-    <!--Timetable Widget-->
-    <dimen name="timetable_widget_bar_height">60dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/preferences_keys.xml b/app/src/main/res/values/preferences_keys.xml
index 54cc2bbde..b09ee51bc 100644
--- a/app/src/main/res/values/preferences_keys.xml
+++ b/app/src/main/res/values/preferences_keys.xml
@@ -2,13 +2,16 @@
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <string name="pref_key_start_menu">start_menu</string>
     <string name="pref_key_attendance_present">attendance_present</string>
-    <string name="pref_key_theme">theme</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_app_theme">app_theme</string>
+    <string name="pref_key_grade_color_scheme">grade_color_scheme</string>
     <string name="pref_key_expand_grade">expand_grade</string>
+    <string name="pref_key_grade_average_mode">grade_average_mode</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_notifications_enable">notifications_enable</string>
-    <string name="pref_key_debug_chucker_notification">chucker_notification</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>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f6140ad04..0cdd71beb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,8 +1,9 @@
 <resources>
     <string name="app_name">Wulkanowy</string>
 
+
     <!--Activity/Fragment title-->
-    <string name="login_title">Select student</string>
+    <string name="login_title">Login</string>
     <string name="main_title">Wulkanowy</string>
     <string name="grade_title">Grades</string>
     <string name="attendance_title">Attendance</string>
@@ -12,6 +13,7 @@
     <string name="more_title">More</string>
     <string name="about_title">About</string>
     <string name="message_title">Messages</string>
+    <string name="send_message_title">New message</string>
     <string name="note_title">Notes and achievements</string>
     <string name="homework_title">Homework</string>
     <string name="account_title">Choose account</string>
@@ -19,19 +21,20 @@
 
     <!--Login-->
     <string name="login_header_default">Sign in with the student or parent account</string>
-    <string name="login_header_symbol">Enter the VULCAN diary symbol</string>
+    <string name="login_header_symbol">Enter the symbol</string>
     <string name="login_nickname_hint">Email or nick</string>
     <string name="login_password_hint">Password</string>
-    <string name="login_host_hint">Log</string>
+    <string name="login_host_hint">Register</string>
     <string name="login_symbol_hint">Symbol</string>
     <string name="login_sign_in">Sign in</string>
-    <string name="login_progress">Logging in&#8230;</string>
-    <string name="login_sync">Synchronization&#8230;</string>
     <string name="login_invalid_password">This password is too short</string>
-    <string name="login_incorrect_password">This password is incorrect</string>
+    <string name="login_incorrect_password">Login details are incorrect</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">This student has already been logged in</string>
+    <string name="login_duplicate_student">The selected student is already logged in</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_privacy_policy">Privacy policy</string>
 
 
     <!--Main-->
@@ -59,31 +62,23 @@
     <string name="grade_summary_calculated_average">Calculated average</string>
     <string name="grade_summary_final_average">Final average</string>
     <string name="grade_menu_summary">Summary</string>
+    <string name="grade_menu_statistics">Class</string>
     <string name="grade_menu_read">Mark as read</string>
+    <string name="grade_statistics_partial">Partial grades</string>
+    <string name="grade_statistics_semester">Semester grades</string>
     <plurals name="grade_number_item">
         <item quantity="one">%d grade</item>
         <item quantity="other">%d grades</item>
     </plurals>
-
     <plurals name="grade_new_items">
         <item quantity="one">New grade</item>
         <item quantity="other">New grades</item>
     </plurals>
-
-    <!--Grade notify-->
-    <string name="notify_grade_channel">New grades</string>
-    <plurals name="notify_grade_new_items">
+    <plurals name="grade_notify_new_items">
         <item quantity="one">You received %1$d grade</item>
         <item quantity="other">You received %1$d grades</item>
     </plurals>
 
-    <!--Note notify-->
-    <string name="notify_note_channel">New notes</string>
-    <plurals name="notify_note_new_items">
-        <item quantity="one">You received %1$d note</item>
-        <item quantity="other">You received %1$d notes</item>
-    </plurals>
-
 
     <!--Timetable-->
     <string name="timetable_lesson">Lesson</string>
@@ -91,7 +86,16 @@
     <string name="timetable_group">Group</string>
     <string name="timetable_time">Hours</string>
     <string name="timetable_changes">Changes</string>
-    <string name="timetable_no_items">No lessons on this day</string>
+    <string name="timetable_no_items">No lessons this day</string>
+
+
+    <!--Completed lessons-->
+    <string name="completed_lessons_title">Completed lessons</string>
+    <string name="completed_lessons_button">Show completed lessons</string>
+    <string name="completed_lessons_no_items">No info about completed lessons</string>
+    <string name="completed_lessons_topic">Topic</string>
+    <string name="completed_lessons_absence">Absence</string>
+    <string name="completed_lessons_resources">Resources</string>
 
 
     <!--Attendance-->
@@ -110,12 +114,13 @@
         <item quantity="other">%1$d absences</item>
     </plurals>
 
+
     <!--Attendance summary-->
     <string name="attendance_summary_final">Attendance</string>
 
 
     <!--Exam-->
-    <string name="exam_no_items">No exams in this week</string>
+    <string name="exam_no_items">No exams this week</string>
     <string name="exam_type">Type</string>
     <string name="exam_entry_date">Entry date</string>
 
@@ -127,29 +132,33 @@
     <string name="message_no_subject">(no subject)</string>
     <string name="message_no_items">No messages</string>
     <string name="message_preview_error">An error occurred while downloading message content</string>
-    <string name="message_from">From: %s</string>
-    <string name="message_to">To: %s</string>
+    <string name="message_from">From:</string>
+    <string name="message_to">To:</string>
     <string name="message_date">Date: %s</string>
+    <string name="message_reply">Reply</string>
+    <string name="message_forward">Forward</string>
+    <string name="message_delete">Delete</string>
+    <string name="message_move_to_bin">Move to trash</string>
+    <string name="message_delete_forever">Delete permanently</string>
+    <string name="message_delete_success">Message deleted successfully</string>
+    <string name="message_subject">Subject</string>
+    <string name="message_content">Content</string>
+    <string name="message_send_successful">Message sent successfully</string>
+    <string name="message_required_recipients">You need to choose at least 1 recipient</string>
+    <string name="message_content_min_length">The message content must be at least 3 characters</string>
     <plurals name="message_number_item">
         <item quantity="one">%d message</item>
         <item quantity="other">%d messages</item>
     </plurals>
-
     <plurals name="message_new_items">
         <item quantity="one">New message</item>
         <item quantity="other">New messages</item>
     </plurals>
-
-    <!--Message notify-->
-    <string name="notify_message_channel">New messages</string>
-    <plurals name="notify_message_new_items">
+    <plurals name="message_notify_new_items">
         <item quantity="one">You received %1$d message</item>
         <item quantity="other">You received %1$d messages</item>
     </plurals>
 
-    <!--About-->
-    <string name="about_source_code">Source code</string>
-    <string name="about_feedback">Report a bug</string>
 
     <!--Note-->
     <string name="note_no_items">No info about notes</string>
@@ -157,17 +166,28 @@
         <item quantity="one">%d note</item>
         <item quantity="other">%d notes</item>
     </plurals>
-
     <plurals name="note_new_items">
         <item quantity="one">New note</item>
         <item quantity="other">New notes</item>
     </plurals>
+    <plurals name="note_notify_new_items">
+        <item quantity="one">You received %1$d note</item>
+        <item quantity="other">You received %1$d notes</item>
+    </plurals>
 
 
     <!--Homework-->
     <string name="homework_no_items">No info about homework</string>
 
 
+    <!--Lucky number-->
+    <string name="lucky_number_title">Lucky number</string>
+    <string name="lucky_number_header">Today\'s lucky number is</string>
+    <string name="lucky_number_empty">No info about the lucky number</string>
+    <string name="lucky_number_notify_new_item_title">Lucky number for today</string>
+    <string name="lucky_number_notify_new_item">Today\'s lucky number is: %d</string>
+
+
     <!--Account-->
     <string name="account_add_new">Add account</string>
     <string name="account_logout">Logout</string>
@@ -175,6 +195,12 @@
     <string name="account_logout_student">Student logout</string>
 
 
+    <!--About-->
+    <string name="about_discord_invite">Discord</string>
+    <string name="about_feedback">Report a bug</string>
+    <string name="about_homepage">Homepage</string>
+
+
     <!--Generic-->
     <string name="all_content">Content</string>
     <string name="all_description">Description</string>
@@ -194,23 +220,20 @@
 
     <!--Timetable Widget-->
     <string name="widget_timetable_no_items">No lessons</string>
-    <string name="widget_timetable_today">Today</string>
-    <string name="widget_timetable_tomorrow">Tomorrow</string>
 
 
     <!--Preferences-->
-    <string name="pref_view_header">View</string>
+    <string name="pref_view_header">Appearance</string>
     <string name="pref_view_list">Default view</string>
-    <string name="pref_view_summary">Show the summary in the grades</string>
+    <string name="pref_view_grade_average_mode">Calculation of the end-of-year average</string>
     <string name="pref_view_present">Show presence in attendance</string>
-    <string name="pref_view_theme_dark">Dark theme (Beta)</string>
-    <string name="pref_view_grade_modifier_plus">Value of the plus</string>
-    <string name="pref_view_grade_modifier_minus">Value of the minus</string>
+    <string name="pref_view_app_theme">Application theme</string>
     <string name="pref_view_expand_grade">Expand grades</string>
+    <string name="pref_view_grade_color_scheme">Grades color scheme</string>
 
     <string name="pref_notify_header">Notifications</string>
     <string name="pref_notify_switch">Show notifications</string>
-    <string name="pref_debug_notify_switch">Show debug notifications</string>
+    <string name="pref_notify_debug_switch">Show debug notifications</string>
 
     <string name="pref_services_header">Synchronization</string>
     <string name="pref_services_switch">Automatic update</string>
@@ -218,6 +241,16 @@
     <string name="pref_services_interval">Updates interval</string>
     <string name="pref_services_wifi">Wi-Fi only</string>
 
+    <string name="pref_other_header">Other</string>
+    <string name="pref_other_grade_modifier_plus">Value of the plus</string>
+    <string name="pref_other_grade_modifier_minus">Value of the minus</string>
+    <string name="pref_other_fill_message_content">Reply with message history</string>
+
+
+    <!--Notification Channels-->
+    <string name="channel_new_entries">New entries in register</string>
+    <string name="channel_debug">Debug</string>
+
 
     <!--Colors-->
     <string name="all_black">Black</string>
@@ -231,10 +264,12 @@
     <!--Others-->
     <string name="all_copied">Copied</string>
 
+
     <!--Errors-->
     <string name="error_no_internet">No internet connection</string>
     <string name="error_timeout">Too long wait for connection</string>
     <string name="error_login_failed">Login is failed. Try again or restart the app</string>
     <string name="error_service_unavailable">The log is not available. Try again later</string>
     <string name="error_unknown">An unexpected error occurred</string>
+    <string name="error_feature_disabled">Feature disabled by your school</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index b79ef7b73..58699c9e3 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,6 +1,6 @@
 <resources>
 
-    <style name="WulkanowyTheme" parent="@style/Theme.AppCompat.DayNight">
+    <style name="WulkanowyTheme" parent="@style/Theme.MaterialComponents.Light.Bridge">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorPrimary</item>
@@ -14,6 +14,8 @@
         <item name="subtitleTextColor">@android:color/primary_text_dark</item>
         <item name="android:colorBackground">@android:color/white</item>
         <item name="bottomNavBackground">@color/bottom_nav_background_inverse</item>
+        <item name="dividerColor">@color/divider</item>
+        <item name="chip_detailed_backgroundColor">@color/chip_detailed_backgroundColor</item>
 
         <!-- AboutLibraries specific values -->
         <item name="about_libraries_window_background">@color/about_libraries_window_background</item>
@@ -38,4 +40,12 @@
     <style name="WulkanowyTheme.ActionBar" parent="WulkanowyTheme">
         <item name="colorControlNormal">@android:color/white</item>
     </style>
+
+    <style name="WulkanowyTheme.WidgetAccountSwitcher" parent="Theme.AppCompat.Light.Dialog">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+        <item name="android:textColorPrimary">@android:color/primary_text_light</item>
+        <item name="android:textColorSecondary">@android:color/secondary_text_light</item>
+        <item name="android:textColorSecondaryInverse">@android:color/primary_text_dark</item>
+    </style>
 </resources>
diff --git a/app/src/main/res/values/value_prefernces.xml b/app/src/main/res/values/value_prefernces.xml
index 56c5de0ea..97396baad 100644
--- a/app/src/main/res/values/value_prefernces.xml
+++ b/app/src/main/res/values/value_prefernces.xml
@@ -13,17 +13,15 @@
         <item>3</item>
     </string-array>
 
-    <string-array name="theme_entries">
-        <item>Off</item>
-        <item>On</item>
-        <item>Auto</item>
-        <item>Follow system settings</item>
+    <string-array name="app_theme_entries">
+        <item>Light</item>
+        <item>Dark</item>
+        <item>Black (AMOLED)</item>
     </string-array>
-    <string-array name="theme_values" translatable="false">
-        <item>1</item>
-        <item>2</item>
-        <item>0</item>
-        <item>-1</item>
+    <string-array name="app_theme_values" translatable="false">
+        <item>light</item>
+        <item>dark</item>
+        <item>black</item>
     </string-array>
 
     <string-array name="services_interval_entries">
@@ -50,11 +48,33 @@
         <item>0,25</item>
         <item>0,33</item>
         <item>0,5</item>
+        <item>0,75</item>
     </string-array>
     <string-array name="grade_modifier_value" translatable="false">
         <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>Grade colors in register</item>
+    </string-array>
+    <string-array name="grade_color_scheme_values" translatable="false">
+        <item>vulcan</item>
+        <item>material</item>
+        <item>grade_color</item>
+    </string-array>
+
+    <string-array name="grade_average_mode_entries">
+        <item>Average grades from the 2nd semester</item>
+        <item>Average of grades from the whole year</item>
+    </string-array>
+    <string-array name="grade_average_mode_values" translatable="false">
+        <item>only_one_semester</item>
+        <item>all_year</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/xml/provider_widget_lucky_number.xml b/app/src/main/res/xml/provider_widget_lucky_number.xml
new file mode 100644
index 000000000..064f20570
--- /dev/null
+++ b/app/src/main/res/xml/provider_widget_lucky_number.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:configure="io.github.wulkanowy.ui.modules.luckynumberwidget.LuckyNumberWidgetConfigureActivity"
+    android:initialLayout="@layout/widget_luckynumber"
+    android:minWidth="110dp"
+    android:minHeight="40dp"
+    android:minResizeWidth="40dp"
+    android:minResizeHeight="40dp"
+    android:previewImage="@drawable/img_luckynumber_widget_preview"
+    android:resizeMode="horizontal|vertical"
+    android:updatePeriodMillis="3600000"
+    android:widgetCategory="home_screen"
+    tools:targetApi="jelly_bean_mr1" />
diff --git a/app/src/main/res/xml/provider_widget_timetable.xml b/app/src/main/res/xml/provider_widget_timetable.xml
index 184b3f399..5392dd50b 100644
--- a/app/src/main/res/xml/provider_widget_timetable.xml
+++ b/app/src/main/res/xml/provider_widget_timetable.xml
@@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:configure="io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetConfigureActivity"
     android:initialLayout="@layout/widget_timetable"
-    android:minWidth="150dp"
-    android:minHeight="100dp"
+    android:minWidth="250dp"
+    android:minHeight="110dp"
+    android:minResizeWidth="250dp"
+    android:minResizeHeight="110dp"
     android:previewImage="@drawable/img_timetable_widget_preview"
     android:resizeMode="horizontal|vertical"
-    android:updatePeriodMillis="7200000"
-    android:widgetCategory="home_screen" />
+    android:updatePeriodMillis="3600000"
+    android:widgetCategory="home_screen"
+    tools:targetApi="jelly_bean_mr1" />
diff --git a/app/src/main/res/xml/scheme_preferences.xml b/app/src/main/res/xml/scheme_preferences.xml
index 575fea63d..149024c03 100644
--- a/app/src/main/res/xml/scheme_preferences.xml
+++ b/app/src/main/res/xml/scheme_preferences.xml
@@ -13,12 +13,12 @@
             android:title="@string/pref_view_list"
             app:iconSpaceReserved="false" />
         <ListPreference
-            android:defaultValue="1"
-            android:entries="@array/theme_entries"
-            android:entryValues="@array/theme_values"
-            android:key="theme"
+            android:defaultValue="light"
+            android:entries="@array/app_theme_entries"
+            android:entryValues="@array/app_theme_values"
+            android:key="@string/pref_key_app_theme"
             android:summary="%s"
-            android:title="@string/pref_view_theme_dark"
+            android:title="@string/pref_view_app_theme"
             app:iconSpaceReserved="false" />
         <SwitchPreference
             android:defaultValue="true"
@@ -31,20 +31,12 @@
             android:title="@string/pref_view_expand_grade"
             app:iconSpaceReserved="false" />
         <ListPreference
-            android:defaultValue="0.0"
-            android:entries="@array/grade_modifier_entries"
-            android:entryValues="@array/grade_modifier_value"
-            android:key="@string/pref_key_grade_modifier_plus"
+            android:defaultValue="vulcan"
+            android:entries="@array/grade_color_scheme_entries"
+            android:entryValues="@array/grade_color_scheme_values"
+            android:key="@string/pref_key_grade_color_scheme"
             android:summary="%s"
-            android:title="@string/pref_view_grade_modifier_plus"
-            app:iconSpaceReserved="false" />
-        <ListPreference
-            android:defaultValue="0.0"
-            android:entries="@array/grade_modifier_entries"
-            android:entryValues="@array/grade_modifier_value"
-            android:key="@string/pref_key_grade_modifier_minus"
-            android:summary="%s"
-            android:title="@string/pref_view_grade_modifier_minus"
+            android:title="@string/pref_view_grade_color_scheme"
             app:iconSpaceReserved="false" />
     </PreferenceCategory>
     <PreferenceCategory
@@ -82,8 +74,41 @@
             app:iconSpaceReserved="false" />
         <SwitchPreference
             android:defaultValue="false"
-            android:key="@string/pref_key_debug_chucker_notification"
-            android:title="@string/pref_debug_notify_switch"
+            android:key="@string/pref_key_notification_debug"
+            android:title="@string/pref_notify_debug_switch"
+            app:iconSpaceReserved="false" />
+    </PreferenceCategory>
+    <PreferenceCategory
+        android:title="@string/pref_other_header"
+        app:iconSpaceReserved="false">
+        <ListPreference
+            android:defaultValue="0.0"
+            android:entries="@array/grade_modifier_entries"
+            android:entryValues="@array/grade_modifier_value"
+            android:key="@string/pref_key_grade_modifier_plus"
+            android:summary="%s"
+            android:title="@string/pref_other_grade_modifier_plus"
+            app:iconSpaceReserved="false" />
+        <ListPreference
+            android:defaultValue="0.0"
+            android:entries="@array/grade_modifier_entries"
+            android:entryValues="@array/grade_modifier_value"
+            android:key="@string/pref_key_grade_modifier_minus"
+            android:summary="%s"
+            android:title="@string/pref_other_grade_modifier_minus"
+            app:iconSpaceReserved="false" />
+        <ListPreference
+            android:defaultValue="only_one_semester"
+            android:entries="@array/grade_average_mode_entries"
+            android:entryValues="@array/grade_average_mode_values"
+            android:key="@string/pref_key_grade_average_mode"
+            android:summary="%s"
+            android:title="@string/pref_view_grade_average_mode"
+            app:iconSpaceReserved="false" />
+        <SwitchPreference
+            android:defaultValue="true"
+            android:key="@string/pref_key_fill_message_content"
+            android:title="@string/pref_other_fill_message_content"
             app:iconSpaceReserved="false" />
     </PreferenceCategory>
 </PreferenceScreen>
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
new file mode 100644
index 000000000..28abbb993
--- /dev/null
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/UnitTestInternetObservingStrategy.kt
@@ -0,0 +1,19 @@
+package io.github.wulkanowy.data.repositories
+
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingStrategy
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.error.ErrorHandler
+import io.reactivex.Observable
+import io.reactivex.Single
+
+class UnitTestInternetObservingStrategy : InternetObservingStrategy {
+
+    override fun checkInternetConnectivity(host: String?, port: Int, timeoutInMs: Int, httpResponse: Int, errorHandler: ErrorHandler?): Single<Boolean> {
+        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(true)
+    }
+
+    override fun getDefaultPingHost() = "localhost"
+}
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/remote/AttendanceRemoteTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRemoteTest.kt
similarity index 96%
rename from app/src/test/java/io/github/wulkanowy/data/repositories/remote/AttendanceRemoteTest.kt
rename to app/src/test/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRemoteTest.kt
index f15f4ea7a..8adfa83bd 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/remote/AttendanceRemoteTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRemoteTest.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.repositories.remote
+package io.github.wulkanowy.data.repositories.attendance
 
 import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.api.attendance.Attendance
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
new file mode 100644
index 000000000..bb9f52945
--- /dev/null
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRemoteTest.kt
@@ -0,0 +1,56 @@
+package io.github.wulkanowy.data.repositories.completedlessons
+
+import io.github.wulkanowy.api.Api
+import io.github.wulkanowy.api.timetable.CompletedLesson
+import io.github.wulkanowy.data.db.entities.Semester
+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
+import org.junit.Test
+import org.threeten.bp.LocalDate
+import java.sql.Date
+
+class CompletedLessonsRemoteTest {
+
+    @SpyK
+    private var mockApi = Api()
+
+    @MockK
+    private lateinit var semesterMock: Semester
+
+    @Before
+    fun initApi() {
+        MockKAnnotations.init(this)
+    }
+
+    @Test
+    fun getCompletedLessonsTest() {
+        every {
+            mockApi.getCompletedLessons(
+                LocalDate.of(2018, 9, 10),
+                LocalDate.of(2018, 9, 15)
+            )
+        } returns Single.just(listOf(
+            getCompletedLesson("2018-09-10"),
+            getCompletedLesson("2018-09-17")
+        ))
+
+        every { mockApi.diaryId } returns 1
+        every { semesterMock.studentId } returns 1
+        every { semesterMock.diaryId } returns 1
+
+        val completed = CompletedLessonsRemote(mockApi).getCompletedLessons(semesterMock,
+            LocalDate.of(2018, 9, 10),
+            LocalDate.of(2018, 9, 15)
+        ).blockingGet()
+        Assert.assertEquals(2, completed.size)
+    }
+
+    private fun getCompletedLesson(dateString: String): CompletedLesson {
+        return CompletedLesson().apply { date = Date.valueOf(dateString) }
+    }
+}
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/remote/ExamRemoteTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/exam/ExamRemoteTest.kt
similarity index 96%
rename from app/src/test/java/io/github/wulkanowy/data/repositories/remote/ExamRemoteTest.kt
rename to app/src/test/java/io/github/wulkanowy/data/repositories/exam/ExamRemoteTest.kt
index 71fcd6d56..0c83bed0a 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/remote/ExamRemoteTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/exam/ExamRemoteTest.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.repositories.remote
+package io.github.wulkanowy.data.repositories.exam
 
 import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.api.exams.Exam
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
new file mode 100644
index 000000000..37d3f2ad6
--- /dev/null
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRemoteTest.kt
@@ -0,0 +1,52 @@
+package io.github.wulkanowy.data.repositories.gradestatistics
+
+import io.github.wulkanowy.api.Api
+import io.github.wulkanowy.api.grades.GradeStatistics
+import io.github.wulkanowy.data.db.entities.Semester
+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
+import org.junit.Test
+
+class GradeStatisticsRemoteTest {
+
+    @SpyK
+    private var mockApi = Api()
+
+    @MockK
+    private lateinit var semesterMock: Semester
+
+    @Before
+    fun initApi() {
+        MockKAnnotations.init(this)
+    }
+
+    @Test
+    fun getGradeStatisticsTest() {
+        every { mockApi.getGradesStatistics(1, any()) } returns Single.just(listOf(
+            getGradeStatistics("Fizyka"),
+            getGradeStatistics("Matematyka")
+        ))
+
+        every { mockApi.diaryId } returns 1
+        every { semesterMock.studentId } returns 1
+        every { semesterMock.semesterId } returns 1
+        every { semesterMock.semesterName } returns 2
+        every { semesterMock.diaryId } returns 1
+
+        val stats = GradeStatisticsRemote(mockApi).getGradeStatistics(semesterMock, false).blockingGet()
+        Assert.assertEquals(2, stats.size)
+    }
+
+    private fun getGradeStatistics(subjectName: String): GradeStatistics {
+        return GradeStatistics().apply {
+            subject = subjectName
+            gradeValue = 5
+            amount = 10
+        }
+    }
+}
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
new file mode 100644
index 000000000..67e6c2ef6
--- /dev/null
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRemoteTest.kt
@@ -0,0 +1,45 @@
+package io.github.wulkanowy.data.repositories.luckynumber
+
+import io.github.wulkanowy.api.Api
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.repositories.luckynumber.LuckyNumberRemote
+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
+import org.junit.Before
+import org.junit.Test
+import org.threeten.bp.LocalDate
+
+class LuckyNumberRemoteTest {
+
+    @SpyK
+    private var mockApi = Api()
+
+    @MockK
+    private lateinit var semesterMock: Semester
+
+    @Before
+    fun initApi() {
+        MockKAnnotations.init(this)
+    }
+
+    @Test
+    fun getLuckyNumberTest() {
+        every { mockApi.getLuckyNumber() } returns Maybe.just(14)
+
+        every { mockApi.diaryId } returns 1
+        every { semesterMock.studentId } returns 1
+        every { semesterMock.diaryId } returns 1
+
+        val luckyNumber = LuckyNumberRemote(mockApi)
+            .getLuckyNumber(semesterMock)
+            .blockingGet()
+
+        assertEquals(14, luckyNumber.luckyNumber)
+        assertEquals(LocalDate.now(), luckyNumber.date)
+        assertEquals(semesterMock.studentId, luckyNumber.studentId)
+    }
+}
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
new file mode 100644
index 000000000..7856b9370
--- /dev/null
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/semester/SemesterRepositoryTest.kt
@@ -0,0 +1,74 @@
+package io.github.wulkanowy.data.repositories.semester
+
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
+import io.github.wulkanowy.data.ApiHelper
+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.reactivex.Maybe
+import io.reactivex.Single
+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
+
+class SemesterRepositoryTest {
+
+    @Mock
+    private lateinit var semesterRemote: SemesterRemote
+
+    @Mock
+    private lateinit var semesterLocal: SemesterLocal
+
+    @Mock
+    private lateinit var apiHelper: ApiHelper
+
+    @Mock
+    private lateinit var student: Student
+
+    private lateinit var semesterRepository: SemesterRepository
+
+    private val settings = InternetObservingSettings.builder()
+        .strategy(UnitTestInternetObservingStrategy())
+        .build()
+
+    @Before
+    fun initTest() {
+        MockitoAnnotations.initMocks(this)
+        semesterRepository = SemesterRepository(semesterRemote, semesterLocal, settings, apiHelper)
+    }
+
+    @Test
+    fun singleCurrentSemesterTest() {
+        val semesters = listOf(
+            createSemesterEntity(false),
+            createSemesterEntity(true)
+        )
+
+        doNothing().`when`(apiHelper).initApi(student)
+        doReturn(Maybe.empty<Semester>()).`when`(semesterLocal).getSemesters(student)
+        doReturn(Single.just(semesters)).`when`(semesterRemote).getSemesters(student)
+
+        semesterRepository.getSemesters(student).blockingGet()
+
+        verify(semesterLocal).deleteSemesters(emptyList())
+        verify(semesterLocal).saveSemesters(semesters)
+    }
+
+    @Test(expected = IllegalArgumentException::class)
+    fun twoCurrentSemesterTest() {
+        val semesters = listOf(
+            createSemesterEntity(true),
+            createSemesterEntity(true)
+        )
+
+        doNothing().`when`(apiHelper).initApi(student)
+        doReturn(Maybe.empty<Semester>()).`when`(semesterLocal).getSemesters(student)
+        doReturn(Single.just(semesters)).`when`(semesterRemote).getSemesters(student)
+
+        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/remote/StudentRemoteTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/student/StudentRemoteTest.kt
similarity index 71%
rename from app/src/test/java/io/github/wulkanowy/data/repositories/remote/StudentRemoteTest.kt
rename to app/src/test/java/io/github/wulkanowy/data/repositories/student/StudentRemoteTest.kt
index 09082ec85..4d7b23ebd 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/remote/StudentRemoteTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/student/StudentRemoteTest.kt
@@ -1,7 +1,7 @@
-package io.github.wulkanowy.data.repositories.remote
+package io.github.wulkanowy.data.repositories.student
 
 import io.github.wulkanowy.api.Api
-import io.github.wulkanowy.api.register.Pupil
+import io.github.wulkanowy.api.register.Student
 import io.reactivex.Single
 import org.junit.Assert.assertEquals
 import org.junit.Before
@@ -22,8 +22,8 @@ class StudentRemoteTest {
 
     @Test
     fun testRemoteAll() {
-        doReturn(Single.just(listOf(Pupil("", "", 1, "test", "", "", "", Api.LoginType.AUTO))))
-            .`when`(mockApi).getPupils()
+        doReturn(Single.just(listOf(Student("", "", 1, "test", "", "", "", 1, Api.LoginType.AUTO))))
+            .`when`(mockApi).getStudents()
 
         val students = StudentRemote(mockApi).getStudents("", "", "").blockingGet()
         assertEquals(1, students.size)
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/remote/TimetableRemoteTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/timetable/TimetableRemoteTest.kt
similarity index 91%
rename from app/src/test/java/io/github/wulkanowy/data/repositories/remote/TimetableRemoteTest.kt
rename to app/src/test/java/io/github/wulkanowy/data/repositories/timetable/TimetableRemoteTest.kt
index 4a5bb6ef3..4bb4091fb 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/remote/TimetableRemoteTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/timetable/TimetableRemoteTest.kt
@@ -1,8 +1,9 @@
-package io.github.wulkanowy.data.repositories.remote
+package io.github.wulkanowy.data.repositories.timetable
 
 import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.api.timetable.Timetable
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.repositories.timetable.TimetableRemote
 import io.mockk.MockKAnnotations
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
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
new file mode 100644
index 000000000..59dc36507
--- /dev/null
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProviderTest.kt
@@ -0,0 +1,124 @@
+package io.github.wulkanowy.ui.modules.grade
+
+import io.github.wulkanowy.data.db.entities.Grade
+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.reactivex.Single
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Test
+import org.mockito.Mock
+import org.mockito.Mockito.doReturn
+import org.mockito.MockitoAnnotations
+import org.threeten.bp.LocalDate.now
+import org.threeten.bp.LocalDateTime
+
+class GradeAverageProviderTest {
+
+    @Mock
+    lateinit var preferencesRepository: PreferencesRepository
+
+    @Mock
+    lateinit var gradeRepository: GradeRepository
+
+    private lateinit var gradeAverageProvider: GradeAverageProvider
+
+    private val student = Student("", "", "", "", "", 101, "", "", "", "", 1, true, LocalDateTime.now())
+
+    private val semesters = mutableListOf(
+        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(
+        getGrade(101, 22, "Matematyka", 4, .0, 1.0),
+        getGrade(101, 22, "Matematyka", 3, .0, 1.0),
+        getGrade(101, 22, "Fizyka", 6, .0, 1.0),
+        getGrade(101, 22, "Fizyka", 1, .0, 1.0)
+    )
+
+    private val secondGrade = listOf(
+        getGrade(101, 23, "Matematyka", 2, .0, 1.0),
+        getGrade(101, 23, "Matematyka", 3, .0, 1.0),
+        getGrade(101, 23, "Fizyka", 4, .0, 1.0),
+        getGrade(101, 23, "Fizyka", 2, .0, 1.0)
+    )
+
+    @Before
+    fun initTest() {
+        MockitoAnnotations.initMocks(this)
+        gradeAverageProvider = GradeAverageProvider(preferencesRepository, gradeRepository)
+
+        doReturn(.33).`when`(preferencesRepository).gradeMinusModifier
+        doReturn(.33).`when`(preferencesRepository).gradePlusModifier
+
+        doReturn(Single.just(firstGrades)).`when`(gradeRepository).getGrades(student, semesters[1], true)
+        doReturn(Single.just(secondGrade)).`when`(gradeRepository).getGrades(student, semesters[2], true)
+    }
+
+    @Test
+    fun onlyOneSemesterTest() {
+        doReturn("only_one_semester").`when`(preferencesRepository).gradeAverageMode
+
+        val averages = gradeAverageProvider.getGradeAverage(student, semesters, semesters[2].semesterId, true)
+            .blockingGet()
+
+        assertEquals(2, averages.size)
+        assertEquals(2.5, averages["Matematyka"])
+        assertEquals(3.0, averages["Fizyka"])
+    }
+
+    @Test
+    fun allYearFirstSemesterTest() {
+        doReturn("all_year").`when`(preferencesRepository).gradeAverageMode
+
+        val averages = gradeAverageProvider.getGradeAverage(student, semesters, semesters[1].semesterId, true)
+            .blockingGet()
+
+        assertEquals(2, averages.size)
+        assertEquals(3.5, averages["Matematyka"])
+        assertEquals(3.5, averages["Fizyka"])
+    }
+
+    @Test
+    fun allYearSecondSemesterTest() {
+        doReturn("all_year").`when`(preferencesRepository).gradeAverageMode
+        doReturn(Single.just(firstGrades)).`when`(gradeRepository).getGrades(student, semesters[1], false)
+
+        val averages = gradeAverageProvider.getGradeAverage(student, semesters, semesters[2].semesterId, true)
+            .blockingGet()
+
+        assertEquals(2, averages.size)
+        assertEquals(3.0, averages["Matematyka"])
+        assertEquals(3.25, averages["Fizyka"])
+    }
+
+    @Test(expected = IllegalArgumentException::class)
+    fun incorrectAverageModeTest() {
+        doReturn("test_mode").`when`(preferencesRepository).gradeAverageMode
+
+        gradeAverageProvider.getGradeAverage(student, semesters, semesters[2].semesterId, true).blockingGet()
+    }
+
+    private fun getGrade(studentId: Int, semesterId: Int, subject: String, value: Int, modifier: Double, weight: Double): Grade {
+        return Grade(
+            studentId = studentId,
+            semesterId = semesterId,
+            subject = subject,
+            value = value,
+            modifier = modifier,
+            weightValue = weight,
+            teacher = "",
+            date = now(),
+            weight = "",
+            gradeSymbol = "",
+            entry = "",
+            description = "",
+            comment = "",
+            color = ""
+        )
+    }
+}
diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/login/LoginPresenterTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/login/LoginPresenterTest.kt
index 6536ec15a..54b3b8792 100644
--- a/app/src/test/java/io/github/wulkanowy/ui/modules/login/LoginPresenterTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/login/LoginPresenterTest.kt
@@ -6,7 +6,6 @@ import org.junit.Test
 import org.mockito.Mock
 import org.mockito.Mockito.clearInvocations
 import org.mockito.Mockito.doReturn
-import org.mockito.Mockito.never
 import org.mockito.Mockito.verify
 import org.mockito.MockitoAnnotations
 
@@ -32,25 +31,7 @@ class LoginPresenterTest {
     @Test
     fun initViewTest() {
         verify(loginView).initAdapter()
-        verify(loginView).hideActionBar()
-    }
-
-    @Test
-    fun onPageSelectedTest() {
-        presenter.onPageSelected(1)
-        verify(loginView).notifyOptionsViewLoadData()
-    }
-
-    @Test
-    fun onPageSelectedNeverTest() {
-        presenter.onPageSelected(0)
-        verify(loginView, never()).notifyOptionsViewLoadData()
-    }
-
-    @Test
-    fun onSwitchFragmentTest() {
-        presenter.onChildViewSwitchOptions()
-        verify(loginView).switchView(1)
+        verify(loginView).showActionBar(false)
     }
 
     @Test
@@ -59,7 +40,6 @@ class LoginPresenterTest {
         doReturn(1).`when`(loginView).currentViewIndex
         presenter.onBackPressed { }
         verify(loginView).switchView(0)
-        verify(loginView).hideActionBar()
     }
 
     @Test
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 05d2e3990..b643a5501 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
@@ -2,7 +2,7 @@ package io.github.wulkanowy.ui.modules.login.form
 
 import io.github.wulkanowy.TestSchedulersProvider
 import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.modules.login.LoginErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 import io.reactivex.Single
@@ -10,12 +10,14 @@ import org.junit.Before
 import org.junit.Test
 import org.mockito.ArgumentMatchers.anyString
 import org.mockito.Mock
+import org.mockito.Mockito.`when`
 import org.mockito.Mockito.clearInvocations
 import org.mockito.Mockito.doReturn
 import org.mockito.Mockito.never
 import org.mockito.Mockito.times
 import org.mockito.Mockito.verify
 import org.mockito.MockitoAnnotations
+import org.threeten.bp.LocalDateTime.now
 
 class LoginFormPresenterTest {
 
@@ -37,7 +39,7 @@ class LoginFormPresenterTest {
     fun initPresenter() {
         MockitoAnnotations.initMocks(this)
         clearInvocations(repository, loginFormView)
-        presenter = LoginFormPresenter(TestSchedulersProvider(), errorHandler, repository, analytics)
+        presenter = LoginFormPresenter(TestSchedulersProvider(), errorHandler, repository, analytics, false)
         presenter.onAttachView(loginFormView)
     }
 
@@ -48,87 +50,89 @@ class LoginFormPresenterTest {
 
     @Test
     fun emptyNicknameLoginTest() {
-        presenter.attemptLogin("", "test123", "test", "https://fakelog.cf")
+        `when`(loginFormView.formNameValue).thenReturn("")
+        `when`(loginFormView.formPassValue).thenReturn("test123")
+        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf")
+        presenter.onSignInClick()
 
-        verify(loginFormView).setErrorNicknameRequired()
+        verify(loginFormView).setErrorNameRequired()
         verify(loginFormView, never()).setErrorPassRequired(false)
-        verify(loginFormView, never()).setErrorSymbolRequire()
         verify(loginFormView, never()).setErrorPassInvalid(false)
     }
 
     @Test
     fun emptyPassLoginTest() {
-        presenter.attemptLogin("@", "", "test", "https://fakelog.cf")
+        `when`(loginFormView.formNameValue).thenReturn("@")
+        `when`(loginFormView.formPassValue).thenReturn("")
+        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf")
+        presenter.onSignInClick()
 
-        verify(loginFormView, never()).setErrorNicknameRequired()
+        verify(loginFormView, never()).setErrorNameRequired()
         verify(loginFormView).setErrorPassRequired(true)
-        verify(loginFormView, never()).setErrorSymbolRequire()
         verify(loginFormView, never()).setErrorPassInvalid(false)
     }
 
     @Test
     fun invalidPassLoginTest() {
-        presenter.attemptLogin("@", "123", "test", "https://fakelog.cf")
+        `when`(loginFormView.formNameValue).thenReturn("@")
+        `when`(loginFormView.formPassValue).thenReturn("123")
+        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf")
+        presenter.onSignInClick()
 
-        verify(loginFormView, never()).setErrorNicknameRequired()
+        verify(loginFormView, never()).setErrorNameRequired()
         verify(loginFormView, never()).setErrorPassRequired(true)
-        verify(loginFormView, never()).setErrorSymbolRequire()
         verify(loginFormView).setErrorPassInvalid(true)
     }
 
-    @Test
-    fun emptySymbolLoginTest() {
-        doReturn(Single.just(emptyList<Student>()))
-            .`when`(repository).getStudents(anyString(), anyString(), anyString(), anyString())
-        presenter.attemptLogin("@", "123456", "", "https://fakelog.cf")
-        presenter.attemptLogin("@", "123456", "", "https://fakelog.cf")
-
-        verify(loginFormView).setErrorSymbolRequire()
-    }
-
     @Test
     fun loginTest() {
-        val studentTest = Student(email = "test@", password = "123", endpoint = "https://fakelog.cf", loginType = "AUTO")
+        val studentTest = Student(email = "test@", password = "123", endpoint = "https://fakelog.cf", loginType = "AUTO", studentName = "", schoolSymbol = "", schoolName = "", studentId = 0, classId = 1, isCurrent = false, symbol = "", registrationDate = now(), className = "")
         doReturn(Single.just(listOf(studentTest)))
             .`when`(repository).getStudents(anyString(), anyString(), anyString(), anyString())
-        presenter.attemptLogin("@", "123456", "test", "https://fakelog.cf")
+
+        `when`(loginFormView.formNameValue).thenReturn("@")
+        `when`(loginFormView.formPassValue).thenReturn("123456")
+        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf")
+        presenter.onSignInClick()
 
         verify(loginFormView).hideSoftKeyboard()
         verify(loginFormView).showProgress(true)
         verify(loginFormView).showProgress(false)
         verify(loginFormView).showContent(false)
         verify(loginFormView).showContent(true)
-        verify(loginFormView).switchOptionsView()
     }
 
     @Test
     fun loginEmptyTest() {
         doReturn(Single.just(emptyList<Student>()))
             .`when`(repository).getStudents(anyString(), anyString(), anyString(), anyString())
-        presenter.attemptLogin("@", "123456", "test", "https://fakelog.cf")
+        `when`(loginFormView.formNameValue).thenReturn("@")
+        `when`(loginFormView.formPassValue).thenReturn("123456")
+        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf")
+        presenter.onSignInClick()
 
         verify(loginFormView).hideSoftKeyboard()
         verify(loginFormView).showProgress(true)
         verify(loginFormView).showProgress(false)
         verify(loginFormView).showContent(false)
         verify(loginFormView).showContent(true)
-        verify(loginFormView).showSymbolInput()
     }
 
     @Test
     fun loginEmptyTwiceTest() {
         doReturn(Single.just(emptyList<Student>()))
             .`when`(repository).getStudents(anyString(), anyString(), anyString(), anyString())
-        presenter.attemptLogin("@", "123456", "", "https://fakelog.cf")
-        presenter.attemptLogin("@", "123456", "test", "https://fakelog.cf")
+        `when`(loginFormView.formNameValue).thenReturn("@")
+        `when`(loginFormView.formPassValue).thenReturn("123456")
+        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf")
+        presenter.onSignInClick()
+        presenter.onSignInClick()
 
         verify(loginFormView, times(2)).hideSoftKeyboard()
         verify(loginFormView, times(2)).showProgress(true)
         verify(loginFormView, times(2)).showProgress(false)
         verify(loginFormView, times(2)).showContent(false)
         verify(loginFormView, times(2)).showContent(true)
-        verify(loginFormView, times(2)).showSymbolInput()
-        verify(loginFormView).setErrorSymbolIncorrect()
     }
 
     @Test
@@ -136,7 +140,10 @@ class LoginFormPresenterTest {
         val testException = RuntimeException("test")
         doReturn(Single.error<List<Student>>(testException))
             .`when`(repository).getStudents(anyString(), anyString(), anyString(), anyString())
-        presenter.attemptLogin("@", "123456", "test", "https://fakelog.cf")
+        `when`(loginFormView.formNameValue).thenReturn("@")
+        `when`(loginFormView.formPassValue).thenReturn("123456")
+        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf")
+        presenter.onSignInClick()
 
         verify(loginFormView).hideSoftKeyboard()
         verify(loginFormView).showProgress(true)
diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/login/options/LoginOptionsPresenterTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/login/options/LoginOptionsPresenterTest.kt
deleted file mode 100644
index 939d017fe..000000000
--- a/app/src/test/java/io/github/wulkanowy/ui/modules/login/options/LoginOptionsPresenterTest.kt
+++ /dev/null
@@ -1,94 +0,0 @@
-package io.github.wulkanowy.ui.modules.login.options
-
-import io.github.wulkanowy.TestSchedulersProvider
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.repositories.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
-import io.github.wulkanowy.ui.modules.login.LoginErrorHandler
-import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.reactivex.Completable
-import io.reactivex.Single
-import org.junit.Before
-import org.junit.Test
-import org.mockito.Mock
-import org.mockito.Mockito.clearInvocations
-import org.mockito.Mockito.doReturn
-import org.mockito.Mockito.verify
-import org.mockito.MockitoAnnotations
-
-class LoginOptionsPresenterTest {
-
-    @Mock
-    lateinit var errorHandler: LoginErrorHandler
-
-    @Mock
-    lateinit var loginOptionsView: LoginOptionsView
-
-    @Mock
-    lateinit var studentRepository: StudentRepository
-
-    @Mock
-    lateinit var semesterRepository: SemesterRepository
-
-    @Mock
-    lateinit var analytics: FirebaseAnalyticsHelper
-
-    private lateinit var presenter: LoginOptionsPresenter
-
-    private val testStudent by lazy { Student(email = "test", password = "test123", endpoint = "https://fakelog.cf", loginType = "AUTO") }
-
-    private val testException by lazy { RuntimeException("Problem") }
-
-    @Before
-    fun initPresenter() {
-        MockitoAnnotations.initMocks(this)
-        clearInvocations(studentRepository, loginOptionsView)
-        clearInvocations(semesterRepository, loginOptionsView)
-        presenter = LoginOptionsPresenter(errorHandler, studentRepository, semesterRepository, TestSchedulersProvider(), analytics)
-        presenter.onAttachView(loginOptionsView)
-    }
-
-    @Test
-    fun initViewTest() {
-        verify(loginOptionsView).initView()
-    }
-
-    @Test
-    fun refreshDataTest() {
-        doReturn(Single.just(listOf(testStudent))).`when`(studentRepository).cachedStudents
-        presenter.onParentViewLoadData()
-        verify(loginOptionsView).showActionBar(true)
-        verify(loginOptionsView).updateData(listOf(LoginOptionsItem(testStudent)))
-    }
-
-    @Test
-    fun refreshDataErrorTest() {
-        doReturn(Single.error<List<Student>>(testException)).`when`(studentRepository).cachedStudents
-        presenter.onParentViewLoadData()
-        verify(loginOptionsView).showActionBar(true)
-        verify(errorHandler).dispatch(testException)
-    }
-
-    @Test
-    fun onSelectedStudentTest() {
-        doReturn(Single.just(1L)).`when`(studentRepository).saveStudent(testStudent)
-        doReturn(Single.just(emptyList<Semester>())).`when`(semesterRepository).getSemesters(testStudent, true)
-        doReturn(Completable.complete()).`when`(studentRepository).switchStudent(testStudent)
-        presenter.onItemSelected(LoginOptionsItem(testStudent))
-        verify(loginOptionsView).showContent(false)
-        verify(loginOptionsView).showProgress(true)
-        verify(loginOptionsView).openMainView()
-    }
-
-    @Test
-    fun onSelectedStudentErrorTest() {
-        doReturn(Single.error<Student>(testException)).`when`(studentRepository).saveStudent(testStudent)
-        doReturn(Single.just(emptyList<Semester>())).`when`(semesterRepository).getSemesters(testStudent, true)
-        doReturn(Completable.complete()).`when`(studentRepository).logoutStudent(testStudent)
-        presenter.onItemSelected(LoginOptionsItem(testStudent))
-        verify(loginOptionsView).showContent(false)
-        verify(loginOptionsView).showProgress(true)
-        verify(errorHandler).dispatch(testException)
-    }
-}
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
new file mode 100644
index 000000000..17c16f415
--- /dev/null
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenterTest.kt
@@ -0,0 +1,73 @@
+package io.github.wulkanowy.ui.modules.login.studentselect
+
+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.FirebaseAnalyticsHelper
+import io.reactivex.Completable
+import io.reactivex.Single
+import org.junit.Before
+import org.junit.Test
+import org.mockito.Mock
+import org.mockito.Mockito.clearInvocations
+import org.mockito.Mockito.doReturn
+import org.mockito.Mockito.verify
+import org.mockito.MockitoAnnotations
+import org.threeten.bp.LocalDateTime.now
+
+class LoginStudentSelectPresenterTest {
+
+    @Mock
+    lateinit var errorHandler: LoginErrorHandler
+
+    @Mock
+    lateinit var loginStudentSelectView: LoginStudentSelectView
+
+    @Mock
+    lateinit var studentRepository: StudentRepository
+
+    @Mock
+    lateinit var analytics: FirebaseAnalyticsHelper
+
+    private lateinit var presenter: LoginStudentSelectPresenter
+
+    private val testStudent by lazy { Student(email = "test", password = "test123", endpoint = "https://fakelog.cf", loginType = "AUTO", symbol = "", isCurrent = false, studentId = 0, schoolName = "", schoolSymbol = "", classId = 1, studentName = "", registrationDate = now(), className = "") }
+
+    private val testException by lazy { RuntimeException("Problem") }
+
+    @Before
+    fun initPresenter() {
+        MockitoAnnotations.initMocks(this)
+        clearInvocations(studentRepository, loginStudentSelectView)
+        presenter = LoginStudentSelectPresenter(errorHandler, studentRepository, TestSchedulersProvider(), analytics)
+        presenter.onAttachView(loginStudentSelectView, null)
+    }
+
+    @Test
+    fun initViewTest() {
+        verify(loginStudentSelectView).initView()
+    }
+
+    @Test
+    fun onSelectedStudentTest() {
+        doReturn(Single.just(listOf(1L))).`when`(studentRepository).saveStudents(listOf(testStudent))
+        doReturn(Completable.complete()).`when`(studentRepository).switchStudent(testStudent)
+        presenter.onItemSelected(LoginStudentSelectItem(testStudent))
+        presenter.onSignIn()
+        verify(loginStudentSelectView).showContent(false)
+        verify(loginStudentSelectView).showProgress(true)
+        verify(loginStudentSelectView).openMainView()
+    }
+
+    @Test
+    fun onSelectedStudentErrorTest() {
+        doReturn(Single.error<Student>(testException)).`when`(studentRepository).saveStudents(listOf(testStudent))
+        doReturn(Completable.complete()).`when`(studentRepository).logoutStudent(testStudent)
+        presenter.onItemSelected(LoginStudentSelectItem(testStudent))
+        presenter.onSignIn()
+        verify(loginStudentSelectView).showContent(false)
+        verify(loginStudentSelectView).showProgress(true)
+        verify(errorHandler).dispatch(testException)
+    }
+}
diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/main/MainPresenterTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/main/MainPresenterTest.kt
index 203ce3048..1f5dc8de0 100644
--- a/app/src/test/java/io/github/wulkanowy/ui/modules/main/MainPresenterTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/main/MainPresenterTest.kt
@@ -1,9 +1,9 @@
 package io.github.wulkanowy.ui.modules.main
 
 import io.github.wulkanowy.TestSchedulersProvider
-import io.github.wulkanowy.data.repositories.PreferencesRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
-import io.github.wulkanowy.services.job.ServiceHelper
+import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
+import io.github.wulkanowy.data.repositories.student.StudentRepository
+import io.github.wulkanowy.services.sync.SyncManager
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 import org.junit.Before
@@ -25,7 +25,7 @@ class MainPresenterTest {
     lateinit var prefRepository: PreferencesRepository
 
     @Mock
-    lateinit var serviceHelper: ServiceHelper
+    lateinit var syncManager: SyncManager
 
     @Mock
     lateinit var mainView: MainView
@@ -40,8 +40,8 @@ class MainPresenterTest {
         MockitoAnnotations.initMocks(this)
         clearInvocations(mainView)
 
-        presenter = MainPresenter(errorHandler, studentRepository, prefRepository, TestSchedulersProvider(), serviceHelper, analytics)
-        presenter.onAttachView(mainView, -1)
+        presenter = MainPresenter(errorHandler, studentRepository, prefRepository, syncManager, TestSchedulersProvider(), analytics)
+        presenter.onAttachView(mainView, null)
     }
 
     @Test
diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/message/send/TestRecipientChip.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/message/send/TestRecipientChip.kt
new file mode 100644
index 000000000..943fb1902
--- /dev/null
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/message/send/TestRecipientChip.kt
@@ -0,0 +1,20 @@
+package io.github.wulkanowy.ui.modules.message.send
+
+import io.github.wulkanowy.data.db.entities.Recipient
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+class TestRecipientChip {
+
+    @Test
+    fun testRecipientChipInfo() {
+        assertEquals("Uczeń", getRecipientChip("Kowalski Jan - Uczeń").info)
+        assertEquals("(JK) - pracownik [Fake123456]", getRecipientChip("Kowalski Jan (JK) - pracownik [Fake123456]").info)
+        assertEquals("[KK] - pracownik (Fake123456)", getRecipientChip("Kowalska Karolina [KK] - pracownik (Fake123456)").info)
+        assertEquals("(BK) - Nauczyciel [Fake123456]", getRecipientChip("Kowal-Mazur Barbara (BK) - Nauczyciel [Fake123456]").info)
+    }
+
+    private fun getRecipientChip(realName: String): RecipientChip {
+        return RecipientChip(Recipient(0, "", "", realName, 0, 0, 0, ""))
+    }
+}
diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/splash/SplashPresenterTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/splash/SplashPresenterTest.kt
index ee4b17cf8..bc530a2bc 100644
--- a/app/src/test/java/io/github/wulkanowy/ui/modules/splash/SplashPresenterTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/splash/SplashPresenterTest.kt
@@ -1,7 +1,9 @@
 package io.github.wulkanowy.ui.modules.splash
 
-import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.TestSchedulersProvider
+import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.ErrorHandler
+import io.reactivex.Single
 import org.junit.Before
 import org.junit.Test
 import org.mockito.Mock
@@ -25,19 +27,19 @@ class SplashPresenterTest {
     @Before
     fun initPresenter() {
         MockitoAnnotations.initMocks(this)
-        presenter = SplashPresenter(studentRepository, errorHandler)
+        presenter = SplashPresenter(studentRepository, errorHandler, TestSchedulersProvider())
     }
 
     @Test
     fun testOpenLoginView() {
-        doReturn(false).`when`(studentRepository).isStudentSaved
+        doReturn(Single.just(false)).`when`(studentRepository).isCurrentStudentSet()
         presenter.onAttachView(splashView)
         verify(splashView).openLoginView()
     }
 
     @Test
     fun testMainMainView() {
-        doReturn(true).`when`(studentRepository).isStudentSaved
+        doReturn(Single.just(true)).`when`(studentRepository).isCurrentStudentSet()
         presenter.onAttachView(splashView)
         verify(splashView).openMainView()
     }
diff --git a/app/src/test/java/io/github/wulkanowy/utils/GradeExtensionTest.kt b/app/src/test/java/io/github/wulkanowy/utils/GradeExtensionTest.kt
index 12a086edd..3b1ab648c 100644
--- a/app/src/test/java/io/github/wulkanowy/utils/GradeExtensionTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/utils/GradeExtensionTest.kt
@@ -22,11 +22,11 @@ class GradeExtensionTest {
     @Test
     fun calcWeightedAverage() {
         assertEquals(3.47, listOf(
-            createGrade(5, 6, 0.33),
-            createGrade(5, 5, -0.33),
-            createGrade(4, 1, 0.0),
-            createGrade(1, 9, 0.5),
-            createGrade(0, 0, 0.0)
+            createGrade(5, 6.0, 0.33),
+            createGrade(5, 5.0, -0.33),
+            createGrade(4, 1.0, 0.0),
+            createGrade(1, 9.0, 0.5),
+            createGrade(0, .0, 0.0)
         ).calcAverage(), 0.005)
     }
 
@@ -42,23 +42,23 @@ class GradeExtensionTest {
 
     @Test
     fun changeModifier_default() {
-        assertEquals(.33, createGrade(5, 0, .33).changeModifier(.0, .0).modifier, .0)
-        assertEquals(-.33, createGrade(5, 0, -.33).changeModifier(.0, .0).modifier, .0)
+        assertEquals(.33, createGrade(5, .0, .33).changeModifier(.0, .0).modifier, .0)
+        assertEquals(-.33, createGrade(5, .0, -.33).changeModifier(.0, .0).modifier, .0)
     }
 
     @Test
     fun changeModifier_plus() {
-        assertEquals(.33, createGrade(5, 0, .25).changeModifier(.33, .50).modifier, .0)
-        assertEquals(.25, createGrade(5, 0, .33).changeModifier(.25, .0).modifier, .0)
+        assertEquals(.33, createGrade(5, .0, .25).changeModifier(.33, .50).modifier, .0)
+        assertEquals(.25, createGrade(5, .0, .33).changeModifier(.25, .0).modifier, .0)
     }
 
     @Test
     fun changeModifier_minus() {
-        assertEquals(-.33, createGrade(5, 0, -.25).changeModifier(.25, .33).modifier, .0)
-        assertEquals(-.25, createGrade(5, 0, -.33).changeModifier(.0, .25).modifier, .0)
+        assertEquals(-.33, createGrade(5, .0, -.25).changeModifier(.25, .33).modifier, .0)
+        assertEquals(-.25, createGrade(5, .0, -.33).changeModifier(.0, .25).modifier, .0)
     }
 
-    private fun createGrade(value: Int, weightValue: Int = 0, modifier: Double = 0.25): Grade {
+    private fun createGrade(value: Int, weightValue: Double = .0, modifier: Double = 0.25): Grade {
         return Grade(
             semesterId = 1,
             studentId = 1,
diff --git a/build.gradle b/build.gradle
index 629b4a48e..1321c5f4c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.3.11'
+    ext.kotlin_version = '1.3.31'
     repositories {
         mavenCentral()
         google()
@@ -9,12 +9,11 @@ buildscript {
     }
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.4.1'
         classpath 'com.google.gms:google-services:4.2.0'
-        classpath "io.fabric.tools:gradle:1.26.1"
-        classpath "com.github.triplet.gradle:play-publisher:1.2.2"
-        classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.6.2"
-        classpath 'com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta02'
+        classpath "io.fabric.tools:gradle:1.28.1"
+        classpath "com.github.triplet.gradle:play-publisher:2.2.0"
+        classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.7"
     }
 }
 
@@ -35,6 +34,7 @@ allprojects {
         google()
         jcenter()
         maven { url 'https://jitpack.io' }
+        maven { url "https://kotlin.bintray.com/kotlinx/" }
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
index 9e6fce102..24e69b6ac 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -11,6 +11,7 @@
 # The setting is particularly useful for tweaking memory settings.
 android.enableJetifier=true
 android.useAndroidX=true
+android.enableR8=true
 org.gradle.jvmargs=-Xmx1536m
 
 # When configured, Gradle will run in incubating parallel mode.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 3f0f9be63..791ac7a45 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Thu Apr 18 00:26:43 CEST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip