diff --git a/.circleci/config.yml b/.circleci/config.yml
index fe74ebe6..841ff9e0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -7,7 +7,7 @@ references:
 
   container_config: &container_config
     docker:
-      - image: circleci/android:api-26-alpha
+      - image: circleci/android:api-27-alpha
     working_directory: *workspace_root
     environment:
       environment:
@@ -31,18 +31,9 @@ jobs:
       - run:
           name: Setup environment
           command: ./gradlew dependencies --no-daemon --stacktrace --console=plain -PdisablePreDex || true
-      - run:
-          name: Decrypt keys
-          command: |
-            openssl aes-256-cbc -d -in ./app/key-encrypted.p12 -k $ENCRYPT_KEY >> ./app/key.p12
-            openssl aes-256-cbc -d -in ./app/upload-key-encrypted.jks -k $ENCRYPT_KEY >> ./app/upload-key.jks
       - run:
           name: Initial build
           command: ./gradlew build assembleDebug -x test -x lint -x fabricGenerateResourcesRelease --no-daemon --stacktrace --console=plain -PdisablePreDex
-      - run:
-          name: Clear keys
-          command: |
-            rm ./app/key.p12 ./app/upload-key.jks
       - store_artifacts:
           path: ./app/build/outputs/apk/
           destination: apks/
@@ -135,9 +126,6 @@ jobs:
           name: Launch emulator
           command: export LD_LIBRARY_PATH=${ANDROID_HOME}/emulator/lib64:${ANDROID_HOME}/emulator/lib64/qt/lib && emulator64-arm -avd test -noaudio -no-boot-anim -no-window -accel on
           background: true
-      - run:
-          name: Change circle-android script file permissions
-          command: sudo chmod +rx /bin/circle-android
       - run:
           name: Wait emulator
           command: |
@@ -181,69 +169,30 @@ jobs:
           name: Run sonarqube runner
           command: ./gradlew -x test -x lint sonarqube -Dsonar.host.url=$SONAR_HOST -Dsonar.organization=$SONAR_ORG -Dsonar.login=$SONAR_KEY -Dsonar.branch.name=$CIRCLE_BRANCH --no-daemon --stacktrace --console=plain -PdisablePreDex
 
-  deploy:
-    <<: *container_config
-    steps:
-      - *attach_workspace
-      - restore_cache:
-          <<: *general_cache_key
-      - run:
-          name: Decrypt keys
-          command: |
-            openssl aes-256-cbc -d -in ./app/key-encrypted.p12 -k $ENCRYPT_KEY >> ./app/key.p12
-            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 -PdisablePreDex
-
 workflows:
   version: 2
 
-  build-test-deploy:
+  build_check_tests:
     jobs:
-      - build:
-          filters:
-            tags:
-              only: /.*/
+      - build
       - lint:
-          filters:
-            tags:
-              only: /.*/
           requires:
             - build
       - app-test:
-          filters:
-            tags:
-              only: /.*/
           requires:
             - build
       - api-test:
-          filters:
-            tags:
-              only: /.*/
           requires:
             - build
       - instrumented:
-          filters:
-            tags:
-              only: /.*/
+          requires:
+            - build
           requires:
             - build
       - sonarcube:
-          filters:
-            tags:
-              only: /.*/
           requires:
             - build
             - lint
             - app-test
             - api-test
             - instrumented
-      - deploy:
-          requires:
-            - instrumented
-          filters:
-            tags:
-              only: /\d+\.\d+\.\d+/
-            branches:
-              ignore: /.*/
diff --git a/.gitignore b/.gitignore
index 8ad04ebf..3b524b65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,8 +32,6 @@ local.properties
 .idea/tasks.xml
 .idea/vcs.xml
 .idea/workspace.xml
-.idea/caches/
-.idea/codeStyles/
 *.iml
 
 # OS-specific files
@@ -44,7 +42,3 @@ local.properties
 .Trashes
 ehthumbs.db
 Thumbs.db
-.idea/codeStyles/
-.idea/caches/
-./app/key.p12
-./app/upload-key.jks
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bf80ae04..d8fdd058 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,7 +12,7 @@ build:
   script:
     - ./gradlew --no-daemon --stacktrace dependencies || true
     - ./gradlew --no-daemon --stacktrace assembleDebug
-    - mv app/build/outputs/apk/debug/app-debug.apk .
+    - mv app/build/outputs/apk/app-debug.apk .
   artifacts:
     name: "${CI_PROJECT_NAME}_${CI_BUILD_REF_NAME}-${CI_BUILD_ID}"
     paths:
@@ -26,7 +26,7 @@ tests:
      - .gradle
     policy: pull
   script:
-    - ./gradlew --no-daemon --stacktrace -x fabricGenerateResourcesRelease test
+    - ./gradlew --no-daemon --stacktrace test
   artifacts:
     paths:
     - app/build/reports/tests
@@ -39,7 +39,7 @@ lint:
      - .gradle
     policy: pull
   script:
-    - ./gradlew --no-daemon --stacktrace -x fabricGenerateResourcesRelease lint
+    - ./gradlew --no-daemon --stacktrace lint
   artifacts:
     paths:
     - app/build/reports
diff --git a/README.md b/README.md
index 6ccaa20a..65cf14af 100644
--- a/README.md
+++ b/README.md
@@ -4,12 +4,9 @@
 [![Bitrise](https://img.shields.io/bitrise/daeff1893f3c8128/master.svg?token=Hjm1ACamk86JDeVVJHOeqQ&style=flat-square)](https://www.bitrise.io/app/daeff1893f3c8128)
 [![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/)
-[![Scrutinizer](https://img.shields.io/scrutinizer/g/wulkanowy/wulkanowy.svg?style=flat-square)](https://scrutinizer-ci.com/g/wulkanowy/wulkanowy/?branch=master)
+[![Known Vulnerabilities](https://snyk.io/test/github/wulkanowy/wulkanowy/badge.svg?targetFile=app%2Fbuild.gradle&style=flat-square)](https://snyk.io/test/github/wulkanowy/wulkanowy?targetFile=app%2Fbuild.gradle)
 [![Bintray](https://img.shields.io/bintray/v/wulkanowy/wulkanowy/api.svg?style=flat-square)](https://bintray.com/wulkanowy/wulkanowy/api)
-[![Discord](https://img.shields.io/discord/390889354199040011.svg?style=flat-square)](https://discord.gg/vccAQBr)
-
-[Pobierz wersję beta](https://play.google.com/store/apps/details?id=io.github.wulkanowy&amp;utm_source=vcs)
 
 [Pobierz wersję rozwojową](https://bitrise-redirector.herokuapp.com/v0.1/apps/daeff1893f3c8128/builds/master/artifacts/app-debug-bitrise-signed.apk)
 
-Androidowy klient dziennika VULCAN UONET+.
+Wulkanowy to aplikacja na androida polepszająca wygodę używania dziennika UONET+.
diff --git a/android-sonarqube.gradle b/android-sonarqube.gradle
index 3ad2c5ff..b9284eea 100644
--- a/android-sonarqube.gradle
+++ b/android-sonarqube.gradle
@@ -5,7 +5,7 @@ sonarqube {
     //noinspection GroovyAssignabilityCheck
     properties {
         def files = fileTree("${rootProject.projectDir}/api/build/libs/").filter { it.isFile() }.files.name
-        def libraries = project.android.sdkDirectory.getPath() + "/platforms/android-26/android.jar," +
+        def libraries = project.android.sdkDirectory.getPath() + "/platforms/android-27/android.jar," +
                 "${project.rootDir}/api/build/libs/" + files[0]
 
         property "sonar.projectName", GROUP_ID + ":app"
diff --git a/api/build.gradle b/api/build.gradle
index 001d2579..ebaca4c8 100644
--- a/api/build.gradle
+++ b/api/build.gradle
@@ -28,12 +28,12 @@ jacocoTestReport {
 }
 
 dependencies {
-    implementation "org.jsoup:jsoup:$jsoup"
-    implementation "org.apache.commons:commons-lang3:$apacheLang"
-    implementation "com.google.code.gson:gson:$gson"
+    implementation 'org.jsoup:jsoup:1.10.3'
+    implementation 'org.apache.commons:commons-lang3:3.7'
+    implementation 'com.google.code.gson:gson:2.8.2'
 
-    testImplementation "junit:junit:$junit"
-    testImplementation "org.mockito:mockito-core:$mockito"
+    testImplementation 'junit:junit:4.12'
+    testImplementation 'org.mockito:mockito-core:2.13.0'
 }
 
 version = PUBLISH_VERSION
diff --git a/api/src/main/java/io/github/wulkanowy/api/Client.java b/api/src/main/java/io/github/wulkanowy/api/Client.java
index 53300788..16b7982c 100644
--- a/api/src/main/java/io/github/wulkanowy/api/Client.java
+++ b/api/src/main/java/io/github/wulkanowy/api/Client.java
@@ -21,9 +21,11 @@ public class Client {
 
     private String password;
 
-    private String symbol;
+    private String symbol = "Default";
 
-    private Date lastSuccessRequest;
+    private Login login;
+
+    private Date lastSuccessRequest = new Date();
 
     private Cookies cookies = new Cookies();
 
@@ -44,11 +46,7 @@ public class Client {
             String[] url = creds[0].split("://");
 
             protocol = url[0];
-            String[] path = url[1].split("/");
-            host = path[0];
-            if (path.length > 1) {
-                symbol = path[1];
-            }
+            host = url[1];
             email = creds[2];
         }
     }
@@ -58,15 +56,25 @@ public class Client {
             return;
         }
 
-        this.symbol = new Login(this).login(email, password, symbol);
+        this.symbol = getLogin().login(email, password, symbol);
     }
 
     private boolean isLoggedIn() {
-        return getCookies().size() > 0 && lastSuccessRequest != null &&
-                5 > TimeUnit.MILLISECONDS.toMinutes(new Date().getTime() - lastSuccessRequest.getTime());
+        return getCookies().size() > 0 &&
+                29 > TimeUnit.MILLISECONDS.toMinutes(new Date().getTime() - lastSuccessRequest.getTime());
 
     }
 
+    Login getLogin() {
+        if (null != login) {
+            return login;
+        }
+
+        login = new Login(this);
+
+        return login;
+    }
+
     public String getSymbol() {
         return symbol;
     }
@@ -75,10 +83,6 @@ public class Client {
         this.symbol = symbol;
     }
 
-    public void addCookies(Map<String, String> items) {
-        cookies.addItems(items);
-    }
-
     private Map<String, String> getCookies() {
         return cookies.getItems();
     }
@@ -94,22 +98,8 @@ public class Client {
                 .replace("{symbol}", symbol);
     }
 
-    public Document getPageByUrl(String url) throws IOException, VulcanException {
-        return getPageByUrl(url, true, null);
-    }
-
-    public Document getPageByUrl(String url, boolean loginBefore) throws IOException, VulcanException {
-        return getPageByUrl(url, loginBefore, null);
-    }
-
-    public synchronized Document getPageByUrl(String url, boolean loginBefore, Map<String, String> cookies) throws IOException, VulcanException {
-        if (loginBefore) {
-            login();
-        }
-
-        if (null != cookies) {
-            this.cookies.addItems(cookies);
-        }
+    Document getPageByUrl(String url) throws IOException, VulcanException {
+        login();
 
         Connection.Response response = Jsoup.connect(getFilledUrl(url))
                 .followRedirects(true)
@@ -118,16 +108,10 @@ public class Client {
 
         this.cookies.addItems(response.cookies());
 
-        Document doc = checkForErrors(response.parse());
-
-        if (loginBefore) {
-            lastSuccessRequest = new Date();
-        }
-
-        return doc;
+        return checkForErrors(response.parse());
     }
 
-    public synchronized Document postPageByUrl(String url, String[][] params) throws IOException, VulcanException {
+    public Document postPageByUrl(String url, String[][] params) throws IOException, VulcanException {
         Connection connection = Jsoup.connect(getFilledUrl(url));
 
         for (String[] data : params) {
@@ -142,8 +126,6 @@ public class Client {
 
         this.cookies.addItems(response.cookies());
 
-        response.bufferUp(); // fixes cert parsing issues #109
-
         return checkForErrors(response.parse());
     }
 
@@ -183,21 +165,15 @@ public class Client {
     }
 
     Document checkForErrors(Document doc) throws VulcanException {
-        lastSuccessRequest = null;
-
-        String title = doc.select("title").text();
-        if ("Przerwa techniczna".equals(title)) {
-            throw new VulcanOfflineException(title);
+        if ("Przerwa techniczna".equals(doc.select("title").text())) {
+            throw new VulcanOfflineException();
         }
 
-        String singIn = doc.select(".loginButton").text();
-        if ("Zaloguj się".equals(singIn)) {
-            throw new NotLoggedInErrorException(singIn);
+        if ("Zaloguj się".equals(doc.select(".loginButton").text())) {
+            throw new NotLoggedInErrorException();
         }
 
-        if (title.startsWith("Błąd")) {
-            throw new NotLoggedInErrorException(title + " " + doc.selectFirst("p, body"));
-        }
+        lastSuccessRequest = new Date();
 
         return doc;
     }
diff --git a/api/src/main/java/io/github/wulkanowy/api/Diary.java b/api/src/main/java/io/github/wulkanowy/api/Diary.java
deleted file mode 100644
index d7d09f9c..00000000
--- a/api/src/main/java/io/github/wulkanowy/api/Diary.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package io.github.wulkanowy.api;
-
-public class Diary implements ParamItem {
-
-    private String id = "";
-
-    private String name = "";
-
-    private boolean current = false;
-
-    public String getId() {
-        return id;
-    }
-
-    public Diary setId(String id) {
-        this.id = id;
-        return this;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public Diary setName(String name) {
-        this.name = name;
-        return this;
-    }
-
-    @Override
-    public boolean isCurrent() {
-        return current;
-    }
-
-    public Diary setCurrent(boolean current) {
-        this.current = current;
-        return this;
-    }
-}
diff --git a/api/src/main/java/io/github/wulkanowy/api/NotLoggedInErrorException.java b/api/src/main/java/io/github/wulkanowy/api/NotLoggedInErrorException.java
index 179fc8cc..86372266 100644
--- a/api/src/main/java/io/github/wulkanowy/api/NotLoggedInErrorException.java
+++ b/api/src/main/java/io/github/wulkanowy/api/NotLoggedInErrorException.java
@@ -1,8 +1,4 @@
 package io.github.wulkanowy.api;
 
 public class NotLoggedInErrorException extends VulcanException {
-
-    public NotLoggedInErrorException(String message) {
-        super(message);
-    }
 }
diff --git a/api/src/main/java/io/github/wulkanowy/api/ParamItem.java b/api/src/main/java/io/github/wulkanowy/api/ParamItem.java
deleted file mode 100644
index c830467a..00000000
--- a/api/src/main/java/io/github/wulkanowy/api/ParamItem.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package io.github.wulkanowy.api;
-
-interface ParamItem {
-
-    ParamItem setId(String id);
-
-    ParamItem setName(String name);
-
-    ParamItem setCurrent(boolean isCurrent);
-
-    boolean isCurrent();
-}
diff --git a/api/src/main/java/io/github/wulkanowy/api/Semester.java b/api/src/main/java/io/github/wulkanowy/api/Semester.java
index 31230f01..64a07c97 100644
--- a/api/src/main/java/io/github/wulkanowy/api/Semester.java
+++ b/api/src/main/java/io/github/wulkanowy/api/Semester.java
@@ -1,12 +1,21 @@
 package io.github.wulkanowy.api;
 
-public class Semester implements ParamItem {
+public class Semester {
+
+    private String number = "";
 
     private String id = "";
 
-    private String name = "";
+    private boolean isCurrent = false;
 
-    private boolean current = false;
+    public String getNumber() {
+        return number;
+    }
+
+    public Semester setNumber(String number) {
+        this.number = number;
+        return this;
+    }
 
     public String getId() {
         return id;
@@ -17,21 +26,12 @@ public class Semester implements ParamItem {
         return this;
     }
 
-    public String getName() {
-        return name;
-    }
-
-    public Semester setName(String number) {
-        this.name = number;
-        return this;
-    }
-
     public boolean isCurrent() {
-        return current;
+        return isCurrent;
     }
 
     public Semester setCurrent(boolean current) {
-        this.current = current;
+        isCurrent = current;
         return this;
     }
 }
diff --git a/api/src/main/java/io/github/wulkanowy/api/SnP.java b/api/src/main/java/io/github/wulkanowy/api/SnP.java
index 7f074071..adbffd4b 100644
--- a/api/src/main/java/io/github/wulkanowy/api/SnP.java
+++ b/api/src/main/java/io/github/wulkanowy/api/SnP.java
@@ -8,25 +8,17 @@ import java.util.List;
 
 public interface SnP {
 
-    String getSchoolID();
+    String getId();
 
-    void setDiaryID(String id);
-
-    String getStudentID();
-
-    List<Student> getStudents() throws IOException, VulcanException;
-
-    StudentAndParent setUp() throws IOException, VulcanException;
+    StudentAndParent storeContextCookies() throws IOException, VulcanException;
 
     String getRowDataChildValue(Element e, int index);
 
     Document getSnPPageDocument(String url) throws IOException, VulcanException;
 
-    List<Diary> getDiaries() throws IOException, VulcanException;
-
     List<Semester> getSemesters() throws IOException, VulcanException;
 
     List<Semester> getSemesters(Document gradesPage);
 
-    <T> T getCurrent(List<? extends ParamItem> list);
+    Semester getCurrentSemester(List<Semester> semesterList);
 }
diff --git a/api/src/main/java/io/github/wulkanowy/api/Student.java b/api/src/main/java/io/github/wulkanowy/api/Student.java
deleted file mode 100644
index 8b22f1d8..00000000
--- a/api/src/main/java/io/github/wulkanowy/api/Student.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package io.github.wulkanowy.api;
-
-public class Student implements ParamItem {
-
-    private String id = "";
-
-    private String name = "";
-
-    private boolean current = false;
-
-    public String getId() {
-        return id;
-    }
-
-    public Student setId(String id) {
-        this.id = id;
-        return this;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public Student setName(String name) {
-        this.name = name;
-        return this;
-    }
-
-    public boolean isCurrent() {
-        return current;
-    }
-
-    public Student setCurrent(boolean current) {
-        this.current = current;
-        return this;
-    }
-}
diff --git a/api/src/main/java/io/github/wulkanowy/api/StudentAndParent.java b/api/src/main/java/io/github/wulkanowy/api/StudentAndParent.java
index 1acecfd3..c014e96c 100644
--- a/api/src/main/java/io/github/wulkanowy/api/StudentAndParent.java
+++ b/api/src/main/java/io/github/wulkanowy/api/StudentAndParent.java
@@ -5,11 +5,8 @@ import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;
 
 import java.io.IOException;
-import java.net.URL;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 public class StudentAndParent implements SnP {
 
@@ -21,47 +18,28 @@ public class StudentAndParent implements SnP {
 
     private Client client;
 
-    private String schoolID;
+    private String id;
 
-    private String studentID;
-
-    private String diaryID;
-
-    StudentAndParent(Client client, String schoolID, String studentID, String diaryID) {
+    StudentAndParent(Client client, String id) {
         this.client = client;
-        this.schoolID = schoolID;
-        this.studentID = studentID;
-        this.diaryID = diaryID;
-    }
-
-    public StudentAndParent setUp() throws IOException, VulcanException {
-        if (null == getStudentID() || "".equals(getStudentID())) {
-            Document doc = client.getPageByUrl(getSnpHomePageUrl());
-
-            Student student = getCurrent(getStudents(doc));
-            studentID = student.getId();
-
-            Diary diary = getCurrent(getDiaries(doc));
-            diaryID = diary.getId();
-        }
-
-        return this;
-    }
-
-    public String getSchoolID() {
-        return schoolID;
-    }
-
-    public String getStudentID() {
-        return studentID;
+        this.id = id;
     }
 
     private String getBaseUrl() {
-        return BASE_URL.replace("{ID}", getSchoolID());
+        return BASE_URL.replace("{ID}", getId());
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public StudentAndParent storeContextCookies() throws IOException, VulcanException {
+        client.getPageByUrl(getSnpHomePageUrl());
+        return this;
     }
 
     String getSnpHomePageUrl() throws IOException, VulcanException {
-        if (null != getSchoolID()) {
+        if (null != getId()) {
             return getBaseUrl();
         }
 
@@ -70,12 +48,12 @@ public class StudentAndParent implements SnP {
         Element studentTileLink = startPage.select(".panel.linkownia.pracownik.klient > a").first();
 
         if (null == studentTileLink) {
-            throw new NotLoggedInErrorException("You are probably not logged in. Force login");
+            throw new NotLoggedInErrorException();
         }
 
         String snpPageUrl = studentTileLink.attr("href");
 
-        this.schoolID = getExtractedIdFromUrl(snpPageUrl);
+        this.id = getExtractedIdFromUrl(snpPageUrl);
 
         return snpPageUrl;
     }
@@ -84,7 +62,7 @@ public class StudentAndParent implements SnP {
         String[] path = snpPageUrl.split(client.getHost())[1].split("/");
 
         if (5 != path.length) {
-            throw new NotLoggedInErrorException("You are probably not logged in");
+            throw new NotLoggedInErrorException();
         }
 
         return path[2];
@@ -94,43 +72,8 @@ public class StudentAndParent implements SnP {
         return e.select(".daneWiersz .wartosc").get(index - 1).text();
     }
 
-    public void setDiaryID(String id) {
-        this.diaryID = id;
-    }
-
     public Document getSnPPageDocument(String url) throws IOException, VulcanException {
-        Map<String, String> cookies = new HashMap<>();
-        cookies.put("idBiezacyDziennik", diaryID);
-        cookies.put("idBiezacyUczen", studentID);
-        client.addCookies(cookies);
-
-        Document doc = client.getPageByUrl(getBaseUrl() + url, true, cookies);
-
-        if (!doc.title().startsWith("Witryna ucznia i rodzica")) {
-            throw new VulcanException("Expected SnP page, got page with title: " + doc.title());
-        }
-
-        if (doc.title().endsWith("Strona główna")) {
-            throw new VulcanException("Sesja została nieprawidłowo zainicjowana");
-        }
-
-        return doc;
-    }
-
-    public List<Diary> getDiaries() throws IOException, VulcanException {
-        return getDiaries(client.getPageByUrl(getBaseUrl()));
-    }
-
-    private List<Diary> getDiaries(Document doc) throws IOException, VulcanException {
-        return getList(doc.select("#dziennikDropDownList option"), Diary.class);
-    }
-
-    public List<Student> getStudents() throws IOException, VulcanException {
-        return getStudents(client.getPageByUrl(getBaseUrl()));
-    }
-
-    private List<Student> getStudents(Document doc) throws IOException, VulcanException {
-        return getList(doc.select("#uczenDropDownList option"), Student.class);
+        return client.getPageByUrl(getBaseUrl() + url);
     }
 
     public List<Semester> getSemesters() throws IOException, VulcanException {
@@ -144,10 +87,10 @@ public class StudentAndParent implements SnP {
 
         for (Element e : semesterOptions) {
             Semester semester = new Semester()
-                    .setId(e.attr("value"))
-                    .setName(e.text());
+                    .setId(e.text())
+                    .setNumber(e.attr("value"));
 
-            if (isCurrent(e)) {
+            if ("selected".equals(e.attr("selected"))) {
                 semester.setCurrent(true);
             }
 
@@ -157,44 +100,15 @@ public class StudentAndParent implements SnP {
         return semesters;
     }
 
-    @SuppressWarnings("unchecked")
-    private <T> List<T> getList(Elements options, Class<? extends ParamItem> type) throws IOException, VulcanException {
-        List<T> list = new ArrayList<>();
-
-        for (Element e : options) {
-            URL url = new URL(e.val());
-            try {
-                ParamItem item = type.newInstance()
-                        .setId(url.getQuery().split("=")[1])
-                        .setName(e.text());
-
-                if (isCurrent(e)) {
-                    item.setCurrent(true);
-                }
-
-                list.add((T) item);
-            } catch (Exception ex) {
-                throw new VulcanException("Error while trying to parse params list", ex);
-            }
-        }
-
-        return list;
-    }
-
-    @SuppressWarnings("unchecked")
-    public <T> T getCurrent(List<? extends ParamItem> list) {
-        ParamItem current = null;
-        for (ParamItem s : list) {
+    public Semester getCurrentSemester(List<Semester> semesterList) {
+        Semester current = null;
+        for (Semester s : semesterList) {
             if (s.isCurrent()) {
                 current = s;
                 break;
             }
         }
 
-        return (T) current;
-    }
-
-    private boolean isCurrent(Element e) {
-        return "selected".equals(e.attr("selected"));
+        return current;
     }
 }
diff --git a/api/src/main/java/io/github/wulkanowy/api/Vulcan.java b/api/src/main/java/io/github/wulkanowy/api/Vulcan.java
index d90d3874..c16ef088 100644
--- a/api/src/main/java/io/github/wulkanowy/api/Vulcan.java
+++ b/api/src/main/java/io/github/wulkanowy/api/Vulcan.java
@@ -18,27 +18,21 @@ import io.github.wulkanowy.api.user.FamilyInformation;
 
 public class Vulcan {
 
+    private String id;
+
     private SnP snp;
 
     private Client client;
 
-    private String schoolId;
-
-    private String studentId;
-
-    private String diaryId;
-
-    public void setCredentials(String email, String password, String symbol, String schoolId, String studentId, String diaryId) {
-        this.schoolId = schoolId;
-        this.studentId = studentId;
-        this.diaryId = diaryId;
-
+    public void setCredentials(String email, String password, String symbol, String id) {
         client = new Client(email, password, symbol);
+
+        this.id = id;
     }
 
     public Client getClient() throws NotLoggedInErrorException {
         if (null == client) {
-            throw new NotLoggedInErrorException("Use setCredentials() method first");
+            throw new NotLoggedInErrorException();
         }
 
         return client;
@@ -49,17 +43,20 @@ public class Vulcan {
 
     }
 
-    public SnP getStudentAndParent() throws VulcanException, IOException {
+    public SnP getStudentAndParent() throws IOException, VulcanException {
         if (null != this.snp) {
             return this.snp;
         }
 
-        this.snp = new StudentAndParent(getClient(), schoolId, studentId, diaryId)
-                .setUp();
+        this.snp = new StudentAndParent(getClient(), id).storeContextCookies();
 
         return this.snp;
     }
 
+    public String getId() throws IOException, VulcanException {
+        return getStudentAndParent().getId();
+    }
+
     public AttendanceTable getAttendanceTable() throws IOException, VulcanException {
         return new AttendanceTable(getStudentAndParent());
     }
diff --git a/api/src/main/java/io/github/wulkanowy/api/VulcanException.java b/api/src/main/java/io/github/wulkanowy/api/VulcanException.java
index 0bc0c51f..0e7ed243 100644
--- a/api/src/main/java/io/github/wulkanowy/api/VulcanException.java
+++ b/api/src/main/java/io/github/wulkanowy/api/VulcanException.java
@@ -1,12 +1,4 @@
 package io.github.wulkanowy.api;
 
-public class VulcanException extends Exception {
-
-    public VulcanException(String message) {
-        super(message);
-    }
-
-    protected VulcanException(String message, Exception e) {
-        super(message, e);
-    }
+public abstract class VulcanException extends Exception {
 }
diff --git a/api/src/main/java/io/github/wulkanowy/api/VulcanOfflineException.java b/api/src/main/java/io/github/wulkanowy/api/VulcanOfflineException.java
index 24ab48e6..497fba94 100644
--- a/api/src/main/java/io/github/wulkanowy/api/VulcanOfflineException.java
+++ b/api/src/main/java/io/github/wulkanowy/api/VulcanOfflineException.java
@@ -1,8 +1,4 @@
 package io.github.wulkanowy.api;
 
 public class VulcanOfflineException extends VulcanException {
-
-    VulcanOfflineException(String message) {
-        super(message);
-    }
 }
diff --git a/api/src/main/java/io/github/wulkanowy/api/attendance/AttendanceTable.java b/api/src/main/java/io/github/wulkanowy/api/attendance/AttendanceTable.java
index d81a30b2..c45cbe6a 100644
--- a/api/src/main/java/io/github/wulkanowy/api/attendance/AttendanceTable.java
+++ b/api/src/main/java/io/github/wulkanowy/api/attendance/AttendanceTable.java
@@ -63,7 +63,7 @@ public class AttendanceTable {
             for (int i = 1; i < size; i++) {
                 Lesson lesson = new Lesson();
                 lesson.setDate(days.get(i - 1).getDate());
-                lesson.setNumber(Integer.valueOf(hours.get(0).text()));
+                lesson.setNumber(hours.get(0).text());
 
                 addLessonDetails(lesson, hours.get(i));
 
diff --git a/api/src/main/java/io/github/wulkanowy/api/exams/ExamsWeek.java b/api/src/main/java/io/github/wulkanowy/api/exams/ExamsWeek.java
index c111ce84..3dd056d9 100644
--- a/api/src/main/java/io/github/wulkanowy/api/exams/ExamsWeek.java
+++ b/api/src/main/java/io/github/wulkanowy/api/exams/ExamsWeek.java
@@ -1,17 +1,12 @@
 package io.github.wulkanowy.api.exams;
 
-import org.apache.commons.lang3.StringUtils;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;
 
 import java.io.IOException;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
-import java.util.Locale;
 
 import io.github.wulkanowy.api.SnP;
 import io.github.wulkanowy.api.VulcanException;
@@ -27,11 +22,11 @@ public class ExamsWeek {
         this.snp = snp;
     }
 
-    public Week<ExamDay> getCurrent() throws IOException, VulcanException, ParseException {
+    public Week<ExamDay> getCurrent() throws IOException, VulcanException {
         return getWeek("", true);
     }
 
-    public Week<ExamDay> getWeek(String tick, final boolean onlyNotEmpty) throws IOException, VulcanException, ParseException {
+    public Week<ExamDay> getWeek(String tick, final boolean onlyNotEmpty) throws IOException, VulcanException {
         Document examsPage = snp.getSnPPageDocument(EXAMS_PAGE_URL + tick);
         Elements examsDays = examsPage.select(".mainContainer > div:not(.navigation)");
 
@@ -46,9 +41,7 @@ public class ExamsWeek {
             }
 
             if (null != dayHeading) {
-                String[] dateHeader = dayHeading.text().split(", ");
-                day.setDayName(StringUtils.capitalize(dateHeader[0]));
-                day.setDate(getFormattedDate(dateHeader[1]));
+                day.setDate(dayHeading.text().split(", ")[1]);
             }
 
             Elements exams = item.select("article");
@@ -58,24 +51,15 @@ public class ExamsWeek {
                         .setType(snp.getRowDataChildValue(e, 2))
                         .setDescription(snp.getRowDataChildValue(e, 3))
                         .setTeacher(snp.getRowDataChildValue(e, 4).split(", ")[0])
-                        .setEntryDate(getFormattedDate(snp.getRowDataChildValue(e, 4).split(", ")[1]))
+                        .setEntryDate(snp.getRowDataChildValue(e, 4).split(", ")[1])
                 );
             }
 
             days.add(day);
         }
 
-
         return new Week<ExamDay>()
-                .setStartDayDate(getFormattedDate(examsPage.select(".mainContainer > h2")
-                        .first().text().split(" ")[1]))
+                .setStartDayDate(examsDays.select("h2").first().text().split(" ")[1])
                 .setDays(days);
     }
-
-    private String getFormattedDate(String date) throws ParseException {
-        SimpleDateFormat sdf = new SimpleDateFormat("dd.MM.yyyy", Locale.ROOT);
-        Date d = sdf.parse(date);
-        sdf.applyPattern("yyyy-MM-dd");
-        return sdf.format(d);
-    }
 }
diff --git a/api/src/main/java/io/github/wulkanowy/api/generic/Day.java b/api/src/main/java/io/github/wulkanowy/api/generic/Day.java
index 5b9086a3..6bf26c04 100644
--- a/api/src/main/java/io/github/wulkanowy/api/generic/Day.java
+++ b/api/src/main/java/io/github/wulkanowy/api/generic/Day.java
@@ -11,6 +11,10 @@ public class Day {
 
     private String dayName = "";
 
+    private boolean isFreeDay = false;
+
+    private String freeDayName = "";
+
     public Lesson getLesson(int index) {
         return lessons.get(index);
     }
@@ -40,4 +44,20 @@ public class Day {
     public void setDayName(String dayName) {
         this.dayName = dayName;
     }
+
+    public boolean isFreeDay() {
+        return isFreeDay;
+    }
+
+    public void setFreeDay(boolean freeDay) {
+        isFreeDay = freeDay;
+    }
+
+    public String getFreeDayName() {
+        return freeDayName;
+    }
+
+    public void setFreeDayName(String freeDayName) {
+        this.freeDayName = freeDayName;
+    }
 }
diff --git a/api/src/main/java/io/github/wulkanowy/api/generic/Lesson.java b/api/src/main/java/io/github/wulkanowy/api/generic/Lesson.java
index 27bf9bf0..8dd65327 100644
--- a/api/src/main/java/io/github/wulkanowy/api/generic/Lesson.java
+++ b/api/src/main/java/io/github/wulkanowy/api/generic/Lesson.java
@@ -2,7 +2,7 @@ package io.github.wulkanowy.api.generic;
 
 public class Lesson {
 
-    private int number = 0;
+    private String number = "";
 
     private String subject = "";
 
@@ -48,13 +48,12 @@ public class Lesson {
 
     private boolean isExemption = false;
 
-    public int getNumber() {
+    public String getNumber() {
         return number;
     }
 
-    public Lesson setNumber(int number) {
+    public void setNumber(String number) {
         this.number = number;
-        return this;
     }
 
     public String getSubject() {
diff --git a/api/src/main/java/io/github/wulkanowy/api/grades/Grade.java b/api/src/main/java/io/github/wulkanowy/api/grades/Grade.java
index 31e1bbbd..564b3e47 100644
--- a/api/src/main/java/io/github/wulkanowy/api/grades/Grade.java
+++ b/api/src/main/java/io/github/wulkanowy/api/grades/Grade.java
@@ -18,6 +18,8 @@ public class Grade {
 
     private String teacher = "";
 
+    private String semester = "";
+
     public String getSubject() {
         return subject;
     }
@@ -97,4 +99,14 @@ public class Grade {
 
         return this;
     }
+
+    public String getSemester() {
+        return semester;
+    }
+
+    public Grade setSemester(String semester) {
+        this.semester = semester;
+
+        return this;
+    }
 }
diff --git a/api/src/main/java/io/github/wulkanowy/api/grades/GradesList.java b/api/src/main/java/io/github/wulkanowy/api/grades/GradesList.java
index 936c1533..ce8c0f77 100644
--- a/api/src/main/java/io/github/wulkanowy/api/grades/GradesList.java
+++ b/api/src/main/java/io/github/wulkanowy/api/grades/GradesList.java
@@ -14,6 +14,7 @@ import java.util.Locale;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import io.github.wulkanowy.api.Semester;
 import io.github.wulkanowy.api.SnP;
 import io.github.wulkanowy.api.VulcanException;
 
@@ -21,7 +22,7 @@ public class GradesList {
 
     private static final String GRADES_PAGE_URL = "Oceny/Wszystkie?details=2&okres=";
 
-    private SnP snp;
+    private SnP snp = null;
 
     private List<Grade> grades = new ArrayList<>();
 
@@ -40,54 +41,43 @@ public class GradesList {
     public List<Grade> getAll(String semester) throws IOException, ParseException, VulcanException {
         Document gradesPage = snp.getSnPPageDocument(getGradesPageUrl() + semester);
         Elements gradesRows = gradesPage.select(".ocenySzczegoly-table > tbody > tr");
+        Semester currentSemester = snp.getCurrentSemester(snp.getSemesters(gradesPage));
 
         for (Element row : gradesRows) {
             if ("Brak ocen".equals(row.select("td:nth-child(2)").text())) {
                 continue;
             }
 
-            grades.add(getGrade(row));
+            String descriptions = row.select("td:nth-child(3)").text();
+            String symbol = descriptions.split(", ")[0];
+            String description = descriptions.replaceFirst(symbol, "").replaceFirst(", ", "");
+
+            Pattern pattern = Pattern.compile("#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})");
+            Matcher matcher = pattern.matcher(row.select("td:nth-child(2) span.ocenaCzastkowa")
+                    .attr("style"));
+
+            String color = "";
+            while (matcher.find()) {
+                color = matcher.group(1);
+            }
+
+            SimpleDateFormat sdf = new SimpleDateFormat("dd.MM.yyyy", Locale.ROOT);
+            Date d = sdf.parse(row.select("td:nth-child(5)").text());
+            sdf.applyPattern("yyyy-MM-dd");
+
+            grades.add(new Grade()
+                    .setSubject(row.select("td:nth-child(1)").text())
+                    .setValue(row.select("td:nth-child(2)").text())
+                    .setColor(color)
+                    .setSymbol(symbol)
+                    .setDescription(description)
+                    .setWeight(row.select("td:nth-child(4)").text())
+                    .setDate(sdf.format(d))
+                    .setTeacher(row.select("td:nth-child(6)").text())
+                    .setSemester(currentSemester.getNumber())
+            );
         }
 
         return grades;
     }
-
-    private Grade getGrade(Element row) throws ParseException {
-        String descriptions = row.select("td:nth-child(3)").text();
-
-        String symbol = descriptions.split(", ")[0];
-        String description = descriptions.replaceFirst(Pattern.quote(symbol), "").replaceFirst(", ", "");
-        String color = getColor(row.select("td:nth-child(2) span.ocenaCzastkowa").attr("style"));
-        String date = formatDate(row.select("td:nth-child(5)").text());
-
-        return new Grade()
-                .setSubject(row.select("td:nth-child(1)").text())
-                .setValue(row.select("td:nth-child(2)").text())
-                .setColor(color)
-                .setSymbol(symbol)
-                .setDescription(description)
-                .setWeight(row.select("td:nth-child(4)").text())
-                .setDate(date)
-                .setTeacher(row.select("td:nth-child(6)").text());
-    }
-
-    private String getColor(String styleAttr) {
-        Pattern pattern = Pattern.compile("#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})");
-        Matcher matcher = pattern.matcher(styleAttr);
-
-        String color = "";
-        while (matcher.find()) {
-            color = matcher.group(1);
-        }
-
-        return color;
-    }
-
-    private String formatDate(String date) throws ParseException {
-        SimpleDateFormat sdf = new SimpleDateFormat("dd.MM.yyyy", Locale.ROOT);
-        Date d = sdf.parse(date);
-        sdf.applyPattern("yyyy-MM-dd");
-
-        return sdf.format(d);
-    }
 }
diff --git a/api/src/main/java/io/github/wulkanowy/api/grades/SubjectsList.java b/api/src/main/java/io/github/wulkanowy/api/grades/SubjectsList.java
index 37902d0d..99359413 100644
--- a/api/src/main/java/io/github/wulkanowy/api/grades/SubjectsList.java
+++ b/api/src/main/java/io/github/wulkanowy/api/grades/SubjectsList.java
@@ -13,21 +13,16 @@ import io.github.wulkanowy.api.VulcanException;
 
 public class SubjectsList {
 
-    private static final String SUBJECTS_PAGE_URL = "Oceny/Wszystkie?details=1&okres=";
+    private static final String SUBJECTS_PAGE_URL = "Oceny/Wszystkie?details=1";
 
-    private SnP snp;
+    private SnP snp = null;
 
     public SubjectsList(SnP snp) {
         this.snp = snp;
     }
 
-
     public List<Subject> getAll() throws IOException, VulcanException {
-        return getAll("");
-    }
-
-    public List<Subject> getAll(String semester) throws IOException, VulcanException {
-        Document subjectPage = snp.getSnPPageDocument(SUBJECTS_PAGE_URL + semester);
+        Document subjectPage = snp.getSnPPageDocument(SUBJECTS_PAGE_URL);
 
         Elements rows = subjectPage.select(".ocenyZwykle-table > tbody > tr");
 
diff --git a/api/src/main/java/io/github/wulkanowy/api/login/AccountPermissionException.java b/api/src/main/java/io/github/wulkanowy/api/login/AccountPermissionException.java
index de3901ff..99feb86f 100644
--- a/api/src/main/java/io/github/wulkanowy/api/login/AccountPermissionException.java
+++ b/api/src/main/java/io/github/wulkanowy/api/login/AccountPermissionException.java
@@ -3,8 +3,4 @@ package io.github.wulkanowy.api.login;
 import io.github.wulkanowy.api.VulcanException;
 
 public class AccountPermissionException extends VulcanException {
-
-    AccountPermissionException(String message) {
-        super(message);
-    }
 }
diff --git a/api/src/main/java/io/github/wulkanowy/api/login/BadCredentialsException.java b/api/src/main/java/io/github/wulkanowy/api/login/BadCredentialsException.java
index 13efd4a1..1ac37f9c 100644
--- a/api/src/main/java/io/github/wulkanowy/api/login/BadCredentialsException.java
+++ b/api/src/main/java/io/github/wulkanowy/api/login/BadCredentialsException.java
@@ -3,8 +3,4 @@ package io.github.wulkanowy.api.login;
 import io.github.wulkanowy.api.VulcanException;
 
 public class BadCredentialsException extends VulcanException {
-
-    BadCredentialsException(String message) {
-        super(message);
-    }
 }
diff --git a/api/src/main/java/io/github/wulkanowy/api/login/Login.java b/api/src/main/java/io/github/wulkanowy/api/login/Login.java
index a734501e..7f88037d 100644
--- a/api/src/main/java/io/github/wulkanowy/api/login/Login.java
+++ b/api/src/main/java/io/github/wulkanowy/api/login/Login.java
@@ -2,7 +2,6 @@ package io.github.wulkanowy.api.login;
 
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
-import org.jsoup.nodes.Element;
 import org.jsoup.parser.Parser;
 import org.jsoup.select.Elements;
 
@@ -13,101 +12,64 @@ import io.github.wulkanowy.api.VulcanException;
 
 public class Login {
 
-    static final String LOGIN_PAGE_URL = "{schema}://cufs.{host}/{symbol}/Account/LogOn" +
+    private static final String LOGIN_PAGE_URL = "{schema}://cufs.{host}/{symbol}/Account/LogOn" +
             "?ReturnUrl=%2F{symbol}%2FFS%2FLS%3Fwa%3Dwsignin1.0%26wtrealm%3D" +
             "{schema}%253a%252f%252fuonetplus.{host}%252f{symbol}%252fLoginEndpoint.aspx%26wctx%3D" +
             "{schema}%253a%252f%252fuonetplus.{host}%252f{symbol}%252fLoginEndpoint.aspx";
 
+    private static final String LOGIN_ENDPOINT_PAGE_URL =
+            "{schema}://uonetplus.{host}/{symbol}/LoginEndpoint.aspx";
+
     private Client client;
 
+    private String symbol;
+
     public Login(Client client) {
         this.client = client;
     }
 
     public String login(String email, String password, String symbol) throws VulcanException, IOException {
-        Document certDoc = sendCredentials(email, password);
+        String certificate = sendCredentials(email, password, symbol);
 
-        return sendCertificate(certDoc, symbol);
+        return sendCertificate(certificate, symbol);
     }
 
-    Document sendCredentials(String email, String password) throws IOException, VulcanException {
-        String[][] credentials = new String[][]{
+    String sendCredentials(String email, String password, String symbol) throws IOException, VulcanException {
+        this.symbol = symbol;
+
+        Document html = client.postPageByUrl(LOGIN_PAGE_URL, new String[][]{
                 {"LoginName", email},
                 {"Password", password}
-        };
+        });
 
-        Document nextDoc = sendCredentialsData(credentials, LOGIN_PAGE_URL);
-
-        Element errorMessage = nextDoc.selectFirst(".ErrorMessage, #ErrorTextLabel");
-        if (null != errorMessage) {
-            throw new BadCredentialsException(errorMessage.text());
+        if (null != html.select(".ErrorMessage").first()) {
+            throw new BadCredentialsException();
         }
 
-        return nextDoc;
+        return html.select("input[name=wresult]").attr("value");
     }
 
-    private Document sendCredentialsData(String[][] credentials, String nextUrl) throws IOException, VulcanException {
-        Element formFirst = client.getPageByUrl(nextUrl, false).selectFirst("#form1");
+    String sendCertificate(String certificate, String defaultSymbol) throws IOException, VulcanException {
+        this.symbol = findSymbol(defaultSymbol, certificate);
+        client.setSymbol(this.symbol);
 
-        if (null != formFirst) { // only on adfs login
-            Document formSecond = client.postPageByUrl(
-                    formFirst.attr("abs:action"),
-                    getFormStateParams(formFirst, "", "")
-            );
-            credentials = getFormStateParams(formSecond, credentials[0][1], credentials[1][1]);
-            nextUrl = formSecond.selectFirst("#form1").attr("abs:action");
-        }
-
-        return client.postPageByUrl(nextUrl, credentials);
-    }
-
-    private String[][] getFormStateParams(Element form, String email, String password) {
-        return new String[][]{
-                {"__VIEWSTATE", form.select("#__VIEWSTATE").val()},
-                {"__VIEWSTATEGENERATOR", form.select("#__VIEWSTATEGENERATOR").val()},
-                {"__EVENTVALIDATION", form.select("#__EVENTVALIDATION").val()},
-                {"__db", form.select("input[name=__db]").val()},
-                {"PassiveSignInButton.x", "0"},
-                {"PassiveSignInButton.y", "0"},
-                {"SubmitButton.x", "0"},
-                {"SubmitButton.y", "0"},
-                {"UsernameTextBox", email},
-                {"PasswordTextBox", password},
-        };
-    }
-
-    String sendCertificate(Document doc, String defaultSymbol) throws IOException, VulcanException {
-        client.setSymbol(findSymbol(defaultSymbol, doc.select("input[name=wresult]").val()));
-
-        Document targetDoc = sendCertData(doc);
-        String title = targetDoc.title();
-
-        if ("Working...".equals(title)) { // on adfs login
-            title = sendCertData(targetDoc).title();
-        }
+        String title = client.postPageByUrl(LOGIN_ENDPOINT_PAGE_URL, new String[][]{
+                {"wa", "wsignin1.0"},
+                {"wresult", certificate}
+        }).select("title").text();
 
         if ("Logowanie".equals(title)) {
-            throw new AccountPermissionException("No account access. Try another symbol");
+            throw new AccountPermissionException();
         }
 
         if (!"Uonet+".equals(title)) {
-            throw new LoginErrorException("Expected page title `UONET+`, got " + title);
+            throw new LoginErrorException();
         }
 
-        return client.getSymbol();
+        return this.symbol;
     }
 
-    private Document sendCertData(Document doc) throws IOException, VulcanException {
-        String url = doc.select("form[name=hiddenform]").attr("action");
-
-        return client.postPageByUrl(url.replaceFirst("Default", "{symbol}"), new String[][]{
-                {"wa", "wsignin1.0"},
-                {"wresult", doc.select("input[name=wresult]").val()},
-                {"wctx", doc.select("input[name=wctx]").val()}
-        });
-    }
-
-    private String findSymbol(String symbol, String certificate) throws AccountPermissionException {
+    private String findSymbol(String symbol, String certificate) {
         if ("Default".equals(symbol)) {
             return findSymbolInCertificate(certificate);
         }
@@ -115,19 +77,15 @@ public class Login {
         return symbol;
     }
 
-    String findSymbolInCertificate(String certificate) throws AccountPermissionException {
-        Elements instances = Jsoup
+    String findSymbolInCertificate(String certificate) {
+        Elements els = Jsoup
                 .parse(certificate.replaceAll(":", ""), "", Parser.xmlParser())
                 .select("[AttributeName=\"UserInstance\"] samlAttributeValue");
 
-        if (instances.isEmpty()) { // on adfs login
+        if (els.isEmpty()) {
             return "";
         }
 
-        if (instances.size() < 2) { // 1st index is always `Default`
-            throw new AccountPermissionException("First login detected, specify symbol");
-        }
-
-        return instances.get(1).text();
+        return els.get(1).text();
     }
 }
diff --git a/api/src/main/java/io/github/wulkanowy/api/login/LoginErrorException.java b/api/src/main/java/io/github/wulkanowy/api/login/LoginErrorException.java
index be7439df..e264dc67 100644
--- a/api/src/main/java/io/github/wulkanowy/api/login/LoginErrorException.java
+++ b/api/src/main/java/io/github/wulkanowy/api/login/LoginErrorException.java
@@ -2,9 +2,5 @@ package io.github.wulkanowy.api.login;
 
 import io.github.wulkanowy.api.NotLoggedInErrorException;
 
-class LoginErrorException extends NotLoggedInErrorException {
-
-    LoginErrorException(String message) {
-        super(message);
-    }
+public class LoginErrorException extends NotLoggedInErrorException {
 }
diff --git a/api/src/main/java/io/github/wulkanowy/api/messages/BadRequestException.java b/api/src/main/java/io/github/wulkanowy/api/messages/BadRequestException.java
index 14dca67b..ed407b4d 100644
--- a/api/src/main/java/io/github/wulkanowy/api/messages/BadRequestException.java
+++ b/api/src/main/java/io/github/wulkanowy/api/messages/BadRequestException.java
@@ -3,8 +3,4 @@ package io.github.wulkanowy.api.messages;
 import io.github.wulkanowy.api.VulcanException;
 
 class BadRequestException extends VulcanException {
-
-    BadRequestException(String message) {
-        super(message);
-    }
 }
diff --git a/api/src/main/java/io/github/wulkanowy/api/messages/Messages.java b/api/src/main/java/io/github/wulkanowy/api/messages/Messages.java
index ec2a3fba..eb5f8bba 100644
--- a/api/src/main/java/io/github/wulkanowy/api/messages/Messages.java
+++ b/api/src/main/java/io/github/wulkanowy/api/messages/Messages.java
@@ -59,10 +59,10 @@ public class Messages {
             messages = new Gson().fromJson(res, MessagesContainer.class).data;
         } catch (JsonParseException e) {
             if (res.contains(ERROR_TITLE)) {
-                throw new BadRequestException(ERROR_TITLE);
+                throw new BadRequestException();
             }
 
-            throw new NotLoggedInErrorException("You are probably not logged in");
+            throw new NotLoggedInErrorException();
         }
 
         return messages;
@@ -80,10 +80,10 @@ public class Messages {
             message = new Gson().fromJson(res, MessageContainer.class).data;
         } catch (JsonParseException e) {
             if (res.contains(ERROR_TITLE)) {
-                throw new BadRequestException(ERROR_TITLE);
+                throw new BadRequestException();
             }
 
-            throw new NotLoggedInErrorException("You are probably not logged in. Force login");
+            throw new NotLoggedInErrorException();
         }
 
         return message;
diff --git a/api/src/main/java/io/github/wulkanowy/api/timetable/Timetable.java b/api/src/main/java/io/github/wulkanowy/api/timetable/Timetable.java
index 77ca41bd..f575edb3 100644
--- a/api/src/main/java/io/github/wulkanowy/api/timetable/Timetable.java
+++ b/api/src/main/java/io/github/wulkanowy/api/timetable/Timetable.java
@@ -14,6 +14,7 @@ import java.util.Locale;
 
 import io.github.wulkanowy.api.SnP;
 import io.github.wulkanowy.api.VulcanException;
+import io.github.wulkanowy.api.generic.Day;
 import io.github.wulkanowy.api.generic.Lesson;
 import io.github.wulkanowy.api.generic.Week;
 
@@ -27,25 +28,25 @@ public class Timetable {
         this.snp = snp;
     }
 
-    public Week<TimetableDay> getWeekTable() throws IOException, ParseException, VulcanException {
+    public Week<Day> getWeekTable() throws IOException, ParseException, VulcanException {
         return getWeekTable("");
     }
 
-    public Week<TimetableDay> getWeekTable(final String tick) throws IOException, ParseException, VulcanException {
+    public Week<Day> getWeekTable(final String tick) throws IOException, ParseException, VulcanException {
         Element table = snp.getSnPPageDocument(TIMETABLE_PAGE_URL + tick)
                 .select(".mainContainer .presentData").first();
 
-        List<TimetableDay> days = getDays(table.select("thead th"));
+        List<Day> days = getDays(table.select("thead th"));
 
         setLessonToDays(table, days);
 
-        return new Week<TimetableDay>()
+        return new Week<Day>()
                 .setStartDayDate(days.get(0).getDate())
                 .setDays(days);
     }
 
-    private List<TimetableDay> getDays(Elements tableHeaderCells) throws ParseException {
-        List<TimetableDay> days = new ArrayList<>();
+    private List<Day> getDays(Elements tableHeaderCells) throws ParseException {
+        List<Day> days = new ArrayList<>();
 
         for (int i = 2; i < 7; i++) {
             String[] dayHeaderCell = tableHeaderCells.get(i).html().split("<br>");
@@ -54,7 +55,7 @@ public class Timetable {
             Date d = sdf.parse(dayHeaderCell[1].trim());
             sdf.applyPattern("yyyy-MM-dd");
 
-            TimetableDay day = new TimetableDay();
+            Day day = new Day();
             day.setDayName(dayHeaderCell[0]);
             day.setDate(sdf.format(d));
 
@@ -69,7 +70,7 @@ public class Timetable {
         return days;
     }
 
-    private void setLessonToDays(Element table, List<TimetableDay> days) {
+    private void setLessonToDays(Element table, List<Day> days) {
         for (Element row : table.select("tbody tr")) {
             Elements hours = row.select("td");
 
@@ -81,7 +82,7 @@ public class Timetable {
                 lesson.setStartTime(startEndEnd[0]);
                 lesson.setEndTime(startEndEnd[1]);
                 lesson.setDate(days.get(i - 2).getDate());
-                lesson.setNumber(Integer.valueOf(hours.get(0).text()));
+                lesson.setNumber(hours.get(0).text());
 
                 addLessonDetails(lesson, hours.get(i).select("div"));
 
@@ -98,14 +99,7 @@ public class Timetable {
                 addLessonInfoFromElement(lesson, e.first());
                 break;
             case 2:
-                Element span = e.last().select("span").first();
-                if (span.hasClass(LessonTypes.CLASS_MOVED_OR_CANCELED)) {
-                    lesson.setNewMovedInOrChanged(true);
-                    lesson.setDescription("poprzednio: " + getLessonAndGroupInfoFromSpan(span)[0]);
-                    addLessonInfoFromElement(lesson, e.first());
-                } else {
-                    addLessonInfoFromElement(lesson, e.last());
-                }
+                addLessonInfoFromElement(lesson, e.last());
                 break;
             case 3:
                 addLessonInfoFromElement(lesson, e.get(1));
@@ -171,8 +165,7 @@ public class Timetable {
             lesson.setRoom(spans.get(5).text());
             lesson.setMovedOrCanceled(false);
             lesson.setNewMovedInOrChanged(true);
-            lesson.setDescription(StringUtils.defaultString(StringUtils.substringBetween(
-                    spans.last().text(), "(", ")"), spans.last().text())
+            lesson.setDescription(StringUtils.substringBetween(spans.last().text(), "(", ")")
                     + " (poprzednio: " + spans.get(0).text() + ")");
         } else if (9 == spans.size()) {
             String[] subjectAndGroupInfo = getLessonAndGroupInfoFromSpan(spans.get(4));
@@ -183,15 +176,13 @@ public class Timetable {
             lesson.setMovedOrCanceled(false);
             lesson.setNewMovedInOrChanged(true);
             lesson.setDivisionIntoGroups(true);
-            lesson.setDescription(StringUtils.defaultString(StringUtils.substringBetween(
-                    spans.last().text(), "(", ")"), spans.last().text())
+            lesson.setDescription(StringUtils.substringBetween(spans.last().text(), "(", ")")
                     + " (poprzednio: " + getLessonAndGroupInfoFromSpan(spans.get(0))[0] + ")");
         } else if (4 <= spans.size()) {
             lesson.setSubject(spans.get(0).text());
             lesson.setTeacher(spans.get(1).text());
             lesson.setRoom(spans.get(2).text());
-            lesson.setDescription(StringUtils.defaultString(StringUtils.substringBetween(
-                    spans.last().text(), "(", ")"), spans.last().text()));
+            lesson.setDescription(StringUtils.substringBetween(spans.last().text(), "(", ")"));
         }
     }
 
@@ -219,8 +210,7 @@ public class Timetable {
 
         return new String[]{
                 span.text().replace(" " + groupName, ""),
-                StringUtils.defaultString(StringUtils.substringBetween(
-                        groupName, "[", "]"), groupName)
+                StringUtils.substringBetween(groupName, "[", "]")
         };
     }
 }
diff --git a/api/src/main/java/io/github/wulkanowy/api/timetable/TimetableDay.java b/api/src/main/java/io/github/wulkanowy/api/timetable/TimetableDay.java
deleted file mode 100644
index 1aa29de2..00000000
--- a/api/src/main/java/io/github/wulkanowy/api/timetable/TimetableDay.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package io.github.wulkanowy.api.timetable;
-
-import io.github.wulkanowy.api.generic.Day;
-
-public class TimetableDay extends Day {
-
-    private boolean isFreeDay = false;
-
-    private String freeDayName = "";
-
-    public boolean isFreeDay() {
-        return isFreeDay;
-    }
-
-    public void setFreeDay(boolean freeDay) {
-        isFreeDay = freeDay;
-    }
-
-    public String getFreeDayName() {
-        return freeDayName;
-    }
-
-    public void setFreeDayName(String freeDayName) {
-        this.freeDayName = freeDayName;
-    }
-}
diff --git a/api/src/test/java/io/github/wulkanowy/api/ClientTest.java b/api/src/test/java/io/github/wulkanowy/api/ClientTest.java
index 38f85617..4aa1be91 100644
--- a/api/src/test/java/io/github/wulkanowy/api/ClientTest.java
+++ b/api/src/test/java/io/github/wulkanowy/api/ClientTest.java
@@ -1,10 +1,13 @@
 package io.github.wulkanowy.api;
 
+import org.hamcrest.CoreMatchers;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.junit.Assert;
 import org.junit.Test;
 
+import io.github.wulkanowy.api.login.Login;
+
 public class ClientTest {
 
     private String getFixtureAsString(String fixtureFileName) {
@@ -46,6 +49,20 @@ public class ClientTest {
         client.checkForErrors(doc);
     }
 
+    @Test
+    public void getClientTest() throws Exception {
+        Client client = new Client("", "", "");
+
+        Assert.assertThat(client.getLogin(), CoreMatchers.instanceOf(Login.class));
+    }
+
+    @Test
+    public void getClientTwiceTest() throws Exception {
+        Client client = new Client("", "", "");
+
+        Assert.assertEquals(client.getLogin(), client.getLogin());
+    }
+
     @Test
     public void getFilledUrlTest() throws Exception {
         Client client = new Client("http://fakelog.cf\\\\admin", "", "symbol123");
diff --git a/api/src/test/java/io/github/wulkanowy/api/StudentAndParentTest.java b/api/src/test/java/io/github/wulkanowy/api/StudentAndParentTest.java
index 2b3d7250..5cde9b64 100644
--- a/api/src/test/java/io/github/wulkanowy/api/StudentAndParentTest.java
+++ b/api/src/test/java/io/github/wulkanowy/api/StudentAndParentTest.java
@@ -7,7 +7,6 @@ import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
 
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -23,21 +22,18 @@ public class StudentAndParentTest {
 
         client = Mockito.mock(Client.class);
         Mockito.when(client.getPageByUrl(Mockito.anyString())).thenReturn(gradesPageDocument);
-        Mockito.when(client.getPageByUrl(
-                Mockito.anyString(),
-                Mockito.anyBoolean(), Mockito.anyMap())).thenReturn(gradesPageDocument);
     }
 
     @Test
-    public void snpTest() {
-        StudentAndParent snp = new StudentAndParent(client, "id123", null, null);
-        Assert.assertEquals("id123", snp.getSchoolID());
+    public void snpTest() throws Exception {
+        StudentAndParent snp = new StudentAndParent(client, "id123");
+        Assert.assertEquals("id123", snp.getId());
     }
 
     @Test
     public void getSnpPageUrlWithIdTest() throws Exception {
         Assert.assertEquals("{schema}://uonetplus-opiekun.{host}/{symbol}/123456/",
-                (new StudentAndParent(client, "123456", null, null)).getSnpHomePageUrl());
+                (new StudentAndParent(client, "123456")).getSnpHomePageUrl());
     }
 
     @Test
@@ -47,7 +43,7 @@ public class StudentAndParentTest {
 
         Mockito.when(client.getHost()).thenReturn("vulcan.net.pl");
         Mockito.when(client.getPageByUrl(Mockito.anyString())).thenReturn(startPageDocument);
-        StudentAndParent snp = new StudentAndParent(client, null, null, null);
+        StudentAndParent snp = new StudentAndParent(client, null);
 
         Assert.assertEquals("https://uonetplus-opiekun.vulcan.net.pl/symbol/534213/Start/Index/",
                 snp.getSnpHomePageUrl());
@@ -60,7 +56,7 @@ public class StudentAndParentTest {
         );
 
         Mockito.when(client.getPageByUrl(Mockito.anyString())).thenReturn(wrongPageDocument);
-        StudentAndParent snp = new StudentAndParent(client, null, null, null);
+        StudentAndParent snp = new StudentAndParent(client, null);
 
         snp.getSnpHomePageUrl();
     }
@@ -68,7 +64,7 @@ public class StudentAndParentTest {
     @Test
     public void getExtractedIDStandardTest() throws Exception {
         Mockito.when(client.getHost()).thenReturn("vulcan.net.pl");
-        StudentAndParent snp = new StudentAndParent(client, "symbol", null, null);
+        StudentAndParent snp = new StudentAndParent(client, "symbol");
         Assert.assertEquals("123456", snp.getExtractedIdFromUrl("https://uonetplus-opiekun"
                 + ".vulcan.net.pl/powiat/123456/Start/Index/"));
     }
@@ -76,7 +72,7 @@ public class StudentAndParentTest {
     @Test
     public void getExtractedIDDemoTest() throws Exception {
         Mockito.when(client.getHost()).thenReturn("vulcan.net.pl");
-        StudentAndParent snp = new StudentAndParent(client, "symbol", null, null);
+        StudentAndParent snp = new StudentAndParent(client, "symbol");
         Assert.assertEquals("demo12345",
                 snp.getExtractedIdFromUrl("https://uonetplus-opiekun.vulcan.net.pl/demoupowiat/demo12345/Start/Index/"));
     }
@@ -84,73 +80,44 @@ public class StudentAndParentTest {
     @Test(expected = NotLoggedInErrorException.class)
     public void getExtractedIDNotLoggedTest() throws Exception {
         Mockito.when(client.getHost()).thenReturn("vulcan.net.pl");
-        StudentAndParent snp = new StudentAndParent(client, "symbol", null, null);
+        StudentAndParent snp = new StudentAndParent(client, "symbol");
         Assert.assertEquals("123",
                 snp.getExtractedIdFromUrl("https://uonetplus.vulcan.net.pl/powiat/"));
     }
 
     @Test
     public void getSemestersTest() throws Exception {
-        SnP snp = new StudentAndParent(client, "123456", null, null);
+        SnP snp = new StudentAndParent(client, "123456");
         List<Semester> semesters = snp.getSemesters();
 
         Assert.assertEquals(2, semesters.size());
 
-        Assert.assertEquals("1", semesters.get(0).getName());
-        Assert.assertEquals("1234", semesters.get(0).getId());
+        Assert.assertEquals("1", semesters.get(0).getId());
+        Assert.assertEquals("1234", semesters.get(0).getNumber());
         Assert.assertFalse(semesters.get(0).isCurrent());
 
-        Assert.assertEquals("2", semesters.get(1).getName());
-        Assert.assertEquals("1235", semesters.get(1).getId());
+        Assert.assertEquals("2", semesters.get(1).getId());
+        Assert.assertEquals("1235", semesters.get(1).getNumber());
         Assert.assertTrue(semesters.get(1).isCurrent());
     }
 
     @Test
-    public void getCurrentSemesterTest() {
+    public void getCurrentSemesterTest() throws Exception {
         List<Semester> semesters = new ArrayList<>();
-        semesters.add(new Semester().setName("1500100900").setId("1").setCurrent(false));
-        semesters.add(new Semester().setName("1500100901").setId("2").setCurrent(true));
+        semesters.add(new Semester().setNumber("1500100900").setId("1").setCurrent(false));
+        semesters.add(new Semester().setNumber("1500100901").setId("2").setCurrent(true));
 
-        SnP snp = new StudentAndParent(client, "", null, null);
-        Semester semester = snp.getCurrent(semesters);
-
-        Assert.assertTrue(semester.isCurrent());
-        Assert.assertEquals("2", semester.getId());
-        Assert.assertEquals("1500100901", semester.getName());
+        SnP snp = new StudentAndParent(client, "");
+        Assert.assertTrue(snp.getCurrentSemester(semesters).isCurrent());
+        Assert.assertEquals("2", snp.getCurrentSemester(semesters).getId());
+        Assert.assertEquals("1500100901", snp.getCurrentSemester(semesters).getNumber());
     }
 
     @Test
-    public void getCurrentSemesterFromEmptyTest() {
-        SnP snp = new StudentAndParent(client, "", null, null);
+    public void getCurrentSemesterFromEmptyTest() throws Exception {
+        SnP snp = new StudentAndParent(client, "");
         List<Semester> semesters = new ArrayList<>();
 
-        Assert.assertNull(snp.getCurrent(semesters));
-    }
-
-    @Test
-    public void getDiariesAndStudentTest() throws IOException, VulcanException {
-        Document snpHome = Jsoup.parse(FixtureHelper.getAsString(
-                getClass().getResourceAsStream("StudentAndParent.html")));
-
-        client = Mockito.mock(Client.class);
-        Mockito.when(client.getPageByUrl(Mockito.anyString())).thenReturn(snpHome);
-        SnP snp = new StudentAndParent(client, "", null, null);
-
-        snp.setUp();
-
-        Assert.assertEquals("3Ti 2017", snp.getDiaries().get(0).getName());
-        Assert.assertEquals("2Ti 2016", snp.getDiaries().get(1).getName());
-        Assert.assertEquals("1Ti 2015", snp.getDiaries().get(2).getName());
-
-        Assert.assertEquals("1300", snp.getDiaries().get(0).getId());
-        Assert.assertEquals("1200", snp.getDiaries().get(1).getId());
-        Assert.assertEquals("1100", snp.getDiaries().get(2).getId());
-
-        Assert.assertTrue(snp.getDiaries().get(0).isCurrent());
-        Assert.assertFalse(snp.getDiaries().get(1).isCurrent());
-        Assert.assertFalse(snp.getDiaries().get(2).isCurrent());
-
-        Assert.assertEquals("Jan Kowal", snp.getStudents().get(0).getName());
-        Assert.assertEquals("100", snp.getStudents().get(0).getId());
+        Assert.assertNull(snp.getCurrentSemester(semesters));
     }
 }
diff --git a/api/src/test/java/io/github/wulkanowy/api/StudentAndParentTestCase.java b/api/src/test/java/io/github/wulkanowy/api/StudentAndParentTestCase.java
index 8d32291f..b18076cf 100644
--- a/api/src/test/java/io/github/wulkanowy/api/StudentAndParentTestCase.java
+++ b/api/src/test/java/io/github/wulkanowy/api/StudentAndParentTestCase.java
@@ -16,7 +16,7 @@ public abstract class StudentAndParentTestCase {
         Mockito.when(snp.getSnPPageDocument(Mockito.anyString()))
                 .thenReturn(tablePageDocument);
         Mockito.when(snp.getSemesters(Mockito.any(Document.class))).thenCallRealMethod();
-        Mockito.when(snp.getCurrent(Mockito.<Semester>anyList()))
+        Mockito.when(snp.getCurrentSemester(Mockito.<Semester>anyList()))
                 .thenCallRealMethod();
         Mockito.when(snp.getRowDataChildValue(Mockito.any(Element.class),
                 Mockito.anyInt())).thenCallRealMethod();
diff --git a/api/src/test/java/io/github/wulkanowy/api/VulcanTest.java b/api/src/test/java/io/github/wulkanowy/api/VulcanTest.java
index 287935c0..bda66e8d 100644
--- a/api/src/test/java/io/github/wulkanowy/api/VulcanTest.java
+++ b/api/src/test/java/io/github/wulkanowy/api/VulcanTest.java
@@ -16,7 +16,7 @@ public class VulcanTest {
     @Test
     public void getClientTest() throws Exception {
         Vulcan vulcan = new Vulcan();
-        vulcan.setCredentials("email", "password", "symbol", null, null, null);
+        vulcan.setCredentials("email", "password", "symbol", null);
 
         Assert.assertThat(vulcan.getClient(), CoreMatchers.instanceOf(Client.class));
     }
@@ -24,7 +24,7 @@ public class VulcanTest {
     @Test
     public void getClientTwiceTest() throws Exception {
         Vulcan vulcan = new Vulcan();
-        vulcan.setCredentials("email", "password", "symbol", null, null, null);
+        vulcan.setCredentials("email", "password", "symbol", null);
 
         Assert.assertEquals(vulcan.getClient(), vulcan.getClient());
     }
diff --git a/api/src/test/java/io/github/wulkanowy/api/exams/ExamsWeekTest.java b/api/src/test/java/io/github/wulkanowy/api/exams/ExamsWeekTest.java
index 0a99c465..9b57ddd6 100644
--- a/api/src/test/java/io/github/wulkanowy/api/exams/ExamsWeekTest.java
+++ b/api/src/test/java/io/github/wulkanowy/api/exams/ExamsWeekTest.java
@@ -12,25 +12,20 @@ public class ExamsWeekTest extends StudentAndParentTestCase {
 
     private ExamsWeek onePerDay;
 
-    private ExamsWeek empty;
-
     @Before
     public void getCurrent() throws Exception {
         onePerDay = new ExamsWeek(getSnp("Sprawdziany-one-per-day.html"));
-        empty = new ExamsWeek(getSnp("Sprawdziany-empty.html"));
     }
 
     @Test
     public void getWeekTest() throws Exception {
-        Assert.assertEquals("2017-10-23", onePerDay.getCurrent().getStartDayDate());
-        Assert.assertEquals("2018-04-30", empty.getCurrent().getStartDayDate());
+        Assert.assertEquals("23.10.2017", onePerDay.getCurrent().getStartDayDate());
     }
 
     @Test
     public void getDaysListTest() throws Exception {
         Assert.assertEquals(3, onePerDay.getCurrent().getDays().size());
         Assert.assertEquals(7, onePerDay.getWeek("", false).getDays().size());
-        Assert.assertEquals(0, empty.getCurrent().getDays().size());
     }
 
     @Test
@@ -50,18 +45,9 @@ public class ExamsWeekTest extends StudentAndParentTestCase {
     public void getDayDateTest() throws Exception {
         List<ExamDay> dayList = onePerDay.getCurrent().getDays();
 
-        Assert.assertEquals("2017-10-23", dayList.get(0).getDate());
-        Assert.assertEquals("2017-10-24", dayList.get(1).getDate());
-        Assert.assertEquals("2017-10-27", dayList.get(2).getDate());
-    }
-
-    @Test
-    public void getDayNameTest() throws Exception {
-        List<ExamDay> dayList = onePerDay.getCurrent().getDays();
-
-        Assert.assertEquals("Poniedziałek", dayList.get(0).getDayName());
-        Assert.assertEquals("Wtorek", dayList.get(1).getDayName());
-        Assert.assertEquals("Piątek", dayList.get(2).getDayName());
+        Assert.assertEquals("23.10.2017", dayList.get(0).getDate());
+        Assert.assertEquals("24.10.2017", dayList.get(1).getDate());
+        Assert.assertEquals("27.10.2017", dayList.get(2).getDate());
     }
 
     @Test
@@ -104,8 +90,8 @@ public class ExamsWeekTest extends StudentAndParentTestCase {
     public void getExamEntryDateTest() throws Exception {
         List<ExamDay> dayList = onePerDay.getCurrent().getDays();
 
-        Assert.assertEquals("2017-10-16", dayList.get(0).getExamList().get(0).getEntryDate());
-        Assert.assertEquals("2017-10-17", dayList.get(1).getExamList().get(0).getEntryDate());
-        Assert.assertEquals("2017-10-16", dayList.get(2).getExamList().get(0).getEntryDate());
+        Assert.assertEquals("16.10.2017", dayList.get(0).getExamList().get(0).getEntryDate());
+        Assert.assertEquals("17.10.2017", dayList.get(1).getExamList().get(0).getEntryDate());
+        Assert.assertEquals("16.10.2017", dayList.get(2).getExamList().get(0).getEntryDate());
     }
 }
diff --git a/api/src/test/java/io/github/wulkanowy/api/grades/GradesListTest.java b/api/src/test/java/io/github/wulkanowy/api/grades/GradesListTest.java
index 6eff84c9..bee5b4fe 100644
--- a/api/src/test/java/io/github/wulkanowy/api/grades/GradesListTest.java
+++ b/api/src/test/java/io/github/wulkanowy/api/grades/GradesListTest.java
@@ -19,7 +19,7 @@ public class GradesListTest extends StudentAndParentTestCase {
 
     @Test
     public void getAllTest() throws Exception {
-        Assert.assertEquals(7, filled.getAll().size()); // 2 items are skipped
+        Assert.assertEquals(6, filled.getAll().size()); // 2 items are skipped
     }
 
     @Test
@@ -60,7 +60,6 @@ public class GradesListTest extends StudentAndParentTestCase {
         Assert.assertEquals("BW3", list.get(3).getSymbol());
         Assert.assertEquals("STR", list.get(4).getSymbol());
         Assert.assertEquals("K", list.get(5).getSymbol());
-        Assert.assertEquals("+Odp", list.get(6).getSymbol());
     }
 
     @Test
@@ -71,7 +70,6 @@ public class GradesListTest extends StudentAndParentTestCase {
         Assert.assertEquals("Writing", list.get(3).getDescription());
         Assert.assertEquals("", list.get(4).getDescription());
         Assert.assertEquals("Kordian", list.get(5).getDescription());
-        Assert.assertEquals("Kordian", list.get(6).getDescription());
     }
 
     @Test
@@ -103,4 +101,14 @@ public class GradesListTest extends StudentAndParentTestCase {
         Assert.assertEquals("Klaudia Dziedzic", list.get(4).getTeacher());
         Assert.assertEquals("Amelia Stępień", list.get(5).getTeacher());
     }
+
+    @Test
+    public void getSemesterTest() throws Exception {
+        List<Grade> list = filled.getAll();
+
+        Assert.assertEquals("7654321", list.get(0).getSemester());
+        Assert.assertEquals("7654321", list.get(3).getSemester());
+        Assert.assertEquals("7654321", list.get(4).getSemester());
+        Assert.assertEquals("7654321", list.get(5).getSemester());
+    }
 }
diff --git a/api/src/test/java/io/github/wulkanowy/api/login/LoginTest.java b/api/src/test/java/io/github/wulkanowy/api/login/LoginTest.java
index 4a4f8915..69118018 100644
--- a/api/src/test/java/io/github/wulkanowy/api/login/LoginTest.java
+++ b/api/src/test/java/io/github/wulkanowy/api/login/LoginTest.java
@@ -11,115 +11,86 @@ import io.github.wulkanowy.api.FixtureHelper;
 
 public class LoginTest {
 
-    private Document getFixtureAsDocument(String fixtureFileName) {
-        return Jsoup.parse(getFixtureAsString(fixtureFileName));
-    }
-
     private String getFixtureAsString(String fixtureFileName) {
         return FixtureHelper.getAsString(getClass().getResourceAsStream(fixtureFileName));
     }
 
     private Client getClient(String fixtureFileName) throws Exception {
-        Document doc = getFixtureAsDocument(fixtureFileName);
+        Document doc = Jsoup.parse(getFixtureAsString(fixtureFileName));
 
         Client client = Mockito.mock(Client.class);
         Mockito.when(client.postPageByUrl(Mockito.anyString(), Mockito.any(String[][].class))).thenReturn(doc);
-        Mockito.when(client.getPageByUrl(Mockito.anyString(), Mockito.anyBoolean())).thenReturn(doc);
 
         return client;
     }
 
     @Test
     public void loginTest() throws Exception {
-        Client client = getClient("Logowanie-success.html");
-        Mockito.when(client.getPageByUrl(Mockito.anyString(), Mockito.anyBoolean()))
-                .thenReturn(getFixtureAsDocument("Logowanie-error.html"));
-        Mockito.when(client.postPageByUrl(Mockito.eq(Login.LOGIN_PAGE_URL), Mockito.any(String[][].class)))
-                .thenReturn(getFixtureAsDocument("Logowanie-certyfikat.html"));
-        Mockito.doCallRealMethod().when(client).setSymbol(Mockito.anyString());
-        Mockito.when(client.getSymbol()).thenCallRealMethod();
-        Login login = new Login(client);
+        Login login = new Login(getClient("Logowanie-success.html"));
 
         Assert.assertEquals("d123", login.login("a@a", "pswd", "d123"));
     }
 
     @Test(expected = BadCredentialsException.class)
     public void sendWrongCredentialsTest() throws Exception {
-        Client client = getClient("Logowanie-error.html");
-        Mockito.when(client.getPageByUrl(Mockito.anyString(), Mockito.anyBoolean()))
-                .thenReturn(getFixtureAsDocument("Logowanie-error.html")); // -error.html because it html with form used by
-        Login login = new Login(client);
+        Login login = new Login(getClient("Logowanie-error.html"));
 
-        login.sendCredentials("a@a", "pswd");
+        login.sendCredentials("a@a", "pswd", "d123");
     }
 
     @Test
     public void sendCredentialsCertificateTest() throws Exception {
-        Client client = getClient("Logowanie-certyfikat.html");
-        Mockito.when(client.getPageByUrl(Mockito.anyString(), Mockito.anyBoolean()))
-                .thenReturn(getFixtureAsDocument("Logowanie-error.html")); // -error.html because it html with form used by
-        Login login = new Login(client);
+        Login login = new Login(getClient("Logowanie-certyfikat.html"));
 
         Assert.assertEquals(
-                getFixtureAsString("cert-stock.xml").replaceAll("\\s+", ""),
-                login.sendCredentials("a@a", "passwd")
-                        .select("input[name=wresult]")
-                        .attr("value")
-                        .replaceAll("\\s+", "")
+                getFixtureAsString("cert.xml").replaceAll("\\s+",""),
+                login.sendCredentials("a@a", "passwd", "d123").replaceAll("\\s+","")
         );
     }
 
     @Test
     public void sendCertificateNotDefaultSymbolSuccessTest() throws Exception {
-        Client client = getClient("Logowanie-success.html");
-        Mockito.doCallRealMethod().when(client).setSymbol(Mockito.anyString());
-        Mockito.when(client.getSymbol()).thenCallRealMethod();
-        Login login = new Login(client);
+        Login login = new Login(getClient("Logowanie-success.html"));
 
-        Assert.assertEquals("wulkanowyschool321", login.sendCertificate(
-                getFixtureAsDocument("Logowanie-certyfikat.html"), "wulkanowyschool321"));
+        Assert.assertEquals("wulkanowyschool321",
+                login.sendCertificate("", "wulkanowyschool321"));
     }
 
     @Test
     public void sendCertificateDefaultSymbolSuccessTest() throws Exception {
-        Client client = getClient("Logowanie-success.html");
-        Mockito.doCallRealMethod().when(client).setSymbol(Mockito.anyString());
-        Mockito.when(client.getSymbol()).thenCallRealMethod();
-        Login login = new Login(client);
+        Login login = new Login(getClient("Logowanie-success.html"));
 
         Assert.assertEquals("demo12345",
-                login.sendCertificate(getFixtureAsDocument("Logowanie-certyfikat.html"), "Default"));
+                login.sendCertificate(getFixtureAsString("cert.xml"), "Default"));
     }
 
     @Test(expected = AccountPermissionException.class)
     public void sendCertificateAccountPermissionTest() throws Exception {
-        Client client = getClient("Logowanie-brak-dostepu.html");
+        Login login = new Login(getClient("Logowanie-brak-dostepu.html"));
 
-        Login login = new Login(client);
-
-        login.sendCertificate(getFixtureAsDocument("Logowanie-certyfikat.html"), "demo123");
+        login.sendCertificate(getFixtureAsString("cert.xml"), "demo123");
     }
 
     @Test(expected = LoginErrorException.class)
     public void sendCertificateLoginErrorTest() throws Exception {
         Login login = new Login(getClient("Logowanie-certyfikat.html")); // change to other document
 
-        login.sendCertificate(getFixtureAsDocument("Logowanie-certyfikat.html"), "demo123");
+        login.sendCertificate(getFixtureAsString("cert.xml"), "demo123");
     }
 
     @Test
     public void findSymbolInCertificateTest() throws Exception {
         Login login = new Login(getClient("Logowanie-certyfikat.html"));
 
-        String certificate = getFixtureAsString("cert-stock.xml");
+        String certificate = getFixtureAsString("cert.xml");
 
         Assert.assertEquals("demo12345", login.findSymbolInCertificate(certificate));
     }
 
-    @Test(expected = AccountPermissionException.class)
-    public void findSymbolInCertificateWithoutSecondInstanceTest() throws Exception {
+    @Test
+    public void findSymbolInInvalidCertificateTest() throws Exception {
         Login login = new Login(getClient("Logowanie-certyfikat.html"));
 
-        login.findSymbolInCertificate(getFixtureAsString("cert-no-symbols.xml"));
+        Assert.assertEquals("", login.findSymbolInCertificate("<xml></xml>")); // change to real cert with empty symbols
     }
 }
diff --git a/api/src/test/java/io/github/wulkanowy/api/timetable/TimetableTest.java b/api/src/test/java/io/github/wulkanowy/api/timetable/TimetableTest.java
index 8939b10f..65267634 100644
--- a/api/src/test/java/io/github/wulkanowy/api/timetable/TimetableTest.java
+++ b/api/src/test/java/io/github/wulkanowy/api/timetable/TimetableTest.java
@@ -83,11 +83,11 @@ public class TimetableTest extends StudentAndParentTestCase {
 
     @Test
     public void getLessonNumberTest() throws Exception {
-        Assert.assertEquals(2, std.getWeekTable().getDay(0).getLesson(1).getNumber());
-        Assert.assertEquals(5, std.getWeekTable().getDay(2).getLesson(4).getNumber());
-        Assert.assertEquals(0, full.getWeekTable().getDay(0).getLesson(0).getNumber());
-        Assert.assertEquals(13, full.getWeekTable().getDay(4).getLesson(13).getNumber());
-        Assert.assertEquals(3, holidays.getWeekTable().getDay(3).getLesson(3).getNumber());
+        Assert.assertEquals("2", std.getWeekTable().getDay(0).getLesson(1).getNumber());
+        Assert.assertEquals("5", std.getWeekTable().getDay(2).getLesson(4).getNumber());
+        Assert.assertEquals("0", full.getWeekTable().getDay(0).getLesson(0).getNumber());
+        Assert.assertEquals("13", full.getWeekTable().getDay(4).getLesson(13).getNumber());
+        Assert.assertEquals("3", holidays.getWeekTable().getDay(3).getLesson(3).getNumber());
     }
 
     @Test
@@ -110,7 +110,6 @@ public class TimetableTest extends StudentAndParentTestCase {
         Assert.assertEquals("Uroczyste zakończenie roku szkolnego", full.getWeekTable().getDay(4).getLesson(0).getSubject());
         Assert.assertEquals("Fizyka", full.getWeekTable().getDay(0).getLesson(0).getSubject());
         Assert.assertEquals("Metodologia programowania", full.getWeekTable().getDay(1).getLesson(0).getSubject());
-        Assert.assertEquals("Język niemiecki", full.getWeekTable().getDay(4).getLesson(2).getSubject());
         Assert.assertEquals("", holidays.getWeekTable().getDay(3).getLesson(3).getSubject());
     }
 
@@ -123,7 +122,6 @@ public class TimetableTest extends StudentAndParentTestCase {
         Assert.assertEquals("Nowak Jadwiga", full.getWeekTable().getDay(2).getLesson(0).getTeacher());
         Assert.assertEquals("Nowicka Irena", full.getWeekTable().getDay(3).getLesson(1).getTeacher());
         Assert.assertEquals("Baran Małgorzata", full.getWeekTable().getDay(4).getLesson(0).getTeacher());
-        Assert.assertEquals("", full.getWeekTable().getDay(4).getLesson(1).getTeacher());
         Assert.assertEquals("", holidays.getWeekTable().getDay(3).getLesson(3).getTeacher());
     }
 
@@ -150,11 +148,7 @@ public class TimetableTest extends StudentAndParentTestCase {
         Assert.assertEquals("zastępstwo (poprzednio: Religia)", full.getWeekTable().getDay(2).getLesson(0).getDescription());
         Assert.assertEquals("zastępstwo (poprzednio: Wychowanie fizyczne)", full.getWeekTable().getDay(3).getLesson(1).getDescription());
         Assert.assertEquals("", full.getWeekTable().getDay(4).getLesson(0).getDescription());
-        Assert.assertEquals("", full.getWeekTable().getDay(4).getLesson(1).getDescription());
-        Assert.assertEquals("bez nawiasów (poprzednio: Religia)", full.getWeekTable().getDay(4).getLesson(3).getDescription());
-        Assert.assertEquals("poprzednio: Wychowanie fizyczne", full.getWeekTable().getDay(4).getLesson(2).getDescription());
         Assert.assertEquals("egzamin", full.getWeekTable().getDay(3).getLesson(0).getDescription());
-        Assert.assertEquals("", full.getWeekTable().getDay(4).getLesson(1).getDescription());
         Assert.assertEquals("", holidays.getWeekTable().getDay(3).getLesson(3).getDescription());
     }
 
@@ -243,8 +237,6 @@ public class TimetableTest extends StudentAndParentTestCase {
         Assert.assertTrue(full.getWeekTable().getDay(1).getLesson(2).isNewMovedInOrChanged());
         Assert.assertTrue(full.getWeekTable().getDay(1).getLesson(3).isNewMovedInOrChanged());
         Assert.assertTrue(full.getWeekTable().getDay(3).getLesson(1).isNewMovedInOrChanged());
-        Assert.assertFalse(full.getWeekTable().getDay(4).getLesson(1).isNewMovedInOrChanged());
-        Assert.assertTrue(full.getWeekTable().getDay(4).getLesson(2).isNewMovedInOrChanged());
         Assert.assertFalse(holidays.getWeekTable().getDay(3).getLesson(3).isNewMovedInOrChanged());
     }
 }
diff --git a/api/src/test/resources/io/github/wulkanowy/api/OcenyWszystkie-semester.html b/api/src/test/resources/io/github/wulkanowy/api/OcenyWszystkie-semester.html
index dc7c6c3b..f4b712c1 100644
--- a/api/src/test/resources/io/github/wulkanowy/api/OcenyWszystkie-semester.html
+++ b/api/src/test/resources/io/github/wulkanowy/api/OcenyWszystkie-semester.html
@@ -15,8 +15,7 @@
             <option selected="selected" value="1235">2</option>
           </select>
         </div>
-      </div>
-    </main>
+      </main>
     <footer>wersja: 17.05.0000.24042</footer>
   </body>
 </html>
diff --git a/api/src/test/resources/io/github/wulkanowy/api/StudentAndParent.html b/api/src/test/resources/io/github/wulkanowy/api/StudentAndParent.html
deleted file mode 100644
index 66e2942f..00000000
--- a/api/src/test/resources/io/github/wulkanowy/api/StudentAndParent.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html>
-<html lang="pl">
-<head>
-    <meta charset="utf-8">
-    <title>Witryna ucznia i rodzica – Strona gł&#243;wna</title>
-</head>
-<body>
-<ul id="idSection">
-    <li>
-        <label for="uczenDropDownList">Uczeń:</label>
-        <select id="uczenDropDownList" name="uczenDropDownList">
-            <option selected="selected"
-                    value="https://uonetplus-opiekun.fakelog.cf/Default/123456/Uczen/UczenOnChange?&amp;id=100">
-                Jan Kowal
-            </option>
-        </select>
-    </li>
-    <li>
-        <label for="dziennikDropDownList">Dziennik:</label>
-        <select id="dziennikDropDownList" name="dziennikDropDownList">
-            <option selected="selected"
-                    value="https://uonetplus-opiekun.fakelog.cf/Default/123456/Dziennik/DziennikOnChange?&amp;id=1300">
-                3Ti 2017
-            </option>
-            <option value="https://uonetplus-opiekun.fakelog.cf/Default/123456/Dziennik/DziennikOnChange?&amp;id=1200">
-                2Ti 2016
-            </option>
-            <option value="https://uonetplus-opiekun.fakelog.cf/Default/123456/Dziennik/DziennikOnChange?&amp;id=1100">
-                1Ti 2015
-            </option>
-        </select>
-    </li>
-</ul>
-
-<footer>wersja: 17.09.0008.26553</footer>
-</body>
-</html>
diff --git a/api/src/test/resources/io/github/wulkanowy/api/exams/Sprawdziany-empty.html b/api/src/test/resources/io/github/wulkanowy/api/exams/Sprawdziany-empty.html
deleted file mode 100644
index bf1032b4..00000000
--- a/api/src/test/resources/io/github/wulkanowy/api/exams/Sprawdziany-empty.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Witryna ucznia i rodzica – Terminarz sprawdzian&#243;w</title>
-  </head>
-  <body>
-    <main class="mainContainer">
-      <h1>Sprawdziany</h1>
-      <h2>Tydzień 30.04.2018 - 06.05.2018</h2>
-      <h2>Nie zaplanowano żadnych sprawdzian&#243;w na wybrany tydzień</h2>
-      <div class="navigation">
-        <a href="/symbol/123456/Sprawdziany.mvc/Terminarz?data=636600384000000000&amp;rokSzkolny=2017&amp;rodzajWidoku=2" class="button-prev">Poprzedni tydzień</a>
-        <a href="/symbol/123456/Sprawdziany.mvc/Terminarz?data=636612480000000000&amp;rokSzkolny=2017&amp;rodzajWidoku=2" class="button-next">Następny tydzień</a>
-      </div>
-    </main>
-  <footer>wersja: 17.09.0009.26859</footer>
-  </body>
-</html>
diff --git a/api/src/test/resources/io/github/wulkanowy/api/grades/OcenyWszystkie-filled.html b/api/src/test/resources/io/github/wulkanowy/api/grades/OcenyWszystkie-filled.html
index d0cdb664..a229d1d5 100644
--- a/api/src/test/resources/io/github/wulkanowy/api/grades/OcenyWszystkie-filled.html
+++ b/api/src/test/resources/io/github/wulkanowy/api/grades/OcenyWszystkie-filled.html
@@ -100,14 +100,6 @@
             <td>06.02.2017</td>
             <td>Amelia Stępień</td>
           </tr>
-          <tr>
-            <td>Język polski</td>
-            <td class="break-word"><span class="ocenaCzastkowa" style="color:#6ECD07;">5</span></td>
-            <td class="break-word">+Odp, Kordian</td>
-            <td>5,00</td>
-            <td>11.05.2017</td>
-            <td>Amelia Stępień</td>
-          </tr>
         </tbody>
       </table>
     </main>
diff --git a/api/src/test/resources/io/github/wulkanowy/api/login/Logowanie-certyfikat.html b/api/src/test/resources/io/github/wulkanowy/api/login/Logowanie-certyfikat.html
index f53a3485..a8496cd1 100644
--- a/api/src/test/resources/io/github/wulkanowy/api/login/Logowanie-certyfikat.html
+++ b/api/src/test/resources/io/github/wulkanowy/api/login/Logowanie-certyfikat.html
@@ -3,10 +3,10 @@
   <title>Working...</title>
  </head>
  <body>
-  <form method="POST" name="hiddenform" action="https://fakelog.cf/Default/LoginEndpoint.aspx">
+  <form method="POST" name="hiddenform" action="https://fake-log.com/Default/LoginEndpoint.aspx">
    <input type="hidden" name="wa" value="wsignin1.0">
-   <input type="hidden" name="wresult" value="<trust:RequestSecurityTokenResponseCollection xmlns:trust=&quot;http://docs.oasis-open.org/ws-sx/ws-trust/200512&quot;><trust:RequestSecurityTokenResponse Context=&quot;https://uonetplus.fakelog.cf/Default/LoginEndpoint.aspx&quot;><trust:RequestedSecurityToken><saml:Assertion AssertionID=&quot;_12345678-1234-1234-1234-1234567890ab&quot; IssueInstant=&quot;2017-10-18T22:00:29.006Z&quot; Issuer=&quot;CUFSTokenService&quot; MajorVersion=&quot;1&quot; MinorVersion=&quot;1&quot; xmlns:saml=&quot;urn:oasis:names:tc:SAML:1.0:assertion&quot;><saml:AttributeStatement><saml:Attribute AttributeName=&quot;UserInstance&quot; AttributeNamespace=&quot;http://schemas.fakelog.cf/ws/identity/claims&quot;><saml:AttributeValue>Default</saml:AttributeValue><saml:AttributeValue>demo12345</saml:AttributeValue><saml:AttributeValue>incorrect value</saml:AttributeValue><saml:AttributeValue>warszawa</saml:AttributeValue><saml:AttributeValue>asdf</saml:AttributeValue><saml:AttributeValue>asdfsdf</saml:AttributeValue></saml:Attribute></saml:AttributeStatement></saml:Assertion></trust:RequestedSecurityToken></trust:RequestSecurityTokenResponse></trust:RequestSecurityTokenResponseCollection>">
-   <input type="hidden" name="wctx" value="https://fakelog.cf/Default/LoginEndpoint.aspx">
+   <input type="hidden" name="wresult" value="<trust:RequestSecurityTokenResponseCollection xmlns:trust=&quot;http://docs.oasis-open.org/ws-sx/ws-trust/200512&quot;><trust:RequestSecurityTokenResponse Context=&quot;https://uonetplus.fake-log.com/Default/LoginEndpoint.aspx&quot;><trust:RequestedSecurityToken><saml:Assertion AssertionID=&quot;_12345678-1234-1234-1234-1234567890ab&quot; IssueInstant=&quot;2017-10-18T22:00:29.006Z&quot; Issuer=&quot;CUFSTokenService&quot; MajorVersion=&quot;1&quot; MinorVersion=&quot;1&quot; xmlns:saml=&quot;urn:oasis:names:tc:SAML:1.0:assertion&quot;><saml:AttributeStatement><saml:Attribute AttributeName=&quot;UserInstance&quot; AttributeNamespace=&quot;http://schemas.fake-log.com/ws/identity/claims&quot;><saml:AttributeValue>Default</saml:AttributeValue><saml:AttributeValue>demo12345</saml:AttributeValue><saml:AttributeValue>incorrect value</saml:AttributeValue><saml:AttributeValue>warszawa</saml:AttributeValue><saml:AttributeValue>asdf</saml:AttributeValue><saml:AttributeValue>asdfsdf</saml:AttributeValue></saml:Attribute></saml:AttributeStatement></saml:Assertion></trust:RequestedSecurityToken></trust:RequestSecurityTokenResponse></trust:RequestSecurityTokenResponseCollection>">
+   <input type="hidden" name="wctx" value="https://fake-log.com/Default/LoginEndpoint.aspx">
    <noscript>
     <p>Script is disabled. Click Submit to continue.</p>
     <input type="submit" value="Submit">
diff --git a/api/src/test/resources/io/github/wulkanowy/api/login/Logowanie-error.html b/api/src/test/resources/io/github/wulkanowy/api/login/Logowanie-error.html
index afb044d7..08713188 100644
--- a/api/src/test/resources/io/github/wulkanowy/api/login/Logowanie-error.html
+++ b/api/src/test/resources/io/github/wulkanowy/api/login/Logowanie-error.html
@@ -6,9 +6,6 @@
     <body>
         <div id="MainDiv">
             <form>
-                <div class="LogOnBoard">
-                    <h1 id="h1Default">Logowanie</h1>
-                </div>
                 <div class="ErrorMessage center">
                     Zła nazwa użytkownika lub hasło
                 </div>
diff --git a/api/src/test/resources/io/github/wulkanowy/api/login/cert-no-symbols.xml b/api/src/test/resources/io/github/wulkanowy/api/login/cert-no-symbols.xml
deleted file mode 100644
index ca14bdf5..00000000
--- a/api/src/test/resources/io/github/wulkanowy/api/login/cert-no-symbols.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<trust:RequestSecurityTokenResponseCollection xmlns:trust="http://docs.oasis-open.org/ws-sx/ws-trust/200512">
-    <trust:RequestSecurityTokenResponse Context="https://uonetplus.fakelog.cf/Default/LoginEndpoint.aspx">
-        <trust:RequestedSecurityToken>
-            <saml:Assertion AssertionID="_12345678-1234-1234-1234-1234567890ab" IssueInstant="2017-10-18T22:00:29.006Z" Issuer="CUFSTokenService" MajorVersion="1" MinorVersion="1" xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion">
-                <saml:AttributeStatement>
-                    <saml:Attribute AttributeName="UserInstance" AttributeNamespace="http://schemas.fakelog.cf/ws/identity/claims">
-                        <saml:AttributeValue>Default</saml:AttributeValue>
-                    </saml:Attribute>
-                </saml:AttributeStatement>
-            </saml:Assertion>
-        </trust:RequestedSecurityToken>
-    </trust:RequestSecurityTokenResponse>
-</trust:RequestSecurityTokenResponseCollection>
diff --git a/api/src/test/resources/io/github/wulkanowy/api/login/cert-stock.xml b/api/src/test/resources/io/github/wulkanowy/api/login/cert.xml
similarity index 91%
rename from api/src/test/resources/io/github/wulkanowy/api/login/cert-stock.xml
rename to api/src/test/resources/io/github/wulkanowy/api/login/cert.xml
index 31aa19b2..549b2d42 100644
--- a/api/src/test/resources/io/github/wulkanowy/api/login/cert-stock.xml
+++ b/api/src/test/resources/io/github/wulkanowy/api/login/cert.xml
@@ -1,9 +1,9 @@
 <trust:RequestSecurityTokenResponseCollection xmlns:trust="http://docs.oasis-open.org/ws-sx/ws-trust/200512">
-	<trust:RequestSecurityTokenResponse Context="https://uonetplus.fakelog.cf/Default/LoginEndpoint.aspx">
+	<trust:RequestSecurityTokenResponse Context="https://uonetplus.fake-log.com/Default/LoginEndpoint.aspx">
 		<trust:RequestedSecurityToken>
 			<saml:Assertion AssertionID="_12345678-1234-1234-1234-1234567890ab" IssueInstant="2017-10-18T22:00:29.006Z" Issuer="CUFSTokenService" MajorVersion="1" MinorVersion="1" xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion">
 				<saml:AttributeStatement>
-					<saml:Attribute AttributeName="UserInstance" AttributeNamespace="http://schemas.fakelog.cf/ws/identity/claims">
+					<saml:Attribute AttributeName="UserInstance" AttributeNamespace="http://schemas.fake-log.com/ws/identity/claims">
 						<saml:AttributeValue>Default</saml:AttributeValue>
 						<saml:AttributeValue>demo12345</saml:AttributeValue>
 						<saml:AttributeValue>incorrect value</saml:AttributeValue>
diff --git a/api/src/test/resources/io/github/wulkanowy/api/timetable/PlanLekcji-full.html b/api/src/test/resources/io/github/wulkanowy/api/timetable/PlanLekcji-full.html
index 4bce6c93..53eb0485 100644
--- a/api/src/test/resources/io/github/wulkanowy/api/timetable/PlanLekcji-full.html
+++ b/api/src/test/resources/io/github/wulkanowy/api/timetable/PlanLekcji-full.html
@@ -3,40 +3,6 @@
   <head>
     <meta charset="utf-8">
     <title>Witryna ucznia i rodzica – Plan lekcji</title>
-    <style>
-      table, th, td {
-        border: 1px solid;
-        border-collapse: collapse;
-      }
-      table td > div:not(:last-child) {
-        border-bottom: 5px solid silver;
-        padding-bottom: 5px;
-        margin-bottom: 5px;
-      }
-      table td div span:nth-child(1) {
-        display: block;
-      }
-      table span {
-        font-size: smaller;
-      }
-      .x-treelabel-ppl {
-        background: #99f;
-        font-style: italic;
-      }
-      .x-treelabel-rlz {
-        background: #f3a;
-      }
-      .x-treelabel-inv {
-        background: #f00;
-      }
-      .x-treelabel-zas {
-        background: #0f0;
-      }
-      table span:not([class]),
-      table span[class=""] {
-        background: #999;
-      }
-    </style>
   </head>
   <body>
     <main class="mainContainer">
@@ -116,13 +82,6 @@
                 </div>
               </td>
               <td>
-                <div>
-                  <span class="x-treelabel-ppl x-treelabel-zas">Wychowanie fizyczne [zaw2]</span>
-                  <span class="x-treelabel-ppl x-treelabel-zas"></span>
-                  <span class="x-treelabel-ppl x-treelabel-zas"></span>
-                  <span class="x-treelabel-ppl x-treelabel-zas">G3</span>
-                  <span class="x-treelabel-rlz">(przeniesiona z lekcji 7, 01.12.2017)</span>
-                </div>
                 <div>
                   <span class="x-treelabel-ppl x-treelabel-inv">Metodologia programowania [zaw2]</span>
                   <span class="x-treelabel-ppl x-treelabel-inv"></span>
@@ -130,6 +89,13 @@
                   <span class="x-treelabel-ppl x-treelabel-inv">36</span>
                   <span class="x-treelabel-rlz">(zmiana organizacji zajęć)</span>
                 </div>
+                <div>
+                  <span class="x-treelabel-ppl x-treelabel-zas">Wychowanie fizyczne [zaw2]</span>
+                  <span class="x-treelabel-ppl x-treelabel-zas"></span>
+                  <span class="x-treelabel-ppl x-treelabel-zas"></span>
+                  <span class="x-treelabel-ppl x-treelabel-zas">G3</span>
+                  <span class="x-treelabel-rlz">(przeniesiona z lekcji 7, 01.12.2017)</span>
+                </div>
               </td>
               <td>
                 <div>
@@ -152,18 +118,7 @@
                   <span class="x-treelabel-rlz">(zastępstwo)</span>
                 </div>
               </td>
-              <td>
-                <div>
-                  <span class="">Uroczyste rozpoczecie roku szkolnego 2017/2018</span>
-                  <span class=""></span>
-                  <span class=""></span>
-                </div>
-                <div>
-                  <span class="x-treelabel-ppl">Uroczyste rozpoczecie roku szkolnego 2017/2018</span>
-                  <span class="x-treelabel-ppl"></span>
-                  <span class="x-treelabel-ppl"></span>
-                </div>
-              </td>
+              <td></td>
             </tr>
             <tr>
               <td>2</td>
@@ -210,20 +165,7 @@
                   <span></span>
                 </div>
               </td>
-              <td>
-                <div>
-                  <span class="">Język niemiecki [wf_grupa_2]</span>
-                  <span class=""></span>
-                  <span class=""></span>
-                  <span class=""></span>
-                </div>
-                <div>
-                  <span class="x-treelabel-ppl x-treelabel-inv">Wychowanie fizyczne [wf_grupa_2]</span>
-                  <span class="x-treelabel-ppl x-treelabel-inv"></span>
-                  <span class="x-treelabel-ppl x-treelabel-inv">Nauczycielel</span>
-                  <span class="x-treelabel-ppl x-treelabel-inv">106</span>
-                </div>
-              </td>
+              <td></td>
             </tr>
             <tr>
               <td>3</td>
@@ -272,17 +214,7 @@
                   <span></span>
                 </div>
               </td>
-              <td>
-                <div>
-                  <span class="x-treelabel-inv">Religia</span>
-                  <span class="x-treelabel-inv">Cyranka Krystian</span>
-                  <span class="x-treelabel-inv">3</span>
-                  <span class="x-treelabel-ppl x-treelabel-zas">Wychowanie do życia w rodzinie</span>
-                  <span class="x-treelabel-ppl x-treelabel-zas">Nowak Jadwiga</span>
-                  <span class="x-treelabel-ppl x-treelabel-zas">3</span>
-                  <span class="x-treelabel-rlz">bez nawiasów</span>
-                </div>
-              </td>
+              <td></td>
             </tr>
             <tr>
               <td>4</td>
diff --git a/app/build.gradle b/app/build.gradle
index 8a831d4f..d930afc0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,14 +2,11 @@ buildscript {
     repositories {
         maven { url "https://plugins.gradle.org/m2/" }
         maven { url 'https://maven.fabric.io/public' }
-        google()
     }
 
     dependencies {
-        classpath "org.greenrobot:greendao-gradle-plugin:$greenDaoGradle"
-        classpath "io.fabric.tools:gradle:$fabricGradle"
-        classpath "com.google.gms:oss-licenses:0.9.2"
-        classpath 'com.github.triplet.gradle:play-publisher:1.2.0'
+        classpath 'org.greenrobot:greendao-gradle-plugin:3.2.2'
+        classpath 'io.fabric.tools:gradle:1.25.1'
     }
 }
 
@@ -22,49 +19,28 @@ apply plugin: 'org.greenrobot.greendao'
 apply plugin: 'io.fabric'
 apply from: '../jacoco.gradle'
 apply from: '../android-sonarqube.gradle'
-apply plugin: 'com.google.gms.oss.licenses.plugin'
-apply plugin: 'com.github.triplet.play'
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion '27.0.3'
-
-    playAccountConfigs {
-        defaultAccountConfig {
-            serviceAccountEmail = System.getenv("PLAY_SERVICE_ACCOUNT_EMAIL")
-            pk12File = file('key.p12')
-        }
-    }
-
+    compileSdkVersion 27
+    buildToolsVersion "27.0.3"
     defaultConfig {
         applicationId "io.github.wulkanowy"
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 15
-        targetSdkVersion 26
-        versionCode 11
-        versionName "0.4.3"
+        targetSdkVersion 27
+        versionCode 3
+        versionName "0.2.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
-        playAccountConfig = playAccountConfigs.defaultAccountConfig
         manifestPlaceholders = [
                 fabricApiKey: System.getenv("FABRIC_API_KEY") ?: "null"
         ]
     }
 
-    signingConfigs {
-        release {
-            storeFile file("upload-key.jks")
-            storePassword System.getenv("PLAY_STORE_PASSWORD")
-            keyAlias System.getenv("PLAY_KEY_ALIAS")
-            keyPassword System.getenv("PLAY_KEY_PASSWORD")
-        }
-    }
-
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            signingConfig signingConfigs.release
         }
         debug {
             applicationIdSuffix ".dev"
@@ -85,56 +61,49 @@ android {
     }
 }
 
-play {
-    track = 'alpha'
-    uploadImages = true
-}
-
 greendao {
-    schemaVersion 28
+    schemaVersion 22
     generateTests = true
 }
 
-configurations.all {
-    resolutionStrategy.force "com.android.support:support-annotations:$supportVersion"
-}
-
 dependencies {
     implementation project(':api')
-    implementation "com.android.support:support-v4:$supportVersion"
-    implementation "com.android.support:design:$supportVersion"
-    implementation "com.android.support:cardview-v7:$supportVersion"
-    implementation "com.android.support:customtabs:$supportVersion"
-    implementation "com.android.support:preference-v14:$supportVersion"
-    implementation "com.firebase:firebase-jobdispatcher:$firebaseJob"
-    implementation "org.apache.commons:commons-lang3:$apacheLang"
-    implementation "org.apache.commons:commons-collections4:$apacheCollections"
-    implementation "eu.davidea:flexible-adapter:$flexibleAdapter"
-    implementation "eu.davidea:flexible-adapter-ui:$flexibleUi"
-    implementation "org.greenrobot:greendao:$greenDao"
-    implementation "com.jakewharton:butterknife:$butterknife"
-    implementation "com.google.dagger:dagger-android-support:$dagger2"
-    implementation "com.aurelhubert:ahbottomnavigation:$ahbottom"
-    implementation "com.jakewharton.threetenabp:threetenabp:$threeTenABP"
-    implementation "com.google.android.gms:play-services-oss-licenses:$ossLicenses"
+    implementation 'com.android.support:appcompat-v7:27.1.0'
+    implementation 'com.android.support:design:27.1.0'
+    implementation 'com.android.support:support-v4:27.1.0'
+    implementation 'com.android.support:recyclerview-v7:27.1.0'
+    implementation 'com.android.support:cardview-v7:27.1.0'
+    implementation 'com.android.support:customtabs:27.1.0'
+    implementation 'com.firebase:firebase-jobdispatcher:0.8.5'
+    implementation 'org.apache.commons:commons-lang3:3.7'
+    implementation 'eu.davidea:flexible-adapter:5.0.0-rc4'
+    implementation 'eu.davidea:flexible-adapter-ui:1.0.0-b1'
+    implementation 'org.apache.commons:commons-collections4:4.1'
+    implementation 'org.greenrobot:greendao:3.2.2'
+    implementation 'com.github.yuweiguocn:GreenDaoUpgradeHelper:v2.0.2'
+    implementation 'com.jakewharton:butterknife:8.8.1'
+    implementation 'joda-time:joda-time:2.9.9'
+    implementation 'com.google.dagger:dagger-android:2.14.1'
+    implementation 'com.google.dagger:dagger-android-support:2.14.1'
+    implementation 'com.aurelhubert:ahbottomnavigation:2.1.0'
 
-    implementation("com.crashlytics.sdk.android:crashlytics:$crashlyticsSdk@aar") {
+    implementation('com.crashlytics.sdk.android:crashlytics:2.8.0@aar') {
         transitive = true
     }
-    implementation("com.crashlytics.sdk.android:answers:$crashlyticsAnswers@aar") {
+    implementation('com.crashlytics.sdk.android:answers:1.4.1@aar') {
         transitive = true
     }
 
-    annotationProcessor "com.google.dagger:dagger-android-processor:$dagger2"
-    annotationProcessor "com.google.dagger:dagger-compiler:$dagger2"
-    annotationProcessor "com.jakewharton:butterknife-compiler:$butterknife"
+    annotationProcessor 'com.google.dagger:dagger-android-processor:2.14.1'
+    annotationProcessor 'com.google.dagger:dagger-compiler:2.14.1'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
 
-    debugImplementation "com.amitshekhar.android:debug-db:$debugDb"
-    debugImplementation "net.zetetic:android-database-sqlcipher:$sqlcipher"
+    debugImplementation 'com.amitshekhar.android:debug-db:1.0.1'
+    debugImplementation 'net.zetetic:android-database-sqlcipher:3.5.9'
 
-    testImplementation "junit:junit:$junit"
-    testImplementation "org.mockito:mockito-core:$mockito"
+    testImplementation 'junit:junit:4.12'
+    testImplementation 'org.mockito:mockito-core:2.13.0'
 
-    androidTestImplementation "com.android.support.test:runner:$testRunner"
-    androidTestImplementation "org.mockito:mockito-android:$mockito"
+    androidTestImplementation 'com.android.support.test:runner:1.0.1'
+    androidTestImplementation 'org.mockito:mockito-android:2.13.0'
 }
diff --git a/app/key-encrypted.p12 b/app/key-encrypted.p12
deleted file mode 100644
index d9811213..00000000
Binary files a/app/key-encrypted.p12 and /dev/null differ
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/db/dao/entities/AttendanceLessonTest.java b/app/src/androidTest/java/io/github/wulkanowy/data/db/dao/entities/AttendanceLessonTest.java
index 0aca371a..492d642d 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/db/dao/entities/AttendanceLessonTest.java
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/db/dao/entities/AttendanceLessonTest.java
@@ -2,6 +2,9 @@ package io.github.wulkanowy.data.db.dao.entities;
 
 import org.greenrobot.greendao.test.AbstractDaoTestLongPk;
 
+import io.github.wulkanowy.data.db.dao.entities.AttendanceLesson;
+import io.github.wulkanowy.data.db.dao.entities.AttendanceLessonDao;
+
 public class AttendanceLessonTest extends AbstractDaoTestLongPk<AttendanceLessonDao, AttendanceLesson> {
 
     public AttendanceLessonTest() {
@@ -12,13 +15,13 @@ public class AttendanceLessonTest extends AbstractDaoTestLongPk<AttendanceLesson
     protected AttendanceLesson createEntity(Long key) {
         AttendanceLesson entity = new AttendanceLesson();
         entity.setId(key);
-        entity.setPresence(false);
-        entity.setAbsenceUnexcused(false);
-        entity.setAbsenceExcused(false);
-        entity.setUnexcusedLateness(false);
-        entity.setAbsenceForSchoolReasons(false);
-        entity.setExcusedLateness(false);
-        entity.setExemption(false);
+        entity.setIsPresence(false);
+        entity.setIsAbsenceUnexcused(false);
+        entity.setIsAbsenceExcused(false);
+        entity.setIsUnexcusedLateness(false);
+        entity.setIsAbsenceForSchoolReasons(false);
+        entity.setIsExcusedLateness(false);
+        entity.setIsExemption(false);
         return entity;
     }
 
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/db/dao/entities/DayTest.java b/app/src/androidTest/java/io/github/wulkanowy/data/db/dao/entities/DayTest.java
index cdab015a..34c4c4c5 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/db/dao/entities/DayTest.java
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/db/dao/entities/DayTest.java
@@ -12,7 +12,7 @@ public class DayTest extends AbstractDaoTestLongPk<DayDao, Day> {
     protected Day createEntity(Long key) {
         Day entity = new Day();
         entity.setId(key);
-        entity.setFreeDay(false);
+        entity.setIsFreeDay(false);
         return entity;
     }
 
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/db/dao/entities/DiaryTest.java b/app/src/androidTest/java/io/github/wulkanowy/data/db/dao/entities/DiaryTest.java
deleted file mode 100644
index 2951aec8..00000000
--- a/app/src/androidTest/java/io/github/wulkanowy/data/db/dao/entities/DiaryTest.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package io.github.wulkanowy.data.db.dao.entities;
-
-import org.greenrobot.greendao.test.AbstractDaoTestLongPk;
-
-public class DiaryTest extends AbstractDaoTestLongPk<DiaryDao, Diary> {
-
-    public DiaryTest() {
-        super(DiaryDao.class);
-    }
-
-    @Override
-    protected Diary createEntity(Long key) {
-        Diary entity = new Diary();
-        entity.setId(key);
-        entity.setCurrent(false);
-        return entity;
-    }
-
-}
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/db/dao/entities/ExamTest.java b/app/src/androidTest/java/io/github/wulkanowy/data/db/dao/entities/ExamTest.java
deleted file mode 100644
index 271e811f..00000000
--- a/app/src/androidTest/java/io/github/wulkanowy/data/db/dao/entities/ExamTest.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package io.github.wulkanowy.data.db.dao.entities;
-
-import org.greenrobot.greendao.test.AbstractDaoTestLongPk;
-
-public class ExamTest extends AbstractDaoTestLongPk<ExamDao, Exam> {
-
-    public ExamTest() {
-        super(ExamDao.class);
-    }
-
-    @Override
-    protected Exam createEntity(Long key) {
-        Exam entity = new Exam();
-        entity.setId(key);
-        return entity;
-    }
-
-}
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/db/dao/entities/SemesterTest.java b/app/src/androidTest/java/io/github/wulkanowy/data/db/dao/entities/SemesterTest.java
deleted file mode 100644
index a18a7674..00000000
--- a/app/src/androidTest/java/io/github/wulkanowy/data/db/dao/entities/SemesterTest.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package io.github.wulkanowy.data.db.dao.entities;
-
-import org.greenrobot.greendao.test.AbstractDaoTestLongPk;
-
-import io.github.wulkanowy.data.db.dao.entities.Semester;
-import io.github.wulkanowy.data.db.dao.entities.SemesterDao;
-
-public class SemesterTest extends AbstractDaoTestLongPk<SemesterDao, Semester> {
-
-    public SemesterTest() {
-        super(SemesterDao.class);
-    }
-
-    @Override
-    protected Semester createEntity(Long key) {
-        Semester entity = new Semester();
-        entity.setId(key);
-        return entity;
-    }
-
-}
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/db/dao/entities/StudentTest.java b/app/src/androidTest/java/io/github/wulkanowy/data/db/dao/entities/StudentTest.java
deleted file mode 100644
index 1ba8fd46..00000000
--- a/app/src/androidTest/java/io/github/wulkanowy/data/db/dao/entities/StudentTest.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package io.github.wulkanowy.data.db.dao.entities;
-
-import org.greenrobot.greendao.test.AbstractDaoTestLongPk;
-
-import io.github.wulkanowy.data.db.dao.entities.Student;
-import io.github.wulkanowy.data.db.dao.entities.StudentDao;
-
-public class StudentTest extends AbstractDaoTestLongPk<StudentDao, Student> {
-
-    public StudentTest() {
-        super(StudentDao.class);
-    }
-
-    @Override
-    protected Student createEntity(Long key) {
-        Student entity = new Student();
-        entity.setId(key);
-        return entity;
-    }
-
-}
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/db/dao/entities/SymbolTest.java b/app/src/androidTest/java/io/github/wulkanowy/data/db/dao/entities/SymbolTest.java
deleted file mode 100644
index e1bad201..00000000
--- a/app/src/androidTest/java/io/github/wulkanowy/data/db/dao/entities/SymbolTest.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package io.github.wulkanowy.data.db.dao.entities;
-
-import org.greenrobot.greendao.test.AbstractDaoTestLongPk;
-
-import io.github.wulkanowy.data.db.dao.entities.Symbol;
-import io.github.wulkanowy.data.db.dao.entities.SymbolDao;
-
-public class SymbolTest extends AbstractDaoTestLongPk<SymbolDao, Symbol> {
-
-    public SymbolTest() {
-        super(SymbolDao.class);
-    }
-
-    @Override
-    protected Symbol createEntity(Long key) {
-        Symbol entity = new Symbol();
-        entity.setId(key);
-        return entity;
-    }
-
-}
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/db/dao/entities/TimetableLessonTest.java b/app/src/androidTest/java/io/github/wulkanowy/data/db/dao/entities/TimetableLessonTest.java
index 190f09b7..b215b6be 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/db/dao/entities/TimetableLessonTest.java
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/db/dao/entities/TimetableLessonTest.java
@@ -2,6 +2,9 @@ package io.github.wulkanowy.data.db.dao.entities;
 
 import org.greenrobot.greendao.test.AbstractDaoTestLongPk;
 
+import io.github.wulkanowy.data.db.dao.entities.TimetableLesson;
+import io.github.wulkanowy.data.db.dao.entities.TimetableLessonDao;
+
 public class TimetableLessonTest extends AbstractDaoTestLongPk<TimetableLessonDao, TimetableLesson> {
 
     public TimetableLessonTest() {
@@ -12,12 +15,12 @@ public class TimetableLessonTest extends AbstractDaoTestLongPk<TimetableLessonDa
     protected TimetableLesson createEntity(Long key) {
         TimetableLesson entity = new TimetableLesson();
         entity.setId(key);
-        entity.setEmpty(false);
-        entity.setDivisionIntoGroups(false);
-        entity.setPlanning(false);
-        entity.setRealized(false);
-        entity.setMovedOrCanceled(false);
-        entity.setNewMovedInOrChanged(false);
+        entity.setIsEmpty(false);
+        entity.setIsDivisionIntoGroups(false);
+        entity.setIsPlanning(false);
+        entity.setIsRealized(false);
+        entity.setIsMovedOrCanceled(false);
+        entity.setIsNewMovedInOrChanged(false);
         return entity;
     }
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 24b5e188..f1733681 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -10,7 +10,8 @@
 
     <application
         android:name=".WulkanowyApp"
-        android:allowBackup="false"
+        android:allowBackup="true"
+        android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
@@ -31,40 +32,19 @@
             android:name=".ui.login.LoginActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/title_activity_login"
-            android:theme="@style/WulkanowyTheme.LoginTheme"
             android:windowSoftInputMode="adjustResize" />
         <activity
             android:name=".ui.main.MainActivity"
             android:configChanges="orientation|screenSize"
-            android:label="@string/activity_dashboard_text"
-            android:launchMode="singleTop"
-            android:theme="@style/WulkanowyTheme" />
-        <activity
-            android:name="com.google.android.gms.oss.licenses.OssLicensesMenuActivity"
-            android:theme="@style/WulkanowyTheme.LoginTheme" />
-        <activity
-            android:name="com.google.android.gms.oss.licenses.OssLicensesActivity"
-            android:theme="@style/WulkanowyTheme.LoginTheme" />
+            android:label="@string/activity_dashboard_text" />
 
         <service
-            android:name=".services.jobs.SyncJob"
+            android:name=".services.SyncJob"
             android:exported="false">
             <intent-filter>
                 <action android:name="com.firebase.jobdispatcher.ACTION_EXECUTE" />
             </intent-filter>
         </service>
-        <service
-            android:name=".services.widgets.TimetableWidgetServices"
-            android:permission="android.permission.BIND_REMOTEVIEWS" />
-
-        <receiver android:name=".ui.widgets.TimetableWidgetProvider">
-            <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-            </intent-filter>
-            <meta-data
-                android:name="android.appwidget.provider"
-                android:resource="@xml/widget_provider" />
-        </receiver>
 
         <meta-data
             android:name="io.fabric.ApiKey"
diff --git a/app/src/main/java/io/github/wulkanowy/WulkanowyApp.java b/app/src/main/java/io/github/wulkanowy/WulkanowyApp.java
index e4fd7ca9..4b8866ce 100644
--- a/app/src/main/java/io/github/wulkanowy/WulkanowyApp.java
+++ b/app/src/main/java/io/github/wulkanowy/WulkanowyApp.java
@@ -4,7 +4,6 @@ import android.app.Application;
 
 import com.crashlytics.android.Crashlytics;
 import com.crashlytics.android.core.CrashlyticsCore;
-import com.jakewharton.threetenabp.AndroidThreeTen;
 
 import org.greenrobot.greendao.query.QueryBuilder;
 
@@ -17,7 +16,6 @@ import io.github.wulkanowy.data.RepositoryContract;
 import io.github.wulkanowy.di.component.ApplicationComponent;
 import io.github.wulkanowy.di.component.DaggerApplicationComponent;
 import io.github.wulkanowy.di.modules.ApplicationModule;
-import io.github.wulkanowy.utils.LogUtils;
 
 public class WulkanowyApp extends Application {
 
@@ -29,8 +27,6 @@ public class WulkanowyApp extends Application {
     @Override
     public void onCreate() {
         super.onCreate();
-        AndroidThreeTen.init(this);
-
         applicationComponent = DaggerApplicationComponent
                 .builder()
                 .applicationModule(new ApplicationModule(this))
@@ -41,17 +37,6 @@ public class WulkanowyApp extends Application {
             enableDebugLog();
         }
         initializeFabric();
-        initializeUserSession();
-    }
-
-    private void initializeUserSession() {
-        if (repository.getSharedRepo().isUserLoggedIn()) {
-            try {
-                repository.getSyncRepo().initLastUser();
-            } catch (Exception e) {
-                LogUtils.error("An error occurred when the application was started", e);
-            }
-        }
     }
 
     private void enableDebugLog() {
diff --git a/app/src/main/java/io/github/wulkanowy/data/Repository.java b/app/src/main/java/io/github/wulkanowy/data/Repository.java
index 1516c027..d25be8b5 100644
--- a/app/src/main/java/io/github/wulkanowy/data/Repository.java
+++ b/app/src/main/java/io/github/wulkanowy/data/Repository.java
@@ -1,50 +1,159 @@
 package io.github.wulkanowy.data;
 
+import java.io.IOException;
+import java.text.ParseException;
+import java.util.List;
+
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import io.github.wulkanowy.data.db.dao.DbContract;
+import io.github.wulkanowy.api.VulcanException;
+import io.github.wulkanowy.data.db.dao.entities.Account;
+import io.github.wulkanowy.data.db.dao.entities.AttendanceLesson;
+import io.github.wulkanowy.data.db.dao.entities.DaoSession;
+import io.github.wulkanowy.data.db.dao.entities.Grade;
+import io.github.wulkanowy.data.db.dao.entities.GradeDao;
+import io.github.wulkanowy.data.db.dao.entities.Week;
+import io.github.wulkanowy.data.db.dao.entities.WeekDao;
 import io.github.wulkanowy.data.db.resources.ResourcesContract;
 import io.github.wulkanowy.data.db.shared.SharedPrefContract;
 import io.github.wulkanowy.data.sync.SyncContract;
+import io.github.wulkanowy.data.sync.account.AccountSyncContract;
+import io.github.wulkanowy.data.sync.attendance.AttendanceSyncContract;
+import io.github.wulkanowy.data.sync.timetable.TimetableSyncContract;
+import io.github.wulkanowy.di.annotations.SyncGrades;
+import io.github.wulkanowy.di.annotations.SyncSubjects;
+import io.github.wulkanowy.utils.security.CryptoException;
 
 @Singleton
 public class Repository implements RepositoryContract {
 
-    private final DbContract database;
+    private final SharedPrefContract sharedPref;
 
     private final ResourcesContract resources;
 
-    private final SharedPrefContract sharedPref;
+    private final DaoSession daoSession;
 
-    private final SyncContract synchronization;
+    private final AccountSyncContract accountSync;
+
+    private final AttendanceSyncContract attendanceSync;
+
+    private final TimetableSyncContract timetableSync;
+
+    private final SyncContract gradeSync;
+
+    private final SyncContract subjectSync;
 
     @Inject
-    Repository(DbContract database, ResourcesContract resources, SharedPrefContract sharedPref,
-               SyncContract synchronization) {
-        this.database = database;
-        this.resources = resources;
+    Repository(SharedPrefContract sharedPref,
+               ResourcesContract resources,
+               DaoSession daoSession,
+               AccountSyncContract accountSync,
+               AttendanceSyncContract attendanceSync,
+               TimetableSyncContract timetableSync,
+               @SyncGrades SyncContract gradeSync,
+               @SyncSubjects SyncContract subjectSync) {
         this.sharedPref = sharedPref;
-        this.synchronization = synchronization;
+        this.resources = resources;
+        this.daoSession = daoSession;
+        this.accountSync = accountSync;
+        this.attendanceSync = attendanceSync;
+        this.timetableSync = timetableSync;
+        this.gradeSync = gradeSync;
+        this.subjectSync = subjectSync;
     }
 
     @Override
-    public SharedPrefContract getSharedRepo() {
-        return sharedPref;
+    public long getCurrentUserId() {
+        return sharedPref.getCurrentUserId();
     }
 
     @Override
-    public ResourcesContract getResRepo() {
-        return resources;
+    public String[] getSymbolsKeysArray() {
+        return resources.getSymbolsKeysArray();
     }
 
     @Override
-    public DbContract getDbRepo() {
-        return database;
+    public String[] getSymbolsValuesArray() {
+        return resources.getSymbolsValuesArray();
     }
 
     @Override
-    public SyncContract getSyncRepo() {
-        return synchronization;
+    public String getErrorLoginMessage(Exception e) {
+        return resources.getErrorLoginMessage(e);
+    }
+
+    @Override
+    public String getAttendanceLessonDescription(AttendanceLesson lesson) {
+        return resources.getAttendanceLessonDescription(lesson);
+    }
+
+    @Override
+    public void registerUser(String email, String password, String symbol) throws VulcanException,
+            IOException, CryptoException {
+        accountSync.registerUser(email, password, symbol);
+    }
+
+    @Override
+    public void initLastUser() throws VulcanException, IOException, CryptoException {
+        accountSync.initLastUser();
+    }
+
+    @Override
+    public void syncGrades() throws VulcanException, IOException, ParseException {
+        gradeSync.sync();
+    }
+
+    @Override
+    public void syncSubjects() throws VulcanException, IOException, ParseException {
+        subjectSync.sync();
+    }
+
+    @Override
+    public void syncAttendance() throws ParseException, IOException, VulcanException {
+        attendanceSync.syncAttendance();
+    }
+
+    @Override
+    public void syncAttendance(String date) throws ParseException, IOException, VulcanException {
+        attendanceSync.syncAttendance(date);
+    }
+
+    @Override
+    public void syncTimetable() throws VulcanException, IOException, ParseException {
+        timetableSync.syncTimetable();
+    }
+
+    @Override
+    public void syncTimetable(String date) throws VulcanException, IOException, ParseException {
+        timetableSync.syncTimetable(date);
+    }
+
+    @Override
+    public void syncAll() throws VulcanException, IOException, ParseException {
+        syncSubjects();
+        syncGrades();
+        syncAttendance();
+        syncTimetable();
+    }
+
+    @Override
+    public Account getCurrentUser() {
+        return daoSession.getAccountDao().load(sharedPref.getCurrentUserId());
+    }
+
+    @Override
+    public Week getWeek(String date) {
+        return daoSession.getWeekDao().queryBuilder()
+                .where(WeekDao.Properties.StartDayDate.eq(date),
+                        WeekDao.Properties.UserId.eq(getCurrentUserId()))
+                .unique();
+    }
+
+    @Override
+    public List<Grade> getNewGrades() {
+        return daoSession.getGradeDao().queryBuilder()
+                .where(GradeDao.Properties.IsNew.eq(1))
+                .list();
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/RepositoryContract.java b/app/src/main/java/io/github/wulkanowy/data/RepositoryContract.java
index ffcfb046..f06c4762 100644
--- a/app/src/main/java/io/github/wulkanowy/data/RepositoryContract.java
+++ b/app/src/main/java/io/github/wulkanowy/data/RepositoryContract.java
@@ -1,20 +1,35 @@
 package io.github.wulkanowy.data;
 
+import java.io.IOException;
+import java.text.ParseException;
+import java.util.List;
+
 import javax.inject.Singleton;
 
-import io.github.wulkanowy.data.db.dao.DbContract;
+import io.github.wulkanowy.api.VulcanException;
+import io.github.wulkanowy.data.db.dao.entities.Account;
+import io.github.wulkanowy.data.db.dao.entities.Grade;
+import io.github.wulkanowy.data.db.dao.entities.Week;
 import io.github.wulkanowy.data.db.resources.ResourcesContract;
-import io.github.wulkanowy.data.db.shared.SharedPrefContract;
-import io.github.wulkanowy.data.sync.SyncContract;
+import io.github.wulkanowy.data.sync.account.AccountSyncContract;
+import io.github.wulkanowy.data.sync.attendance.AttendanceSyncContract;
+import io.github.wulkanowy.data.sync.timetable.TimetableSyncContract;
 
 @Singleton
-public interface RepositoryContract {
+public interface RepositoryContract extends ResourcesContract, AccountSyncContract,
+        AttendanceSyncContract, TimetableSyncContract {
 
-    SharedPrefContract getSharedRepo();
+    long getCurrentUserId();
 
-    ResourcesContract getResRepo();
+    void syncGrades() throws VulcanException, IOException, ParseException;
 
-    DbContract getDbRepo();
+    void syncSubjects() throws VulcanException, IOException, ParseException;
 
-    SyncContract getSyncRepo();
+    void syncAll() throws VulcanException, IOException, ParseException;
+
+    Account getCurrentUser();
+
+    Week getWeek(String date);
+
+    List<Grade> getNewGrades();
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/DbContract.java b/app/src/main/java/io/github/wulkanowy/data/db/dao/DbContract.java
deleted file mode 100644
index 38115cc4..00000000
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/DbContract.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package io.github.wulkanowy.data.db.dao;
-
-import java.util.List;
-
-import io.github.wulkanowy.data.db.dao.entities.Grade;
-import io.github.wulkanowy.data.db.dao.entities.Subject;
-import io.github.wulkanowy.data.db.dao.entities.Week;
-
-public interface DbContract {
-
-    Week getWeek(String date);
-
-    Week getWeek(long diaryId, String date);
-
-    List<Subject> getSubjectList(int semesterName);
-
-    List<Grade> getNewGrades(int semesterName);
-
-    long getCurrentStudentId();
-
-    long getCurrentSymbolId();
-
-    long getCurrentDiaryId();
-
-    long getSemesterId(int name);
-
-    long getCurrentSemesterId();
-
-    int getCurrentSemesterName();
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/DbHelper.java b/app/src/main/java/io/github/wulkanowy/data/db/dao/DbHelper.java
index 97bb7559..a67e9b7f 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/DbHelper.java
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/DbHelper.java
@@ -3,23 +3,19 @@ package io.github.wulkanowy.data.db.dao;
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
 
+import com.github.yuweiguocn.library.greendao.MigrationHelper;
+
 import org.greenrobot.greendao.database.Database;
 import org.greenrobot.greendao.database.StandardDatabase;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import io.github.wulkanowy.api.Vulcan;
+import io.github.wulkanowy.BuildConfig;
+import io.github.wulkanowy.data.db.dao.entities.AccountDao;
 import io.github.wulkanowy.data.db.dao.entities.DaoMaster;
-import io.github.wulkanowy.data.db.dao.migrations.Migration23;
-import io.github.wulkanowy.data.db.dao.migrations.Migration26;
-import io.github.wulkanowy.data.db.dao.migrations.Migration27;
-import io.github.wulkanowy.data.db.dao.migrations.Migration28;
+import io.github.wulkanowy.data.db.dao.entities.GradeDao;
+import io.github.wulkanowy.data.db.dao.entities.SubjectDao;
 import io.github.wulkanowy.data.db.shared.SharedPrefContract;
 import io.github.wulkanowy.di.annotations.ApplicationContext;
 import io.github.wulkanowy.di.annotations.DatabaseInfo;
@@ -28,74 +24,38 @@ import io.github.wulkanowy.utils.LogUtils;
 @Singleton
 public class DbHelper extends DaoMaster.OpenHelper {
 
-    private final SharedPrefContract sharedPref;
-
-    private final Vulcan vulcan;
+    private SharedPrefContract sharedPref;
 
     @Inject
     DbHelper(@ApplicationContext Context context, @DatabaseInfo String dbName,
-             SharedPrefContract sharedPref, Vulcan vulcan) {
+             SharedPrefContract sharedPref) {
         super(context, dbName);
         this.sharedPref = sharedPref;
-        this.vulcan = vulcan;
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public void onUpgrade(Database db, int oldVersion, int newVersion) {
+        MigrationHelper.DEBUG = BuildConfig.DEBUG;
+        MigrationHelper.migrate(db, new MigrationHelper.ReCreateAllTableListener() {
+            @Override
+            public void onCreateAllTables(Database db, boolean ifNotExists) {
+                DaoMaster.createAllTables(db, ifNotExists);
+            }
+            @Override
+            public void onDropAllTables(Database db, boolean ifExists) {
+                DaoMaster.dropAllTables(db, ifExists);
+            }
+        }, AccountDao.class, SubjectDao.class, GradeDao.class);
     }
 
     @Override
     public void onDowngrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-        LogUtils.info("Cleaning user data oldVersion=" + oldVersion + " newVersion=" + newVersion);
         Database database = new StandardDatabase(db);
-        recreateDatabase(database);
-    }
-
-    @Override
-    public void onUpgrade(Database db, int oldVersion, int newVersion) {
-        List<Migration> migrations = getMigrations();
-
-        // Only run migrations past the old version
-        for (Migration migration : migrations) {
-            if (oldVersion < migration.getVersion()) {
-                try {
-                    LogUtils.info("Applying migration to db schema v" + migration.getVersion() + "...");
-                    migration.runMigration(db, sharedPref, vulcan);
-                    LogUtils.info("Migration " + migration.getVersion() + " complete");
-                } catch (Exception e) {
-                    e.printStackTrace();
-                    recreateDatabase(db);
-                    break;
-                }
-            }
-        }
-    }
-
-    private void recreateDatabase(Database db) {
-        LogUtils.info("Database is recreating...");
+        DaoMaster.dropAllTables(database, true);
+        onCreate(database);
         sharedPref.setCurrentUserId(0);
-        DaoMaster.dropAllTables(db, true);
-        onCreate(db);
-    }
 
-    private List<Migration> getMigrations() {
-        List<Migration> migrations = new ArrayList<>();
-        migrations.add(new Migration23());
-        migrations.add(new Migration26());
-        migrations.add(new Migration27());
-        migrations.add(new Migration28());
-
-        // Sorting just to be safe, in case other people add migrations in the wrong order.
-        Comparator<Migration> migrationComparator = new Comparator<Migration>() {
-            @Override
-            public int compare(Migration m1, Migration m2) {
-                return m1.getVersion().compareTo(m2.getVersion());
-            }
-        };
-        Collections.sort(migrations, migrationComparator);
-
-        return migrations;
-    }
-
-    public interface Migration {
-        Integer getVersion();
-
-        void runMigration(Database db, SharedPrefContract sharedPref, Vulcan vulcan) throws Exception;
+        LogUtils.info("Cleaning user data oldVersion=" + oldVersion + " newVersion=" + newVersion);
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/DbRepository.java b/app/src/main/java/io/github/wulkanowy/data/db/dao/DbRepository.java
deleted file mode 100644
index 6757c48e..00000000
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/DbRepository.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package io.github.wulkanowy.data.db.dao;
-
-import java.util.List;
-
-import javax.inject.Inject;
-
-import io.github.wulkanowy.data.db.dao.entities.DaoSession;
-import io.github.wulkanowy.data.db.dao.entities.DiaryDao;
-import io.github.wulkanowy.data.db.dao.entities.Grade;
-import io.github.wulkanowy.data.db.dao.entities.GradeDao;
-import io.github.wulkanowy.data.db.dao.entities.Semester;
-import io.github.wulkanowy.data.db.dao.entities.SemesterDao;
-import io.github.wulkanowy.data.db.dao.entities.StudentDao;
-import io.github.wulkanowy.data.db.dao.entities.Subject;
-import io.github.wulkanowy.data.db.dao.entities.SymbolDao;
-import io.github.wulkanowy.data.db.dao.entities.Week;
-import io.github.wulkanowy.data.db.dao.entities.WeekDao;
-import io.github.wulkanowy.data.db.shared.SharedPrefContract;
-
-public class DbRepository implements DbContract {
-
-    private final DaoSession daoSession;
-
-    private final SharedPrefContract sharedPref;
-
-    @Inject
-    DbRepository(DaoSession daoSession, SharedPrefContract sharedPrefContract) {
-        this.daoSession = daoSession;
-        this.sharedPref = sharedPrefContract;
-    }
-
-
-    @Override
-    public Week getWeek(String date) {
-        return getWeek(getCurrentDiaryId(), date);
-    }
-
-    @Override
-    public Week getWeek(long diaryId, String date) {
-        return daoSession.getWeekDao().queryBuilder().where(
-                WeekDao.Properties.StartDayDate.eq(date),
-                WeekDao.Properties.DiaryId.eq(diaryId)
-        ).unique();
-    }
-
-    @Override
-    public List<Subject> getSubjectList(int semesterName) {
-        return daoSession.getSemesterDao().load(getSemesterId(semesterName)).getSubjectList();
-    }
-
-    @Override
-    public List<Grade> getNewGrades(int semesterName) {
-        return daoSession.getGradeDao().queryBuilder().where(
-                GradeDao.Properties.IsNew.eq(1),
-                GradeDao.Properties.SemesterId.eq(getSemesterId(semesterName))
-        ).list();
-    }
-
-    @Override
-    public long getCurrentSymbolId() {
-        return daoSession.getSymbolDao().queryBuilder().where(
-                SymbolDao.Properties.UserId.eq(sharedPref.getCurrentUserId())
-        ).unique().getId();
-    }
-
-    @Override
-    public long getCurrentStudentId() {
-        return daoSession.getStudentDao().queryBuilder().where(
-                StudentDao.Properties.SymbolId.eq(getCurrentSymbolId()),
-                StudentDao.Properties.Current.eq(true)
-        ).unique().getId();
-    }
-
-    @Override
-    public long getCurrentDiaryId() {
-        return daoSession.getDiaryDao().queryBuilder().where(
-                DiaryDao.Properties.StudentId.eq(getCurrentStudentId()),
-                DiaryDao.Properties.Current.eq(true)
-        ).unique().getId();
-    }
-
-    @Override
-    public long getSemesterId(int name) {
-        return daoSession.getSemesterDao().queryBuilder().where(
-                SemesterDao.Properties.DiaryId.eq(getCurrentDiaryId()),
-                SemesterDao.Properties.Name.eq(String.valueOf(name))
-        ).unique().getId();
-    }
-
-    @Override
-    public long getCurrentSemesterId() {
-        return getCurrentSemester().getId();
-    }
-
-    @Override
-    public int getCurrentSemesterName() {
-        return Integer.valueOf(getCurrentSemester().getName());
-    }
-
-    private Semester getCurrentSemester() {
-        return daoSession.getSemesterDao().queryBuilder().where(
-                SemesterDao.Properties.DiaryId.eq(getCurrentDiaryId()),
-                SemesterDao.Properties.Current.eq(true)
-        ).unique();
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/entities/Account.java b/app/src/main/java/io/github/wulkanowy/data/db/dao/entities/Account.java
index 78dff361..20a47ac2 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/entities/Account.java
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/entities/Account.java
@@ -6,7 +6,6 @@ import org.greenrobot.greendao.annotation.Generated;
 import org.greenrobot.greendao.annotation.Id;
 import org.greenrobot.greendao.annotation.Property;
 import org.greenrobot.greendao.annotation.ToMany;
-import org.greenrobot.greendao.annotation.Unique;
 
 import java.util.List;
 
@@ -19,15 +18,29 @@ public class Account {
     @Id(autoincrement = true)
     private Long id;
 
-    @Unique
-    @Property(nameInDb = "email")
+    @Property(nameInDb = "NAME")
+    private String name;
+
+    @Property(nameInDb = "E-MAIL")
     private String email;
 
-    @Property(nameInDb = "password")
+    @Property(nameInDb = "PASSWORD")
     private String password;
 
+    @Property(nameInDb = "SYMBOL")
+    private String symbol;
+
+    @Property(nameInDb = "SNPID")
+    private String snpId;
+
     @ToMany(referencedJoinProperty = "userId")
-    private List<Symbol> symbolList;
+    private List<Subject> subjectList;
+
+    @ToMany(referencedJoinProperty = "userId")
+    private List<Grade> gradeList;
+
+    @ToMany(referencedJoinProperty = "userId")
+    private List<Day> dayList;
 
     /**
      * Used to resolve relations
@@ -41,11 +54,15 @@ public class Account {
     @Generated(hash = 335469827)
     private transient AccountDao myDao;
 
-    @Generated(hash = 1104194311)
-    public Account(Long id, String email, String password) {
+    @Generated(hash = 735765217)
+    public Account(Long id, String name, String email, String password, String symbol,
+                   String snpId) {
         this.id = id;
+        this.name = name;
         this.email = email;
         this.password = password;
+        this.symbol = symbol;
+        this.snpId = snpId;
     }
 
     @Generated(hash = 882125521)
@@ -53,15 +70,25 @@ public class Account {
     }
 
     public Long getId() {
-        return this.id;
+        return id;
     }
 
-    public void setId(Long id) {
+    public Account setId(Long id) {
         this.id = id;
+        return this;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Account setName(String name) {
+        this.name = name;
+        return this;
     }
 
     public String getEmail() {
-        return this.email;
+        return email;
     }
 
     public Account setEmail(String email) {
@@ -70,7 +97,7 @@ public class Account {
     }
 
     public String getPassword() {
-        return this.password;
+        return password;
     }
 
     public Account setPassword(String password) {
@@ -78,34 +105,82 @@ public class Account {
         return this;
     }
 
+    public String getSymbol() {
+        return symbol;
+    }
+
+    public Account setSymbol(String symbol) {
+        this.symbol = symbol;
+        return this;
+    }
+
+    public String getSnpId() {
+        return this.snpId;
+    }
+
+    public Account setSnpId(String snpId) {
+        this.snpId = snpId;
+        return this;
+    }
+
     /**
      * To-many relationship, resolved on first access (and after reset).
      * Changes to to-many relations are not persisted, make changes to the target entity.
      */
-    @Generated(hash = 822972496)
-    public List<Symbol> getSymbolList() {
-        if (symbolList == null) {
+    @Generated(hash = 1800750450)
+    public List<Subject> getSubjectList() {
+        if (subjectList == null) {
             final DaoSession daoSession = this.daoSession;
             if (daoSession == null) {
                 throw new DaoException("Entity is detached from DAO context");
             }
-            SymbolDao targetDao = daoSession.getSymbolDao();
-            List<Symbol> symbolListNew = targetDao._queryAccount_SymbolList(id);
+            SubjectDao targetDao = daoSession.getSubjectDao();
+            List<Subject> subjectListNew = targetDao._queryAccount_SubjectList(id);
             synchronized (this) {
-                if (symbolList == null) {
-                    symbolList = symbolListNew;
+                if (subjectList == null) {
+                    subjectList = subjectListNew;
                 }
             }
         }
-        return symbolList;
+        return subjectList;
     }
 
     /**
      * Resets a to-many relationship, making the next get call to query for a fresh result.
      */
-    @Generated(hash = 1716801695)
-    public synchronized void resetSymbolList() {
-        symbolList = null;
+    @Generated(hash = 594294258)
+    public synchronized void resetSubjectList() {
+        subjectList = null;
+    }
+
+    /**
+     * To-many relationship, resolved on first access (and after reset).
+     * Changes to to-many relations are not persisted, make changes to the target entity.
+     */
+    @Generated(hash = 1040074549)
+    public List<Grade> getGradeList() {
+        if (gradeList == null) {
+            final DaoSession daoSession = this.daoSession;
+            if (daoSession == null) {
+                throw new DaoException("Entity is detached from DAO context");
+            }
+            GradeDao targetDao = daoSession.getGradeDao();
+            List<Grade> gradeListNew = targetDao._queryAccount_GradeList(id);
+            synchronized (this) {
+                if (gradeList == null) {
+                    gradeList = gradeListNew;
+                }
+            }
+        }
+        return gradeList;
+    }
+
+    /**
+     * Resets a to-many relationship, making the next get call to query for a fresh result.
+     */
+    @Generated(hash = 1939990047)
+    public synchronized void resetGradeList() {
+        gradeList = null;
     }
 
     /**
@@ -144,6 +219,36 @@ public class Account {
         myDao.update(this);
     }
 
+    /**
+     * To-many relationship, resolved on first access (and after reset).
+     * Changes to to-many relations are not persisted, make changes to the target entity.
+     */
+    @Generated(hash = 300459794)
+    public List<Day> getDayList() {
+        if (dayList == null) {
+            final DaoSession daoSession = this.daoSession;
+            if (daoSession == null) {
+                throw new DaoException("Entity is detached from DAO context");
+            }
+            DayDao targetDao = daoSession.getDayDao();
+            List<Day> dayListNew = targetDao._queryAccount_DayList(id);
+            synchronized (this) {
+                if (dayList == null) {
+                    dayList = dayListNew;
+                }
+            }
+        }
+        return dayList;
+    }
+
+    /**
+     * Resets a to-many relationship, making the next get call to query for a fresh result.
+     */
+    @Generated(hash = 1010399236)
+    public synchronized void resetDayList() {
+        dayList = null;
+    }
+
     /** called by internal mechanisms, do not call yourself. */
     @Generated(hash = 1812283172)
     public void __setDaoSession(DaoSession daoSession) {
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/entities/AttendanceLesson.java b/app/src/main/java/io/github/wulkanowy/data/db/dao/entities/AttendanceLesson.java
index 81235e59..9250518a 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/entities/AttendanceLesson.java
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/entities/AttendanceLesson.java
@@ -20,38 +20,38 @@ public class AttendanceLesson implements Serializable {
     @Id(autoincrement = true)
     private Long id;
 
-    @Property(nameInDb = "day_id")
+    @Property(nameInDb = "DAY_ID")
     private Long dayId;
 
-    @Property(nameInDb = "date")
+    @Property(nameInDb = "DATE")
     private String date = "";
 
-    @Property(nameInDb = "number_of_lesson")
+    @Property(nameInDb = "NUMBER_OF_LESSON")
     private int number = 0;
 
-    @Property(nameInDb = "subject")
+    @Property(nameInDb = "SUBJECT_NAME")
     private String subject = "";
 
-    @Property(nameInDb = "presence")
-    private boolean presence = false;
+    @Property(nameInDb = "IS_PRESENCE")
+    private boolean isPresence = false;
 
-    @Property(nameInDb = "absence_unexcused")
-    private boolean absenceUnexcused = false;
+    @Property(nameInDb = "IS_ABSENCE_UNEXCUSED")
+    private boolean isAbsenceUnexcused = false;
 
-    @Property(nameInDb = "absence_excused")
-    private boolean absenceExcused = false;
+    @Property(nameInDb = "IS_ABSENCE_EXCUSED")
+    private boolean isAbsenceExcused = false;
 
-    @Property(nameInDb = "unexcused_lateness")
-    private boolean unexcusedLateness = false;
+    @Property(nameInDb = "IS_UNEXCUSED_LATENESS")
+    private boolean isUnexcusedLateness = false;
 
-    @Property(nameInDb = "absence_for_school_reasons")
-    private boolean absenceForSchoolReasons = false;
+    @Property(nameInDb = "IS_ABSENCE_FOR_SCHOOL_REASONS")
+    private boolean isAbsenceForSchoolReasons = false;
 
-    @Property(nameInDb = "excused_lateness")
-    private boolean excusedLateness = false;
+    @Property(nameInDb = "IS_EXCUSED_LATENESS")
+    private boolean isExcusedLateness = false;
 
-    @Property(nameInDb = "exemption")
-    private boolean exemption = false;
+    @Property(nameInDb = "IS_EXEMPTION")
+    private boolean isExemption = false;
 
     @Transient
     private String description = "";
@@ -70,24 +70,24 @@ public class AttendanceLesson implements Serializable {
     @Generated(hash = 1936953859)
     private transient AttendanceLessonDao myDao;
 
-    @Generated(hash = 1741231228)
+    @Generated(hash = 1428129046)
     public AttendanceLesson(Long id, Long dayId, String date, int number,
-                            String subject, boolean presence, boolean absenceUnexcused,
-                            boolean absenceExcused, boolean unexcusedLateness,
-                            boolean absenceForSchoolReasons, boolean excusedLateness,
-                            boolean exemption) {
+                            String subject, boolean isPresence, boolean isAbsenceUnexcused,
+                            boolean isAbsenceExcused, boolean isUnexcusedLateness,
+                            boolean isAbsenceForSchoolReasons, boolean isExcusedLateness,
+                            boolean isExemption) {
         this.id = id;
         this.dayId = dayId;
         this.date = date;
         this.number = number;
         this.subject = subject;
-        this.presence = presence;
-        this.absenceUnexcused = absenceUnexcused;
-        this.absenceExcused = absenceExcused;
-        this.unexcusedLateness = unexcusedLateness;
-        this.absenceForSchoolReasons = absenceForSchoolReasons;
-        this.excusedLateness = excusedLateness;
-        this.exemption = exemption;
+        this.isPresence = isPresence;
+        this.isAbsenceUnexcused = isAbsenceUnexcused;
+        this.isAbsenceExcused = isAbsenceExcused;
+        this.isUnexcusedLateness = isUnexcusedLateness;
+        this.isAbsenceForSchoolReasons = isAbsenceForSchoolReasons;
+        this.isExcusedLateness = isExcusedLateness;
+        this.isExemption = isExemption;
     }
 
     @Generated(hash = 921806575)
@@ -137,66 +137,66 @@ public class AttendanceLesson implements Serializable {
         return this;
     }
 
-    public boolean getPresence() {
-        return this.presence;
+    public boolean getIsPresence() {
+        return this.isPresence;
     }
 
-    public AttendanceLesson setPresence(boolean presence) {
-        this.presence = presence;
+    public AttendanceLesson setIsPresence(boolean isPresence) {
+        this.isPresence = isPresence;
         return this;
     }
 
-    public boolean getAbsenceUnexcused() {
-        return this.absenceUnexcused;
+    public boolean getIsAbsenceUnexcused() {
+        return this.isAbsenceUnexcused;
     }
 
-    public AttendanceLesson setAbsenceUnexcused(boolean absenceUnexcused) {
-        this.absenceUnexcused = absenceUnexcused;
+    public AttendanceLesson setIsAbsenceUnexcused(boolean isAbsenceUnexcused) {
+        this.isAbsenceUnexcused = isAbsenceUnexcused;
         return this;
     }
 
-    public boolean getAbsenceExcused() {
-        return this.absenceExcused;
+    public boolean getIsAbsenceExcused() {
+        return this.isAbsenceExcused;
     }
 
-    public AttendanceLesson setAbsenceExcused(boolean absenceExcused) {
-        this.absenceExcused = absenceExcused;
+    public AttendanceLesson setIsAbsenceExcused(boolean isAbsenceExcused) {
+        this.isAbsenceExcused = isAbsenceExcused;
         return this;
     }
 
-    public boolean getUnexcusedLateness() {
-        return this.unexcusedLateness;
+    public boolean getIsUnexcusedLateness() {
+        return this.isUnexcusedLateness;
     }
 
-    public AttendanceLesson setUnexcusedLateness(boolean unexcusedLateness) {
-        this.unexcusedLateness = unexcusedLateness;
+    public AttendanceLesson setIsUnexcusedLateness(boolean isUnexcusedLateness) {
+        this.isUnexcusedLateness = isUnexcusedLateness;
         return this;
     }
 
-    public boolean getAbsenceForSchoolReasons() {
-        return this.absenceForSchoolReasons;
+    public boolean getIsAbsenceForSchoolReasons() {
+        return this.isAbsenceForSchoolReasons;
     }
 
-    public AttendanceLesson setAbsenceForSchoolReasons(boolean absenceForSchoolReasons) {
-        this.absenceForSchoolReasons = absenceForSchoolReasons;
+    public AttendanceLesson setIsAbsenceForSchoolReasons(boolean isAbsenceForSchoolReasons) {
+        this.isAbsenceForSchoolReasons = isAbsenceForSchoolReasons;
         return this;
     }
 
-    public boolean getExcusedLateness() {
-        return this.excusedLateness;
+    public boolean getIsExcusedLateness() {
+        return this.isExcusedLateness;
     }
 
-    public AttendanceLesson setExcusedLateness(boolean excusedLateness) {
-        this.excusedLateness = excusedLateness;
+    public AttendanceLesson setIsExcusedLateness(boolean isExcusedLateness) {
+        this.isExcusedLateness = isExcusedLateness;
         return this;
     }
 
-    public boolean getExemption() {
-        return this.exemption;
+    public boolean getIsExemption() {
+        return this.isExemption;
     }
 
-    public AttendanceLesson setExemption(boolean exemption) {
-        this.exemption = exemption;
+    public AttendanceLesson setIsExemption(boolean isExemption) {
+        this.isExemption = isExemption;
         return this;
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/entities/Day.java b/app/src/main/java/io/github/wulkanowy/data/db/dao/entities/Day.java
index c5472e98..fb3ce414 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/entities/Day.java
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/entities/Day.java
@@ -14,57 +14,59 @@ import java.util.List;
 @Entity(
         nameInDb = "Days",
         active = true,
-        indexes = {@Index(value = "weekId,date", unique = true)}
+        indexes = {@Index(value = "userId,weekId,date", unique = true)}
 )
 public class Day {
 
     @Id(autoincrement = true)
     private Long id;
 
-    @Property(nameInDb = "week_id")
+    @Property(nameInDb = "USER_ID")
+    private Long userId;
+
+    @Property(nameInDb = "WEEK_ID")
     private Long weekId;
 
-    @Property(nameInDb = "date")
+    @Property(nameInDb = "DATE")
     private String date = "";
 
-    @Property(nameInDb = "day_name")
+    @Property(nameInDb = "DAY_NAME")
     private String dayName = "";
 
-    @Property(nameInDb = "free_day")
-    private boolean freeDay = false;
+    @Property(nameInDb = "IS_FREE_DAY")
+    private boolean isFreeDay = false;
 
-    @Property(nameInDb = "free_day_name")
+    @Property(nameInDb = "FREE_DAY_NAME")
     private String freeDayName = "";
 
-    @OrderBy("number ASC")
     @ToMany(referencedJoinProperty = "dayId")
     private List<TimetableLesson> timetableLessons;
 
+    @ToMany(referencedJoinProperty = "dayId")
     @OrderBy("number ASC")
-    @ToMany(referencedJoinProperty = "dayId")
     private List<AttendanceLesson> attendanceLessons;
 
-    @ToMany(referencedJoinProperty = "dayId")
-    private List<Exam> exams;
-
     /**
      * Used to resolve relations
      */
     @Generated(hash = 2040040024)
     private transient DaoSession daoSession;
 
-    /** Used for active entity operations. */
+    /**
+     * Used for active entity operations.
+     */
     @Generated(hash = 312167767)
     private transient DayDao myDao;
 
-    @Generated(hash = 523139020)
-    public Day(Long id, Long weekId, String date, String dayName, boolean freeDay,
-               String freeDayName) {
+    @Generated(hash = 723729681)
+    public Day(Long id, Long userId, Long weekId, String date, String dayName,
+            boolean isFreeDay, String freeDayName) {
         this.id = id;
+        this.userId = userId;
         this.weekId = weekId;
         this.date = date;
         this.dayName = dayName;
-        this.freeDay = freeDay;
+        this.isFreeDay = isFreeDay;
         this.freeDayName = freeDayName;
     }
 
@@ -80,16 +82,26 @@ public class Day {
         this.id = id;
     }
 
-    public Long getWeekId() {
-        return this.weekId;
+    public Long getUserId() {
+        return userId;
     }
 
-    public void setWeekId(Long weekId) {
+    public Long getWeekId() {
+        return weekId;
+    }
+
+    public Day setWeekId(Long weekId) {
         this.weekId = weekId;
+        return this;
+    }
+
+    public Day setUserId(Long userId) {
+        this.userId = userId;
+        return this;
     }
 
     public String getDate() {
-        return this.date;
+        return date;
     }
 
     public Day setDate(String date) {
@@ -98,7 +110,7 @@ public class Day {
     }
 
     public String getDayName() {
-        return this.dayName;
+        return dayName;
     }
 
     public Day setDayName(String dayName) {
@@ -106,17 +118,17 @@ public class Day {
         return this;
     }
 
-    public boolean getFreeDay() {
-        return this.freeDay;
+    public boolean getIsFreeDay() {
+        return this.isFreeDay;
     }
 
-    public Day setFreeDay(boolean freeDay) {
-        this.freeDay = freeDay;
+    public Day setIsFreeDay(boolean isFreeDay) {
+        this.isFreeDay = isFreeDay;
         return this;
     }
 
     public String getFreeDayName() {
-        return this.freeDayName;
+        return freeDayName;
     }
 
     public Day setFreeDayName(String freeDayName) {
@@ -147,9 +159,7 @@ public class Day {
         return timetableLessons;
     }
 
-    /**
-     * Resets a to-many relationship, making the next get call to query for a fresh result.
-     */
+    /** Resets a to-many relationship, making the next get call to query for a fresh result. */
     @Generated(hash = 1687683740)
     public synchronized void resetTimetableLessons() {
         timetableLessons = null;
@@ -178,44 +188,12 @@ public class Day {
         return attendanceLessons;
     }
 
-    /**
-     * Resets a to-many relationship, making the next get call to query for a fresh result.
-     */
+    /** Resets a to-many relationship, making the next get call to query for a fresh result. */
     @Generated(hash = 1343075564)
     public synchronized void resetAttendanceLessons() {
         attendanceLessons = null;
     }
 
-    /**
-     * To-many relationship, resolved on first access (and after reset).
-     * Changes to to-many relations are not persisted, make changes to the target entity.
-     */
-    @Generated(hash = 1231531946)
-    public List<Exam> getExams() {
-        if (exams == null) {
-            final DaoSession daoSession = this.daoSession;
-            if (daoSession == null) {
-                throw new DaoException("Entity is detached from DAO context");
-            }
-            ExamDao targetDao = daoSession.getExamDao();
-            List<Exam> examsNew = targetDao._queryDay_Exams(id);
-            synchronized (this) {
-                if (exams == null) {
-                    exams = examsNew;
-                }
-            }
-        }
-        return exams;
-    }
-
-    /**
-     * Resets a to-many relationship, making the next get call to query for a fresh result.
-     */
-    @Generated(hash = 841969952)
-    public synchronized void resetExams() {
-        exams = null;
-    }
-
     /**
      * Convenient call for {@link org.greenrobot.greendao.AbstractDao#delete(Object)}.
      * Entity must attached to an entity context.
@@ -258,6 +236,4 @@ public class Day {
         this.daoSession = daoSession;
         myDao = daoSession != null ? daoSession.getDayDao() : null;
     }
-
-
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/entities/Diary.java b/app/src/main/java/io/github/wulkanowy/data/db/dao/entities/Diary.java
deleted file mode 100644
index b0b145da..00000000
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/entities/Diary.java
+++ /dev/null
@@ -1,177 +0,0 @@
-package io.github.wulkanowy.data.db.dao.entities;
-
-import org.greenrobot.greendao.DaoException;
-import org.greenrobot.greendao.annotation.Entity;
-import org.greenrobot.greendao.annotation.Generated;
-import org.greenrobot.greendao.annotation.Id;
-import org.greenrobot.greendao.annotation.Property;
-import org.greenrobot.greendao.annotation.ToMany;
-
-import java.util.List;
-
-@Entity(
-        nameInDb = "Diaries",
-        active = true
-)
-public class Diary {
-
-    @Id(autoincrement = true)
-    private Long id;
-
-    @Property(nameInDb = "student_id")
-    private Long studentId;
-
-    @Property(nameInDb = "current")
-    private boolean current;
-
-    @Property(nameInDb = "name")
-    private String name;
-
-    @Property(nameInDb = "value")
-    private String value;
-
-    @ToMany(referencedJoinProperty = "diaryId")
-    private List<Semester> semesterList;
-
-    /**
-     * Used to resolve relations
-     */
-    @Generated(hash = 2040040024)
-    private transient DaoSession daoSession;
-
-    /**
-     * Used for active entity operations.
-     */
-    @Generated(hash = 21166549)
-    private transient DiaryDao myDao;
-
-    @Generated(hash = 277096196)
-    public Diary(Long id, Long studentId, boolean current, String name, String value) {
-        this.id = id;
-        this.studentId = studentId;
-        this.current = current;
-        this.name = name;
-        this.value = value;
-    }
-
-    @Generated(hash = 112123061)
-    public Diary() {
-    }
-
-    public Long getId() {
-        return this.id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getStudentId() {
-        return this.studentId;
-    }
-
-    public Diary setStudentId(Long studentId) {
-        this.studentId = studentId;
-        return this;
-    }
-
-    public String getName() {
-        return this.name;
-    }
-
-    public Diary setName(String name) {
-        this.name = name;
-        return this;
-    }
-
-    public String getValue() {
-        return this.value;
-    }
-
-    public Diary setValue(String value) {
-        this.value = value;
-        return this;
-    }
-
-    public boolean getCurrent() {
-        return this.current;
-    }
-
-    public Diary setCurrent(boolean current) {
-        this.current = current;
-        return this;
-    }
-
-    /**
-     * To-many relationship, resolved on first access (and after reset).
-     * Changes to to-many relations are not persisted, make changes to the target entity.
-     */
-    @Generated(hash = 1738383053)
-    public List<Semester> getSemesterList() {
-        if (semesterList == null) {
-            final DaoSession daoSession = this.daoSession;
-            if (daoSession == null) {
-                throw new DaoException("Entity is detached from DAO context");
-            }
-            SemesterDao targetDao = daoSession.getSemesterDao();
-            List<Semester> semesterListNew = targetDao._queryDiary_SemesterList(id);
-            synchronized (this) {
-                if (semesterList == null) {
-                    semesterList = semesterListNew;
-                }
-            }
-        }
-        return semesterList;
-    }
-
-    /**
-     * Resets a to-many relationship, making the next get call to query for a fresh result.
-     */
-    @Generated(hash = 995060657)
-    public synchronized void resetSemesterList() {
-        semesterList = null;
-    }
-
-    /**
-     * Convenient call for {@link org.greenrobot.greendao.AbstractDao#delete(Object)}.
-     * Entity must attached to an entity context.
-     */
-    @Generated(hash = 128553479)
-    public void delete() {
-        if (myDao == null) {
-            throw new DaoException("Entity is detached from DAO context");
-        }
-        myDao.delete(this);
-    }
-
-    /**
-     * Convenient call for {@link org.greenrobot.greendao.AbstractDao#refresh(Object)}.
-     * Entity must attached to an entity context.
-     */
-    @Generated(hash = 1942392019)
-    public void refresh() {
-        if (myDao == null) {
-            throw new DaoException("Entity is detached from DAO context");
-        }
-        myDao.refresh(this);
-    }
-
-    /**
-     * Convenient call for {@link org.greenrobot.greendao.AbstractDao#update(Object)}.
-     * Entity must attached to an entity context.
-     */
-    @Generated(hash = 713229351)
-    public void update() {
-        if (myDao == null) {
-            throw new DaoException("Entity is detached from DAO context");
-        }
-        myDao.update(this);
-    }
-
-    /** called by internal mechanisms, do not call yourself. */
-    @Generated(hash = 629297785)
-    public void __setDaoSession(DaoSession daoSession) {
-        this.daoSession = daoSession;
-        myDao = daoSession != null ? daoSession.getDiaryDao() : null;
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/entities/Exam.java b/app/src/main/java/io/github/wulkanowy/data/db/dao/entities/Exam.java
deleted file mode 100644
index 543b6859..00000000
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/entities/Exam.java
+++ /dev/null
@@ -1,177 +0,0 @@
-package io.github.wulkanowy.data.db.dao.entities;
-
-import org.greenrobot.greendao.DaoException;
-import org.greenrobot.greendao.annotation.Entity;
-import org.greenrobot.greendao.annotation.Generated;
-import org.greenrobot.greendao.annotation.Id;
-import org.greenrobot.greendao.annotation.Index;
-import org.greenrobot.greendao.annotation.Property;
-
-import java.io.Serializable;
-
-@Entity(
-        nameInDb = "Exams",
-        active = true,
-        indexes = {@Index(value = "dayId,entryDate,subjectAndGroup,type,teacher", unique = true)}
-)
-
-public class Exam implements Serializable {
-
-    @Id(autoincrement = true)
-    private Long id;
-
-    @Property(nameInDb = "day_id")
-    private Long dayId;
-
-    @Property(nameInDb = "subject_and_group")
-    private String subjectAndGroup = "";
-
-    @Property(nameInDb = "type")
-    private String type = "";
-
-    @Property(nameInDb = "description")
-    private String description = "";
-
-    @Property(nameInDb = "teacher")
-    private String teacher = "";
-
-    @Property(nameInDb = "entry_date")
-    private String entryDate = "";
-
-    private static final long serialVersionUID = 42L;
-
-    /**
-     * Used to resolve relations
-     */
-    @Generated(hash = 2040040024)
-    private transient DaoSession daoSession;
-
-    /**
-     * Used for active entity operations.
-     */
-    @Generated(hash = 973692038)
-    private transient ExamDao myDao;
-
-    @Generated(hash = 998653360)
-    public Exam(Long id, Long dayId, String subjectAndGroup, String type, String description,
-                String teacher, String entryDate) {
-        this.id = id;
-        this.dayId = dayId;
-        this.subjectAndGroup = subjectAndGroup;
-        this.type = type;
-        this.description = description;
-        this.teacher = teacher;
-        this.entryDate = entryDate;
-    }
-
-    @Generated(hash = 945526930)
-    public Exam() {
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public Exam setId(Long id) {
-        this.id = id;
-        return this;
-    }
-
-    public Long getDayId() {
-        return this.dayId;
-    }
-
-    public Exam setDayId(Long dayId) {
-        this.dayId = dayId;
-        return this;
-    }
-
-    public String getSubjectAndGroup() {
-        return subjectAndGroup;
-    }
-
-    public Exam setSubjectAndGroup(String subjectAndGroup) {
-        this.subjectAndGroup = subjectAndGroup;
-        return this;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public Exam setType(String type) {
-        this.type = type;
-        return this;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public Exam setDescription(String description) {
-        this.description = description;
-        return this;
-    }
-
-    public String getTeacher() {
-        return teacher;
-    }
-
-    public Exam setTeacher(String teacher) {
-        this.teacher = teacher;
-        return this;
-    }
-
-    public String getEntryDate() {
-        return entryDate;
-    }
-
-    public Exam setEntryDate(String entryDate) {
-        this.entryDate = entryDate;
-        return this;
-    }
-
-    /**
-     * Convenient call for {@link org.greenrobot.greendao.AbstractDao#delete(Object)}.
-     * Entity must attached to an entity context.
-     */
-    @Generated(hash = 128553479)
-    public void delete() {
-        if (myDao == null) {
-            throw new DaoException("Entity is detached from DAO context");
-        }
-        myDao.delete(this);
-    }
-
-    /**
-     * Convenient call for {@link org.greenrobot.greendao.AbstractDao#refresh(Object)}.
-     * Entity must attached to an entity context.
-     */
-    @Generated(hash = 1942392019)
-    public void refresh() {
-        if (myDao == null) {
-            throw new DaoException("Entity is detached from DAO context");
-        }
-        myDao.refresh(this);
-    }
-
-    /**
-     * Convenient call for {@link org.greenrobot.greendao.AbstractDao#update(Object)}.
-     * Entity must attached to an entity context.
-     */
-    @Generated(hash = 713229351)
-    public void update() {
-        if (myDao == null) {
-            throw new DaoException("Entity is detached from DAO context");
-        }
-        myDao.update(this);
-    }
-
-    /** called by internal mechanisms, do not call yourself. */
-    @Generated(hash = 1730563422)
-    public void __setDaoSession(DaoSession daoSession) {
-        this.daoSession = daoSession;
-        myDao = daoSession != null ? daoSession.getExamDao() : null;
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/entities/Grade.java b/app/src/main/java/io/github/wulkanowy/data/db/dao/entities/Grade.java
index 537b9e75..632f9bcc 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/entities/Grade.java
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/entities/Grade.java
@@ -10,6 +10,8 @@ import org.greenrobot.greendao.annotation.Property;
 
 import java.io.Serializable;
 
+import io.github.wulkanowy.R;
+
 @Entity(
         nameInDb = "Grades",
         active = true
@@ -19,44 +21,72 @@ public class Grade implements Serializable {
     @Id(autoincrement = true)
     protected Long id;
 
-    @Property(nameInDb = "semester_id")
-    private Long semesterId;
-
-    @Property(nameInDb = "subject_id")
+    @Property(nameInDb = "SUBJECT_ID")
     private Long subjectId;
 
-    @Property(nameInDb = "subject")
+    @Property(nameInDb = "USER_ID")
+    private Long userId;
+
+    @Property(nameInDb = "SUBJECT")
     private String subject = "";
 
-    @Property(nameInDb = "value")
+    @Property(nameInDb = "VALUE")
     protected String value = "";
 
-    @Property(nameInDb = "weight")
-    private String weight = "";
-
-    @Property(nameInDb = "date")
-    private String date = "";
-
-    @Property(nameInDb = "symbol")
-    private String symbol = "";
-
-    @Property(nameInDb = "color")
+    @Property(nameInDb = "COLOR")
     private String color = "";
 
-    @Property(nameInDb = "description")
+    @Property(nameInDb = "SYMBOL")
+    private String symbol = "";
+
+    @Property(nameInDb = "DESCRIPTION")
     private String description = "";
 
-    @Property(nameInDb = "teacher")
+    @Property(nameInDb = "WEIGHT")
+    private String weight = "";
+
+    @Property(nameInDb = "DATE")
+    private String date = "";
+
+    @Property(nameInDb = "TEACHER")
     private String teacher = "";
 
-    @Property(nameInDb = "is_new")
+    @Property(nameInDb = "SEMESTER")
+    private String semester = "";
+
+    @Property(nameInDb = "IS_NEW")
     private boolean isNew = false;
 
-    @Property(nameInDb = "read")
+    @Property(nameInDb = "READ")
     private boolean read = true;
 
     private static final long serialVersionUID = 42L;
 
+    @Generated(hash = 568899968)
+    public Grade(Long id, Long subjectId, Long userId, String subject, String value,
+                 String color, String symbol, String description, String weight,
+                 String date, String teacher, String semester, boolean isNew,
+                 boolean read) {
+        this.id = id;
+        this.subjectId = subjectId;
+        this.userId = userId;
+        this.subject = subject;
+        this.value = value;
+        this.color = color;
+        this.symbol = symbol;
+        this.description = description;
+        this.weight = weight;
+        this.date = date;
+        this.teacher = teacher;
+        this.semester = semester;
+        this.isNew = isNew;
+        this.read = read;
+    }
+
+    @Generated(hash = 2042976393)
+    public Grade() {
+    }
+
     /**
      * Used to resolve relations
      */
@@ -69,27 +99,29 @@ public class Grade implements Serializable {
     @Generated(hash = 681281562)
     private transient GradeDao myDao;
 
-    @Generated(hash = 2042976393)
-    public Grade() {
-    }
+    public int getValueColor() {
 
-    @Generated(hash = 619853992)
-    public Grade(Long id, Long semesterId, Long subjectId, String subject, String value,
-                 String weight, String date, String symbol, String color, String description,
-                 String teacher, boolean isNew, boolean read) {
-        this.id = id;
-        this.semesterId = semesterId;
-        this.subjectId = subjectId;
-        this.subject = subject;
-        this.value = value;
-        this.weight = weight;
-        this.date = date;
-        this.symbol = symbol;
-        this.color = color;
-        this.description = description;
-        this.teacher = teacher;
-        this.isNew = isNew;
-        this.read = read;
+        String replacedString = value.replaceAll("[^0-9]", "");
+
+        if (!"".equals(replacedString)) {
+            switch (Integer.parseInt(replacedString)) {
+                case 6:
+                    return R.color.six_grade;
+                case 5:
+                    return R.color.five_grade;
+                case 4:
+                    return R.color.four_grade;
+                case 3:
+                    return R.color.three_grade;
+                case 2:
+                    return R.color.two_grade;
+                case 1:
+                    return R.color.one_grade;
+                default:
+                    return R.color.default_grade;
+            }
+        }
+        return R.color.default_grade;
     }
 
     @Override
@@ -101,7 +133,6 @@ public class Grade implements Serializable {
         Grade grade = (Grade) o;
 
         return new EqualsBuilder()
-                .append(semesterId, grade.semesterId)
                 .append(subject, grade.subject)
                 .append(value, grade.value)
                 .append(color, grade.color)
@@ -110,13 +141,13 @@ public class Grade implements Serializable {
                 .append(weight, grade.weight)
                 .append(date, grade.date)
                 .append(teacher, grade.teacher)
+                .append(semester, grade.semester)
                 .isEquals();
     }
 
     @Override
     public int hashCode() {
         return new HashCodeBuilder(17, 37)
-                .append(semesterId)
                 .append(subject)
                 .append(value)
                 .append(color)
@@ -125,37 +156,39 @@ public class Grade implements Serializable {
                 .append(weight)
                 .append(date)
                 .append(teacher)
+                .append(semester)
                 .toHashCode();
     }
 
     public Long getId() {
-        return this.id;
+        return id;
     }
 
-    public void setId(Long id) {
+    public Grade setId(Long id) {
         this.id = id;
-    }
-
-    public String getValue() {
-        return this.value;
-    }
-
-    public Grade setValue(String value) {
-        this.value = value;
         return this;
     }
 
-    public Long getSemesterId() {
-        return this.semesterId;
+    public Long getSubjectId() {
+        return subjectId;
     }
 
-    public Grade setSemesterId(Long semesterId) {
-        this.semesterId = semesterId;
+    public Grade setSubjectId(Long subjectId) {
+        this.subjectId = subjectId;
+        return this;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public Grade setUserId(Long userId) {
+        this.userId = userId;
         return this;
     }
 
     public String getSubject() {
-        return this.subject;
+        return subject;
     }
 
     public Grade setSubject(String subject) {
@@ -163,8 +196,17 @@ public class Grade implements Serializable {
         return this;
     }
 
+    public String getValue() {
+        return value;
+    }
+
+    public Grade setValue(String value) {
+        this.value = value;
+        return this;
+    }
+
     public String getColor() {
-        return this.color;
+        return color;
     }
 
     public Grade setColor(String color) {
@@ -173,7 +215,7 @@ public class Grade implements Serializable {
     }
 
     public String getSymbol() {
-        return this.symbol;
+        return symbol;
     }
 
     public Grade setSymbol(String symbol) {
@@ -182,7 +224,7 @@ public class Grade implements Serializable {
     }
 
     public String getDescription() {
-        return this.description;
+        return description;
     }
 
     public Grade setDescription(String description) {
@@ -191,7 +233,7 @@ public class Grade implements Serializable {
     }
 
     public String getWeight() {
-        return this.weight;
+        return weight;
     }
 
     public Grade setWeight(String weight) {
@@ -200,7 +242,7 @@ public class Grade implements Serializable {
     }
 
     public String getDate() {
-        return this.date;
+        return date;
     }
 
     public Grade setDate(String date) {
@@ -209,7 +251,7 @@ public class Grade implements Serializable {
     }
 
     public String getTeacher() {
-        return this.teacher;
+        return teacher;
     }
 
     public Grade setTeacher(String teacher) {
@@ -217,12 +259,22 @@ public class Grade implements Serializable {
         return this;
     }
 
+    public String getSemester() {
+        return semester;
+    }
+
+    public Grade setSemester(String semester) {
+        this.semester = semester;
+        return this;
+    }
+
     public boolean getIsNew() {
         return this.isNew;
     }
 
-    public void setIsNew(boolean isNew) {
+    public Grade setIsNew(boolean isNew) {
         this.isNew = isNew;
+        return this;
     }
 
     public boolean getRead() {
@@ -234,17 +286,6 @@ public class Grade implements Serializable {
         return this;
     }
 
-
-    public Long getSubjectId() {
-        return this.subjectId;
-    }
-
-
-    public void setSubjectId(Long subjectId) {
-        this.subjectId = subjectId;
-    }
-
-
     /**
      * Convenient call for {@link org.greenrobot.greendao.AbstractDao#delete(Object)}.
      * Entity must attached to an entity context.
@@ -257,7 +298,6 @@ public class Grade implements Serializable {
         myDao.delete(this);
     }
 
-
     /**
      * Convenient call for {@link org.greenrobot.greendao.AbstractDao#refresh(Object)}.
      * Entity must attached to an entity context.
@@ -270,7 +310,6 @@ public class Grade implements Serializable {
         myDao.refresh(this);
     }
 
-
     /**
      * Convenient call for {@link org.greenrobot.greendao.AbstractDao#update(Object)}.
      * Entity must attached to an entity context.
@@ -283,7 +322,6 @@ public class Grade implements Serializable {
         myDao.update(this);
     }
 
-
     /** called by internal mechanisms, do not call yourself. */
     @Generated(hash = 1187286414)
     public void __setDaoSession(DaoSession daoSession) {
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/entities/Semester.java b/app/src/main/java/io/github/wulkanowy/data/db/dao/entities/Semester.java
deleted file mode 100644
index c739688f..00000000
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/entities/Semester.java
+++ /dev/null
@@ -1,208 +0,0 @@
-package io.github.wulkanowy.data.db.dao.entities;
-
-import org.greenrobot.greendao.DaoException;
-import org.greenrobot.greendao.annotation.Entity;
-import org.greenrobot.greendao.annotation.Generated;
-import org.greenrobot.greendao.annotation.Id;
-import org.greenrobot.greendao.annotation.Property;
-import org.greenrobot.greendao.annotation.ToMany;
-
-import java.util.List;
-
-@Entity(
-        nameInDb = "Semesters",
-        active = true
-)
-public class Semester {
-
-    @Id(autoincrement = true)
-    private Long id;
-
-    @Property(nameInDb = "diary_id")
-    private Long diaryId;
-
-    @Property(nameInDb = "current")
-    private boolean current;
-
-    @Property(nameInDb = "name")
-    private String name;
-
-    @Property(nameInDb = "value")
-    private String value;
-
-    @ToMany(referencedJoinProperty = "semesterId")
-    private List<Subject> subjectList;
-
-    @ToMany(referencedJoinProperty = "semesterId")
-    private List<Grade> gradeList;
-
-    /**
-     * Used to resolve relations
-     */
-    @Generated(hash = 2040040024)
-    private transient DaoSession daoSession;
-
-    /**
-     * Used for active entity operations.
-     */
-    @Generated(hash = 282930393)
-    private transient SemesterDao myDao;
-
-    @Generated(hash = 1661077309)
-    public Semester(Long id, Long diaryId, boolean current, String name, String value) {
-        this.id = id;
-        this.diaryId = diaryId;
-        this.current = current;
-        this.name = name;
-        this.value = value;
-    }
-
-    @Generated(hash = 58335877)
-    public Semester() {
-    }
-
-    public Long getId() {
-        return this.id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getDiaryId() {
-        return this.diaryId;
-    }
-
-    public Semester setDiaryId(Long diaryId) {
-        this.diaryId = diaryId;
-        return this;
-    }
-
-    public String getName() {
-        return this.name;
-    }
-
-    public Semester setName(String name) {
-        this.name = name;
-        return this;
-    }
-
-    public String getValue() {
-        return this.value;
-    }
-
-    public Semester setValue(String value) {
-        this.value = value;
-        return this;
-    }
-
-    public boolean getCurrent() {
-        return this.current;
-    }
-
-    public Semester setCurrent(boolean current) {
-        this.current = current;
-        return this;
-    }
-
-    /**
-     * To-many relationship, resolved on first access (and after reset).
-     * Changes to to-many relations are not persisted, make changes to the target entity.
-     */
-    @Generated(hash = 723353662)
-    public List<Subject> getSubjectList() {
-        if (subjectList == null) {
-            final DaoSession daoSession = this.daoSession;
-            if (daoSession == null) {
-                throw new DaoException("Entity is detached from DAO context");
-            }
-            SubjectDao targetDao = daoSession.getSubjectDao();
-            List<Subject> subjectListNew = targetDao._querySemester_SubjectList(id);
-            synchronized (this) {
-                if (subjectList == null) {
-                    subjectList = subjectListNew;
-                }
-            }
-        }
-        return subjectList;
-    }
-
-    /**
-     * Resets a to-many relationship, making the next get call to query for a fresh result.
-     */
-    @Generated(hash = 594294258)
-    public synchronized void resetSubjectList() {
-        subjectList = null;
-    }
-
-    /**
-     * Convenient call for {@link org.greenrobot.greendao.AbstractDao#delete(Object)}.
-     * Entity must attached to an entity context.
-     */
-    @Generated(hash = 128553479)
-    public void delete() {
-        if (myDao == null) {
-            throw new DaoException("Entity is detached from DAO context");
-        }
-        myDao.delete(this);
-    }
-
-    /**
-     * Convenient call for {@link org.greenrobot.greendao.AbstractDao#refresh(Object)}.
-     * Entity must attached to an entity context.
-     */
-    @Generated(hash = 1942392019)
-    public void refresh() {
-        if (myDao == null) {
-            throw new DaoException("Entity is detached from DAO context");
-        }
-        myDao.refresh(this);
-    }
-
-    /**
-     * Convenient call for {@link org.greenrobot.greendao.AbstractDao#update(Object)}.
-     * Entity must attached to an entity context.
-     */
-    @Generated(hash = 713229351)
-    public void update() {
-        if (myDao == null) {
-            throw new DaoException("Entity is detached from DAO context");
-        }
-        myDao.update(this);
-    }
-
-    /**
-     * To-many relationship, resolved on first access (and after reset).
-     * Changes to to-many relations are not persisted, make changes to the target entity.
-     */
-    @Generated(hash = 390330007)
-    public List<Grade> getGradeList() {
-        if (gradeList == null) {
-            final DaoSession daoSession = this.daoSession;
-            if (daoSession == null) {
-                throw new DaoException("Entity is detached from DAO context");
-            }
-            GradeDao targetDao = daoSession.getGradeDao();
-            List<Grade> gradeListNew = targetDao._querySemester_GradeList(id);
-            synchronized (this) {
-                if (gradeList == null) {
-                    gradeList = gradeListNew;
-                }
-            }
-        }
-        return gradeList;
-    }
-
-    /** Resets a to-many relationship, making the next get call to query for a fresh result. */
-    @Generated(hash = 1939990047)
-    public synchronized void resetGradeList() {
-        gradeList = null;
-    }
-
-    /** called by internal mechanisms, do not call yourself. */
-    @Generated(hash = 676204164)
-    public void __setDaoSession(DaoSession daoSession) {
-        this.daoSession = daoSession;
-        myDao = daoSession != null ? daoSession.getSemesterDao() : null;
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/entities/Student.java b/app/src/main/java/io/github/wulkanowy/data/db/dao/entities/Student.java
deleted file mode 100644
index f8ae0e31..00000000
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/entities/Student.java
+++ /dev/null
@@ -1,178 +0,0 @@
-package io.github.wulkanowy.data.db.dao.entities;
-
-import org.greenrobot.greendao.DaoException;
-import org.greenrobot.greendao.annotation.Entity;
-import org.greenrobot.greendao.annotation.Generated;
-import org.greenrobot.greendao.annotation.Id;
-import org.greenrobot.greendao.annotation.Property;
-import org.greenrobot.greendao.annotation.ToMany;
-
-import java.util.List;
-
-@Entity(
-        nameInDb = "Students",
-        active = true
-)
-public class Student {
-
-    @Id(autoincrement = true)
-    private Long id;
-
-    @Property(nameInDb = "symbol_id")
-    private Long symbolId;
-
-    @Property(nameInDb = "current")
-    private boolean current;
-
-    @Property(nameInDb = "real_id")
-    private String realId;
-
-    @Property(nameInDb = "name")
-    private String name;
-
-    @ToMany(referencedJoinProperty = "studentId")
-    private List<Diary> diaryList;
-
-    /**
-     * Used to resolve relations
-     */
-    @Generated(hash = 2040040024)
-    private transient DaoSession daoSession;
-
-    /**
-     * Used for active entity operations.
-     */
-    @Generated(hash = 1943931642)
-    private transient StudentDao myDao;
-
-    @Generated(hash = 1334215952)
-    public Student(Long id, Long symbolId, boolean current, String realId, String name) {
-        this.id = id;
-        this.symbolId = symbolId;
-        this.current = current;
-        this.realId = realId;
-        this.name = name;
-    }
-
-    @Generated(hash = 1556870573)
-    public Student() {
-    }
-
-    public Long getId() {
-        return this.id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getSymbolId() {
-        return this.symbolId;
-    }
-
-    public Student setSymbolId(Long symbolId) {
-        this.symbolId = symbolId;
-        return this;
-    }
-
-    public String getRealId() {
-        return this.realId;
-    }
-
-    public Student setRealId(String realId) {
-        this.realId = realId;
-        return this;
-    }
-
-    public String getName() {
-        return this.name;
-    }
-
-    public Student setName(String name) {
-        this.name = name;
-        return this;
-    }
-
-    public boolean getCurrent() {
-        return this.current;
-    }
-
-    public Student setCurrent(boolean current) {
-        this.current = current;
-        return this;
-    }
-
-    /**
-     * To-many relationship, resolved on first access (and after reset).
-     * Changes to to-many relations are not persisted, make changes to the target entity.
-     */
-    @Generated(hash = 508305571)
-    public List<Diary> getDiaryList() {
-        if (diaryList == null) {
-            final DaoSession daoSession = this.daoSession;
-            if (daoSession == null) {
-                throw new DaoException("Entity is detached from DAO context");
-            }
-            DiaryDao targetDao = daoSession.getDiaryDao();
-            List<Diary> diaryListNew = targetDao._queryStudent_DiaryList(id);
-            synchronized (this) {
-                if (diaryList == null) {
-                    diaryList = diaryListNew;
-                }
-            }
-        }
-        return diaryList;
-    }
-
-    /**
-     * Resets a to-many relationship, making the next get call to query for a fresh result.
-     */
-    @Generated(hash = 1078514341)
-    public synchronized void resetDiaryList() {
-        diaryList = null;
-    }
-
-    /**
-     * Convenient call for {@link org.greenrobot.greendao.AbstractDao#delete(Object)}.
-     * Entity must attached to an entity context.
-     */
-    @Generated(hash = 128553479)
-    public void delete() {
-        if (myDao == null) {
-            throw new DaoException("Entity is detached from DAO context");
-        }
-        myDao.delete(this);
-    }
-
-    /**
-     * Convenient call for {@link org.greenrobot.greendao.AbstractDao#refresh(Object)}.
-     * Entity must attached to an entity context.
-     */
-    @Generated(hash = 1942392019)
-    public void refresh() {
-        if (myDao == null) {
-            throw new DaoException("Entity is detached from DAO context");
-        }
-        myDao.refresh(this);
-    }
-
-    /**
-     * Convenient call for {@link org.greenrobot.greendao.AbstractDao#update(Object)}.
-     * Entity must attached to an entity context.
-     */
-    @Generated(hash = 713229351)
-    public void update() {
-        if (myDao == null) {
-            throw new DaoException("Entity is detached from DAO context");
-        }
-        myDao.update(this);
-    }
-
-    /** called by internal mechanisms, do not call yourself. */
-    @Generated(hash = 1701634981)
-    public void __setDaoSession(DaoSession daoSession) {
-        this.daoSession = daoSession;
-        myDao = daoSession != null ? daoSession.getStudentDao() : null;
-    }
-
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/entities/Subject.java b/app/src/main/java/io/github/wulkanowy/data/db/dao/entities/Subject.java
index 285cd7c0..6bcce622 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/entities/Subject.java
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/entities/Subject.java
@@ -18,18 +18,21 @@ public class Subject {
     @Id(autoincrement = true)
     private Long id;
 
-    @Property(nameInDb = "semester_id")
-    private Long semesterId;
+    @Property(nameInDb = "USER_ID")
+    private Long userId;
 
-    @Property(nameInDb = "name")
+    @Property(nameInDb = "NAME")
     private String name;
 
-    @Property(nameInDb = "predicted_rating")
+    @Property(nameInDb = "PREDICTED_RATING")
     private String predictedRating;
 
-    @Property(nameInDb = "final_rating")
+    @Property(nameInDb = "FINAL_RATING")
     private String finalRating;
 
+    @Property(nameInDb = "SEMESTER")
+    private String semester;
+
     @ToMany(referencedJoinProperty = "subjectId")
     private List<Grade> gradeList;
 
@@ -45,14 +48,15 @@ public class Subject {
     @Generated(hash = 1644932788)
     private transient SubjectDao myDao;
 
-    @Generated(hash = 1817932538)
-    public Subject(Long id, Long semesterId, String name, String predictedRating,
-                   String finalRating) {
+    @Generated(hash = 396325764)
+    public Subject(Long id, Long userId, String name, String predictedRating,
+                   String finalRating, String semester) {
         this.id = id;
-        this.semesterId = semesterId;
+        this.userId = userId;
         this.name = name;
         this.predictedRating = predictedRating;
         this.finalRating = finalRating;
+        this.semester = semester;
     }
 
     @Generated(hash = 1617906264)
@@ -60,24 +64,25 @@ public class Subject {
     }
 
     public Long getId() {
-        return this.id;
+        return id;
     }
 
-    public void setId(Long id) {
+    public Subject setId(Long id) {
         this.id = id;
+        return this;
     }
 
-    public Long getSemesterId() {
-        return this.semesterId;
+    public Long getUserId() {
+        return userId;
     }
 
-    public Subject setSemesterId(Long semesterId) {
-        this.semesterId = semesterId;
+    public Subject setUserId(Long userId) {
+        this.userId = userId;
         return this;
     }
 
     public String getName() {
-        return this.name;
+        return name;
     }
 
     public Subject setName(String name) {
@@ -86,7 +91,7 @@ public class Subject {
     }
 
     public String getPredictedRating() {
-        return this.predictedRating;
+        return predictedRating;
     }
 
     public Subject setPredictedRating(String predictedRating) {
@@ -95,7 +100,7 @@ public class Subject {
     }
 
     public String getFinalRating() {
-        return this.finalRating;
+        return finalRating;
     }
 
     public Subject setFinalRating(String finalRating) {
@@ -103,6 +108,45 @@ public class Subject {
         return this;
     }
 
+    public String getSemester() {
+        return semester;
+    }
+
+    public Subject setSemester(String semester) {
+        this.semester = semester;
+        return this;
+    }
+
+    /**
+     * To-many relationship, resolved on first access (and after reset).
+     * Changes to to-many relations are not persisted, make changes to the target entity.
+     */
+    @Generated(hash = 1358847893)
+    public List<Grade> getGradeList() {
+        if (gradeList == null) {
+            final DaoSession daoSession = this.daoSession;
+            if (daoSession == null) {
+                throw new DaoException("Entity is detached from DAO context");
+            }
+            GradeDao targetDao = daoSession.getGradeDao();
+            List<Grade> gradeListNew = targetDao._querySubject_GradeList(id);
+            synchronized (this) {
+                if (gradeList == null) {
+                    gradeList = gradeListNew;
+                }
+            }
+        }
+        return gradeList;
+    }
+
+    /**
+     * Resets a to-many relationship, making the next get call to query for a fresh result.
+     */
+    @Generated(hash = 1939990047)
+    public synchronized void resetGradeList() {
+        gradeList = null;
+    }
+
     /**
      * Convenient call for {@link org.greenrobot.greendao.AbstractDao#delete(Object)}.
      * Entity must attached to an entity context.
@@ -139,34 +183,6 @@ public class Subject {
         myDao.update(this);
     }
 
-    /**
-     * To-many relationship, resolved on first access (and after reset).
-     * Changes to to-many relations are not persisted, make changes to the target entity.
-     */
-    @Generated(hash = 1358847893)
-    public List<Grade> getGradeList() {
-        if (gradeList == null) {
-            final DaoSession daoSession = this.daoSession;
-            if (daoSession == null) {
-                throw new DaoException("Entity is detached from DAO context");
-            }
-            GradeDao targetDao = daoSession.getGradeDao();
-            List<Grade> gradeListNew = targetDao._querySubject_GradeList(id);
-            synchronized (this) {
-                if (gradeList == null) {
-                    gradeList = gradeListNew;
-                }
-            }
-        }
-        return gradeList;
-    }
-
-    /** Resets a to-many relationship, making the next get call to query for a fresh result. */
-    @Generated(hash = 1939990047)
-    public synchronized void resetGradeList() {
-        gradeList = null;
-    }
-
     /** called by internal mechanisms, do not call yourself. */
     @Generated(hash = 937984622)
     public void __setDaoSession(DaoSession daoSession) {
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/entities/Symbol.java b/app/src/main/java/io/github/wulkanowy/data/db/dao/entities/Symbol.java
deleted file mode 100644
index 2b5984b5..00000000
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/entities/Symbol.java
+++ /dev/null
@@ -1,191 +0,0 @@
-package io.github.wulkanowy.data.db.dao.entities;
-
-import org.greenrobot.greendao.DaoException;
-import org.greenrobot.greendao.annotation.Entity;
-import org.greenrobot.greendao.annotation.Generated;
-import org.greenrobot.greendao.annotation.Id;
-import org.greenrobot.greendao.annotation.Property;
-import org.greenrobot.greendao.annotation.ToMany;
-
-import java.util.List;
-
-@Entity(
-        nameInDb = "Symbols",
-        active = true
-)
-public class Symbol {
-
-    @Id(autoincrement = true)
-    private Long id;
-
-    @Property(nameInDb = "user_id")
-    private Long userId;
-
-    @Property(nameInDb = "host")
-    private String host;
-
-    @Property(nameInDb = "school_id")
-    private String schoolId;
-
-    @Property(nameInDb = "symbol")
-    private String symbol;
-
-    @Property(nameInDb = "type")
-    private String type;
-
-    @ToMany(referencedJoinProperty = "symbolId")
-    private List<Student> studentList;
-
-    /**
-     * Used to resolve relations
-     */
-    @Generated(hash = 2040040024)
-    private transient DaoSession daoSession;
-
-    /**
-     * Used for active entity operations.
-     */
-    @Generated(hash = 684907977)
-    private transient SymbolDao myDao;
-
-    @Generated(hash = 242774339)
-    public Symbol(Long id, Long userId, String host, String schoolId, String symbol,
-                  String type) {
-        this.id = id;
-        this.userId = userId;
-        this.host = host;
-        this.schoolId = schoolId;
-        this.symbol = symbol;
-        this.type = type;
-    }
-
-    @Generated(hash = 460475327)
-    public Symbol() {
-    }
-
-    public Long getId() {
-        return this.id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getUserId() {
-        return this.userId;
-    }
-
-    public Symbol setUserId(Long userId) {
-        this.userId = userId;
-        return this;
-    }
-
-    public String getHost() {
-        return this.host;
-    }
-
-    public Symbol setHost(String host) {
-        this.host = host;
-        return this;
-    }
-
-    public String getSchoolId() {
-        return this.schoolId;
-    }
-
-    public Symbol setSchoolId(String schoolId) {
-        this.schoolId = schoolId;
-        return this;
-    }
-
-    public String getSymbol() {
-        return this.symbol;
-    }
-
-    public Symbol setSymbol(String symbol) {
-        this.symbol = symbol;
-        return this;
-    }
-
-    public String getType() {
-        return this.type;
-    }
-
-    public Symbol setType(String type) {
-        this.type = type;
-        return this;
-    }
-
-    /**
-     * To-many relationship, resolved on first access (and after reset).
-     * Changes to to-many relations are not persisted, make changes to the target entity.
-     */
-    @Generated(hash = 604366458)
-    public List<Student> getStudentList() {
-        if (studentList == null) {
-            final DaoSession daoSession = this.daoSession;
-            if (daoSession == null) {
-                throw new DaoException("Entity is detached from DAO context");
-            }
-            StudentDao targetDao = daoSession.getStudentDao();
-            List<Student> studentListNew = targetDao._querySymbol_StudentList(id);
-            synchronized (this) {
-                if (studentList == null) {
-                    studentList = studentListNew;
-                }
-            }
-        }
-        return studentList;
-    }
-
-    /**
-     * Resets a to-many relationship, making the next get call to query for a fresh result.
-     */
-    @Generated(hash = 1628625923)
-    public synchronized void resetStudentList() {
-        studentList = null;
-    }
-
-    /**
-     * Convenient call for {@link org.greenrobot.greendao.AbstractDao#delete(Object)}.
-     * Entity must attached to an entity context.
-     */
-    @Generated(hash = 128553479)
-    public void delete() {
-        if (myDao == null) {
-            throw new DaoException("Entity is detached from DAO context");
-        }
-        myDao.delete(this);
-    }
-
-    /**
-     * Convenient call for {@link org.greenrobot.greendao.AbstractDao#refresh(Object)}.
-     * Entity must attached to an entity context.
-     */
-    @Generated(hash = 1942392019)
-    public void refresh() {
-        if (myDao == null) {
-            throw new DaoException("Entity is detached from DAO context");
-        }
-        myDao.refresh(this);
-    }
-
-    /**
-     * Convenient call for {@link org.greenrobot.greendao.AbstractDao#update(Object)}.
-     * Entity must attached to an entity context.
-     */
-    @Generated(hash = 713229351)
-    public void update() {
-        if (myDao == null) {
-            throw new DaoException("Entity is detached from DAO context");
-        }
-        myDao.update(this);
-    }
-
-    /** called by internal mechanisms, do not call yourself. */
-    @Generated(hash = 632145708)
-    public void __setDaoSession(DaoSession daoSession) {
-        this.daoSession = daoSession;
-        myDao = daoSession != null ? daoSession.getSymbolDao() : null;
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/entities/TimetableLesson.java b/app/src/main/java/io/github/wulkanowy/data/db/dao/entities/TimetableLesson.java
index f3fdf6a8..390f679e 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/entities/TimetableLesson.java
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/entities/TimetableLesson.java
@@ -1,7 +1,5 @@
 package io.github.wulkanowy.data.db.dao.entities;
 
-import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.greenrobot.greendao.DaoException;
 import org.greenrobot.greendao.annotation.Entity;
 import org.greenrobot.greendao.annotation.Generated;
@@ -14,62 +12,62 @@ import java.io.Serializable;
 @Entity(
         nameInDb = "TimetableLessons",
         active = true,
-        indexes = {@Index(value = "dayId,date,number,startTime,endTime", unique = true)}
+        indexes = {@Index(value = "dayId,date,startTime,endTime", unique = true)}
 )
 public class TimetableLesson implements Serializable {
 
-    private static final long serialVersionUID = 42L;
-
     @Id(autoincrement = true)
     private Long id;
 
-    @Property(nameInDb = "day_id")
+    @Property(nameInDb = "DAY_ID")
     private Long dayId;
 
-    @Property(nameInDb = "number")
-    private int number = 0;
+    @Property(nameInDb = "NUMBER_OF_LESSON")
+    private String number;
 
-    @Property(nameInDb = "subject")
+    @Property(nameInDb = "SUBJECT_NAME")
     private String subject = "";
 
-    @Property(nameInDb = "teacher")
+    @Property(nameInDb = "TEACHER")
     private String teacher = "";
 
-    @Property(nameInDb = "room")
+    @Property(nameInDb = "ROOM")
     private String room = "";
 
-    @Property(nameInDb = "description")
+    @Property(nameInDb = "DESCRIPTION")
     private String description = "";
 
-    @Property(nameInDb = "group")
-    private String group = "";
+    @Property(nameInDb = "GROUP_NAME")
+    private String groupName = "";
 
-    @Property(nameInDb = "start_time")
+    @Property(nameInDb = "START_TIME")
     private String startTime = "";
 
-    @Property(nameInDb = "end_time")
+    @Property(nameInDb = "END_TIME")
     private String endTime = "";
 
-    @Property(nameInDb = "date")
+    @Property(nameInDb = "DATE")
     private String date = "";
 
-    @Property(nameInDb = "empty")
-    private boolean empty = false;
+    @Property(nameInDb = "IS_EMPTY")
+    private boolean isEmpty = false;
 
-    @Property(nameInDb = "division_into_groups")
-    private boolean divisionIntoGroups = false;
+    @Property(nameInDb = "IS_DIVISION_INTO_GROUP")
+    private boolean isDivisionIntoGroups = false;
 
-    @Property(nameInDb = "planning")
-    private boolean planning = false;
+    @Property(nameInDb = "IS_PLANNING")
+    private boolean isPlanning = false;
 
-    @Property(nameInDb = "realized")
-    private boolean realized = false;
+    @Property(nameInDb = "IS_REALIZED")
+    private boolean isRealized = false;
 
-    @Property(nameInDb = "moved_canceled")
-    private boolean movedOrCanceled = false;
+    @Property(nameInDb = "IS_MOVED_CANCELED")
+    private boolean isMovedOrCanceled = false;
 
-    @Property(nameInDb = "new_moved_in_canceled")
-    private boolean newMovedInOrChanged = false;
+    @Property(nameInDb = "IS_NEW_MOVED_IN_CANCELED")
+    private boolean isNewMovedInOrChanged = false;
+
+    private static final long serialVersionUID = 42L;
 
     /**
      * Used to resolve relations
@@ -77,15 +75,18 @@ public class TimetableLesson implements Serializable {
     @Generated(hash = 2040040024)
     private transient DaoSession daoSession;
 
-    /** Used for active entity operations. */
+    /**
+     * Used for active entity operations.
+     */
     @Generated(hash = 1119360138)
     private transient TimetableLessonDao myDao;
 
-    @Generated(hash = 1665905034)
-    public TimetableLesson(Long id, Long dayId, int number, String subject, String teacher,
-                           String room, String description, String group, String startTime, String endTime,
-                           String date, boolean empty, boolean divisionIntoGroups, boolean planning,
-                           boolean realized, boolean movedOrCanceled, boolean newMovedInOrChanged) {
+    @Generated(hash = 627457324)
+    public TimetableLesson(Long id, Long dayId, String number, String subject,
+                           String teacher, String room, String description, String groupName,
+                           String startTime, String endTime, String date, boolean isEmpty,
+                           boolean isDivisionIntoGroups, boolean isPlanning, boolean isRealized,
+                           boolean isMovedOrCanceled, boolean isNewMovedInOrChanged) {
         this.id = id;
         this.dayId = dayId;
         this.number = number;
@@ -93,22 +94,22 @@ public class TimetableLesson implements Serializable {
         this.teacher = teacher;
         this.room = room;
         this.description = description;
-        this.group = group;
+        this.groupName = groupName;
         this.startTime = startTime;
         this.endTime = endTime;
         this.date = date;
-        this.empty = empty;
-        this.divisionIntoGroups = divisionIntoGroups;
-        this.planning = planning;
-        this.realized = realized;
-        this.movedOrCanceled = movedOrCanceled;
-        this.newMovedInOrChanged = newMovedInOrChanged;
+        this.isEmpty = isEmpty;
+        this.isDivisionIntoGroups = isDivisionIntoGroups;
+        this.isPlanning = isPlanning;
+        this.isRealized = isRealized;
+        this.isMovedOrCanceled = isMovedOrCanceled;
+        this.isNewMovedInOrChanged = isNewMovedInOrChanged;
     }
 
     @Generated(hash = 1878030142)
     public TimetableLesson() {
     }
-    
+
     public Long getId() {
         return this.id;
     }
@@ -121,16 +122,15 @@ public class TimetableLesson implements Serializable {
         return this.dayId;
     }
 
-    public TimetableLesson setDayId(Long dayId) {
+    public void setDayId(Long dayId) {
         this.dayId = dayId;
-        return this;
     }
 
-    public int getNumber() {
+    public String getNumber() {
         return this.number;
     }
 
-    public TimetableLesson setNumber(int number) {
+    public TimetableLesson setNumber(String number) {
         this.number = number;
         return this;
     }
@@ -171,12 +171,12 @@ public class TimetableLesson implements Serializable {
         return this;
     }
 
-    public String getGroup() {
-        return this.group;
+    public String getGroupName() {
+        return this.groupName;
     }
 
-    public TimetableLesson setGroup(String group) {
-        this.group = group;
+    public TimetableLesson setGroupName(String groupName) {
+        this.groupName = groupName;
         return this;
     }
 
@@ -207,86 +207,60 @@ public class TimetableLesson implements Serializable {
         return this;
     }
 
-    public boolean getEmpty() {
-        return this.empty;
+    public boolean getIsEmpty() {
+        return this.isEmpty;
     }
 
-    public TimetableLesson setEmpty(boolean empty) {
-        this.empty = empty;
+    public TimetableLesson setEmpty(boolean isEmpty) {
+        this.isEmpty = isEmpty;
         return this;
     }
 
-    public boolean getDivisionIntoGroups() {
-        return this.divisionIntoGroups;
+    public boolean getIsDivisionIntoGroups() {
+        return this.isDivisionIntoGroups;
     }
 
-    public TimetableLesson setDivisionIntoGroups(boolean divisionIntoGroups) {
-        this.divisionIntoGroups = divisionIntoGroups;
+    public TimetableLesson setDivisionIntoGroups(boolean isDivisionIntoGroups) {
+        this.isDivisionIntoGroups = isDivisionIntoGroups;
         return this;
     }
 
-    public boolean getPlanning() {
-        return this.planning;
+    public boolean getIsPlanning() {
+        return this.isPlanning;
     }
 
-    public TimetableLesson setPlanning(boolean planning) {
-        this.planning = planning;
+    public TimetableLesson setPlanning(boolean isPlanning) {
+        this.isPlanning = isPlanning;
         return this;
     }
 
-    public boolean getRealized() {
-        return this.realized;
+    public boolean getIsRealized() {
+        return this.isRealized;
     }
 
-    public TimetableLesson setRealized(boolean realized) {
-        this.realized = realized;
+    public TimetableLesson setRealized(boolean isRealized) {
+        this.isRealized = isRealized;
         return this;
     }
 
-    public boolean getMovedOrCanceled() {
-        return this.movedOrCanceled;
+    public boolean getIsMovedOrCanceled() {
+        return this.isMovedOrCanceled;
     }
 
-    public TimetableLesson setMovedOrCanceled(boolean movedOrCanceled) {
-        this.movedOrCanceled = movedOrCanceled;
+    public TimetableLesson setMovedOrCanceled(boolean isMovedOrCanceled) {
+        this.isMovedOrCanceled = isMovedOrCanceled;
         return this;
     }
 
-    public boolean getNewMovedInOrChanged() {
-        return this.newMovedInOrChanged;
+    public boolean getIsNewMovedInOrChanged() {
+        return this.isNewMovedInOrChanged;
     }
 
-    public TimetableLesson setNewMovedInOrChanged(boolean newMovedInOrChanged) {
-        this.newMovedInOrChanged = newMovedInOrChanged;
+    public TimetableLesson setNewMovedInOrChanged(boolean isNewMovedInOrChanged) {
+        this.isNewMovedInOrChanged = isNewMovedInOrChanged;
         return this;
     }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-
-        if (o == null || getClass() != o.getClass()) return false;
-
-        TimetableLesson lesson = (TimetableLesson) o;
-
-        return new EqualsBuilder()
-                .append(number, lesson.number)
-                .append(startTime, lesson.startTime)
-                .append(endTime, lesson.endTime)
-                .append(date, lesson.date)
-                .isEquals();
-    }
-
-    @Override
-    public int hashCode() {
-        return new HashCodeBuilder(17, 37)
-                .append(number)
-                .append(startTime)
-                .append(endTime)
-                .append(date)
-                .toHashCode();
-    }
-
     /**
      * Convenient call for {@link org.greenrobot.greendao.AbstractDao#delete(Object)}.
      * Entity must attached to an entity context.
@@ -323,6 +297,30 @@ public class TimetableLesson implements Serializable {
         myDao.update(this);
     }
 
+    public void setIsEmpty(boolean isEmpty) {
+        this.isEmpty = isEmpty;
+    }
+
+    public void setIsDivisionIntoGroups(boolean isDivisionIntoGroups) {
+        this.isDivisionIntoGroups = isDivisionIntoGroups;
+    }
+
+    public void setIsPlanning(boolean isPlanning) {
+        this.isPlanning = isPlanning;
+    }
+
+    public void setIsRealized(boolean isRealized) {
+        this.isRealized = isRealized;
+    }
+
+    public void setIsMovedOrCanceled(boolean isMovedOrCanceled) {
+        this.isMovedOrCanceled = isMovedOrCanceled;
+    }
+
+    public void setIsNewMovedInOrChanged(boolean isNewMovedInOrChanged) {
+        this.isNewMovedInOrChanged = isNewMovedInOrChanged;
+    }
+
     /** called by internal mechanisms, do not call yourself. */
     @Generated(hash = 1885258429)
     public void __setDaoSession(DaoSession daoSession) {
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/entities/Week.java b/app/src/main/java/io/github/wulkanowy/data/db/dao/entities/Week.java
index 1edfa245..778f6ca3 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/entities/Week.java
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/entities/Week.java
@@ -13,52 +13,44 @@ import java.util.List;
 @Entity(
         nameInDb = "Weeks",
         active = true,
-        indexes = {@Index(value = "diaryId,startDayDate", unique = true)}
+        indexes ={@Index(value = "userId,startDayDate", unique = true)}
 )
 public class Week {
 
     @Id(autoincrement = true)
     private Long id;
 
-    @Property(nameInDb = "diary_id")
-    private Long diaryId;
+    @Property(nameInDb = "USER_ID")
+    private Long userId;
 
-    @Property(nameInDb = "start_day_date")
+    @Property(nameInDb = "START_DATE")
     private String startDayDate = "";
 
-    @Property(nameInDb = "attendance_synced")
-    private boolean attendanceSynced = false;
+    @Property(nameInDb = "IS_ATTENDANCE_SYNCED")
+    private boolean isAttendanceSynced = false;
 
-    @Property(nameInDb = "timetable_synced")
-    private boolean timetableSynced = false;
-
-    @Property(nameInDb = "exams_synced")
-    private boolean examsSynced = false;
+    @Property(nameInDb = "IS_TIMETABLE_SYNCED")
+    private boolean isTimetableSynced = false;
 
     @ToMany(referencedJoinProperty = "weekId")
     private List<Day> dayList;
 
-    /**
-     * Used to resolve relations
-     */
+    /** Used to resolve relations */
     @Generated(hash = 2040040024)
     private transient DaoSession daoSession;
 
-    /**
-     * Used for active entity operations.
-     */
+    /** Used for active entity operations. */
     @Generated(hash = 1019310398)
     private transient WeekDao myDao;
 
-    @Generated(hash = 23357599)
-    public Week(Long id, Long diaryId, String startDayDate, boolean attendanceSynced,
-                boolean timetableSynced, boolean examsSynced) {
+    @Generated(hash = 1745118398)
+    public Week(Long id, Long userId, String startDayDate, boolean isAttendanceSynced,
+            boolean isTimetableSynced) {
         this.id = id;
-        this.diaryId = diaryId;
+        this.userId = userId;
         this.startDayDate = startDayDate;
-        this.attendanceSynced = attendanceSynced;
-        this.timetableSynced = timetableSynced;
-        this.examsSynced = examsSynced;
+        this.isAttendanceSynced = isAttendanceSynced;
+        this.isTimetableSynced = isTimetableSynced;
     }
 
     @Generated(hash = 2135529658)
@@ -74,12 +66,12 @@ public class Week {
         return this;
     }
 
-    public Long getDiaryId() {
-        return diaryId;
+    public Long getUserId() {
+        return userId;
     }
 
-    public Week setDiaryId(Long diaryId) {
-        this.diaryId = diaryId;
+    public Week setUserId(Long userId) {
+        this.userId = userId;
         return this;
     }
 
@@ -92,31 +84,20 @@ public class Week {
         return this;
     }
 
-    public boolean getAttendanceSynced() {
-        return this.attendanceSynced;
+    public boolean getIsAttendanceSynced() {
+        return this.isAttendanceSynced;
     }
 
-    public Week setAttendanceSynced(boolean attendanceSynced) {
-        this.attendanceSynced = attendanceSynced;
-        return this;
+    public void setIsAttendanceSynced(boolean isAttendanceSynced) {
+        this.isAttendanceSynced = isAttendanceSynced;
     }
 
-    public boolean getTimetableSynced() {
-        return this.timetableSynced;
+    public boolean getIsTimetableSynced() {
+        return this.isTimetableSynced;
     }
 
-    public Week setTimetableSynced(boolean timetableSynced) {
-        this.timetableSynced = timetableSynced;
-        return this;
-    }
-
-    public Week setExamsSynced(boolean examsSynced) {
-        this.examsSynced = examsSynced;
-        return this;
-    }
-
-    public boolean getExamsSynced() {
-        return examsSynced;
+    public void setIsTimetableSynced(boolean isTimetableSynced) {
+        this.isTimetableSynced = isTimetableSynced;
     }
 
     /**
@@ -141,9 +122,7 @@ public class Week {
         return dayList;
     }
 
-    /**
-     * Resets a to-many relationship, making the next get call to query for a fresh result.
-     */
+    /** Resets a to-many relationship, making the next get call to query for a fresh result. */
     @Generated(hash = 1010399236)
     public synchronized void resetDayList() {
         dayList = null;
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/migrations/Migration23.java b/app/src/main/java/io/github/wulkanowy/data/db/dao/migrations/Migration23.java
deleted file mode 100644
index b32c6261..00000000
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/migrations/Migration23.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package io.github.wulkanowy.data.db.dao.migrations;
-
-import android.database.Cursor;
-import android.os.AsyncTask;
-
-import org.greenrobot.greendao.database.Database;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import io.github.wulkanowy.api.Diary;
-import io.github.wulkanowy.api.Vulcan;
-import io.github.wulkanowy.data.db.dao.DbHelper;
-import io.github.wulkanowy.data.db.shared.SharedPrefContract;
-import io.github.wulkanowy.utils.security.Scrambler;
-
-public class Migration23 implements DbHelper.Migration {
-
-    @Override
-    public Integer getVersion() {
-        return 23;
-    }
-
-    @Override
-    public void runMigration(final Database db, final SharedPrefContract sharedPref, final Vulcan vulcan) throws Exception {
-        createDiaryTable(db);
-        migrateAccountsTable(db);
-
-        final Map<String, String> user = getAccountData(db);
-        vulcan.setCredentials(
-                user.get("email"),
-                Scrambler.decrypt(user.get("email"), user.get("password")),
-                user.get("symbol"),
-                user.get("school_id"),
-                "", // inserted in code bellow
-                ""
-        );
-
-        AsyncTask.execute(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    insertDiaries(db, vulcan.getStudentAndParent().getDiaries());
-                    updateAccount(db, vulcan.getStudentAndParent().getStudentID());
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-            }
-        });
-    }
-
-    private void createDiaryTable(Database db) {
-        db.execSQL("DROP TABLE IF EXISTS Diaries");
-        db.execSQL("CREATE TABLE IF NOT EXISTS \"Diaries\" (" + //
-                "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id
-                "\"STUDENT_ID\" TEXT," + // 1: studentId
-                "\"NAME\" TEXT," + // 2: name
-                "\"VALUE\" TEXT," + // 3: value
-                "\"IS_CURRENT\" INTEGER NOT NULL );"); // 4: isCurrent
-    }
-
-    private void migrateAccountsTable(Database db) {
-        db.execSQL("DROP TABLE IF EXISTS tmp_account");
-        db.execSQL("ALTER TABLE Accounts RENAME TO tmp_account");
-        db.execSQL("CREATE TABLE IF NOT EXISTS \"Accounts\" (" + //
-                "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id
-                "\"REAL_ID\" TEXT," + // 1: realId
-                "\"SYMBOL\" TEXT," + // 2: symbol
-                "\"SCHOOL_ID\" TEXT," + // 3: schoolId
-                "\"NAME\" TEXT," + // 4: name
-                "\"E_MAIL\" TEXT," + // 5: email
-                "\"PASSWORD\" TEXT);"); // 6: password
-        // Add Indexes
-        db.execSQL("CREATE UNIQUE INDEX IF NOT EXISTS IDX_Accounts_REAL_ID ON \"Accounts\" (\"REAL_ID\" ASC);");
-        db.execSQL("INSERT INTO Accounts(NAME, E_MAIL, PASSWORD, SYMBOL, SCHOOL_ID)" +
-                "SELECT `NAME`, `E-MAIL`, `PASSWORD`, `SYMBOL`, `SNPID` FROM tmp_account");
-        db.execSQL("DROP TABLE tmp_account");
-    }
-
-    private Map<String, String> getAccountData(Database db) {
-        Map<String, String> values = new HashMap<>();
-        Cursor cursor = db.rawQuery("SELECT SYMBOL, SCHOOL_ID, NAME, E_MAIL, PASSWORD FROM Accounts", null);
-
-        if (cursor.moveToFirst()) {
-            do {
-                values.put("symbol", cursor.getString(cursor.getColumnIndex("SYMBOL")));
-                values.put("school_id", cursor.getString(cursor.getColumnIndex("SCHOOL_ID")));
-                values.put("name", cursor.getString(cursor.getColumnIndex("NAME")));
-                values.put("email", cursor.getString(cursor.getColumnIndex("E_MAIL")));
-                values.put("password", cursor.getString(cursor.getColumnIndex("PASSWORD")));
-            } while (cursor.moveToNext());
-        }
-
-        cursor.close();
-
-        return values;
-    }
-
-    private void insertDiaries(Database db, List<Diary> list) {
-        for (Diary diary : list) {
-            db.execSQL("INSERT INTO Diaries(STUDENT_ID, NAME, VALUE, IS_CURRENT) VALUES(" +
-                    "\"" + diary.getId() + "\"," +
-                    "\"" + diary.getName() + "\"," +
-                    "\"" + diary.getId() + "\"," +
-                    "\"" + (diary.isCurrent() ? "1" : "0") + "\"" +
-                    ")");
-        }
-    }
-
-    private void updateAccount(Database db, String realId) {
-        db.execSQL("UPDATE Accounts SET REAL_ID = ?", new String[]{realId});
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/migrations/Migration26.java b/app/src/main/java/io/github/wulkanowy/data/db/dao/migrations/Migration26.java
deleted file mode 100644
index 332f2dd2..00000000
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/migrations/Migration26.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package io.github.wulkanowy.data.db.dao.migrations;
-
-import org.greenrobot.greendao.database.Database;
-
-import io.github.wulkanowy.api.Vulcan;
-import io.github.wulkanowy.data.db.dao.DbHelper;
-import io.github.wulkanowy.data.db.shared.SharedPrefContract;
-
-public class Migration26 implements DbHelper.Migration {
-
-    @Override
-    public Integer getVersion() {
-        return 26;
-    }
-
-    @Override
-    public void runMigration(final Database db, final SharedPrefContract sharedPref, final Vulcan vulcan) throws Exception {
-        throw new Exception("No migrations");
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/migrations/Migration27.java b/app/src/main/java/io/github/wulkanowy/data/db/dao/migrations/Migration27.java
deleted file mode 100644
index 5c8c82f1..00000000
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/migrations/Migration27.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package io.github.wulkanowy.data.db.dao.migrations;
-
-import org.greenrobot.greendao.database.Database;
-
-import io.github.wulkanowy.api.Vulcan;
-import io.github.wulkanowy.data.db.dao.DbHelper;
-import io.github.wulkanowy.data.db.dao.entities.ExamDao;
-import io.github.wulkanowy.data.db.shared.SharedPrefContract;
-
-public class Migration27 implements DbHelper.Migration {
-
-    @Override
-    public Integer getVersion() {
-        return 27;
-    }
-
-    @Override
-    public void runMigration(Database db, SharedPrefContract sharedPref, Vulcan vulcan) throws Exception {
-        ExamDao.dropTable(db, true);
-        ExamDao.createTable(db, true);
-
-        db.execSQL("UPDATE Weeks SET exams_synced = 0");
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/migrations/Migration28.java b/app/src/main/java/io/github/wulkanowy/data/db/dao/migrations/Migration28.java
deleted file mode 100644
index 3970df4c..00000000
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/migrations/Migration28.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package io.github.wulkanowy.data.db.dao.migrations;
-
-import org.greenrobot.greendao.database.Database;
-
-import io.github.wulkanowy.api.Vulcan;
-import io.github.wulkanowy.data.db.dao.DbHelper;
-import io.github.wulkanowy.data.db.shared.SharedPrefContract;
-
-public class Migration28 implements DbHelper.Migration {
-
-    @Override
-    public Integer getVersion() {
-        return 28;
-    }
-
-    @Override
-    public void runMigration(final Database db, final SharedPrefContract sharedPref, final Vulcan vulcan) throws Exception {
-        throw new Exception("No migrations");
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/resources/ResourcesRepository.java b/app/src/main/java/io/github/wulkanowy/data/db/resources/AppResources.java
similarity index 69%
rename from app/src/main/java/io/github/wulkanowy/data/db/resources/ResourcesRepository.java
rename to app/src/main/java/io/github/wulkanowy/data/db/resources/AppResources.java
index a430e335..349ac177 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/resources/ResourcesRepository.java
+++ b/app/src/main/java/io/github/wulkanowy/data/db/resources/AppResources.java
@@ -3,8 +3,6 @@ package io.github.wulkanowy.data.db.resources;
 import android.content.Context;
 import android.content.res.Resources;
 
-import com.crashlytics.android.Crashlytics;
-
 import java.io.IOException;
 import java.net.SocketTimeoutException;
 import java.net.UnknownHostException;
@@ -14,6 +12,7 @@ import javax.inject.Singleton;
 
 import io.github.wulkanowy.R;
 import io.github.wulkanowy.api.NotLoggedInErrorException;
+import io.github.wulkanowy.api.VulcanOfflineException;
 import io.github.wulkanowy.data.db.dao.entities.AttendanceLesson;
 import io.github.wulkanowy.di.annotations.ApplicationContext;
 import io.github.wulkanowy.utils.AppConstant;
@@ -21,12 +20,12 @@ import io.github.wulkanowy.utils.LogUtils;
 import io.github.wulkanowy.utils.security.CryptoException;
 
 @Singleton
-public class ResourcesRepository implements ResourcesContract {
+public class AppResources implements ResourcesContract {
 
     private Resources resources;
 
     @Inject
-    ResourcesRepository(@ApplicationContext Context context) {
+    AppResources(@ApplicationContext Context context) {
         resources = context.getResources();
     }
 
@@ -43,7 +42,6 @@ public class ResourcesRepository implements ResourcesContract {
     @Override
     public String getErrorLoginMessage(Exception exception) {
         LogUtils.error(AppConstant.APP_NAME + " encountered a error", exception);
-        Crashlytics.logException(exception);
 
         if (exception instanceof CryptoException) {
             return resources.getString(R.string.encrypt_failed_text);
@@ -52,7 +50,9 @@ public class ResourcesRepository implements ResourcesContract {
         } else if (exception instanceof SocketTimeoutException) {
             return resources.getString(R.string.generic_timeout_error);
         } else if (exception instanceof NotLoggedInErrorException || exception instanceof IOException) {
-            return resources.getString(R.string.login_failed_text);
+            return resources.getString(R.string.login_denied_text);
+        } else if (exception instanceof VulcanOfflineException) {
+            return resources.getString(R.string.error_host_offline);
         } else {
             return exception.getMessage();
         }
@@ -62,28 +62,28 @@ public class ResourcesRepository implements ResourcesContract {
     public String getAttendanceLessonDescription(AttendanceLesson lesson) {
         int id = R.string.attendance_present;
 
-        if (lesson.getAbsenceForSchoolReasons()) {
+        if (lesson.getIsAbsenceForSchoolReasons()) {
             id = R.string.attendance_absence_for_school_reasons;
         }
 
-        if (lesson.getAbsenceExcused()) {
-            id = R.string.attendance_absence_excused;
+        if (lesson.getIsAbsenceExcused()) {
+            id =  R.string.attendance_absence_excused;
         }
 
-        if (lesson.getAbsenceUnexcused()) {
-            id = R.string.attendance_absence_unexcused;
+        if (lesson.getIsAbsenceUnexcused()) {
+            id =  R.string.attendance_absence_unexcused;
         }
 
-        if (lesson.getExemption()) {
-            id = R.string.attendance_exemption;
+        if (lesson.getIsExemption()) {
+            id =  R.string.attendance_exemption;
         }
 
-        if (lesson.getExcusedLateness()) {
-            id = R.string.attendance_excused_lateness;
+        if (lesson.getIsExcusedLateness()) {
+            id =  R.string.attendance_excused_lateness;
         }
 
-        if (lesson.getUnexcusedLateness()) {
-            id = R.string.attendance_unexcused_lateness;
+        if (lesson.getIsUnexcusedLateness()) {
+            id =  R.string.attendance_unexcused_lateness;
         }
 
         return resources.getString(id);
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/resources/ResourcesContract.java b/app/src/main/java/io/github/wulkanowy/data/db/resources/ResourcesContract.java
index 0e654997..0ef45a76 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/resources/ResourcesContract.java
+++ b/app/src/main/java/io/github/wulkanowy/data/db/resources/ResourcesContract.java
@@ -1,10 +1,7 @@
 package io.github.wulkanowy.data.db.resources;
 
-import javax.inject.Singleton;
-
 import io.github.wulkanowy.data.db.dao.entities.AttendanceLesson;
 
-@Singleton
 public interface ResourcesContract {
 
     String[] getSymbolsKeysArray();
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/shared/SharedPref.java b/app/src/main/java/io/github/wulkanowy/data/db/shared/SharedPref.java
new file mode 100644
index 00000000..ba437f88
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/shared/SharedPref.java
@@ -0,0 +1,33 @@
+package io.github.wulkanowy.data.db.shared;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import io.github.wulkanowy.di.annotations.ApplicationContext;
+import io.github.wulkanowy.di.annotations.SharedPreferencesInfo;
+
+@Singleton
+public class SharedPref implements SharedPrefContract {
+
+    private static final String SHARED_KEY_USER_ID = "USER_ID";
+
+    private final SharedPreferences sharedPreferences;
+
+    @Inject
+    SharedPref(@ApplicationContext Context context, @SharedPreferencesInfo String sharedName) {
+        sharedPreferences = context.getSharedPreferences(sharedName, Context.MODE_PRIVATE);
+    }
+
+    @Override
+    public long getCurrentUserId() {
+        return sharedPreferences.getLong(SHARED_KEY_USER_ID, 0);
+    }
+
+    @Override
+    public void setCurrentUserId(long userId) {
+        sharedPreferences.edit().putLong(SHARED_KEY_USER_ID, userId).apply();
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/shared/SharedPrefContract.java b/app/src/main/java/io/github/wulkanowy/data/db/shared/SharedPrefContract.java
index b9d3fd14..7f540acf 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/shared/SharedPrefContract.java
+++ b/app/src/main/java/io/github/wulkanowy/data/db/shared/SharedPrefContract.java
@@ -1,31 +1,8 @@
 package io.github.wulkanowy.data.db.shared;
 
-import javax.inject.Singleton;
-
-@Singleton
 public interface SharedPrefContract {
 
     long getCurrentUserId();
 
-    boolean isUserLoggedIn();
-
     void setCurrentUserId(long userId);
-
-    void setTimetableWidgetState(boolean nextDay);
-
-    boolean getTimetableWidgetState();
-
-    int getStartupTab();
-
-    boolean isShowGradesSummary();
-
-    boolean isShowAttendancePresent();
-
-    int getServicesInterval();
-
-    boolean isMobileDisable();
-
-    boolean isServicesEnable();
-
-    boolean isNotifyEnable();
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/shared/SharedPrefRepository.java b/app/src/main/java/io/github/wulkanowy/data/db/shared/SharedPrefRepository.java
deleted file mode 100644
index bf46ce35..00000000
--- a/app/src/main/java/io/github/wulkanowy/data/db/shared/SharedPrefRepository.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package io.github.wulkanowy.data.db.shared;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.preference.PreferenceManager;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import io.github.wulkanowy.di.annotations.ApplicationContext;
-import io.github.wulkanowy.di.annotations.SharedPreferencesInfo;
-import io.github.wulkanowy.ui.main.settings.SettingsFragment;
-
-@Singleton
-public class SharedPrefRepository implements SharedPrefContract {
-
-    private static final String SHARED_KEY_USER_ID = "USER_ID";
-
-    private static final String SHARED_KEY_TIMETABLE_WIDGET_STATE = "TIMETABLE_WIDGET_STATE";
-
-    private final SharedPreferences appSharedPref;
-
-    private final SharedPreferences settingsSharedPref;
-
-    @Inject
-    SharedPrefRepository(@ApplicationContext Context context, @SharedPreferencesInfo String sharedName) {
-        appSharedPref = context.getSharedPreferences(sharedName, Context.MODE_PRIVATE);
-        settingsSharedPref = PreferenceManager.getDefaultSharedPreferences(context);
-    }
-
-    @Override
-    public long getCurrentUserId() {
-        return appSharedPref.getLong(SHARED_KEY_USER_ID, 0);
-    }
-
-    @Override
-    public boolean isUserLoggedIn() {
-        return getCurrentUserId() != 0;
-    }
-
-    @Override
-    public void setCurrentUserId(long userId) {
-        appSharedPref.edit().putLong(SHARED_KEY_USER_ID, userId).apply();
-    }
-
-    @SuppressLint("ApplySharedPref")
-    @Override
-    public void setTimetableWidgetState(boolean nextDay) {
-        appSharedPref.edit().putBoolean(SHARED_KEY_TIMETABLE_WIDGET_STATE, nextDay).commit();
-    }
-
-    @Override
-    public boolean getTimetableWidgetState() {
-        return appSharedPref.getBoolean(SHARED_KEY_TIMETABLE_WIDGET_STATE, false);
-    }
-
-    @Override
-    public int getStartupTab() {
-        return Integer.parseInt(settingsSharedPref.getString(SettingsFragment.SHARED_KEY_START_TAB, "0"));
-    }
-
-    @Override
-    public boolean isShowGradesSummary() {
-        return settingsSharedPref.getBoolean(SettingsFragment.SHARED_KEY_GRADES_SUMMARY, false);
-    }
-
-    @Override
-    public boolean isShowAttendancePresent() {
-        return settingsSharedPref.getBoolean(SettingsFragment.SHARED_KEY_ATTENDANCE_PRESENT, false);
-    }
-
-    @Override
-    public int getServicesInterval() {
-        return Integer.parseInt(settingsSharedPref.getString(SettingsFragment.SHARED_KEY_SERVICES_INTERVAL, "60"));
-    }
-
-    @Override
-    public boolean isServicesEnable() {
-        return settingsSharedPref.getBoolean(SettingsFragment.SHARED_KEY_SERVICES_ENABLE, true);
-    }
-
-    @Override
-    public boolean isNotifyEnable() {
-        return settingsSharedPref.getBoolean(SettingsFragment.SHARED_KEY_NOTIFY_ENABLE, true);
-    }
-
-    @Override
-    public boolean isMobileDisable() {
-        return settingsSharedPref.getBoolean(SettingsFragment.SHARED_KEY_SERVICES_MOBILE_DISABLED, false);
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/sync/AccountSync.java b/app/src/main/java/io/github/wulkanowy/data/sync/AccountSync.java
deleted file mode 100644
index a79540a6..00000000
--- a/app/src/main/java/io/github/wulkanowy/data/sync/AccountSync.java
+++ /dev/null
@@ -1,155 +0,0 @@
-package io.github.wulkanowy.data.sync;
-
-import android.content.Context;
-
-import java.io.IOException;
-import java.util.List;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import io.github.wulkanowy.api.Vulcan;
-import io.github.wulkanowy.api.VulcanException;
-import io.github.wulkanowy.data.db.dao.entities.Account;
-import io.github.wulkanowy.data.db.dao.entities.DaoSession;
-import io.github.wulkanowy.data.db.dao.entities.Diary;
-import io.github.wulkanowy.data.db.dao.entities.DiaryDao;
-import io.github.wulkanowy.data.db.dao.entities.Semester;
-import io.github.wulkanowy.data.db.dao.entities.Student;
-import io.github.wulkanowy.data.db.dao.entities.StudentDao;
-import io.github.wulkanowy.data.db.dao.entities.Symbol;
-import io.github.wulkanowy.data.db.dao.entities.SymbolDao;
-import io.github.wulkanowy.data.db.shared.SharedPrefContract;
-import io.github.wulkanowy.di.annotations.ApplicationContext;
-import io.github.wulkanowy.utils.DataObjectConverter;
-import io.github.wulkanowy.utils.LogUtils;
-import io.github.wulkanowy.utils.security.CryptoException;
-import io.github.wulkanowy.utils.security.Scrambler;
-
-@Singleton
-public class AccountSync {
-
-    private final DaoSession daoSession;
-
-    private final SharedPrefContract sharedPref;
-
-    private final Vulcan vulcan;
-
-    private final Context context;
-
-    @Inject
-    AccountSync(DaoSession daoSession, SharedPrefContract sharedPref,
-                Vulcan vulcan, @ApplicationContext Context context) {
-        this.daoSession = daoSession;
-        this.sharedPref = sharedPref;
-        this.vulcan = vulcan;
-        this.context = context;
-    }
-
-    public void registerUser(String email, String password, String symbol)
-            throws VulcanException, IOException, CryptoException {
-
-        vulcan.setCredentials(email, password, symbol, null, null, null);
-
-        daoSession.getDatabase().beginTransaction();
-
-        try {
-            Account account = insertAccount(email, password);
-            Symbol symbolEntity = insertSymbol(account);
-            insertStudents(symbolEntity);
-            insertDiaries(symbolEntity);
-            insertSemesters();
-
-            sharedPref.setCurrentUserId(account.getId());
-
-            daoSession.getDatabase().setTransactionSuccessful();
-        } finally {
-            daoSession.getDatabase().endTransaction();
-        }
-    }
-
-    private Account insertAccount(String email, String password) throws CryptoException {
-        LogUtils.debug("Register account: " + email);
-        Account account = new Account()
-                .setEmail(email)
-                .setPassword(Scrambler.encrypt(email, password, context));
-        daoSession.getAccountDao().insert(account);
-        return account;
-    }
-
-    private Symbol insertSymbol(Account account) throws VulcanException, IOException {
-        LogUtils.debug("Register symbol: " + vulcan.getSymbol());
-        Symbol symbol = new Symbol()
-                .setUserId(account.getId())
-                .setSchoolId(vulcan.getStudentAndParent().getSchoolID())
-                .setSymbol(vulcan.getSymbol());
-        daoSession.getSymbolDao().insert(symbol);
-
-        return symbol;
-    }
-
-    private void insertStudents(Symbol symbol) throws VulcanException, IOException {
-        List<Student> studentList = DataObjectConverter.studentsToStudentEntities(
-                vulcan.getStudentAndParent().getStudents(),
-                symbol.getId()
-        );
-        LogUtils.debug("Register students: " + studentList.size());
-        daoSession.getStudentDao().insertInTx(studentList);
-    }
-
-    private void insertDiaries(Symbol symbolEntity) throws VulcanException, IOException {
-        List<Diary> diaryList = DataObjectConverter.diariesToDiaryEntities(
-                vulcan.getStudentAndParent().getDiaries(),
-                daoSession.getStudentDao().queryBuilder().where(
-                        StudentDao.Properties.SymbolId.eq(symbolEntity.getId()),
-                        StudentDao.Properties.Current.eq(true)
-                ).unique().getId());
-        LogUtils.debug("Register diaries: " + diaryList.size());
-        daoSession.getDiaryDao().insertInTx(diaryList);
-    }
-
-    private void insertSemesters() throws VulcanException, IOException {
-        List<Semester> semesterList = DataObjectConverter.semestersToSemesterEntities(
-                vulcan.getStudentAndParent().getSemesters(),
-                daoSession.getDiaryDao().queryBuilder().where(
-                        DiaryDao.Properties.Current.eq(true)
-                ).unique().getId());
-        LogUtils.debug("Register semesters: " + semesterList.size());
-        daoSession.getSemesterDao().insertInTx(semesterList);
-    }
-
-    public void initLastUser() throws CryptoException {
-
-        long userId = sharedPref.getCurrentUserId();
-
-        if (userId == 0) {
-            throw new NotRegisteredUserException("Can't find user id in SharedPreferences");
-        }
-
-        LogUtils.debug("Initialization current user id=" + userId);
-
-        Account account = daoSession.getAccountDao().load(userId);
-
-        Symbol symbol = daoSession.getSymbolDao().queryBuilder().where(
-                SymbolDao.Properties.UserId.eq(account.getId())).unique();
-
-        Student student = daoSession.getStudentDao().queryBuilder().where(
-                StudentDao.Properties.SymbolId.eq(symbol.getId()),
-                StudentDao.Properties.Current.eq(true)
-        ).unique();
-
-        Diary diary = daoSession.getDiaryDao().queryBuilder().where(
-                DiaryDao.Properties.StudentId.eq(student.getId()),
-                DiaryDao.Properties.Current.eq(true)
-        ).unique();
-
-        vulcan.setCredentials(
-                account.getEmail(),
-                Scrambler.decrypt(account.getEmail(), account.getPassword()),
-                symbol.getSymbol(),
-                symbol.getSchoolId(),
-                student.getRealId(),
-                diary.getValue()
-        );
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/sync/ExamsSync.java b/app/src/main/java/io/github/wulkanowy/data/sync/ExamsSync.java
deleted file mode 100644
index 53470882..00000000
--- a/app/src/main/java/io/github/wulkanowy/data/sync/ExamsSync.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package io.github.wulkanowy.data.sync;
-
-import java.io.IOException;
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.inject.Inject;
-
-import io.github.wulkanowy.api.Vulcan;
-import io.github.wulkanowy.api.VulcanException;
-import io.github.wulkanowy.api.exams.ExamDay;
-import io.github.wulkanowy.data.db.dao.entities.DaoSession;
-import io.github.wulkanowy.data.db.dao.entities.Day;
-import io.github.wulkanowy.data.db.dao.entities.DayDao;
-import io.github.wulkanowy.data.db.dao.entities.Exam;
-import io.github.wulkanowy.data.db.dao.entities.ExamDao;
-import io.github.wulkanowy.data.db.dao.entities.Week;
-import io.github.wulkanowy.data.db.dao.entities.WeekDao;
-import io.github.wulkanowy.utils.DataObjectConverter;
-import io.github.wulkanowy.utils.LogUtils;
-import io.github.wulkanowy.utils.TimeUtils;
-
-public class ExamsSync {
-
-    private final DaoSession daoSession;
-
-    private final Vulcan vulcan;
-
-    private long diaryId;
-
-    @Inject
-    ExamsSync(DaoSession daoSession, Vulcan vulcan) {
-        this.daoSession = daoSession;
-        this.vulcan = vulcan;
-    }
-
-    public void syncExams(long diaryId, String date) throws IOException, VulcanException,
-            ParseException {
-        this.diaryId = diaryId;
-
-        io.github.wulkanowy.api.generic.Week<ExamDay> weekApi = getWeekFromApi(getNormalizedDate(date));
-        Week weekDb = getWeekFromDb(weekApi.getStartDayDate());
-
-        long weekId = updateWeekInDb(weekDb, weekApi);
-
-        List<Exam> examList = getPreparedExams(weekApi.getDays(), weekId);
-
-        daoSession.getExamDao().saveInTx(examList);
-
-        LogUtils.debug("Synchronization exams (amount = " + examList.size() + ")");
-    }
-
-    private Week getWeekFromDb(String date) {
-        return daoSession.getWeekDao().queryBuilder().where(
-                WeekDao.Properties.DiaryId.eq(diaryId),
-                WeekDao.Properties.StartDayDate.eq(date)
-        ).unique();
-    }
-
-    private io.github.wulkanowy.api.generic.Week<ExamDay> getWeekFromApi(String date)
-            throws VulcanException, IOException, ParseException {
-        return vulcan.getExamsList().getWeek(date, true);
-    }
-
-    private Long updateWeekInDb(Week weekDb, io.github.wulkanowy.api.generic.Week weekApi) {
-        if (weekDb != null) {
-            weekDb.setExamsSynced(true);
-            weekDb.update();
-
-            return weekDb.getId();
-        }
-
-        Week weekApiEntity = DataObjectConverter.weekToWeekEntity(weekApi).setDiaryId(diaryId);
-        weekApiEntity.setExamsSynced(true);
-
-        return daoSession.getWeekDao().insert(weekApiEntity);
-    }
-
-    private String getNormalizedDate(String date) throws ParseException {
-        return null != date ? String.valueOf(TimeUtils.getNetTicks(date)) : "";
-    }
-
-    private Day getDayFromDb(String date, long weekId) {
-        return daoSession.getDayDao().queryBuilder().where(
-                DayDao.Properties.WeekId.eq(weekId),
-                DayDao.Properties.Date.eq(date)
-        ).unique();
-    }
-
-    private List<Exam> getPreparedExams(List<ExamDay> dayListFromApi,
-                                        long weekId) {
-        List<Exam> preparedExamList = new ArrayList<>();
-
-        for (ExamDay dayFromApi : dayListFromApi) {
-
-            Day dayDb = getDayFromDb(dayFromApi.getDate(), weekId);
-
-            Day dayApiEntity = DataObjectConverter.dayToDayEntity(dayFromApi);
-
-            long dayId = updateDayInDb(dayDb, dayApiEntity, weekId);
-
-            prepareExam(dayFromApi.getExamList(), preparedExamList, dayId);
-        }
-        return preparedExamList;
-    }
-
-    private long updateDayInDb(Day dayDb, Day dayApi, long weekId) {
-        dayApi.setWeekId(weekId);
-
-        if (null != dayDb) {
-            return dayDb.getId();
-        }
-        return daoSession.getDayDao().insert(dayApi);
-    }
-
-    private void prepareExam(List<io.github.wulkanowy.api.exams.Exam> examList,
-                             List<Exam> preparedExams, long dayId) {
-        List<Exam> examsApiEntity = DataObjectConverter.examsToExamsEntity(examList);
-
-        for (Exam examApi : examsApiEntity) {
-            Exam examDb = getExamFromDb(examApi, dayId);
-
-            examApi.setDayId(dayId);
-
-            if (examDb != null) {
-                examApi.setId(examDb.getId());
-            }
-            preparedExams.add(examApi);
-        }
-    }
-
-    private Exam getExamFromDb(Exam examApi, long dayId) {
-        return daoSession.getExamDao().queryBuilder()
-                .where(ExamDao.Properties.DayId.eq(dayId),
-                        ExamDao.Properties.EntryDate.eq(examApi.getEntryDate()),
-                        ExamDao.Properties.SubjectAndGroup.eq(examApi.getSubjectAndGroup()),
-                        ExamDao.Properties.Type.eq(examApi.getType()),
-                        ExamDao.Properties.Teacher.eq(examApi.getTeacher()))
-                .unique();
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/sync/GradeSync.java b/app/src/main/java/io/github/wulkanowy/data/sync/GradeSync.java
deleted file mode 100644
index 0b70695d..00000000
--- a/app/src/main/java/io/github/wulkanowy/data/sync/GradeSync.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package io.github.wulkanowy.data.sync;
-
-import java.io.IOException;
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import io.github.wulkanowy.api.Vulcan;
-import io.github.wulkanowy.api.VulcanException;
-import io.github.wulkanowy.data.db.dao.entities.DaoSession;
-import io.github.wulkanowy.data.db.dao.entities.Grade;
-import io.github.wulkanowy.data.db.dao.entities.Semester;
-import io.github.wulkanowy.data.db.dao.entities.SubjectDao;
-import io.github.wulkanowy.utils.DataObjectConverter;
-import io.github.wulkanowy.utils.EntitiesCompare;
-import io.github.wulkanowy.utils.LogUtils;
-
-@Singleton
-public class GradeSync {
-
-    private final DaoSession daoSession;
-
-    private final Vulcan vulcan;
-
-    private long semesterId;
-
-    @Inject
-    GradeSync(DaoSession daoSession, Vulcan vulcan) {
-        this.daoSession = daoSession;
-        this.vulcan = vulcan;
-    }
-
-    public void sync(long semesterId) throws IOException, VulcanException, ParseException {
-        this.semesterId = semesterId;
-
-        Semester semester = daoSession.getSemesterDao().load(semesterId);
-        resetSemesterRelations(semester);
-
-        List<Grade> lastList = getUpdatedList(getComparedList(semester));
-
-        daoSession.getGradeDao().deleteInTx(semester.getGradeList());
-        daoSession.getGradeDao().insertInTx(lastList);
-
-        LogUtils.debug("Synchronization grades (amount = " + lastList.size() + ")");
-    }
-
-    private void resetSemesterRelations(Semester semester) {
-        semester.resetSubjectList();
-        semester.resetGradeList();
-    }
-
-    private List<Grade> getUpdatedList(List<Grade> comparedList) {
-        List<Grade> updatedList = new ArrayList<>();
-
-        for (Grade grade : comparedList) {
-            grade.setSemesterId(semesterId);
-            grade.setSubjectId(getSubjectId(grade.getSubject()));
-            updatedList.add(grade);
-        }
-
-        return updatedList;
-    }
-
-    private List<Grade> getComparedList(Semester semester) throws IOException, VulcanException, ParseException {
-        List<Grade> gradesFromNet = DataObjectConverter.gradesToGradeEntities(
-                vulcan.getGradesList().getAll(semester.getValue()), semesterId);
-
-        List<Grade> gradesFromDb = semester.getGradeList();
-
-        return EntitiesCompare.compareGradeList(gradesFromNet, gradesFromDb);
-    }
-
-    private Long getSubjectId(String subjectName) {
-        return daoSession.getSubjectDao().queryBuilder().where(
-                SubjectDao.Properties.Name.eq(subjectName),
-                SubjectDao.Properties.SemesterId.eq(semesterId)
-        ).build().uniqueOrThrow().getId();
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/sync/NotRegisteredUserException.java b/app/src/main/java/io/github/wulkanowy/data/sync/NotRegisteredUserException.java
deleted file mode 100644
index ddba1a21..00000000
--- a/app/src/main/java/io/github/wulkanowy/data/sync/NotRegisteredUserException.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package io.github.wulkanowy.data.sync;
-
-public class NotRegisteredUserException extends RuntimeException {
-
-    public NotRegisteredUserException(String message) {
-        super(message);
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/sync/SyncContract.java b/app/src/main/java/io/github/wulkanowy/data/sync/SyncContract.java
index 67797ad1..d9850ab1 100644
--- a/app/src/main/java/io/github/wulkanowy/data/sync/SyncContract.java
+++ b/app/src/main/java/io/github/wulkanowy/data/sync/SyncContract.java
@@ -3,38 +3,9 @@ package io.github.wulkanowy.data.sync;
 import java.io.IOException;
 import java.text.ParseException;
 
-import javax.inject.Singleton;
-
 import io.github.wulkanowy.api.VulcanException;
-import io.github.wulkanowy.utils.security.CryptoException;
 
-@Singleton
 public interface SyncContract {
 
-    void registerUser(String email, String password, String symbol) throws VulcanException,
-            IOException, CryptoException;
-
-    void initLastUser() throws IOException, CryptoException;
-
-    void syncGrades(int semesterName) throws VulcanException, IOException, ParseException;
-
-    void syncGrades() throws VulcanException, IOException, ParseException;
-
-    void syncSubjects(int semesterName) throws VulcanException, IOException;
-
-    void syncSubjects() throws VulcanException, IOException;
-
-    void syncAttendance() throws ParseException, IOException, VulcanException;
-
-    void syncAttendance(long diaryId, String date) throws ParseException, IOException, VulcanException;
-
-    void syncTimetable() throws VulcanException, IOException, ParseException;
-
-    void syncTimetable(long diaryId, String date) throws VulcanException, IOException, ParseException;
-
-    void syncExams() throws VulcanException, IOException, ParseException;
-
-    void syncExams(long diaryId, String date) throws VulcanException, IOException, ParseException;
-
-    void syncAll() throws VulcanException, IOException, ParseException;
+    void sync() throws VulcanException, IOException, ParseException;
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/sync/SyncRepository.java b/app/src/main/java/io/github/wulkanowy/data/sync/SyncRepository.java
deleted file mode 100644
index 6a1e4dc1..00000000
--- a/app/src/main/java/io/github/wulkanowy/data/sync/SyncRepository.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package io.github.wulkanowy.data.sync;
-
-import java.io.IOException;
-import java.text.ParseException;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import io.github.wulkanowy.api.VulcanException;
-import io.github.wulkanowy.data.db.dao.DbContract;
-import io.github.wulkanowy.utils.security.CryptoException;
-
-@Singleton
-public class SyncRepository implements SyncContract {
-
-    private final GradeSync gradeSync;
-
-    private final SubjectSync subjectSync;
-
-    private final AttendanceSync attendanceSync;
-
-    private final TimetableSync timetableSync;
-
-    private final AccountSync accountSync;
-
-    private final ExamsSync examsSync;
-
-    private final DbContract database;
-
-    @Inject
-    SyncRepository(GradeSync gradeSync, SubjectSync subjectSync, AttendanceSync attendanceSync,
-                   TimetableSync timetableSync, AccountSync accountSync, ExamsSync examsSync,
-                   DbContract database) {
-        this.gradeSync = gradeSync;
-        this.subjectSync = subjectSync;
-        this.attendanceSync = attendanceSync;
-        this.timetableSync = timetableSync;
-        this.accountSync = accountSync;
-        this.examsSync = examsSync;
-        this.database = database;
-    }
-
-    @Override
-    public void registerUser(String email, String password, String symbol) throws VulcanException,
-            IOException, CryptoException {
-        accountSync.registerUser(email, password, symbol);
-    }
-
-    @Override
-    public void initLastUser() throws IOException, CryptoException {
-        accountSync.initLastUser();
-    }
-
-    @Override
-    public void syncGrades(int semesterName) throws VulcanException, IOException, ParseException {
-        gradeSync.sync(semesterName);
-    }
-
-    @Override
-    public void syncGrades() throws VulcanException, IOException, ParseException {
-        gradeSync.sync(database.getCurrentSemesterId());
-    }
-
-    @Override
-    public void syncSubjects(int semesterName) throws VulcanException, IOException {
-        subjectSync.sync(semesterName);
-    }
-
-    @Override
-    public void syncSubjects() throws VulcanException, IOException {
-        subjectSync.sync(database.getCurrentSemesterId());
-    }
-
-    @Override
-    public void syncAttendance() throws ParseException, IOException, VulcanException {
-        attendanceSync.syncAttendance(database.getCurrentDiaryId(), null);
-    }
-
-    @Override
-    public void syncAttendance(long diaryId, String date) throws ParseException, IOException, VulcanException {
-        if (diaryId != 0) {
-            attendanceSync.syncAttendance(diaryId, date);
-        } else {
-            attendanceSync.syncAttendance(database.getCurrentDiaryId(), date);
-        }
-    }
-
-    @Override
-    public void syncTimetable() throws VulcanException, IOException, ParseException {
-        timetableSync.syncTimetable(database.getCurrentDiaryId(), null);
-    }
-
-    @Override
-    public void syncTimetable(long diaryId, String date) throws VulcanException, IOException, ParseException {
-        if (diaryId != 0) {
-            timetableSync.syncTimetable(diaryId, date);
-        } else {
-            timetableSync.syncTimetable(database.getCurrentDiaryId(), date);
-        }
-    }
-
-    @Override
-    public void syncExams() throws VulcanException, IOException, ParseException {
-        examsSync.syncExams(database.getCurrentDiaryId(), null);
-    }
-
-    @Override
-    public void syncExams(long diaryId, String date) throws VulcanException, IOException, ParseException {
-        if (diaryId != 0) {
-            examsSync.syncExams(diaryId, date);
-        } else {
-            examsSync.syncExams(database.getCurrentDiaryId(), date);
-        }
-    }
-
-    @Override
-    public void syncAll() throws VulcanException, IOException, ParseException {
-        syncSubjects();
-        syncGrades();
-        syncAttendance();
-        syncTimetable();
-        syncExams();
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/sync/account/AccountSync.java b/app/src/main/java/io/github/wulkanowy/data/sync/account/AccountSync.java
new file mode 100644
index 00000000..d56f9990
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/sync/account/AccountSync.java
@@ -0,0 +1,78 @@
+package io.github.wulkanowy.data.sync.account;
+
+import android.content.Context;
+
+import java.io.IOException;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import io.github.wulkanowy.api.Vulcan;
+import io.github.wulkanowy.api.VulcanException;
+import io.github.wulkanowy.data.db.dao.entities.Account;
+import io.github.wulkanowy.data.db.dao.entities.DaoSession;
+import io.github.wulkanowy.data.db.shared.SharedPrefContract;
+import io.github.wulkanowy.di.annotations.ApplicationContext;
+import io.github.wulkanowy.utils.LogUtils;
+import io.github.wulkanowy.utils.security.CryptoException;
+import io.github.wulkanowy.utils.security.Scrambler;
+
+@Singleton
+public class AccountSync implements AccountSyncContract {
+
+    private final DaoSession daoSession;
+
+    private final SharedPrefContract sharedPref;
+
+    private final Vulcan vulcan;
+
+    private final Context context;
+
+    @Inject
+    AccountSync(DaoSession daoSession, SharedPrefContract sharedPref,
+                Vulcan vulcan, @ApplicationContext Context context) {
+        this.daoSession = daoSession;
+        this.sharedPref = sharedPref;
+        this.vulcan = vulcan;
+        this.context = context;
+    }
+
+    @Override
+    public void registerUser(String email, String password, String symbol)
+            throws VulcanException, IOException, CryptoException {
+
+        LogUtils.debug("Register new user email=" + email);
+
+        vulcan.setCredentials(email, password, symbol, null);
+
+        Account account = new Account()
+                .setName(vulcan.getBasicInformation().getPersonalData().getFirstAndLastName())
+                .setEmail(email)
+                .setPassword(Scrambler.encrypt(email, password, context))
+                .setSymbol(vulcan.getSymbol())
+                .setSnpId(vulcan.getStudentAndParent().getId());
+
+        daoSession.getAccountDao().insert(account);
+
+        sharedPref.setCurrentUserId(account.getId());
+    }
+
+    @Override
+    public void initLastUser() throws VulcanException, IOException, CryptoException {
+
+        long userId = sharedPref.getCurrentUserId();
+
+        if (userId == 0) {
+            throw new IOException("Can't find saved user");
+        }
+
+        LogUtils.debug("Initialization current user id=" + userId);
+
+        Account account = daoSession.getAccountDao().load(userId);
+
+        vulcan.setCredentials(account.getEmail(),
+                Scrambler.decrypt(account.getEmail(), account.getPassword()),
+                account.getSymbol(),
+                account.getSnpId());
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/sync/account/AccountSyncContract.java b/app/src/main/java/io/github/wulkanowy/data/sync/account/AccountSyncContract.java
new file mode 100644
index 00000000..799d320e
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/sync/account/AccountSyncContract.java
@@ -0,0 +1,16 @@
+package io.github.wulkanowy.data.sync.account;
+
+import java.io.IOException;
+
+import io.github.wulkanowy.api.VulcanException;
+import io.github.wulkanowy.utils.security.CryptoException;
+
+public interface AccountSyncContract {
+
+    void registerUser(String email, String password, String symbol)
+            throws VulcanException, IOException,
+            CryptoException;
+
+    void initLastUser() throws VulcanException, IOException,
+            CryptoException;
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/sync/AttendanceSync.java b/app/src/main/java/io/github/wulkanowy/data/sync/attendance/AttendanceSync.java
similarity index 76%
rename from app/src/main/java/io/github/wulkanowy/data/sync/AttendanceSync.java
rename to app/src/main/java/io/github/wulkanowy/data/sync/attendance/AttendanceSync.java
index 59a6e1a3..325fff19 100644
--- a/app/src/main/java/io/github/wulkanowy/data/sync/AttendanceSync.java
+++ b/app/src/main/java/io/github/wulkanowy/data/sync/attendance/AttendanceSync.java
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.sync;
+package io.github.wulkanowy.data.sync.attendance;
 
 import java.io.IOException;
 import java.text.ParseException;
@@ -18,27 +18,37 @@ import io.github.wulkanowy.data.db.dao.entities.Day;
 import io.github.wulkanowy.data.db.dao.entities.DayDao;
 import io.github.wulkanowy.data.db.dao.entities.Week;
 import io.github.wulkanowy.data.db.dao.entities.WeekDao;
+import io.github.wulkanowy.data.db.shared.SharedPrefContract;
 import io.github.wulkanowy.utils.DataObjectConverter;
 import io.github.wulkanowy.utils.LogUtils;
 import io.github.wulkanowy.utils.TimeUtils;
 
 @Singleton
-public class AttendanceSync {
+public class AttendanceSync implements AttendanceSyncContract {
 
     private final DaoSession daoSession;
 
+    private final SharedPrefContract sharedPref;
+
     private final Vulcan vulcan;
 
-    private long diaryId;
+    private long userId;
 
     @Inject
-    AttendanceSync(DaoSession daoSession, Vulcan vulcan) {
+    AttendanceSync(DaoSession daoSession, SharedPrefContract sharedPref, Vulcan vulcan) {
         this.daoSession = daoSession;
+        this.sharedPref = sharedPref;
         this.vulcan = vulcan;
     }
 
-    public void syncAttendance(long diaryId, String date) throws IOException, ParseException, VulcanException {
-        this.diaryId = diaryId;
+    @Override
+    public void syncAttendance() throws IOException, ParseException, VulcanException {
+        syncAttendance(null);
+    }
+
+    @Override
+    public void syncAttendance(String date) throws IOException, ParseException, VulcanException {
+        this.userId = sharedPref.getCurrentUserId();
 
         io.github.wulkanowy.api.generic.Week<io.github.wulkanowy.api.generic.Day> weekApi = getWeekFromApi(getNormalizedDate(date));
         Week weekDb = getWeekFromDb(weekApi.getStartDayDate());
@@ -62,22 +72,22 @@ public class AttendanceSync {
     }
 
     private Week getWeekFromDb(String date) {
-        return daoSession.getWeekDao().queryBuilder().where(
-                WeekDao.Properties.DiaryId.eq(diaryId),
-                WeekDao.Properties.StartDayDate.eq(date)
-        ).unique();
+        return daoSession.getWeekDao()
+                .queryBuilder()
+                .where(WeekDao.Properties.UserId.eq(userId), WeekDao.Properties.StartDayDate.eq(date))
+                .unique();
     }
 
     private Long updateWeekInDb(Week dbWeekEntity, io.github.wulkanowy.api.generic.Week fromApi) {
         if (dbWeekEntity != null) {
-            dbWeekEntity.setAttendanceSynced(true);
+            dbWeekEntity.setIsAttendanceSynced(true);
             dbWeekEntity.update();
 
             return dbWeekEntity.getId();
         }
 
-        Week apiWeekEntity = DataObjectConverter.weekToWeekEntity(fromApi).setDiaryId(diaryId);
-        apiWeekEntity.setAttendanceSynced(true);
+        Week apiWeekEntity = DataObjectConverter.weekToWeekEntity(fromApi).setUserId(userId);
+        apiWeekEntity.setIsAttendanceSynced(true);
 
         return daoSession.getWeekDao().insert(apiWeekEntity);
     }
@@ -87,7 +97,7 @@ public class AttendanceSync {
 
         for (io.github.wulkanowy.api.generic.Day dayFromApi : dayListFromApi) {
 
-            Day dbDayEntity = getDayFromDb(dayFromApi.getDate(), weekId);
+            Day dbDayEntity = getDayFromDb(dayFromApi.getDate());
 
             Day apiDayEntity = DataObjectConverter.dayToDayEntity(dayFromApi);
 
@@ -99,12 +109,11 @@ public class AttendanceSync {
         return updatedLessonList;
     }
 
-    private Day getDayFromDb(String date, long weekId) {
-        return daoSession.getDayDao().queryBuilder()
-                .where(
-                        DayDao.Properties.WeekId.eq(weekId),
-                        DayDao.Properties.Date.eq(date)
-                ).unique();
+    private Day getDayFromDb(String date) {
+        return daoSession.getDayDao()
+                .queryBuilder()
+                .where(DayDao.Properties.UserId.eq(userId), DayDao.Properties.Date.eq(date))
+                .unique();
     }
 
     private long updateDay(Day dbDayEntity, Day apiDayEntity, long weekId) {
@@ -112,6 +121,7 @@ public class AttendanceSync {
             return dbDayEntity.getId();
         }
 
+        apiDayEntity.setUserId(userId);
         apiDayEntity.setWeekId(weekId);
 
         return daoSession.getDayDao().insert(apiDayEntity);
diff --git a/app/src/main/java/io/github/wulkanowy/data/sync/attendance/AttendanceSyncContract.java b/app/src/main/java/io/github/wulkanowy/data/sync/attendance/AttendanceSyncContract.java
new file mode 100644
index 00000000..dfb4c1b4
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/sync/attendance/AttendanceSyncContract.java
@@ -0,0 +1,13 @@
+package io.github.wulkanowy.data.sync.attendance;
+
+import java.io.IOException;
+import java.text.ParseException;
+
+import io.github.wulkanowy.api.VulcanException;
+
+public interface AttendanceSyncContract {
+
+    void syncAttendance(String date) throws IOException, ParseException, VulcanException;
+
+    void syncAttendance() throws IOException, ParseException, VulcanException;
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/sync/grades/GradeSync.java b/app/src/main/java/io/github/wulkanowy/data/sync/grades/GradeSync.java
new file mode 100644
index 00000000..b132ac1b
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/sync/grades/GradeSync.java
@@ -0,0 +1,91 @@
+package io.github.wulkanowy.data.sync.grades;
+
+import java.io.IOException;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import io.github.wulkanowy.api.Vulcan;
+import io.github.wulkanowy.api.VulcanException;
+import io.github.wulkanowy.data.db.dao.entities.Account;
+import io.github.wulkanowy.data.db.dao.entities.DaoSession;
+import io.github.wulkanowy.data.db.dao.entities.Grade;
+import io.github.wulkanowy.data.db.dao.entities.SubjectDao;
+import io.github.wulkanowy.data.db.shared.SharedPrefContract;
+import io.github.wulkanowy.data.sync.SyncContract;
+import io.github.wulkanowy.utils.DataObjectConverter;
+import io.github.wulkanowy.utils.EntitiesCompare;
+import io.github.wulkanowy.utils.LogUtils;
+
+@Singleton
+public class GradeSync implements SyncContract {
+
+    private final DaoSession daoSession;
+
+    private final Vulcan vulcan;
+
+    private final SharedPrefContract sharedPref;
+
+    private Long userId;
+
+    @Inject
+    GradeSync(DaoSession daoSession, SharedPrefContract sharedPref, Vulcan vulcan) {
+        this.daoSession = daoSession;
+        this.sharedPref = sharedPref;
+        this.vulcan = vulcan;
+    }
+
+    @Override
+    public void sync() throws IOException, VulcanException, ParseException {
+
+        userId = sharedPref.getCurrentUserId();
+
+        Account account = daoSession.getAccountDao().load(userId);
+        resetAccountRelations(account);
+
+        List<Grade> lastList = getUpdatedList(getComparedList(account));
+
+        daoSession.getGradeDao().deleteInTx(account.getGradeList());
+        daoSession.getGradeDao().insertInTx(lastList);
+
+        LogUtils.debug("Synchronization grades (amount = " + lastList.size() + ")");
+    }
+
+    private void resetAccountRelations(Account account) {
+        account.resetSubjectList();
+        account.resetGradeList();
+    }
+
+    private List<Grade> getUpdatedList(List<Grade> comparedList) {
+        List<Grade> updatedList = new ArrayList<>();
+
+        for (Grade grade : comparedList) {
+            grade.setUserId(userId);
+            grade.setSubjectId(getSubjectId(grade.getSubject()));
+            updatedList.add(grade);
+        }
+        return updatedList;
+    }
+
+    private List<Grade> getComparedList(Account account) throws IOException, VulcanException,
+            ParseException {
+        List<Grade> gradesFromNet = DataObjectConverter
+                .gradesToGradeEntities(vulcan.getGradesList().getAll());
+
+        List<Grade> gradesFromDb = account.getGradeList();
+
+        return EntitiesCompare.compareGradeList(gradesFromNet, gradesFromDb);
+    }
+
+    private Long getSubjectId(String subjectName) {
+        return daoSession.getSubjectDao().queryBuilder()
+                .where(SubjectDao.Properties.Name.eq(subjectName),
+                        SubjectDao.Properties.UserId.eq(userId))
+                .build()
+                .uniqueOrThrow()
+                .getId();
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/sync/SubjectSync.java b/app/src/main/java/io/github/wulkanowy/data/sync/subjects/SubjectSync.java
similarity index 54%
rename from app/src/main/java/io/github/wulkanowy/data/sync/SubjectSync.java
rename to app/src/main/java/io/github/wulkanowy/data/sync/subjects/SubjectSync.java
index 163a6234..1c5bfc71 100644
--- a/app/src/main/java/io/github/wulkanowy/data/sync/SubjectSync.java
+++ b/app/src/main/java/io/github/wulkanowy/data/sync/subjects/SubjectSync.java
@@ -1,6 +1,7 @@
-package io.github.wulkanowy.data.sync;
+package io.github.wulkanowy.data.sync.subjects;
 
 import java.io.IOException;
+import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -9,33 +10,38 @@ import javax.inject.Singleton;
 
 import io.github.wulkanowy.api.Vulcan;
 import io.github.wulkanowy.api.VulcanException;
+import io.github.wulkanowy.data.db.dao.entities.Account;
 import io.github.wulkanowy.data.db.dao.entities.DaoSession;
-import io.github.wulkanowy.data.db.dao.entities.Semester;
 import io.github.wulkanowy.data.db.dao.entities.Subject;
+import io.github.wulkanowy.data.db.shared.SharedPrefContract;
+import io.github.wulkanowy.data.sync.SyncContract;
 import io.github.wulkanowy.utils.DataObjectConverter;
 import io.github.wulkanowy.utils.LogUtils;
 
 @Singleton
-public class SubjectSync {
+public class SubjectSync implements SyncContract {
 
     private final DaoSession daoSession;
 
     private final Vulcan vulcan;
 
-    private long semesterId;
+    private final SharedPrefContract sharedPref;
+
+    private Long userId;
 
     @Inject
-    SubjectSync(DaoSession daoSession, Vulcan vulcan) {
+    SubjectSync(DaoSession daoSession, SharedPrefContract sharedPref, Vulcan vulcan) {
         this.daoSession = daoSession;
+        this.sharedPref = sharedPref;
         this.vulcan = vulcan;
     }
 
-    public void sync(long semesterId) throws VulcanException, IOException {
-        this.semesterId = semesterId;
+    @Override
+    public void sync() throws VulcanException, IOException, ParseException {
 
-        Semester semester = daoSession.getSemesterDao().load(semesterId);
+        userId = sharedPref.getCurrentUserId();
 
-        List<Subject> lastList = getUpdatedList(getSubjectsFromNet(semester));
+        List<Subject> lastList = getUpdatedList(getSubjectsFromNet());
 
         daoSession.getSubjectDao().deleteInTx(getSubjectsFromDb());
         daoSession.getSubjectDao().insertInTx(lastList);
@@ -43,22 +49,21 @@ public class SubjectSync {
         LogUtils.debug("Synchronization subjects (amount = " + lastList.size() + ")");
     }
 
-    private List<Subject> getSubjectsFromNet(Semester semester) throws VulcanException, IOException {
-        return DataObjectConverter.subjectsToSubjectEntities(
-                vulcan.getSubjectsList().getAll(semester.getValue()), semesterId);
+    private List<Subject> getSubjectsFromNet() throws VulcanException, IOException {
+        return DataObjectConverter.subjectsToSubjectEntities(vulcan.getSubjectsList().getAll());
     }
 
     private List<Subject> getSubjectsFromDb() {
-        Semester semester = daoSession.getSemesterDao().load(semesterId);
-        semester.resetSubjectList();
-        return semester.getSubjectList();
+        Account account = daoSession.getAccountDao().load(userId);
+        account.resetSubjectList();
+        return account.getSubjectList();
     }
 
     private List<Subject> getUpdatedList(List<Subject> subjectsFromNet) {
         List<Subject> updatedList = new ArrayList<>();
 
         for (Subject subject : subjectsFromNet) {
-            subject.setSemesterId(semesterId);
+            subject.setUserId(userId);
             updatedList.add(subject);
         }
         return updatedList;
diff --git a/app/src/main/java/io/github/wulkanowy/data/sync/TimetableSync.java b/app/src/main/java/io/github/wulkanowy/data/sync/timetable/TimetableSync.java
similarity index 67%
rename from app/src/main/java/io/github/wulkanowy/data/sync/TimetableSync.java
rename to app/src/main/java/io/github/wulkanowy/data/sync/timetable/TimetableSync.java
index 3fe22aff..da6b143f 100644
--- a/app/src/main/java/io/github/wulkanowy/data/sync/TimetableSync.java
+++ b/app/src/main/java/io/github/wulkanowy/data/sync/timetable/TimetableSync.java
@@ -1,6 +1,4 @@
-package io.github.wulkanowy.data.sync;
-
-import org.apache.commons.collections4.CollectionUtils;
+package io.github.wulkanowy.data.sync.timetable;
 
 import java.io.IOException;
 import java.text.ParseException;
@@ -20,29 +18,39 @@ import io.github.wulkanowy.data.db.dao.entities.TimetableLesson;
 import io.github.wulkanowy.data.db.dao.entities.TimetableLessonDao;
 import io.github.wulkanowy.data.db.dao.entities.Week;
 import io.github.wulkanowy.data.db.dao.entities.WeekDao;
+import io.github.wulkanowy.data.db.shared.SharedPrefContract;
 import io.github.wulkanowy.utils.DataObjectConverter;
 import io.github.wulkanowy.utils.LogUtils;
 import io.github.wulkanowy.utils.TimeUtils;
 
 @Singleton
-public class TimetableSync {
+public class TimetableSync implements TimetableSyncContract {
 
     private final DaoSession daoSession;
 
+    private final SharedPrefContract sharedPref;
+
     private final Vulcan vulcan;
 
-    private long diaryId;
+    private long userId;
 
     @Inject
-    TimetableSync(DaoSession daoSession, Vulcan vulcan) {
+    TimetableSync(DaoSession daoSession, SharedPrefContract sharedPref, Vulcan vulcan) {
         this.daoSession = daoSession;
+        this.sharedPref = sharedPref;
         this.vulcan = vulcan;
     }
 
-    public void syncTimetable(long diaryId, String date) throws IOException, ParseException, VulcanException {
-        this.diaryId = diaryId;
+    @Override
+    public void syncTimetable() throws IOException, ParseException, VulcanException {
+        syncTimetable(null);
+    }
 
-        io.github.wulkanowy.api.generic.Week<io.github.wulkanowy.api.timetable.TimetableDay> weekApi = getWeekFromApi(getNormalizedDate(date));
+    @Override
+    public void syncTimetable(String date) throws IOException, ParseException, VulcanException {
+        this.userId = sharedPref.getCurrentUserId();
+
+        io.github.wulkanowy.api.generic.Week<io.github.wulkanowy.api.generic.Day> weekApi = getWeekFromApi(getNormalizedDate(date));
         Week weekDb = getWeekFromDb(weekApi.getStartDayDate());
 
         long weekId = updateWeekInDb(weekDb, weekApi);
@@ -58,40 +66,40 @@ public class TimetableSync {
         return null != date ? String.valueOf(TimeUtils.getNetTicks(date)) : "";
     }
 
-    private io.github.wulkanowy.api.generic.Week<io.github.wulkanowy.api.timetable.TimetableDay> getWeekFromApi(String date)
-            throws IOException, ParseException, VulcanException {
+    private io.github.wulkanowy.api.generic.Week<io.github.wulkanowy.api.generic.Day> getWeekFromApi(String date)
+            throws IOException, VulcanException, ParseException {
         return vulcan.getTimetable().getWeekTable(date);
     }
 
     private Week getWeekFromDb(String date) {
-        return daoSession.getWeekDao().queryBuilder().where(
-                WeekDao.Properties.DiaryId.eq(diaryId),
-                WeekDao.Properties.StartDayDate.eq(date)
-        ).unique();
+        return daoSession.getWeekDao()
+                .queryBuilder()
+                .where(WeekDao.Properties.UserId.eq(userId), WeekDao.Properties.StartDayDate.eq(date))
+                .unique();
     }
 
     private Long updateWeekInDb(Week dbEntity, io.github.wulkanowy.api.generic.Week fromApi) {
         if (dbEntity != null) {
-            dbEntity.setTimetableSynced(true);
+            dbEntity.setIsTimetableSynced(true);
             dbEntity.update();
 
             return dbEntity.getId();
         }
 
-        Week apiEntity = DataObjectConverter.weekToWeekEntity(fromApi).setDiaryId(diaryId);
-        apiEntity.setTimetableSynced(true);
+        Week apiEntity = DataObjectConverter.weekToWeekEntity(fromApi).setUserId(userId);
+        apiEntity.setIsTimetableSynced(true);
 
         return daoSession.getWeekDao().insert(apiEntity);
     }
 
-    private List<TimetableLesson> updateDays(List<io.github.wulkanowy.api.timetable.TimetableDay> dayListFromApi, long weekId) {
+    private List<TimetableLesson> updateDays(List<io.github.wulkanowy.api.generic.Day> dayListFromApi, long weekId) {
         List<TimetableLesson> updatedLessonList = new ArrayList<>();
 
-        for (io.github.wulkanowy.api.timetable.TimetableDay dayFromApi : dayListFromApi) {
+        for (io.github.wulkanowy.api.generic.Day dayFromApi : dayListFromApi) {
 
-            Day dbDayEntity = getDayFromDb(dayFromApi.getDate(), weekId);
+            Day dbDayEntity = getDayFromDb(dayFromApi.getDate());
 
-            Day apiDayEntity = DataObjectConverter.timetableDayToDayEntity(dayFromApi);
+            Day apiDayEntity = DataObjectConverter.dayToDayEntity(dayFromApi);
 
             long dayId = updateDay(dbDayEntity, apiDayEntity, weekId);
 
@@ -101,14 +109,15 @@ public class TimetableSync {
         return updatedLessonList;
     }
 
-    private Day getDayFromDb(String date, long weekId) {
-        return daoSession.getDayDao().queryBuilder().where(
-                DayDao.Properties.WeekId.eq(weekId),
-                DayDao.Properties.Date.eq(date)
-        ).unique();
+    private Day getDayFromDb(String date) {
+        return daoSession.getDayDao()
+                .queryBuilder()
+                .where(DayDao.Properties.UserId.eq(userId), DayDao.Properties.Date.eq(date))
+                .unique();
     }
 
     private long updateDay(Day dayFromDb, Day apiDayEntity, long weekId) {
+        apiDayEntity.setUserId(userId);
         apiDayEntity.setWeekId(weekId);
 
         if (null != dayFromDb) {
@@ -127,16 +136,6 @@ public class TimetableSync {
         List<TimetableLesson> lessonsFromApiEntities = DataObjectConverter
                 .lessonsToTimetableLessonsEntities(lessons);
 
-        List<TimetableLesson> lessonsFromDbEntities = getLessonsFromDb(dayId);
-
-        if (!lessonsFromDbEntities.isEmpty()) {
-            List<TimetableLesson> lessonToRemove = new ArrayList<>(CollectionUtils.removeAll(lessonsFromDbEntities, lessonsFromApiEntities));
-
-            for (TimetableLesson timetableLesson : lessonToRemove) {
-                daoSession.getTimetableLessonDao().delete(timetableLesson);
-            }
-        }
-
         for (TimetableLesson apiLessonEntity : lessonsFromApiEntities) {
             TimetableLesson lessonFromDb = getLessonFromDb(apiLessonEntity, dayId);
 
@@ -160,8 +159,4 @@ public class TimetableSync {
                         TimetableLessonDao.Properties.EndTime.eq(apiEntity.getEndTime()))
                 .unique();
     }
-
-    private List<TimetableLesson> getLessonsFromDb(long dayId) {
-        return daoSession.getDayDao().load(dayId).getTimetableLessons();
-    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/sync/timetable/TimetableSyncContract.java b/app/src/main/java/io/github/wulkanowy/data/sync/timetable/TimetableSyncContract.java
new file mode 100644
index 00000000..9bba209a
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/sync/timetable/TimetableSyncContract.java
@@ -0,0 +1,13 @@
+package io.github.wulkanowy.data.sync.timetable;
+
+import java.io.IOException;
+import java.text.ParseException;
+
+import io.github.wulkanowy.api.VulcanException;
+
+public interface TimetableSyncContract {
+
+    void syncTimetable(String date) throws VulcanException, IOException, ParseException;
+
+    void syncTimetable() throws VulcanException, IOException, ParseException;
+}
diff --git a/app/src/main/java/io/github/wulkanowy/di/annotations/SyncGrades.java b/app/src/main/java/io/github/wulkanowy/di/annotations/SyncGrades.java
new file mode 100644
index 00000000..90e6c02f
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/di/annotations/SyncGrades.java
@@ -0,0 +1,11 @@
+package io.github.wulkanowy.di.annotations;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import javax.inject.Qualifier;
+
+@Qualifier
+@Retention(RetentionPolicy.RUNTIME)
+public @interface SyncGrades {
+}
diff --git a/app/src/main/java/io/github/wulkanowy/di/annotations/SyncSubjects.java b/app/src/main/java/io/github/wulkanowy/di/annotations/SyncSubjects.java
new file mode 100644
index 00000000..81d351be
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/di/annotations/SyncSubjects.java
@@ -0,0 +1,11 @@
+package io.github.wulkanowy.di.annotations;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import javax.inject.Qualifier;
+
+@Qualifier
+@Retention(RetentionPolicy.RUNTIME)
+public @interface SyncSubjects {
+}
diff --git a/app/src/main/java/io/github/wulkanowy/di/component/ApplicationComponent.java b/app/src/main/java/io/github/wulkanowy/di/component/ApplicationComponent.java
index d4bf7bb7..3439a949 100644
--- a/app/src/main/java/io/github/wulkanowy/di/component/ApplicationComponent.java
+++ b/app/src/main/java/io/github/wulkanowy/di/component/ApplicationComponent.java
@@ -9,9 +9,7 @@ import io.github.wulkanowy.WulkanowyApp;
 import io.github.wulkanowy.data.RepositoryContract;
 import io.github.wulkanowy.di.annotations.ApplicationContext;
 import io.github.wulkanowy.di.modules.ApplicationModule;
-import io.github.wulkanowy.services.jobs.SyncJob;
-import io.github.wulkanowy.ui.widgets.TimetableWidgetFactory;
-import io.github.wulkanowy.ui.widgets.TimetableWidgetProvider;
+import io.github.wulkanowy.services.SyncJob;
 
 @Singleton
 @Component(modules = ApplicationModule.class)
@@ -25,8 +23,4 @@ public interface ApplicationComponent {
     void inject(WulkanowyApp wulkanowyApp);
 
     void inject(SyncJob syncJob);
-
-    void inject(TimetableWidgetFactory timetableWidgetFactory);
-
-    void inject(TimetableWidgetProvider timetableWidgetProvider);
 }
diff --git a/app/src/main/java/io/github/wulkanowy/di/component/FragmentComponent.java b/app/src/main/java/io/github/wulkanowy/di/component/FragmentComponent.java
index 9f56364c..b26abaaf 100644
--- a/app/src/main/java/io/github/wulkanowy/di/component/FragmentComponent.java
+++ b/app/src/main/java/io/github/wulkanowy/di/component/FragmentComponent.java
@@ -5,8 +5,7 @@ import io.github.wulkanowy.di.annotations.PerFragment;
 import io.github.wulkanowy.di.modules.FragmentModule;
 import io.github.wulkanowy.ui.main.attendance.AttendanceFragment;
 import io.github.wulkanowy.ui.main.attendance.AttendanceTabFragment;
-import io.github.wulkanowy.ui.main.exams.ExamsFragment;
-import io.github.wulkanowy.ui.main.exams.ExamsTabFragment;
+import io.github.wulkanowy.ui.main.dashboard.DashboardFragment;
 import io.github.wulkanowy.ui.main.grades.GradesFragment;
 import io.github.wulkanowy.ui.main.timetable.TimetableFragment;
 import io.github.wulkanowy.ui.main.timetable.TimetableTabFragment;
@@ -21,9 +20,7 @@ public interface FragmentComponent {
 
     void inject(AttendanceTabFragment attendanceTabFragment);
 
-    void inject(ExamsFragment examsFragment);
-
-    void inject(ExamsTabFragment examsTabFragment);
+    void inject(DashboardFragment dashboardFragment);
 
     void inject(TimetableFragment timetableFragment);
 
diff --git a/app/src/main/java/io/github/wulkanowy/di/modules/ActivityModule.java b/app/src/main/java/io/github/wulkanowy/di/modules/ActivityModule.java
index cdffe73a..53dc1086 100644
--- a/app/src/main/java/io/github/wulkanowy/di/modules/ActivityModule.java
+++ b/app/src/main/java/io/github/wulkanowy/di/modules/ActivityModule.java
@@ -8,10 +8,10 @@ import dagger.Module;
 import dagger.Provides;
 import io.github.wulkanowy.di.annotations.ActivityContext;
 import io.github.wulkanowy.di.annotations.PerActivity;
-import io.github.wulkanowy.ui.base.BasePagerAdapter;
 import io.github.wulkanowy.ui.login.LoginContract;
 import io.github.wulkanowy.ui.login.LoginPresenter;
 import io.github.wulkanowy.ui.main.MainContract;
+import io.github.wulkanowy.ui.main.MainPagerAdapter;
 import io.github.wulkanowy.ui.main.MainPresenter;
 import io.github.wulkanowy.ui.splash.SplashContract;
 import io.github.wulkanowy.ui.splash.SplashPresenter;
@@ -58,7 +58,7 @@ public class ActivityModule {
     }
 
     @Provides
-    BasePagerAdapter provideMainPagerAdapter() {
-        return new BasePagerAdapter(activity.getSupportFragmentManager());
+    MainPagerAdapter provideMainPagerAdapter() {
+        return new MainPagerAdapter(activity.getSupportFragmentManager());
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/di/modules/ApplicationModule.java b/app/src/main/java/io/github/wulkanowy/di/modules/ApplicationModule.java
index 7c2b3984..e7d2bcc6 100644
--- a/app/src/main/java/io/github/wulkanowy/di/modules/ApplicationModule.java
+++ b/app/src/main/java/io/github/wulkanowy/di/modules/ApplicationModule.java
@@ -13,20 +13,27 @@ import dagger.Provides;
 import io.github.wulkanowy.api.Vulcan;
 import io.github.wulkanowy.data.Repository;
 import io.github.wulkanowy.data.RepositoryContract;
-import io.github.wulkanowy.data.db.dao.DbContract;
 import io.github.wulkanowy.data.db.dao.DbHelper;
-import io.github.wulkanowy.data.db.dao.DbRepository;
 import io.github.wulkanowy.data.db.dao.entities.DaoMaster;
 import io.github.wulkanowy.data.db.dao.entities.DaoSession;
+import io.github.wulkanowy.data.db.resources.AppResources;
 import io.github.wulkanowy.data.db.resources.ResourcesContract;
-import io.github.wulkanowy.data.db.resources.ResourcesRepository;
+import io.github.wulkanowy.data.db.shared.SharedPref;
 import io.github.wulkanowy.data.db.shared.SharedPrefContract;
-import io.github.wulkanowy.data.db.shared.SharedPrefRepository;
 import io.github.wulkanowy.data.sync.SyncContract;
-import io.github.wulkanowy.data.sync.SyncRepository;
+import io.github.wulkanowy.data.sync.account.AccountSync;
+import io.github.wulkanowy.data.sync.account.AccountSyncContract;
+import io.github.wulkanowy.data.sync.attendance.AttendanceSync;
+import io.github.wulkanowy.data.sync.attendance.AttendanceSyncContract;
+import io.github.wulkanowy.data.sync.grades.GradeSync;
+import io.github.wulkanowy.data.sync.subjects.SubjectSync;
+import io.github.wulkanowy.data.sync.timetable.TimetableSync;
+import io.github.wulkanowy.data.sync.timetable.TimetableSyncContract;
 import io.github.wulkanowy.di.annotations.ApplicationContext;
 import io.github.wulkanowy.di.annotations.DatabaseInfo;
 import io.github.wulkanowy.di.annotations.SharedPreferencesInfo;
+import io.github.wulkanowy.di.annotations.SyncGrades;
+import io.github.wulkanowy.di.annotations.SyncSubjects;
 import io.github.wulkanowy.utils.AppConstant;
 
 @Module
@@ -81,27 +88,46 @@ public class ApplicationModule {
 
     @Singleton
     @Provides
-    SharedPrefContract provideSharedPref(SharedPrefRepository sharedPrefRepository) {
-        return sharedPrefRepository;
+    SharedPrefContract provideSharedPref(SharedPref sharedPref) {
+        return sharedPref;
     }
 
     @Singleton
     @Provides
-    ResourcesContract provideAppResources(ResourcesRepository resourcesRepository) {
-        return resourcesRepository;
-    }
-
-
-    @Singleton
-    @Provides
-    DbContract provideDatabase(DbRepository dbRepository) {
-        return dbRepository;
+    ResourcesContract provideAppResources(AppResources appResources) {
+        return appResources;
     }
 
     @Singleton
     @Provides
-    SyncContract provideSync(SyncRepository syncRepository) {
-        return syncRepository;
+    AccountSyncContract provideLoginSync(AccountSync accountSync) {
+        return accountSync;
+    }
+
+    @SyncGrades
+    @Singleton
+    @Provides
+    SyncContract provideGradesSync(GradeSync gradeSync) {
+        return gradeSync;
+    }
+
+    @SyncSubjects
+    @Singleton
+    @Provides
+    SyncContract provideSubjectSync(SubjectSync subjectSync) {
+        return subjectSync;
+    }
+
+    @Singleton
+    @Provides
+    TimetableSyncContract provideTimetableSync(TimetableSync timetableSync) {
+        return timetableSync;
+    }
+
+    @Singleton
+    @Provides
+    AttendanceSyncContract provideAttendanceSync(AttendanceSync attendanceSync) {
+        return attendanceSync;
     }
 
     @Provides
diff --git a/app/src/main/java/io/github/wulkanowy/di/modules/FragmentModule.java b/app/src/main/java/io/github/wulkanowy/di/modules/FragmentModule.java
index 005b7aa1..3479a8c4 100644
--- a/app/src/main/java/io/github/wulkanowy/di/modules/FragmentModule.java
+++ b/app/src/main/java/io/github/wulkanowy/di/modules/FragmentModule.java
@@ -6,22 +6,20 @@ import dagger.Module;
 import dagger.Provides;
 import eu.davidea.flexibleadapter.FlexibleAdapter;
 import io.github.wulkanowy.di.annotations.PerFragment;
-import io.github.wulkanowy.ui.base.BasePagerAdapter;
 import io.github.wulkanowy.ui.main.attendance.AttendanceContract;
 import io.github.wulkanowy.ui.main.attendance.AttendanceHeaderItem;
+import io.github.wulkanowy.ui.main.attendance.AttendancePagerAdapter;
 import io.github.wulkanowy.ui.main.attendance.AttendancePresenter;
 import io.github.wulkanowy.ui.main.attendance.AttendanceTabContract;
 import io.github.wulkanowy.ui.main.attendance.AttendanceTabPresenter;
-import io.github.wulkanowy.ui.main.exams.ExamsContract;
-import io.github.wulkanowy.ui.main.exams.ExamsPresenter;
-import io.github.wulkanowy.ui.main.exams.ExamsSubItem;
-import io.github.wulkanowy.ui.main.exams.ExamsTabContract;
-import io.github.wulkanowy.ui.main.exams.ExamsTabPresenter;
+import io.github.wulkanowy.ui.main.dashboard.DashboardContract;
+import io.github.wulkanowy.ui.main.dashboard.DashboardPresenter;
 import io.github.wulkanowy.ui.main.grades.GradeHeaderItem;
 import io.github.wulkanowy.ui.main.grades.GradesContract;
 import io.github.wulkanowy.ui.main.grades.GradesPresenter;
 import io.github.wulkanowy.ui.main.timetable.TimetableContract;
 import io.github.wulkanowy.ui.main.timetable.TimetableHeaderItem;
+import io.github.wulkanowy.ui.main.timetable.TimetablePagerAdapter;
 import io.github.wulkanowy.ui.main.timetable.TimetablePresenter;
 import io.github.wulkanowy.ui.main.timetable.TimetableTabContract;
 import io.github.wulkanowy.ui.main.timetable.TimetableTabPresenter;
@@ -49,8 +47,8 @@ public class FragmentModule {
 
     @PerFragment
     @Provides
-    ExamsContract.Presenter provideDashboardPresenter(ExamsPresenter examsPresenter) {
-        return examsPresenter;
+    DashboardContract.Presenter provideDashboardPresenter(DashboardPresenter dashboardPresenter) {
+        return dashboardPresenter;
     }
 
     @PerFragment
@@ -60,8 +58,8 @@ public class FragmentModule {
     }
 
     @Provides
-    BasePagerAdapter provideBasePagerAdapter() {
-        return new BasePagerAdapter(fragment.getChildFragmentManager());
+    AttendancePagerAdapter provideAttendancePagerAdapter() {
+        return new AttendancePagerAdapter(fragment.getChildFragmentManager());
     }
 
     @Provides
@@ -69,21 +67,6 @@ public class FragmentModule {
         return new FlexibleAdapter<>(null);
     }
 
-    @Provides
-    FlexibleAdapter<TimetableHeaderItem> provideTimetableTabAdapter() {
-        return new FlexibleAdapter<>(null);
-    }
-
-    @Provides
-    FlexibleAdapter<GradeHeaderItem> provideGradesAdapter() {
-        return new FlexibleAdapter<>(null);
-    }
-
-    @Provides
-    FlexibleAdapter<ExamsSubItem> provideExamAdapter() {
-        return new FlexibleAdapter<>(null);
-    }
-
     @PerFragment
     @Provides
     TimetableContract.Presenter provideTimetablePresenter(TimetablePresenter timetablePresenter) {
@@ -97,7 +80,17 @@ public class FragmentModule {
     }
 
     @Provides
-    ExamsTabContract.Presenter provideExamsTabPresenter(ExamsTabPresenter examsTabPresenter) {
-        return examsTabPresenter;
+    TimetablePagerAdapter provideTimetablePagerAdapter() {
+        return new TimetablePagerAdapter(fragment.getChildFragmentManager());
+    }
+
+    @Provides
+    FlexibleAdapter<TimetableHeaderItem> provideTimetableTabAdapter() {
+        return new FlexibleAdapter<>(null);
+    }
+
+    @Provides
+    FlexibleAdapter<GradeHeaderItem> provideGradesAdapter() {
+        return new FlexibleAdapter<>(null);
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/services/NotificationService.java b/app/src/main/java/io/github/wulkanowy/services/NotificationService.java
new file mode 100644
index 00000000..ab721f46
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/NotificationService.java
@@ -0,0 +1,55 @@
+package io.github.wulkanowy.services;
+
+
+import android.annotation.TargetApi;
+import android.app.Notification;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.content.Context;
+import android.os.Build;
+import android.support.v4.app.NotificationCompat;
+
+import java.util.Random;
+
+class NotificationService {
+
+    private static final String CHANNEL_ID = "Wulkanowy_New_Grade_Channel";
+
+    private static final String CHANNEL_NAME = "New Grade Channel";
+
+    private NotificationManager manager;
+
+    private Context context;
+
+    NotificationService(Context context) {
+        this.context = context;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            createChannel();
+        }
+    }
+
+    void notify(Notification notification) {
+        getManager().notify(new Random().nextInt(1000), notification);
+    }
+
+    NotificationCompat.Builder notificationBuilder() {
+        return new NotificationCompat.Builder(context, CHANNEL_ID);
+    }
+
+    @TargetApi(26)
+    private void createChannel() {
+        NotificationChannel notificationChannel = new NotificationChannel(CHANNEL_ID, CHANNEL_NAME,
+                NotificationManager.IMPORTANCE_HIGH);
+        notificationChannel.enableLights(true);
+        notificationChannel.enableVibration(true);
+        notificationChannel.setLockscreenVisibility(Notification.VISIBILITY_PUBLIC);
+        getManager().createNotificationChannel(notificationChannel);
+    }
+
+    private NotificationManager getManager() {
+        if (manager == null) {
+            manager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+        }
+        return manager;
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/services/jobs/SyncJob.java b/app/src/main/java/io/github/wulkanowy/services/SyncJob.java
similarity index 62%
rename from app/src/main/java/io/github/wulkanowy/services/jobs/SyncJob.java
rename to app/src/main/java/io/github/wulkanowy/services/SyncJob.java
index ab79034f..e7b0908f 100644
--- a/app/src/main/java/io/github/wulkanowy/services/jobs/SyncJob.java
+++ b/app/src/main/java/io/github/wulkanowy/services/SyncJob.java
@@ -1,10 +1,9 @@
-package io.github.wulkanowy.services.jobs;
+package io.github.wulkanowy.services;
 
 import android.app.PendingIntent;
 import android.content.Context;
 import android.support.v4.app.NotificationCompat;
 
-import com.crashlytics.android.Crashlytics;
 import com.firebase.jobdispatcher.Constraint;
 import com.firebase.jobdispatcher.FirebaseJobDispatcher;
 import com.firebase.jobdispatcher.GooglePlayDriver;
@@ -15,7 +14,6 @@ import com.firebase.jobdispatcher.RetryStrategy;
 import com.firebase.jobdispatcher.SimpleJobService;
 import com.firebase.jobdispatcher.Trigger;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import javax.inject.Inject;
@@ -24,39 +22,37 @@ import io.github.wulkanowy.R;
 import io.github.wulkanowy.WulkanowyApp;
 import io.github.wulkanowy.data.RepositoryContract;
 import io.github.wulkanowy.data.db.dao.entities.Grade;
-import io.github.wulkanowy.data.sync.NotRegisteredUserException;
-import io.github.wulkanowy.services.notifies.GradeNotify;
 import io.github.wulkanowy.ui.main.MainActivity;
 import io.github.wulkanowy.utils.LogUtils;
 
 public class SyncJob extends SimpleJobService {
 
-    public static final String JOB_TAG = "SyncJob";
+    private static final int DEFAULT_INTERVAL_START = 60 * 50;
 
-    private List<Grade> gradeList = new ArrayList<>();
+    private static final int DEFAULT_INTERVAL_END = DEFAULT_INTERVAL_START + (60 * 40);
+
+    public static final String EXTRA_INTENT_KEY = "cardId";
+
+    private List<Grade> gradeList;
 
     @Inject
     RepositoryContract repository;
 
-    public static void start(Context context, int interval, boolean useOnlyWifi) {
+    public static void start(Context context) {
         FirebaseJobDispatcher dispatcher = new FirebaseJobDispatcher(new GooglePlayDriver(context));
 
         dispatcher.mustSchedule(dispatcher.newJobBuilder()
                 .setLifetime(Lifetime.FOREVER)
                 .setService(SyncJob.class)
-                .setTag(JOB_TAG)
+                .setTag("SyncJob")
                 .setRecurring(true)
-                .setTrigger(Trigger.executionWindow(interval * 60, (interval + 10) * 60))
-                .setConstraints(useOnlyWifi ? Constraint.ON_UNMETERED_NETWORK : Constraint.ON_ANY_NETWORK)
+                .setTrigger(Trigger.executionWindow(DEFAULT_INTERVAL_START, DEFAULT_INTERVAL_END))
+                .setConstraints(Constraint.ON_ANY_NETWORK)
                 .setReplaceCurrent(false)
                 .setRetryStrategy(RetryStrategy.DEFAULT_EXPONENTIAL)
                 .build());
     }
 
-    public static void stop(Context context) {
-        new FirebaseJobDispatcher(new GooglePlayDriver(context)).cancel(JOB_TAG);
-    }
-
     @Override
     public void onCreate() {
         super.onCreate();
@@ -66,40 +62,35 @@ public class SyncJob extends SimpleJobService {
     @Override
     public int onRunJob(JobParameters job) {
         try {
-            repository.getSyncRepo().initLastUser();
-            repository.getSyncRepo().syncAll();
+            repository.initLastUser();
+            repository.syncAll();
 
-            gradeList = repository.getDbRepo().getNewGrades(repository.getDbRepo().getCurrentSemesterName());
+            gradeList = repository.getNewGrades();
 
-            if (!gradeList.isEmpty() && repository.getSharedRepo().isNotifyEnable()) {
+            if (!gradeList.isEmpty()) {
                 showNotification();
             }
             return JobService.RESULT_SUCCESS;
-        } catch (NotRegisteredUserException e) {
-            logError(e);
-            stop(getApplicationContext());
-            return JobService.RESULT_FAIL_NORETRY;
         } catch (Exception e) {
-            logError(e);
+            LogUtils.error("During background synchronization an error occurred", e);
             return JobService.RESULT_FAIL_RETRY;
         }
     }
 
     private void showNotification() {
-        GradeNotify gradeNotify = new GradeNotify(getApplicationContext());
+        NotificationService service = new NotificationService(getApplicationContext());
 
-        gradeNotify.notify(gradeNotify.notificationBuilder()
+        service.notify(service.notificationBuilder()
                 .setContentTitle(getStringTitle())
                 .setContentText(getStringContent())
-                .setSmallIcon(R.drawable.ic_notify_grade)
+                .setSmallIcon(R.drawable.ic_stat_notify)
                 .setAutoCancel(true)
                 .setDefaults(NotificationCompat.DEFAULT_ALL)
                 .setPriority(NotificationCompat.PRIORITY_HIGH)
                 .setColor(getResources().getColor(R.color.colorPrimary))
                 .setContentIntent(PendingIntent.getActivity(getApplicationContext(), 0,
-                        MainActivity.getStartIntent(getApplicationContext())
-                                .putExtra(MainActivity.EXTRA_CARD_ID_KEY, 0)
-                        , PendingIntent.FLAG_UPDATE_CURRENT
+                        MainActivity.getStartIntent(getApplicationContext()).putExtra(EXTRA_INTENT_KEY, 0)
+                        , 0
                 ))
                 .build());
     }
@@ -120,9 +111,4 @@ public class SyncJob extends SimpleJobService {
                     gradeList.size(), gradeList.size());
         }
     }
-
-    private void logError(Exception e) {
-        Crashlytics.logException(e);
-        LogUtils.error("During background synchronization an error occurred", e);
-    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/services/notifies/GradeNotify.java b/app/src/main/java/io/github/wulkanowy/services/notifies/GradeNotify.java
deleted file mode 100644
index a554bea3..00000000
--- a/app/src/main/java/io/github/wulkanowy/services/notifies/GradeNotify.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package io.github.wulkanowy.services.notifies;
-
-import android.annotation.TargetApi;
-import android.app.Notification;
-import android.app.NotificationChannel;
-import android.app.NotificationManager;
-import android.content.Context;
-
-import io.github.wulkanowy.R;
-
-public class GradeNotify extends NotificationService {
-
-    private static final String CHANNEL_ID = "Grade_Notify";
-
-    public GradeNotify(Context context) {
-        super(context);
-    }
-
-    @Override
-    @TargetApi(26)
-    void createChannel() {
-        String channelName = getString(R.string.notify_grade_channel);
-
-        NotificationChannel notificationChannel = new NotificationChannel(CHANNEL_ID, channelName,
-                NotificationManager.IMPORTANCE_HIGH);
-        notificationChannel.enableLights(true);
-        notificationChannel.enableVibration(true);
-        notificationChannel.setLockscreenVisibility(Notification.VISIBILITY_PUBLIC);
-        getManager().createNotificationChannel(notificationChannel);
-    }
-
-    @Override
-    String getChannelId() {
-        return CHANNEL_ID;
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/services/notifies/NotificationService.java b/app/src/main/java/io/github/wulkanowy/services/notifies/NotificationService.java
deleted file mode 100644
index 156de2bd..00000000
--- a/app/src/main/java/io/github/wulkanowy/services/notifies/NotificationService.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package io.github.wulkanowy.services.notifies;
-
-
-import android.annotation.TargetApi;
-import android.app.Notification;
-import android.app.NotificationManager;
-import android.content.Context;
-import android.os.Build;
-import android.support.annotation.StringRes;
-import android.support.v4.app.NotificationCompat;
-
-import java.util.Random;
-
-public class NotificationService {
-
-    private NotificationManager manager;
-
-    private Context context;
-
-    public NotificationService(Context context) {
-        this.context = context;
-    }
-
-    public void notify(Notification notification) {
-        getManager().notify(new Random().nextInt(1000), notification);
-    }
-
-    public NotificationCompat.Builder notificationBuilder() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            createChannel();
-        }
-        return new NotificationCompat.Builder(context, getChannelId());
-    }
-
-    public void cancelAll() {
-        getManager().cancelAll();
-    }
-
-    NotificationManager getManager() {
-        if (manager == null) {
-            manager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
-        }
-        return manager;
-    }
-
-    String getString(@StringRes int stringId) {
-        return context.getString(stringId);
-    }
-
-    @TargetApi(26)
-    void createChannel() {
-    }
-
-    String getChannelId() {
-        return null;
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/io/github/wulkanowy/services/widgets/TimetableWidgetServices.java b/app/src/main/java/io/github/wulkanowy/services/widgets/TimetableWidgetServices.java
deleted file mode 100644
index 728cc805..00000000
--- a/app/src/main/java/io/github/wulkanowy/services/widgets/TimetableWidgetServices.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package io.github.wulkanowy.services.widgets;
-
-import android.content.Intent;
-import android.widget.RemoteViewsService;
-
-import io.github.wulkanowy.ui.widgets.TimetableWidgetFactory;
-
-public class TimetableWidgetServices extends RemoteViewsService {
-
-    @Override
-    public RemoteViewsFactory onGetViewFactory(Intent intent) {
-        return new TimetableWidgetFactory(getApplicationContext());
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/BasePagerAdapter.java b/app/src/main/java/io/github/wulkanowy/ui/base/BasePagerAdapter.java
deleted file mode 100644
index 178f0110..00000000
--- a/app/src/main/java/io/github/wulkanowy/ui/base/BasePagerAdapter.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package io.github.wulkanowy.ui.base;
-
-import android.support.annotation.NonNull;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentStatePagerAdapter;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class BasePagerAdapter extends FragmentStatePagerAdapter {
-
-    private List<Fragment> fragmentList = new ArrayList<>();
-
-    private List<String> titleList = new ArrayList<>();
-
-    public BasePagerAdapter(FragmentManager fragmentManager) {
-        super(fragmentManager);
-    }
-
-    public void addFragment(@NonNull Fragment fragment, @NonNull String title) {
-        fragmentList.add(fragment);
-        titleList.add(title);
-    }
-
-    public void addFragment(@NonNull Fragment fragment) {
-        fragmentList.add(fragment);
-    }
-
-    @Override
-    public Fragment getItem(int position) {
-        return fragmentList.get(position);
-    }
-
-    @Override
-    public int getCount() {
-        return fragmentList.size();
-    }
-
-    @Override
-    public CharSequence getPageTitle(int position) {
-        if (!titleList.isEmpty()) {
-            return titleList.get(position);
-        }
-        return null;
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/login/LoginActivity.java b/app/src/main/java/io/github/wulkanowy/ui/login/LoginActivity.java
index 9d6e8b12..95c5548b 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/login/LoginActivity.java
+++ b/app/src/main/java/io/github/wulkanowy/ui/login/LoginActivity.java
@@ -7,7 +7,6 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.support.design.widget.Snackbar;
 import android.support.design.widget.TextInputLayout;
-import android.support.v7.app.ActionBar;
 import android.view.View;
 import android.view.inputmethod.EditorInfo;
 import android.widget.ArrayAdapter;
@@ -210,18 +209,6 @@ public class LoginActivity extends BaseActivity implements LoginContract.View {
         });
     }
 
-    @Override
-    public void showActionBar(boolean show) {
-        ActionBar actionBar = getSupportActionBar();
-        if (actionBar != null) {
-            if (show) {
-                actionBar.show();
-            } else {
-                actionBar.hide();
-            }
-        }
-    }
-
     @Override
     public void onDestroy() {
         super.onDestroy();
diff --git a/app/src/main/java/io/github/wulkanowy/ui/login/LoginContract.java b/app/src/main/java/io/github/wulkanowy/ui/login/LoginContract.java
index 570e1b26..debfbbde 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/login/LoginContract.java
+++ b/app/src/main/java/io/github/wulkanowy/ui/login/LoginContract.java
@@ -33,8 +33,6 @@ public interface LoginContract {
 
         void hideSoftInput();
 
-        void showActionBar(boolean show);
-
     }
 
     @PerActivity
diff --git a/app/src/main/java/io/github/wulkanowy/ui/login/LoginPresenter.java b/app/src/main/java/io/github/wulkanowy/ui/login/LoginPresenter.java
index 3140ad78..2b6d173d 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/login/LoginPresenter.java
+++ b/app/src/main/java/io/github/wulkanowy/ui/login/LoginPresenter.java
@@ -55,7 +55,6 @@ public class LoginPresenter extends BasePresenter<LoginContract.View>
     @Override
     public void onStartAsync() {
         if (isViewAttached()) {
-            getView().showActionBar(false);
             getView().showLoginProgress(true);
         }
     }
@@ -64,10 +63,10 @@ public class LoginPresenter extends BasePresenter<LoginContract.View>
     public void onDoInBackground(int stepNumber) throws Exception {
         switch (stepNumber) {
             case 1:
-                getRepository().getSyncRepo().registerUser(email, password, symbol);
+                getRepository().registerUser(email, password, symbol);
                 break;
             case 2:
-                getRepository().getSyncRepo().syncAll();
+                getRepository().syncAll();
                 break;
         }
     }
@@ -85,25 +84,24 @@ public class LoginPresenter extends BasePresenter<LoginContract.View>
     public void onEndAsync(boolean success, Exception exception) {
         if (success) {
             getView().openMainActivity();
-            return;
         } else if (exception instanceof BadCredentialsException) {
             getView().setErrorPassIncorrect();
             getView().showSoftInput();
+            getView().showLoginProgress(false);
         } else if (exception instanceof AccountPermissionException) {
             getView().setErrorSymbolRequired();
             getView().showSoftInput();
+            getView().showLoginProgress(false);
         } else {
-            getView().onError(getRepository().getResRepo().getErrorLoginMessage(exception));
+            getView().onError(getRepository().getErrorLoginMessage(exception));
+            getView().showLoginProgress(false);
         }
 
-        getView().showActionBar(true);
-        getView().showLoginProgress(false);
     }
 
     @Override
     public void onCanceledAsync() {
         if (isViewAttached()) {
-            getView().showActionBar(true);
             getView().showLoginProgress(false);
         }
     }
@@ -121,8 +119,8 @@ public class LoginPresenter extends BasePresenter<LoginContract.View>
             return AppConstant.DEFAULT_SYMBOL;
         }
 
-        String[] keys = getRepository().getResRepo().getSymbolsKeysArray();
-        String[] values = getRepository().getResRepo().getSymbolsValuesArray();
+        String[] keys = getRepository().getSymbolsKeysArray();
+        String[] values = getRepository().getSymbolsValuesArray();
         LinkedHashMap<String, String> map = new LinkedHashMap<>();
 
         for (int i = 0; i < Math.min(keys.length, values.length); ++i) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/MainActivity.java b/app/src/main/java/io/github/wulkanowy/ui/main/MainActivity.java
index 6b7d07cf..cc9b1dc8 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/MainActivity.java
+++ b/app/src/main/java/io/github/wulkanowy/ui/main/MainActivity.java
@@ -5,7 +5,6 @@ import android.content.Intent;
 import android.graphics.Color;
 import android.os.Bundle;
 import android.support.v7.app.ActionBar;
-import android.support.v7.widget.Toolbar;
 import android.view.View;
 
 import com.aurelhubert.ahbottomnavigation.AHBottomNavigation;
@@ -17,19 +16,17 @@ import javax.inject.Inject;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import io.github.wulkanowy.R;
-import io.github.wulkanowy.services.jobs.SyncJob;
+import io.github.wulkanowy.services.SyncJob;
 import io.github.wulkanowy.ui.base.BaseActivity;
-import io.github.wulkanowy.ui.base.BasePagerAdapter;
 import io.github.wulkanowy.ui.main.attendance.AttendanceFragment;
-import io.github.wulkanowy.ui.main.exams.ExamsFragment;
+import io.github.wulkanowy.ui.main.dashboard.DashboardFragment;
 import io.github.wulkanowy.ui.main.grades.GradesFragment;
-import io.github.wulkanowy.ui.main.settings.SettingsFragment;
 import io.github.wulkanowy.ui.main.timetable.TimetableFragment;
 
 public class MainActivity extends BaseActivity implements MainContract.View,
         AHBottomNavigation.OnTabSelectedListener, OnFragmentIsReadyListener {
 
-    public static final String EXTRA_CARD_ID_KEY = "cardId";
+    private int initTabPosition = 0;
 
     @BindView(R.id.main_activity_nav)
     AHBottomNavigation bottomNavigation;
@@ -41,7 +38,7 @@ public class MainActivity extends BaseActivity implements MainContract.View,
     View progressBar;
 
     @Inject
-    BasePagerAdapter pagerAdapter;
+    MainPagerAdapter pagerAdapter;
 
     @Inject
     MainContract.Presenter presenter;
@@ -54,12 +51,16 @@ public class MainActivity extends BaseActivity implements MainContract.View,
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-        setSupportActionBar((Toolbar) findViewById(R.id.toolbar));
+
+        initTabPosition = getIntent().getIntExtra(SyncJob.EXTRA_INTENT_KEY, initTabPosition);
 
         getActivityComponent().inject(this);
         setButterKnife(ButterKnife.bind(this));
 
-        presenter.onStart(this, getIntent().getIntExtra(EXTRA_CARD_ID_KEY, -1));
+        presenter.onStart(this);
+
+        initiationViewPager();
+        initiationBottomNav();
     }
 
     @Override
@@ -101,49 +102,48 @@ public class MainActivity extends BaseActivity implements MainContract.View,
         presenter.onFragmentIsReady();
     }
 
-    @Override
-    public void initiationBottomNav(int tabPosition) {
-        bottomNavigation.addItem(new AHBottomNavigationItem(getString(R.string.grades_text),
-                R.drawable.ic_menu_grade_26dp));
-
-        bottomNavigation.addItem(new AHBottomNavigationItem(getString(R.string.attendance_text),
-                R.drawable.ic_menu_attendance_24dp));
-
-        bottomNavigation.addItem(new AHBottomNavigationItem(getString(R.string.exams_text),
-                R.drawable.ic_menu_exams_24dp));
-
-        bottomNavigation.addItem(new AHBottomNavigationItem(getString(R.string.timetable_text),
-                R.drawable.ic_menu_timetable_24dp));
-
-        bottomNavigation.addItem(new AHBottomNavigationItem(getString(R.string.settings_text),
-                R.drawable.ic_menu_other_24dp));
+    private void initiationBottomNav() {
+        bottomNavigation.addItem(new AHBottomNavigationItem(
+                getString(R.string.grades_text),
+                getResources().getDrawable(R.drawable.ic_menu_grade_26dp)
+        ));
+        bottomNavigation.addItem(new AHBottomNavigationItem(
+                getString(R.string.attendance_text),
+                getResources().getDrawable(R.drawable.ic_menu_attendance_24dp)
+        ));
+        bottomNavigation.addItem(new AHBottomNavigationItem(
+                getString(R.string.dashboard_text),
+                getResources().getDrawable(R.drawable.ic_menu_dashboard_24dp)
+        ));
+        bottomNavigation.addItem(new AHBottomNavigationItem(
+                getString(R.string.lessonplan_text),
+                getResources().getDrawable(R.drawable.ic_menu_timetable_24dp)
+        ));
+        bottomNavigation.addItem(new AHBottomNavigationItem(
+                getString(R.string.settings_text),
+                getResources().getDrawable(R.drawable.ic_menu_other_24dp)
+        ));
 
         bottomNavigation.setAccentColor(getResources().getColor(R.color.colorPrimary));
         bottomNavigation.setInactiveColor(Color.BLACK);
         bottomNavigation.setBackgroundColor(getResources().getColor(R.color.colorBackgroundBottomNav));
         bottomNavigation.setTitleState(AHBottomNavigation.TitleState.ALWAYS_SHOW);
         bottomNavigation.setOnTabSelectedListener(this);
-        bottomNavigation.setCurrentItem(tabPosition);
+        bottomNavigation.setCurrentItem(initTabPosition);
         bottomNavigation.setBehaviorTranslationEnabled(false);
     }
 
-    @Override
-    public void initiationViewPager(int tabPosition) {
+    private void initiationViewPager() {
         pagerAdapter.addFragment(new GradesFragment());
         pagerAdapter.addFragment(new AttendanceFragment());
-        pagerAdapter.addFragment(new ExamsFragment());
+        pagerAdapter.addFragment(new DashboardFragment());
         pagerAdapter.addFragment(new TimetableFragment());
-        pagerAdapter.addFragment(new SettingsFragment());
+        pagerAdapter.addFragment(new DashboardFragment());
 
         viewPager.setPagingEnabled(false);
         viewPager.setAdapter(pagerAdapter);
         viewPager.setOffscreenPageLimit(4);
-        viewPager.setCurrentItem(tabPosition, false);
-    }
-
-    @Override
-    public void startSyncService(int interval, boolean useOnlyWifi) {
-        SyncJob.start(getApplicationContext(), interval, useOnlyWifi);
+        viewPager.setCurrentItem(initTabPosition, false);
     }
 
     @Override
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/MainContract.java b/app/src/main/java/io/github/wulkanowy/ui/main/MainContract.java
index cc326654..cb1d5d7c 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/MainContract.java
+++ b/app/src/main/java/io/github/wulkanowy/ui/main/MainContract.java
@@ -14,19 +14,11 @@ public interface MainContract {
         void showActionBar();
 
         void hideActionBar();
-
-        void initiationViewPager(int tabPosition);
-
-        void initiationBottomNav(int tabPosition);
-
-        void startSyncService(int interval, boolean useOnlyWifi);
     }
 
     @PerActivity
     interface Presenter extends BaseContract.Presenter<View> {
 
-        void onStart(View view, int tabPositionIntent);
-
         void onTabSelected(int position, boolean wasSelected);
 
         void onFragmentIsReady();
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/MainPagerAdapter.java b/app/src/main/java/io/github/wulkanowy/ui/main/MainPagerAdapter.java
new file mode 100644
index 00000000..fcc51fb5
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/main/MainPagerAdapter.java
@@ -0,0 +1,31 @@
+package io.github.wulkanowy.ui.main;
+
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentStatePagerAdapter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class MainPagerAdapter extends FragmentStatePagerAdapter {
+
+    private List<Fragment> fragmentList = new ArrayList<>();
+
+    public MainPagerAdapter(FragmentManager fragmentManager) {
+        super(fragmentManager);
+    }
+
+    void addFragment(Fragment fragment) {
+        fragmentList.add(fragment);
+    }
+
+    @Override
+    public Fragment getItem(int position) {
+        return fragmentList.get(position);
+    }
+
+    @Override
+    public int getCount() {
+        return fragmentList.size();
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/MainPresenter.java b/app/src/main/java/io/github/wulkanowy/ui/main/MainPresenter.java
index ba5e41d8..149e49e2 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/MainPresenter.java
+++ b/app/src/main/java/io/github/wulkanowy/ui/main/MainPresenter.java
@@ -17,26 +17,10 @@ public class MainPresenter extends BasePresenter<MainContract.View>
     }
 
     @Override
-    public void onStart(MainContract.View view, int tabPositionIntent) {
+    public void onStart(MainContract.View view) {
         super.onStart(view);
         getView().showProgressBar(true);
         getView().hideActionBar();
-
-        int tabPosition;
-
-        if (tabPositionIntent != -1) {
-            tabPosition = tabPositionIntent;
-        } else {
-            tabPosition = getRepository().getSharedRepo().getStartupTab();
-        }
-
-        getView().initiationBottomNav(tabPosition);
-        getView().initiationViewPager(tabPosition);
-
-        if (getRepository().getSharedRepo().isServicesEnable()) {
-            getView().startSyncService(getRepository().getSharedRepo().getServicesInterval(),
-                    getRepository().getSharedRepo().isMobileDisable());
-        }
     }
 
     @Override
@@ -48,11 +32,11 @@ public class MainPresenter extends BasePresenter<MainContract.View>
 
     @Override
     public void onFragmentIsReady() {
-        if (fragmentCount < 4) {
+        if (fragmentCount < 5) {
             fragmentCount++;
         }
 
-        if (fragmentCount == 4) {
+        if (fragmentCount == 5) {
             getView().showActionBar();
             getView().showProgressBar(false);
         }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/TabsData.java b/app/src/main/java/io/github/wulkanowy/ui/main/TabsData.java
new file mode 100644
index 00000000..3af29534
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/main/TabsData.java
@@ -0,0 +1,37 @@
+package io.github.wulkanowy.ui.main;
+
+import android.support.v4.app.Fragment;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TabsData {
+
+    private List<Fragment> fragments = new ArrayList<>();
+
+    private List<String> titles = new ArrayList<>();
+
+    public Fragment getFragment(int index) {
+        return fragments.get(index);
+    }
+
+    public void addFragment(Fragment fragment) {
+        if (fragment != null) {
+            fragments.add(fragment);
+        }
+    }
+
+    public int getFragmentsCount() {
+        return fragments.size();
+    }
+
+    public String getTitle(int index) {
+        return titles.get(index);
+    }
+
+    public void addTitle(String title) {
+        if (title != null) {
+            titles.add(title);
+        }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendanceContract.java b/app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendanceContract.java
index daee63d2..f8d3b302 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendanceContract.java
+++ b/app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendanceContract.java
@@ -3,6 +3,7 @@ package io.github.wulkanowy.ui.main.attendance;
 import io.github.wulkanowy.di.annotations.PerActivity;
 import io.github.wulkanowy.ui.base.BaseContract;
 import io.github.wulkanowy.ui.main.OnFragmentIsReadyListener;
+import io.github.wulkanowy.ui.main.TabsData;
 
 public interface AttendanceContract {
 
@@ -12,22 +13,24 @@ public interface AttendanceContract {
 
         void scrollViewPagerToPosition(int position);
 
-        void setTabDataToAdapter(String date);
+        void setTabDataToAdapter(TabsData tabsData);
 
         void setAdapterWithTabLayout();
 
-        boolean isMenuVisible();
+        void setChildFragmentSelected(int position, boolean selected);
 
-        void setThemeForTab(int position);
+        boolean isMenuVisible();
     }
 
     @PerActivity
     interface Presenter extends BaseContract.Presenter<View> {
 
-        void onFragmentActivated(boolean isVisible);
+        void onFragmentVisible(boolean isVisible);
+
+        void onTabSelected(int position);
+
+        void onTabUnselected(int position);
 
         void onStart(View view, OnFragmentIsReadyListener listener);
-
-        void setRestoredPosition(int position);
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendanceDialogFragment.java b/app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendanceDialogFragment.java
index 5e8f3a02..f5bbcb41 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendanceDialogFragment.java
+++ b/app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendanceDialogFragment.java
@@ -77,7 +77,7 @@ public class AttendanceDialogFragment extends DialogFragment {
 
         description.setText(lesson.getDescription());
 
-        if (lesson.getAbsenceUnexcused()) {
+        if (lesson.getIsAbsenceUnexcused()) {
             description.setTextColor(getResources().getColor(R.color.colorPrimaryDark));
         }
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendanceFragment.java b/app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendanceFragment.java
index e26c9fc7..82bb2520 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendanceFragment.java
+++ b/app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendanceFragment.java
@@ -17,12 +17,10 @@ import butterknife.ButterKnife;
 import io.github.wulkanowy.R;
 import io.github.wulkanowy.di.component.FragmentComponent;
 import io.github.wulkanowy.ui.base.BaseFragment;
-import io.github.wulkanowy.ui.base.BasePagerAdapter;
 import io.github.wulkanowy.ui.main.OnFragmentIsReadyListener;
+import io.github.wulkanowy.ui.main.TabsData;
 
-public class AttendanceFragment extends BaseFragment implements AttendanceContract.View {
-
-    private static final String CURRENT_ITEM_KEY = "CurrentItem";
+public class AttendanceFragment extends BaseFragment implements AttendanceContract.View, TabLayout.OnTabSelectedListener {
 
     @BindView(R.id.attendance_fragment_viewpager)
     ViewPager viewPager;
@@ -31,7 +29,7 @@ public class AttendanceFragment extends BaseFragment implements AttendanceContra
     TabLayout tabLayout;
 
     @Inject
-    BasePagerAdapter pagerAdapter;
+    AttendancePagerAdapter pagerAdapter;
 
     @Inject
     AttendanceContract.Presenter presenter;
@@ -47,10 +45,6 @@ public class AttendanceFragment extends BaseFragment implements AttendanceContra
             component.inject(this);
             setButterKnife(ButterKnife.bind(this, view));
             presenter.onStart(this, (OnFragmentIsReadyListener) getActivity());
-
-            if (savedInstanceState != null) {
-                presenter.setRestoredPosition(savedInstanceState.getInt(CURRENT_ITEM_KEY));
-            }
         }
 
         return view;
@@ -60,19 +54,41 @@ public class AttendanceFragment extends BaseFragment implements AttendanceContra
     public void setMenuVisibility(boolean menuVisible) {
         super.setMenuVisibility(menuVisible);
         if (presenter != null) {
-            presenter.onFragmentActivated(menuVisible);
+            presenter.onFragmentVisible(menuVisible);
         }
     }
 
     @Override
-    public void setTabDataToAdapter(String date) {
-        pagerAdapter.addFragment(AttendanceTabFragment.newInstance(date), date);
+    public void onTabSelected(TabLayout.Tab tab) {
+        presenter.onTabSelected(tab.getPosition());
+    }
+
+    @Override
+    public void onTabUnselected(TabLayout.Tab tab) {
+        presenter.onTabUnselected(tab.getPosition());
+    }
+
+    @Override
+    public void onTabReselected(TabLayout.Tab tab) {
+        //do nothing
+    }
+
+    @Override
+    public void setTabDataToAdapter(TabsData tabsData) {
+        pagerAdapter.setTabsData(tabsData);
     }
 
     @Override
     public void setAdapterWithTabLayout() {
         viewPager.setAdapter(pagerAdapter);
+
         tabLayout.setupWithViewPager(viewPager);
+        tabLayout.addOnTabSelectedListener(this);
+    }
+
+    @Override
+    public void setChildFragmentSelected(int position, boolean selected) {
+        ((AttendanceTabFragment) pagerAdapter.getItem(position)).setSelected(selected);
     }
 
     @Override
@@ -80,14 +96,6 @@ public class AttendanceFragment extends BaseFragment implements AttendanceContra
         viewPager.setCurrentItem(position, false);
     }
 
-    @Override
-    public void setThemeForTab(int position) {
-        TabLayout.Tab tab = tabLayout.getTabAt(position);
-        if (tab != null) {
-            tab.setCustomView(R.layout.current_week_tab);
-        }
-    }
-
     @Override
     public void setActivityTitle() {
         setTitle(getString(R.string.attendance_text));
@@ -101,12 +109,6 @@ public class AttendanceFragment extends BaseFragment implements AttendanceContra
         }
     }
 
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        outState.putInt(CURRENT_ITEM_KEY, viewPager.getCurrentItem());
-        super.onSaveInstanceState(outState);
-    }
-
     @Override
     public void onDestroyView() {
         presenter.onDestroy();
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendanceHeaderItem.java b/app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendanceHeaderItem.java
index b7e6aecd..b103a007 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendanceHeaderItem.java
+++ b/app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendanceHeaderItem.java
@@ -1,8 +1,5 @@
 package io.github.wulkanowy.ui.main.attendance;
 
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.graphics.drawable.Drawable;
 import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
@@ -19,7 +16,6 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 import eu.davidea.flexibleadapter.FlexibleAdapter;
 import eu.davidea.flexibleadapter.items.AbstractExpandableHeaderItem;
-import eu.davidea.flexibleadapter.items.IFlexible;
 import eu.davidea.viewholders.ExpandableViewHolder;
 import io.github.wulkanowy.R;
 import io.github.wulkanowy.data.db.dao.entities.Day;
@@ -59,13 +55,12 @@ public class AttendanceHeaderItem
     }
 
     @Override
-    public HeaderViewHolder createViewHolder(View view, FlexibleAdapter<IFlexible> adapter) {
+    public HeaderViewHolder createViewHolder(View view, FlexibleAdapter adapter) {
         return new HeaderViewHolder(view, adapter);
     }
 
     @Override
-    public void bindViewHolder(FlexibleAdapter<IFlexible> adapter, HeaderViewHolder holder,
-                               int position, List<Object> payloads) {
+    public void bindViewHolder(FlexibleAdapter adapter, HeaderViewHolder holder, int position, List payloads) {
         holder.onBind(day, getSubItems());
     }
 
@@ -92,16 +87,10 @@ public class AttendanceHeaderItem
         @BindColor(R.color.free_day)
         int backgroundFreeDay;
 
-        @BindColor(android.R.color.black)
-        int black;
-
-        private Context context;
-
         HeaderViewHolder(View view, FlexibleAdapter adapter) {
             super(view, adapter);
             view.setOnClickListener(this);
             ButterKnife.bind(this, view);
-            context = view.getContext();
         }
 
         void onBind(Day item, List<AttendanceSubItem> subItems) {
@@ -114,47 +103,32 @@ public class AttendanceHeaderItem
             description.setVisibility(numberOfHours > 0 ? View.VISIBLE : View.INVISIBLE);
             alert.setVisibility(isSubItemsHasChanges(subItems) ? View.VISIBLE : View.INVISIBLE);
             freeName.setVisibility(subItems.isEmpty() ? View.VISIBLE : View.INVISIBLE);
-            setInactiveHeader(item.getAttendanceLessons().isEmpty());
-        }
 
-
-        private void setInactiveHeader(boolean inactive) {
-            ((FrameLayout) getContentView()).setForeground(inactive ? null : getSelectableDrawable());
-            dayName.setTextColor(inactive ? secondaryColor : black);
-
-            if (inactive) {
+            if (item.getAttendanceLessons().isEmpty()) {
+                ((FrameLayout) getContentView()).setForeground(null);
                 getContentView().setBackgroundColor(backgroundFreeDay);
-            } else {
-                getContentView().setBackgroundDrawable(context.getResources()
-                        .getDrawable(R.drawable.ic_border));
+                dayName.setTextColor(secondaryColor);
             }
         }
 
-        private Drawable getSelectableDrawable() {
-            int[] attrs = new int[]{R.attr.selectableItemBackground};
-            TypedArray typedArray = context.obtainStyledAttributes(attrs);
-            Drawable drawable = typedArray.getDrawable(0);
-            typedArray.recycle();
-            return drawable;
-        }
-
         private int countNotPresentHours(List<AttendanceSubItem> subItems) {
             int i = 0;
             for (AttendanceSubItem subItem : subItems) {
-                if (subItem.getLesson().getAbsenceUnexcused()) {
+                if (subItem.getLesson().getIsAbsenceUnexcused()) {
                     i++;
                 }
             }
+
             return i;
         }
 
         private boolean isSubItemsHasChanges(List<AttendanceSubItem> subItems) {
             for (AttendanceSubItem subItem : subItems) {
-                if (subItem.getLesson().getAbsenceUnexcused() || subItem.getLesson()
-                        .getUnexcusedLateness()) {
+                if (subItem.getLesson().getIsAbsenceUnexcused() || subItem.getLesson().getIsUnexcusedLateness()) {
                     return true;
                 }
             }
+
             return false;
         }
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendancePagerAdapter.java b/app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendancePagerAdapter.java
new file mode 100644
index 00000000..3cabff71
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendancePagerAdapter.java
@@ -0,0 +1,38 @@
+package io.github.wulkanowy.ui.main.attendance;
+
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentStatePagerAdapter;
+
+import io.github.wulkanowy.ui.main.TabsData;
+
+public class AttendancePagerAdapter extends FragmentStatePagerAdapter {
+
+    private TabsData tabsData;
+
+    public AttendancePagerAdapter(FragmentManager fragmentManager) {
+        super(fragmentManager);
+    }
+
+    void setTabsData(TabsData tabsData) {
+        this.tabsData = tabsData;
+    }
+
+    @Override
+    public Fragment getItem(int position) {
+        return tabsData.getFragment(position);
+    }
+
+
+    @Override
+    public int getCount() {
+        return tabsData.getFragmentsCount();
+    }
+
+    @Nullable
+    @Override
+    public CharSequence getPageTitle(int position) {
+        return tabsData.getTitle(position);
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendancePresenter.java b/app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendancePresenter.java
index 55541ed2..73dd44ca 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendancePresenter.java
+++ b/app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendancePresenter.java
@@ -8,6 +8,7 @@ import javax.inject.Inject;
 import io.github.wulkanowy.data.RepositoryContract;
 import io.github.wulkanowy.ui.base.BasePresenter;
 import io.github.wulkanowy.ui.main.OnFragmentIsReadyListener;
+import io.github.wulkanowy.ui.main.TabsData;
 import io.github.wulkanowy.utils.TimeUtils;
 import io.github.wulkanowy.utils.async.AbstractTask;
 import io.github.wulkanowy.utils.async.AsyncListeners;
@@ -19,9 +20,11 @@ public class AttendancePresenter extends BasePresenter<AttendanceContract.View>
 
     private List<String> dates = new ArrayList<>();
 
+    private TabsData tabsData = new TabsData();
+
     private OnFragmentIsReadyListener listener;
 
-    private int positionToScroll = 0;
+    private int positionToScroll;
 
     private boolean isFirstSight = false;
 
@@ -42,10 +45,7 @@ public class AttendancePresenter extends BasePresenter<AttendanceContract.View>
         if (dates.isEmpty()) {
             dates = TimeUtils.getMondaysFromCurrentSchoolYear();
         }
-
-        if (positionToScroll == 0) {
-            positionToScroll = dates.indexOf(TimeUtils.getDateOfCurrentMonday(true));
-        }
+        positionToScroll = dates.indexOf(TimeUtils.getDateOfCurrentMonday(true));
 
         if (!isFirstSight) {
             isFirstSight = true;
@@ -57,16 +57,27 @@ public class AttendancePresenter extends BasePresenter<AttendanceContract.View>
     }
 
     @Override
-    public void onFragmentActivated(boolean isVisible) {
+    public void onFragmentVisible(boolean isVisible) {
         if (isVisible) {
             getView().setActivityTitle();
         }
     }
 
+    @Override
+    public void onTabSelected(int position) {
+        getView().setChildFragmentSelected(position, true);
+    }
+
+    @Override
+    public void onTabUnselected(int position) {
+        getView().setChildFragmentSelected(position, false);
+    }
+
     @Override
     public void onDoInBackgroundLoading() throws Exception {
         for (String date : dates) {
-            getView().setTabDataToAdapter(date);
+            tabsData.addTitle(date);
+            tabsData.addFragment(AttendanceTabFragment.newInstance(date));
         }
     }
 
@@ -79,18 +90,13 @@ public class AttendancePresenter extends BasePresenter<AttendanceContract.View>
     @Override
     public void onEndLoadingAsync(boolean result, Exception exception) {
         if (result) {
+            getView().setTabDataToAdapter(tabsData);
             getView().setAdapterWithTabLayout();
-            getView().setThemeForTab(positionToScroll);
             getView().scrollViewPagerToPosition(positionToScroll);
             listener.onFragmentIsReady();
         }
     }
 
-    @Override
-    public void setRestoredPosition(int position) {
-        this.positionToScroll = position;
-    }
-
     @Override
     public void onDestroy() {
         isFirstSight = false;
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendanceSubItem.java b/app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendanceSubItem.java
index 440d878e..6da35555 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendanceSubItem.java
+++ b/app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendanceSubItem.java
@@ -16,7 +16,6 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 import eu.davidea.flexibleadapter.FlexibleAdapter;
 import eu.davidea.flexibleadapter.items.AbstractSectionableItem;
-import eu.davidea.flexibleadapter.items.IFlexible;
 import eu.davidea.viewholders.FlexibleViewHolder;
 import io.github.wulkanowy.R;
 import io.github.wulkanowy.data.db.dao.entities.AttendanceLesson;
@@ -61,13 +60,12 @@ class AttendanceSubItem
     }
 
     @Override
-    public SubItemViewHolder createViewHolder(View view, FlexibleAdapter<IFlexible> adapter) {
-        return new SubItemViewHolder(view, adapter);
+    public AttendanceSubItem.SubItemViewHolder createViewHolder(View view, FlexibleAdapter adapter) {
+        return new AttendanceSubItem.SubItemViewHolder(view, adapter);
     }
 
     @Override
-    public void bindViewHolder(FlexibleAdapter<IFlexible> adapter, SubItemViewHolder holder,
-                               int position, List<Object> payloads) {
+    public void bindViewHolder(FlexibleAdapter adapter, AttendanceSubItem.SubItemViewHolder holder, int position, List payloads) {
         holder.onBind(lesson);
     }
 
@@ -102,7 +100,7 @@ class AttendanceSubItem
             lessonName.setText(lesson.getSubject());
             lessonNumber.setText((String.valueOf(lesson.getNumber())));
             lessonDescription.setText(lesson.getDescription());
-            alert.setVisibility(lesson.getAbsenceUnexcused() || lesson.getUnexcusedLateness()
+            alert.setVisibility(lesson.getIsAbsenceUnexcused() || lesson.getIsUnexcusedLateness()
                     ? View.VISIBLE : View.INVISIBLE);
         }
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendanceTabContract.java b/app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendanceTabContract.java
index dcb16bf8..1bac005d 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendanceTabContract.java
+++ b/app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendanceTabContract.java
@@ -21,10 +21,12 @@ public interface AttendanceTabContract {
 
     interface Presenter extends BaseContract.Presenter<AttendanceTabContract.View> {
 
-        void onFragmentActivated(boolean isSelected);
+        void onFragmentSelected(boolean isSelected);
 
         void setArgumentDate(String date);
 
+        void onStart(AttendanceTabContract.View view, boolean isPrimary);
+
         void onRefresh();
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendanceTabFragment.java b/app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendanceTabFragment.java
index e5e65bb9..90313daa 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendanceTabFragment.java
+++ b/app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendanceTabFragment.java
@@ -27,6 +27,12 @@ public class AttendanceTabFragment extends BaseFragment implements AttendanceTab
 
     private static final String ARGUMENT_KEY = "date";
 
+    private static final String SAVED_KEY = "isSelected";
+
+    private boolean isPrimary = false;
+
+    private boolean isSelected = false;
+
     @BindView(R.id.attendance_tab_fragment_recycler)
     RecyclerView recyclerView;
 
@@ -45,8 +51,6 @@ public class AttendanceTabFragment extends BaseFragment implements AttendanceTab
     @Inject
     FlexibleAdapter<AttendanceHeaderItem> adapter;
 
-    private boolean isFragmentVisible = false;
-
     public static AttendanceTabFragment newInstance(String date) {
         AttendanceTabFragment fragmentTab = new AttendanceTabFragment();
 
@@ -57,6 +61,15 @@ public class AttendanceTabFragment extends BaseFragment implements AttendanceTab
         return fragmentTab;
     }
 
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        if (savedInstanceState != null) {
+            isSelected = savedInstanceState.getBoolean(SAVED_KEY, isSelected);
+        }
+    }
+
     @Nullable
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
@@ -71,8 +84,7 @@ public class AttendanceTabFragment extends BaseFragment implements AttendanceTab
                 presenter.setArgumentDate(getArguments().getString(ARGUMENT_KEY));
             }
 
-            presenter.onStart(this);
-            presenter.onFragmentActivated(isFragmentVisible);
+            presenter.onStart(this, isPrimary);
         }
         return view;
     }
@@ -99,9 +111,10 @@ public class AttendanceTabFragment extends BaseFragment implements AttendanceTab
     @Override
     public void setMenuVisibility(boolean menuVisible) {
         super.setMenuVisibility(menuVisible);
-        isFragmentVisible = menuVisible;
-        if (presenter != null) {
-            presenter.onFragmentActivated(menuVisible);
+        if (presenter != null && getView() != null) {
+            presenter.onFragmentSelected(isSelected);
+        } else if (isSelected) {
+            isPrimary = true;
         }
     }
 
@@ -112,7 +125,7 @@ public class AttendanceTabFragment extends BaseFragment implements AttendanceTab
 
     @Override
     public void onRefreshSuccess() {
-        onError(R.string.sync_completed);
+        onError(R.string.timetable_refresh_success);
     }
 
     @Override
@@ -130,6 +143,10 @@ public class AttendanceTabFragment extends BaseFragment implements AttendanceTab
         noItemView.setVisibility(show ? View.VISIBLE : View.INVISIBLE);
     }
 
+    public void setSelected(boolean selected) {
+        isSelected = selected;
+    }
+
     @Override
     public void onError(String message) {
         if (getActivity() != null) {
@@ -138,8 +155,15 @@ public class AttendanceTabFragment extends BaseFragment implements AttendanceTab
         }
     }
 
+    @Override
+    public void onSaveInstanceState(@NonNull Bundle outState) {
+        outState.putBoolean(SAVED_KEY, isSelected);
+        super.onSaveInstanceState(outState);
+    }
+
     @Override
     public void onDestroyView() {
+        isPrimary = false;
         presenter.onDestroy();
         super.onDestroyView();
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendanceTabPresenter.java b/app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendanceTabPresenter.java
index 47927feb..d0d448ca 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendanceTabPresenter.java
+++ b/app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendanceTabPresenter.java
@@ -33,22 +33,21 @@ public class AttendanceTabPresenter extends BasePresenter<AttendanceTabContract.
     }
 
     @Override
-    public void onStart(AttendanceTabContract.View view) {
+    public void onStart(AttendanceTabContract.View view, boolean isPrimary) {
         super.onStart(view);
         getView().showProgressBar(true);
         getView().showNoItem(false);
+        onFragmentSelected(isPrimary);
     }
 
     @Override
-    public void onFragmentActivated(boolean isSelected) {
-        if (!isFirstSight && isSelected && isViewAttached()) {
+    public void onFragmentSelected(boolean isSelected) {
+        if (!isFirstSight && isSelected) {
             isFirstSight = true;
 
             loadingTask = new AbstractTask();
             loadingTask.setOnFirstLoadingListener(this);
             loadingTask.execute();
-        } else if (!isSelected) {
-            cancelAsyncTasks();
         }
     }
 
@@ -85,22 +84,20 @@ public class AttendanceTabPresenter extends BasePresenter<AttendanceTabContract.
 
             getView().onRefreshSuccess();
         } else {
-            getView().onError(getRepository().getResRepo().getErrorLoginMessage(exception));
+            getView().onError(getRepository().getErrorLoginMessage(exception));
         }
         getView().hideRefreshingBar();
     }
 
     @Override
     public void onDoInBackgroundLoading() throws Exception {
-        Week week = getRepository().getDbRepo().getWeek(date);
-        boolean isShowPresent = getRepository().getSharedRepo().isShowAttendancePresent();
+        Week week = getRepository().getWeek(date);
 
-        if (week == null || !week.getAttendanceSynced()) {
+        if (week == null || !week.getIsAttendanceSynced()) {
             syncData();
-            week = getRepository().getDbRepo().getWeek(date);
+            week = getRepository().getWeek(date);
         }
 
-        week.resetDayList();
         List<Day> dayList = week.getDayList();
 
         headerItems = new ArrayList<>();
@@ -108,7 +105,6 @@ public class AttendanceTabPresenter extends BasePresenter<AttendanceTabContract.
         boolean isEmptyWeek = true;
 
         for (Day day : dayList) {
-            day.resetAttendanceLessons();
             AttendanceHeaderItem headerItem = new AttendanceHeaderItem(day);
 
             if (isEmptyWeek) {
@@ -120,18 +116,10 @@ public class AttendanceTabPresenter extends BasePresenter<AttendanceTabContract.
             List<AttendanceSubItem> subItems = new ArrayList<>();
 
             for (AttendanceLesson lesson : lessonList) {
-                if (!isShowPresent && lesson.getPresence()) {
-                    continue;
-                }
-
-                lesson.setDescription(getRepository().getResRepo().getAttendanceLessonDescription(lesson));
+                lesson.setDescription(getRepository().getAttendanceLessonDescription(lesson));
                 subItems.add(new AttendanceSubItem(headerItem, lesson));
             }
 
-            if (!isShowPresent && subItems.isEmpty()) {
-                continue;
-            }
-
             headerItem.setSubItems(subItems);
             headerItem.setExpanded(false);
             headerItems.add(headerItem);
@@ -165,10 +153,13 @@ public class AttendanceTabPresenter extends BasePresenter<AttendanceTabContract.
     }
 
     private void syncData() throws Exception {
-        getRepository().getSyncRepo().syncAttendance(0, date);
+        getRepository().syncAttendance(date);
     }
 
-    private void cancelAsyncTasks() {
+    @Override
+    public void onDestroy() {
+        isFirstSight = false;
+
         if (refreshTask != null) {
             refreshTask.cancel(true);
             refreshTask = null;
@@ -177,12 +168,7 @@ public class AttendanceTabPresenter extends BasePresenter<AttendanceTabContract.
             loadingTask.cancel(true);
             loadingTask = null;
         }
-    }
 
-    @Override
-    public void onDestroy() {
-        cancelAsyncTasks();
-        isFirstSight = false;
         super.onDestroy();
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/exams/ExamsContract.java b/app/src/main/java/io/github/wulkanowy/ui/main/dashboard/DashboardContract.java
similarity index 55%
rename from app/src/main/java/io/github/wulkanowy/ui/main/exams/ExamsContract.java
rename to app/src/main/java/io/github/wulkanowy/ui/main/dashboard/DashboardContract.java
index da733f1e..2488eb95 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/exams/ExamsContract.java
+++ b/app/src/main/java/io/github/wulkanowy/ui/main/dashboard/DashboardContract.java
@@ -1,24 +1,16 @@
-package io.github.wulkanowy.ui.main.exams;
+package io.github.wulkanowy.ui.main.dashboard;
 
 import io.github.wulkanowy.di.annotations.PerActivity;
 import io.github.wulkanowy.ui.base.BaseContract;
 import io.github.wulkanowy.ui.main.OnFragmentIsReadyListener;
 
-public interface ExamsContract {
+public interface DashboardContract {
 
     interface View extends BaseContract.View {
 
         void setActivityTitle();
 
         boolean isMenuVisible();
-
-        void scrollViewPagerToPosition(int position);
-
-        void setTabDataToAdapter(String date);
-
-        void setAdapterWithTabLayout();
-
-        void setThemeForTab(int position);
     }
 
     @PerActivity
@@ -26,8 +18,6 @@ public interface ExamsContract {
 
         void onStart(View view, OnFragmentIsReadyListener listener);
 
-        void onFragmentActivated(boolean isVisible);
-
-        void setRestoredPosition(int position);
+        void onFragmentVisible(boolean isVisible);
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/dashboard/DashboardFragment.java b/app/src/main/java/io/github/wulkanowy/ui/main/dashboard/DashboardFragment.java
new file mode 100644
index 00000000..0832b5fb
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/main/dashboard/DashboardFragment.java
@@ -0,0 +1,48 @@
+package io.github.wulkanowy.ui.main.dashboard;
+
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import javax.inject.Inject;
+
+import butterknife.ButterKnife;
+import io.github.wulkanowy.R;
+import io.github.wulkanowy.di.component.FragmentComponent;
+import io.github.wulkanowy.ui.base.BaseFragment;
+import io.github.wulkanowy.ui.main.OnFragmentIsReadyListener;
+
+public class DashboardFragment extends BaseFragment implements DashboardContract.View {
+
+    @Inject
+    DashboardContract.Presenter presenter;
+
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.fragment_board, container, false);
+
+        FragmentComponent component = getFragmentComponent();
+        if (component != null) {
+            component.inject(this);
+            setButterKnife(ButterKnife.bind(this, view));
+            presenter.onStart(this, (OnFragmentIsReadyListener) getActivity());
+        }
+        return view;
+    }
+
+    @Override
+    public void setMenuVisibility(boolean menuVisible) {
+        super.setMenuVisibility(menuVisible);
+        if (presenter != null) {
+            presenter.onFragmentVisible(menuVisible);
+        }
+    }
+
+    @Override
+    public void setActivityTitle() {
+        setTitle(getString(R.string.dashboard_text));
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/dashboard/DashboardPresenter.java b/app/src/main/java/io/github/wulkanowy/ui/main/dashboard/DashboardPresenter.java
new file mode 100644
index 00000000..58d89b39
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/main/dashboard/DashboardPresenter.java
@@ -0,0 +1,37 @@
+package io.github.wulkanowy.ui.main.dashboard;
+
+import javax.inject.Inject;
+
+import io.github.wulkanowy.data.RepositoryContract;
+import io.github.wulkanowy.ui.base.BasePresenter;
+import io.github.wulkanowy.ui.main.OnFragmentIsReadyListener;
+
+public class DashboardPresenter extends BasePresenter<DashboardContract.View>
+        implements DashboardContract.Presenter {
+
+    private OnFragmentIsReadyListener listener;
+
+    @Inject
+    DashboardPresenter(RepositoryContract repository) {
+        super(repository);
+    }
+
+    @Override
+    public void onStart(DashboardContract.View view, OnFragmentIsReadyListener listener) {
+        super.onStart(view);
+        this.listener = listener;
+
+        if (getView().isMenuVisible()) {
+            getView().setActivityTitle();
+        }
+
+        this.listener.onFragmentIsReady();
+    }
+
+    @Override
+    public void onFragmentVisible(boolean isVisible) {
+        if (isVisible) {
+            getView().setActivityTitle();
+        }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/exams/ExamsDialogFragment.java b/app/src/main/java/io/github/wulkanowy/ui/main/exams/ExamsDialogFragment.java
deleted file mode 100644
index 8c4fafcd..00000000
--- a/app/src/main/java/io/github/wulkanowy/ui/main/exams/ExamsDialogFragment.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package io.github.wulkanowy.ui.main.exams;
-
-
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.DialogFragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.OnClick;
-import io.github.wulkanowy.R;
-import io.github.wulkanowy.data.db.dao.entities.Exam;
-
-public class ExamsDialogFragment extends DialogFragment {
-
-    private static final String ARGUMENT_KEY = "Item";
-
-    private Exam exam;
-
-    @BindView(R.id.exams_dialog_subject_value)
-    TextView subject;
-
-    @BindView(R.id.exams_dialog_type_value)
-    TextView type;
-
-    @BindView(R.id.exams_dialog_teacher_value)
-    TextView teacher;
-
-    @BindView(R.id.exams_dialog_date_value)
-    TextView entryDate;
-
-    @BindView(R.id.exams_dialog_description_value)
-    TextView description;
-
-    public static ExamsDialogFragment newInstance(Exam exam) {
-        ExamsDialogFragment dialogFragment = new ExamsDialogFragment();
-
-        Bundle bundle = new Bundle();
-        bundle.putSerializable(ARGUMENT_KEY, exam);
-
-        dialogFragment.setArguments(bundle);
-
-        return dialogFragment;
-    }
-
-    @Override
-    public void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        if (getArguments() != null) {
-            exam = (Exam) getArguments().getSerializable(ARGUMENT_KEY);
-        }
-    }
-
-    @Nullable
-    @Override
-    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.exams_dialog, container, false);
-
-        ButterKnife.bind(this, view);
-
-        subject.setText(exam.getSubjectAndGroup());
-        teacher.setText(exam.getTeacher());
-        type.setText(exam.getType());
-        entryDate.setText(exam.getEntryDate());
-
-        if (!exam.getDescription().isEmpty()) {
-            description.setText(exam.getDescription());
-        }
-
-        return view;
-    }
-
-    @OnClick(R.id.exams_dialog_close)
-    void onClickCloseButton() {
-        dismiss();
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/exams/ExamsFragment.java b/app/src/main/java/io/github/wulkanowy/ui/main/exams/ExamsFragment.java
deleted file mode 100644
index cab3b902..00000000
--- a/app/src/main/java/io/github/wulkanowy/ui/main/exams/ExamsFragment.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package io.github.wulkanowy.ui.main.exams;
-
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.design.widget.Snackbar;
-import android.support.design.widget.TabLayout;
-import android.support.v4.view.ViewPager;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import javax.inject.Inject;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import io.github.wulkanowy.R;
-import io.github.wulkanowy.di.component.FragmentComponent;
-import io.github.wulkanowy.ui.base.BaseFragment;
-import io.github.wulkanowy.ui.base.BasePagerAdapter;
-import io.github.wulkanowy.ui.main.OnFragmentIsReadyListener;
-
-public class ExamsFragment extends BaseFragment implements ExamsContract.View {
-
-    private static final String CURRENT_ITEM_KEY = "CurrentItem";
-
-    @BindView(R.id.exams_fragment_viewpager)
-    ViewPager viewPager;
-
-    @BindView(R.id.exams_fragment_tab_layout)
-    TabLayout tabLayout;
-
-    @Inject
-    BasePagerAdapter pagerAdapter;
-
-    @Inject
-    ExamsContract.Presenter presenter;
-
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.fragment_exams, container, false);
-
-        FragmentComponent component = getFragmentComponent();
-        if (component != null) {
-            component.inject(this);
-            setButterKnife(ButterKnife.bind(this, view));
-            presenter.onStart(this, (OnFragmentIsReadyListener) getActivity());
-
-            if (savedInstanceState != null) {
-                presenter.setRestoredPosition(savedInstanceState.getInt(CURRENT_ITEM_KEY));
-            }
-        }
-        return view;
-    }
-
-    @Override
-    public void setMenuVisibility(boolean menuVisible) {
-        super.setMenuVisibility(menuVisible);
-        if (presenter != null) {
-            presenter.onFragmentActivated(menuVisible);
-        }
-    }
-
-    @Override
-    public void onError(String message) {
-        if (getActivity() != null) {
-            Snackbar.make(getActivity().findViewById(R.id.main_activity_view_pager),
-                    message, Snackbar.LENGTH_LONG).show();
-        }
-    }
-
-    @Override
-    public void setActivityTitle() {
-        setTitle(getString(R.string.exams_text));
-    }
-
-    @Override
-    public void scrollViewPagerToPosition(int position) {
-        viewPager.setCurrentItem(position, false);
-    }
-
-    @Override
-    public void setThemeForTab(int position) {
-        TabLayout.Tab tab = tabLayout.getTabAt(position);
-        if (tab != null) {
-            tab.setCustomView(R.layout.current_week_tab);
-        }
-    }
-
-    @Override
-    public void setTabDataToAdapter(String date) {
-        pagerAdapter.addFragment(ExamsTabFragment.newInstance(date), date);
-    }
-
-    @Override
-    public void setAdapterWithTabLayout() {
-        viewPager.setAdapter(pagerAdapter);
-        tabLayout.setupWithViewPager(viewPager);
-    }
-
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        outState.putInt(CURRENT_ITEM_KEY, viewPager.getCurrentItem());
-        super.onSaveInstanceState(outState);
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        presenter.onDestroy();
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/exams/ExamsHeaderItem.java b/app/src/main/java/io/github/wulkanowy/ui/main/exams/ExamsHeaderItem.java
deleted file mode 100644
index 86070515..00000000
--- a/app/src/main/java/io/github/wulkanowy/ui/main/exams/ExamsHeaderItem.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package io.github.wulkanowy.ui.main.exams;
-
-import android.view.View;
-import android.widget.TextView;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.apache.commons.lang3.builder.HashCodeBuilder;
-
-import java.util.List;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import eu.davidea.flexibleadapter.FlexibleAdapter;
-import eu.davidea.flexibleadapter.items.AbstractHeaderItem;
-import eu.davidea.flexibleadapter.items.IFlexible;
-import eu.davidea.viewholders.FlexibleViewHolder;
-import io.github.wulkanowy.R;
-import io.github.wulkanowy.data.db.dao.entities.Day;
-
-public class ExamsHeaderItem extends AbstractHeaderItem<ExamsHeaderItem.HeaderVieHolder> {
-
-    private Day day;
-
-    public ExamsHeaderItem(Day day) {
-        this.day = day;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-
-        if (o == null || getClass() != o.getClass()) return false;
-
-        ExamsHeaderItem that = (ExamsHeaderItem) o;
-
-        return new EqualsBuilder()
-                .append(day, that.day)
-                .isEquals();
-    }
-
-    @Override
-    public int hashCode() {
-        return new HashCodeBuilder(17, 37)
-                .append(day)
-                .toHashCode();
-    }
-
-    @Override
-    public int getLayoutRes() {
-        return R.layout.exams_header;
-    }
-
-    @Override
-    public HeaderVieHolder createViewHolder(View view, FlexibleAdapter<IFlexible> adapter) {
-        return new HeaderVieHolder(view, adapter);
-    }
-
-    @Override
-    public void bindViewHolder(FlexibleAdapter<IFlexible> adapter, HeaderVieHolder holder, int position, List<Object> payloads) {
-        holder.onBind(day);
-    }
-
-    static class HeaderVieHolder extends FlexibleViewHolder {
-
-        @BindView(R.id.exams_header_name)
-        TextView name;
-
-        @BindView(R.id.exams_header_date)
-        TextView date;
-
-        HeaderVieHolder(View view, FlexibleAdapter adapter) {
-            super(view, adapter);
-            ButterKnife.bind(this, view);
-        }
-
-        void onBind(Day item) {
-            name.setText(StringUtils.capitalize(item.getDayName()));
-            date.setText(item.getDate());
-        }
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/exams/ExamsPresenter.java b/app/src/main/java/io/github/wulkanowy/ui/main/exams/ExamsPresenter.java
deleted file mode 100644
index 5f6cd4dc..00000000
--- a/app/src/main/java/io/github/wulkanowy/ui/main/exams/ExamsPresenter.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package io.github.wulkanowy.ui.main.exams;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.inject.Inject;
-
-import io.github.wulkanowy.data.RepositoryContract;
-import io.github.wulkanowy.ui.base.BasePresenter;
-import io.github.wulkanowy.ui.main.OnFragmentIsReadyListener;
-import io.github.wulkanowy.utils.TimeUtils;
-import io.github.wulkanowy.utils.async.AbstractTask;
-import io.github.wulkanowy.utils.async.AsyncListeners;
-
-public class ExamsPresenter extends BasePresenter<ExamsContract.View>
-        implements ExamsContract.Presenter, AsyncListeners.OnFirstLoadingListener {
-
-    private AbstractTask loadingTask;
-
-    private List<String> dates = new ArrayList<>();
-
-    private OnFragmentIsReadyListener listener;
-
-    private int positionToScroll = 0;
-
-    private boolean isFirstSight = false;
-
-    @Inject
-    ExamsPresenter(RepositoryContract repository) {
-        super(repository);
-    }
-
-    @Override
-    public void onStart(ExamsContract.View view, OnFragmentIsReadyListener listener) {
-        super.onStart(view);
-        this.listener = listener;
-
-        if (getView().isMenuVisible()) {
-            getView().setActivityTitle();
-        }
-
-        if (dates.isEmpty()) {
-            dates = TimeUtils.getMondaysFromCurrentSchoolYear();
-        }
-
-        if (positionToScroll == 0) {
-            positionToScroll = dates.indexOf(TimeUtils.getDateOfCurrentMonday(true));
-        }
-
-        if (!isFirstSight) {
-            isFirstSight = true;
-
-            loadingTask = new AbstractTask();
-            loadingTask.setOnFirstLoadingListener(this);
-            loadingTask.execute();
-        }
-    }
-
-    @Override
-    public void onFragmentActivated(boolean isVisible) {
-        if (isVisible) {
-            getView().setActivityTitle();
-        }
-    }
-
-    @Override
-    public void setRestoredPosition(int position) {
-        this.positionToScroll = position;
-    }
-
-    @Override
-    public void onDoInBackgroundLoading() throws Exception {
-        for (String date : dates) {
-            getView().setTabDataToAdapter(date);
-        }
-    }
-
-    @Override
-    public void onCanceledLoadingAsync() {
-        // do nothing
-    }
-
-    @Override
-    public void onEndLoadingAsync(boolean result, Exception exception) {
-        if (result) {
-            getView().setAdapterWithTabLayout();
-            getView().setThemeForTab(positionToScroll);
-            getView().scrollViewPagerToPosition(positionToScroll);
-            listener.onFragmentIsReady();
-        }
-    }
-
-    @Override
-    public void onDestroy() {
-        isFirstSight = false;
-
-        if (loadingTask != null) {
-            loadingTask.cancel(true);
-            loadingTask = null;
-        }
-        super.onDestroy();
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/exams/ExamsSubItem.java b/app/src/main/java/io/github/wulkanowy/ui/main/exams/ExamsSubItem.java
deleted file mode 100644
index aca20d6b..00000000
--- a/app/src/main/java/io/github/wulkanowy/ui/main/exams/ExamsSubItem.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package io.github.wulkanowy.ui.main.exams;
-
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.FragmentActivity;
-import android.view.View;
-import android.widget.TextView;
-
-import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.apache.commons.lang3.builder.HashCodeBuilder;
-
-import java.util.List;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import eu.davidea.flexibleadapter.FlexibleAdapter;
-import eu.davidea.flexibleadapter.items.AbstractSectionableItem;
-import eu.davidea.flexibleadapter.items.IFlexible;
-import eu.davidea.viewholders.FlexibleViewHolder;
-import io.github.wulkanowy.R;
-import io.github.wulkanowy.data.db.dao.entities.Exam;
-
-public class ExamsSubItem
-        extends AbstractSectionableItem<ExamsSubItem.SubItemViewHolder, ExamsHeaderItem> {
-
-    private Exam exam;
-
-    ExamsSubItem(ExamsHeaderItem header, Exam exam) {
-        super(header);
-        this.exam = exam;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-
-        if (o == null || getClass() != o.getClass()) return false;
-
-        ExamsSubItem that = (ExamsSubItem) o;
-
-        return new EqualsBuilder()
-                .append(exam, that.exam)
-                .isEquals();
-    }
-
-    @Override
-    public int hashCode() {
-        return new HashCodeBuilder(17, 37)
-                .append(exam)
-                .toHashCode();
-    }
-
-    @Override
-    public int getLayoutRes() {
-        return R.layout.exams_subitem;
-    }
-
-    @Override
-    public SubItemViewHolder createViewHolder(View view, FlexibleAdapter<IFlexible> adapter) {
-        return new SubItemViewHolder(view, adapter);
-    }
-
-    @Override
-    public void bindViewHolder(FlexibleAdapter<IFlexible> adapter, SubItemViewHolder holder, int position, List<Object> payloads) {
-        holder.onBind(exam);
-    }
-
-    static class SubItemViewHolder extends FlexibleViewHolder {
-
-        @BindView(R.id.exams_subitem_subject)
-        TextView subject;
-
-        @BindView(R.id.exams_subitems_teacher)
-        TextView teacher;
-
-        @BindView(R.id.exams_subitems_type)
-        TextView type;
-
-        private Exam item;
-
-        SubItemViewHolder(View view, FlexibleAdapter adapter) {
-            super(view, adapter);
-            ButterKnife.bind(this, view);
-            view.setOnClickListener(this);
-        }
-
-        void onBind(Exam exam) {
-            item = exam;
-
-            subject.setText(item.getSubjectAndGroup());
-            teacher.setText(item.getTeacher());
-            type.setText(item.getType());
-        }
-
-        @Override
-        public void onClick(View view) {
-            super.onClick(view);
-            showDialog();
-
-        }
-
-        private void showDialog() {
-            ExamsDialogFragment dialogFragment = ExamsDialogFragment.newInstance(item);
-            dialogFragment.setStyle(DialogFragment.STYLE_NO_TITLE, 0);
-            dialogFragment.show(((FragmentActivity) getContentView().getContext()).getSupportFragmentManager(),
-                    item.toString());
-        }
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/exams/ExamsTabContract.java b/app/src/main/java/io/github/wulkanowy/ui/main/exams/ExamsTabContract.java
deleted file mode 100644
index ec59628a..00000000
--- a/app/src/main/java/io/github/wulkanowy/ui/main/exams/ExamsTabContract.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package io.github.wulkanowy.ui.main.exams;
-
-import java.util.List;
-
-import io.github.wulkanowy.di.annotations.PerFragment;
-import io.github.wulkanowy.ui.base.BaseContract;
-
-public interface ExamsTabContract {
-
-    interface View extends BaseContract.View {
-
-        void onRefreshSuccess();
-
-        void hideRefreshingBar();
-
-        void showNoItem(boolean show);
-
-        void showProgressBar(boolean show);
-
-        void updateAdapterList(List<ExamsSubItem> headerItems);
-    }
-
-    @PerFragment
-    interface Presenter extends BaseContract.Presenter<View> {
-
-        void onFragmentActivated(boolean isSelected);
-
-        void setArgumentDate(String date);
-
-        void onRefresh();
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/exams/ExamsTabFragment.java b/app/src/main/java/io/github/wulkanowy/ui/main/exams/ExamsTabFragment.java
deleted file mode 100644
index d41e34d2..00000000
--- a/app/src/main/java/io/github/wulkanowy/ui/main/exams/ExamsTabFragment.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package io.github.wulkanowy.ui.main.exams;
-
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.design.widget.Snackbar;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import java.util.List;
-
-import javax.inject.Inject;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import eu.davidea.flexibleadapter.FlexibleAdapter;
-import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager;
-import io.github.wulkanowy.R;
-import io.github.wulkanowy.di.component.FragmentComponent;
-import io.github.wulkanowy.ui.base.BaseFragment;
-
-public class ExamsTabFragment extends BaseFragment implements ExamsTabContract.View,
-        SwipeRefreshLayout.OnRefreshListener {
-
-    private static final String ARGUMENT_KEY = "date";
-
-    @BindView(R.id.exams_tab_fragment_recycler)
-    RecyclerView recyclerView;
-
-    @BindView(R.id.exams_tab_fragment_swipe_refresh)
-    SwipeRefreshLayout refreshLayout;
-
-    @BindView(R.id.exams_tab_fragment_progress_bar)
-    View progressBar;
-
-    @BindView(R.id.exams_tab_fragment_no_item_container)
-    View noItemView;
-
-    @Inject
-    ExamsTabContract.Presenter presenter;
-
-    @Inject
-    FlexibleAdapter<ExamsSubItem> adapter;
-
-    private boolean isFragmentVisible = false;
-
-    public static ExamsTabFragment newInstance(String date) {
-        ExamsTabFragment tabFragment = new ExamsTabFragment();
-
-        Bundle bundle = new Bundle();
-        bundle.putString(ARGUMENT_KEY, date);
-        tabFragment.setArguments(bundle);
-
-        return tabFragment;
-    }
-
-    @Nullable
-    @Override
-    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.fragment_exams_tab, container, false);
-
-        FragmentComponent component = getFragmentComponent();
-        if (component != null) {
-            component.inject(this);
-            setButterKnife(ButterKnife.bind(this, view));
-
-            if (getArguments() != null) {
-                presenter.setArgumentDate(getArguments().getString(ARGUMENT_KEY));
-            }
-            presenter.onStart(this);
-            presenter.onFragmentActivated(isFragmentVisible);
-        }
-        return view;
-    }
-
-    @Override
-    protected void setUpOnViewCreated(View fragmentView) {
-        adapter.setDisplayHeadersAtStartUp(true);
-
-        recyclerView.setLayoutManager(new SmoothScrollLinearLayoutManager(fragmentView.getContext()));
-        recyclerView.setAdapter(adapter);
-
-        refreshLayout.setColorSchemeResources(android.R.color.black);
-        refreshLayout.setOnRefreshListener(this);
-    }
-
-    @Override
-    public void setMenuVisibility(boolean menuVisible) {
-        super.setMenuVisibility(menuVisible);
-        isFragmentVisible = menuVisible;
-        if (presenter != null) {
-            presenter.onFragmentActivated(menuVisible);
-        }
-    }
-
-    @Override
-    public void updateAdapterList(List<ExamsSubItem> headerItems) {
-        adapter.updateDataSet(headerItems);
-    }
-
-    @Override
-    public void onRefresh() {
-        presenter.onRefresh();
-    }
-
-    @Override
-    public void onRefreshSuccess() {
-        onError(R.string.sync_completed);
-    }
-
-    @Override
-    public void hideRefreshingBar() {
-        refreshLayout.setRefreshing(false);
-    }
-
-    @Override
-    public void showNoItem(boolean show) {
-        noItemView.setVisibility(show ? View.VISIBLE : View.INVISIBLE);
-    }
-
-    @Override
-    public void showProgressBar(boolean show) {
-        progressBar.setVisibility(show ? View.VISIBLE : View.INVISIBLE);
-    }
-
-    @Override
-    public void onError(String message) {
-        if (getActivity() != null) {
-            Snackbar.make(getActivity().findViewById(R.id.main_activity_view_pager),
-                    message, Snackbar.LENGTH_LONG).show();
-        }
-    }
-
-    @Override
-    public void onDestroyView() {
-        presenter.onDestroy();
-        super.onDestroyView();
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/exams/ExamsTabPresenter.java b/app/src/main/java/io/github/wulkanowy/ui/main/exams/ExamsTabPresenter.java
deleted file mode 100644
index 8c8914a0..00000000
--- a/app/src/main/java/io/github/wulkanowy/ui/main/exams/ExamsTabPresenter.java
+++ /dev/null
@@ -1,162 +0,0 @@
-package io.github.wulkanowy.ui.main.exams;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.inject.Inject;
-
-import io.github.wulkanowy.data.RepositoryContract;
-import io.github.wulkanowy.data.db.dao.entities.Day;
-import io.github.wulkanowy.data.db.dao.entities.Exam;
-import io.github.wulkanowy.data.db.dao.entities.Week;
-import io.github.wulkanowy.ui.base.BasePresenter;
-import io.github.wulkanowy.utils.async.AbstractTask;
-import io.github.wulkanowy.utils.async.AsyncListeners;
-
-public class ExamsTabPresenter extends BasePresenter<ExamsTabContract.View>
-        implements ExamsTabContract.Presenter, AsyncListeners.OnFirstLoadingListener,
-        AsyncListeners.OnRefreshListener {
-
-    private AbstractTask refreshTask;
-
-    private AbstractTask loadingTask;
-
-    private List<ExamsSubItem> subItems = new ArrayList<>();
-
-    private String date;
-
-    private boolean isFirstSight = false;
-
-    @Inject
-    public ExamsTabPresenter(RepositoryContract repository) {
-        super(repository);
-    }
-
-    @Override
-    public void onStart(ExamsTabContract.View view) {
-        super.onStart(view);
-        getView().showProgressBar(true);
-        getView().showNoItem(false);
-    }
-
-    @Override
-    public void onFragmentActivated(boolean isSelected) {
-        if (!isFirstSight && isSelected && isViewAttached()) {
-            isFirstSight = true;
-
-            loadingTask = new AbstractTask();
-            loadingTask.setOnFirstLoadingListener(this);
-            loadingTask.execute();
-        } else if (!isSelected) {
-            cancelAsyncTasks();
-        }
-    }
-
-    @Override
-    public void setArgumentDate(String date) {
-        this.date = date;
-    }
-
-    @Override
-    public void onRefresh() {
-        if (getView().isNetworkConnected()) {
-            refreshTask = new AbstractTask();
-            refreshTask.setOnRefreshListener(this);
-            refreshTask.execute();
-        } else {
-            getView().onNoNetworkError();
-            getView().hideRefreshingBar();
-        }
-    }
-
-    @Override
-    public void onDoInBackgroundRefresh() throws Exception {
-        syncData();
-    }
-
-    @Override
-    public void onCanceledRefreshAsync() {
-        if (isViewAttached()) {
-            getView().hideRefreshingBar();
-        }
-    }
-
-    @Override
-    public void onEndRefreshAsync(boolean result, Exception exception) {
-        if (result) {
-            loadingTask = new AbstractTask();
-            loadingTask.setOnFirstLoadingListener(this);
-            loadingTask.execute();
-
-            getView().onRefreshSuccess();
-        } else {
-            getView().onError(getRepository().getResRepo().getErrorLoginMessage(exception));
-        }
-        getView().hideRefreshingBar();
-    }
-
-    @Override
-    public void onDoInBackgroundLoading() throws Exception {
-        Week week = getRepository().getDbRepo().getWeek(date);
-
-        if (week == null || !week.getExamsSynced()) {
-            syncData();
-            week = getRepository().getDbRepo().getWeek(date);
-        }
-
-        week.resetDayList();
-        List<Day> dayList = week.getDayList();
-
-        subItems = new ArrayList<>();
-
-        for (Day day : dayList) {
-            day.resetExams();
-            ExamsHeaderItem headerItem = new ExamsHeaderItem(day);
-
-            List<Exam> examList = day.getExams();
-
-            for (Exam exam : examList) {
-                subItems.add(new ExamsSubItem(headerItem, exam));
-            }
-        }
-    }
-
-    @Override
-    public void onCanceledLoadingAsync() {
-        // do nothing
-    }
-
-    @Override
-    public void onEndLoadingAsync(boolean result, Exception exception) {
-        if (subItems.isEmpty()) {
-            getView().showNoItem(true);
-            getView().updateAdapterList(null);
-        } else {
-            getView().updateAdapterList(subItems);
-            getView().showNoItem(false);
-        }
-        getView().showProgressBar(false);
-    }
-
-    private void syncData() throws Exception {
-        getRepository().getSyncRepo().syncExams(0, date);
-    }
-
-    private void cancelAsyncTasks() {
-        if (refreshTask != null) {
-            refreshTask.cancel(true);
-            refreshTask = null;
-        }
-        if (loadingTask != null) {
-            loadingTask.cancel(true);
-            loadingTask = null;
-        }
-    }
-
-    @Override
-    public void onDestroy() {
-        isFirstSight = false;
-        cancelAsyncTasks();
-        super.onDestroy();
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/grades/GradeHeaderItem.java b/app/src/main/java/io/github/wulkanowy/ui/main/grades/GradeHeaderItem.java
index 5d0fd073..a66be29b 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/grades/GradeHeaderItem.java
+++ b/app/src/main/java/io/github/wulkanowy/ui/main/grades/GradeHeaderItem.java
@@ -17,19 +17,15 @@ import eu.davidea.flexibleadapter.items.AbstractExpandableHeaderItem;
 import eu.davidea.viewholders.ExpandableViewHolder;
 import io.github.wulkanowy.R;
 import io.github.wulkanowy.data.db.dao.entities.Subject;
-import io.github.wulkanowy.utils.AnimationUtils;
-import io.github.wulkanowy.utils.GradeUtils;
+import io.github.wulkanowy.utils.AverageCalculator;
 
 public class GradeHeaderItem
         extends AbstractExpandableHeaderItem<GradeHeaderItem.HeaderViewHolder, GradesSubItem> {
 
     private Subject subject;
 
-    private final boolean isShowSummary;
-
-    GradeHeaderItem(Subject subject, boolean isShowSummary) {
+    GradeHeaderItem(Subject subject) {
         this.subject = subject;
-        this.isShowSummary = isShowSummary;
     }
 
     @Override
@@ -59,7 +55,7 @@ public class GradeHeaderItem
 
     @Override
     public HeaderViewHolder createViewHolder(View view, FlexibleAdapter adapter) {
-        return new HeaderViewHolder(view, adapter, isShowSummary);
+        return new HeaderViewHolder(view, adapter);
     }
 
     @Override
@@ -78,127 +74,45 @@ public class GradeHeaderItem
         @BindView(R.id.grade_header_number_of_grade_text)
         TextView numberText;
 
-        @BindView(R.id.grade_header_predicted_rating_text)
-        TextView predictedText;
-
-        @BindView(R.id.grade_header_final_rating_text)
-        TextView finalText;
-
         @BindView(R.id.grade_header_alert_image)
         View alertImage;
 
-        private Resources resources;
+        Resources resources;
 
-        private Subject item;
-
-        private FlexibleAdapter adapter;
-
-        private boolean isShowSummary;
-
-        HeaderViewHolder(View view, FlexibleAdapter adapter, boolean isShowSummary) {
+        HeaderViewHolder(View view, FlexibleAdapter adapter) {
             super(view, adapter);
             ButterKnife.bind(this, view);
             resources = view.getResources();
             view.setOnClickListener(this);
-            this.isShowSummary = isShowSummary;
-            this.adapter = adapter;
         }
 
         void onBind(Subject item, List<GradesSubItem> subItems) {
-            this.item = item;
-
             subjectName.setText(item.getName());
             numberText.setText(resources.getQuantityString(R.plurals.numberOfGradesPlurals,
                     subItems.size(), subItems.size()));
-            averageText.setText(getGradesAverageString());
-
-            predictedText.setText(resources.getString(R.string.info_grades_predicted_rating,
-                    item.getPredictedRating()));
-            finalText.setText(resources.getString(R.string.info_grades_final_rating,
-                    item.getFinalRating()));
-
-            resetViews();
-            toggleSummaryText();
-            toggleSubjectText();
-
+            averageText.setText(getGradesAverageString(item));
             alertImage.setVisibility(isSubItemsReadAndSaveAlertView(subItems)
                     ? View.INVISIBLE : View.VISIBLE);
         }
 
-        @Override
-        public void onClick(View view) {
-            super.onClick(view);
-            toggleSubjectText();
-            toggleSummaryText();
-        }
-
-        private void toggleSummaryText() {
-            if (isSummaryToggleable()) {
-                if (isExpand()) {
-                    AnimationUtils.slideDown(predictedText);
-                    AnimationUtils.slideDown(finalText);
-                } else {
-                    AnimationUtils.slideUp(predictedText);
-                    AnimationUtils.slideUp(finalText);
-                }
-            }
-        }
-
-        private void toggleSubjectText() {
-            if (isExpand()) {
-                subjectName.setMaxLines(3);
-            } else {
-                subjectName.setMaxLines(1);
-            }
-        }
-
-        private void resetViews() {
-            subjectName.setMaxLines(1);
-            predictedText.setVisibility(View.GONE);
-            finalText.setVisibility(View.GONE);
-        }
-
         private boolean isSubItemsReadAndSaveAlertView(List<GradesSubItem> subItems) {
             boolean isRead = true;
 
-            for (GradesSubItem gradesSubItem : subItems) {
-                isRead = gradesSubItem.getGrade().getRead();
-                gradesSubItem.setSubjectAlertImage(alertImage);
+            for (GradesSubItem item : subItems) {
+                isRead = item.getGrade().getRead();
+                item.setSubjectAlertImage(alertImage);
             }
-
             return isRead;
         }
 
-        private String getGradesAverageString() {
-            float average = GradeUtils.calculate(item.getGradeList());
+        private String getGradesAverageString(Subject item) {
+            float average = AverageCalculator.calculate(item.getGradeList());
 
             if (average < 0) {
                 return resources.getString(R.string.info_no_average);
+            } else {
+                return resources.getString(R.string.info_average_grades, average);
             }
-
-            return resources.getString(R.string.info_average_grades, average);
-        }
-
-        private boolean isExpand() {
-            return adapter.isExpanded(getFlexibleAdapterPosition());
-        }
-
-        private boolean isSummaryToggleable() {
-            boolean isSummaryEmpty = true;
-
-            if (!"-".equals(item.getPredictedRating()) || !"-".equals(item.getFinalRating())) {
-                isSummaryEmpty = false;
-            }
-
-            if (isSummaryEmpty) {
-                return false;
-            } else if (isShowSummary) {
-                predictedText.setVisibility(View.VISIBLE);
-                finalText.setVisibility(View.VISIBLE);
-
-                return false;
-            }
-            return true;
         }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/grades/GradesContract.java b/app/src/main/java/io/github/wulkanowy/ui/main/grades/GradesContract.java
index a48b340d..7deabb5e 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/grades/GradesContract.java
+++ b/app/src/main/java/io/github/wulkanowy/ui/main/grades/GradesContract.java
@@ -24,8 +24,6 @@ public interface GradesContract {
 
         void setActivityTitle();
 
-        void setCurrentSemester(int semester);
-
         boolean isMenuVisible();
 
     }
@@ -38,7 +36,5 @@ public interface GradesContract {
         void onRefresh();
 
         void onStart(View view, OnFragmentIsReadyListener listener);
-
-        void onSemesterChange(int which);
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/grades/GradesDialogFragment.java b/app/src/main/java/io/github/wulkanowy/ui/main/grades/GradesDialogFragment.java
index b8da5a96..0d9a699f 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/grades/GradesDialogFragment.java
+++ b/app/src/main/java/io/github/wulkanowy/ui/main/grades/GradesDialogFragment.java
@@ -16,7 +16,6 @@ import butterknife.OnClick;
 import io.github.wulkanowy.R;
 import io.github.wulkanowy.data.db.dao.entities.Grade;
 import io.github.wulkanowy.utils.CommonUtils;
-import io.github.wulkanowy.utils.GradeUtils;
 
 public class GradesDialogFragment extends DialogFragment {
 
@@ -77,7 +76,7 @@ public class GradesDialogFragment extends DialogFragment {
 
         subject.setText(grade.getSubject());
         value.setText(grade.getValue());
-        value.setBackgroundResource(GradeUtils.getValueColor(grade.getValue()));
+        value.setBackgroundResource(grade.getValueColor());
         weight.setText(grade.getWeight());
         date.setText(grade.getDate());
         color.setText(CommonUtils.colorHexToColorName(grade.getColor()));
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/grades/GradesFragment.java b/app/src/main/java/io/github/wulkanowy/ui/main/grades/GradesFragment.java
index 32c1f3d3..bd44f298 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/grades/GradesFragment.java
+++ b/app/src/main/java/io/github/wulkanowy/ui/main/grades/GradesFragment.java
@@ -1,17 +1,12 @@
 package io.github.wulkanowy.ui.main.grades;
 
-import android.content.DialogInterface;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.design.widget.Snackbar;
 import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 
@@ -45,8 +40,6 @@ public class GradesFragment extends BaseFragment implements GradesContract.View
     @Inject
     GradesContract.Presenter presenter;
 
-    int currentSemester = -1;
-
     public GradesFragment() {
         // empty constructor for fragment
     }
@@ -66,40 +59,6 @@ public class GradesFragment extends BaseFragment implements GradesContract.View
         return view;
     }
 
-    @Override
-    public void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setHasOptionsMenu(true);
-    }
-
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        inflater.inflate(R.menu.semester_switch, menu);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == R.id.action_filter) {
-            CharSequence[] items = new CharSequence[]{
-                    getResources().getString(R.string.semester_text, 1),
-                    getResources().getString(R.string.semester_text, 2),
-            };
-            new AlertDialog.Builder(getContext())
-                    .setTitle(R.string.switch_semester)
-                    .setNegativeButton(R.string.cancel, null)
-                    .setSingleChoiceItems(items, this.currentSemester, new DialogInterface.OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dialog, int which) {
-                            presenter.onSemesterChange(which);
-                            dialog.cancel();
-                        }
-                    }).show();
-            return true;
-        } else {
-            return super.onOptionsItemSelected(item);
-        }
-    }
-
     @Override
     protected void setUpOnViewCreated(View fragmentView) {
         noItemView.setVisibility(View.GONE);
@@ -128,10 +87,6 @@ public class GradesFragment extends BaseFragment implements GradesContract.View
         setTitle(getString(R.string.grades_text));
     }
 
-    public void setCurrentSemester(int currentSemester) {
-        this.currentSemester = currentSemester;
-    }
-
     @Override
     public void onRefresh() {
         presenter.onRefresh();
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/grades/GradesPresenter.java b/app/src/main/java/io/github/wulkanowy/ui/main/grades/GradesPresenter.java
index 0927d145..8bdad12a 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/grades/GradesPresenter.java
+++ b/app/src/main/java/io/github/wulkanowy/ui/main/grades/GradesPresenter.java
@@ -27,8 +27,6 @@ public class GradesPresenter extends BasePresenter<GradesContract.View>
 
     private boolean isFirstSight = false;
 
-    private int semesterName;
-
     @Inject
     GradesPresenter(RepositoryContract repository) {
         super(repository);
@@ -43,30 +41,15 @@ public class GradesPresenter extends BasePresenter<GradesContract.View>
             getView().setActivityTitle();
         }
 
-        semesterName = getRepository().getDbRepo().getCurrentSemesterName();
-        getView().setCurrentSemester(semesterName - 1);
-
         if (!isFirstSight) {
             isFirstSight = true;
 
-            reloadGrades();
+            loadingTask = new AbstractTask();
+            loadingTask.setOnFirstLoadingListener(this);
+            loadingTask.execute();
         }
     }
 
-    @Override
-    public void onSemesterChange(int which) {
-        semesterName = which + 1;
-        getView().setCurrentSemester(which);
-
-        reloadGrades();
-    }
-
-    private void reloadGrades() {
-        loadingTask = new AbstractTask();
-        loadingTask.setOnFirstLoadingListener(this);
-        loadingTask.execute();
-    }
-
     @Override
     public void onFragmentVisible(boolean isVisible) {
         if (isVisible) {
@@ -88,8 +71,8 @@ public class GradesPresenter extends BasePresenter<GradesContract.View>
 
     @Override
     public void onDoInBackgroundRefresh() throws Exception {
-        getRepository().getSyncRepo().syncSubjects(semesterName);
-        getRepository().getSyncRepo().syncGrades(semesterName);
+        getRepository().syncSubjects();
+        getRepository().syncGrades();
     }
 
     @Override
@@ -102,9 +85,11 @@ public class GradesPresenter extends BasePresenter<GradesContract.View>
     @Override
     public void onEndRefreshAsync(boolean success, Exception exception) {
         if (success) {
-            reloadGrades();
+            loadingTask = new AbstractTask();
+            loadingTask.setOnFirstLoadingListener(this);
+            loadingTask.execute();
 
-            int numberOfNewGrades = getRepository().getDbRepo().getNewGrades(semesterName).size();
+            int numberOfNewGrades = getRepository().getNewGrades().size();
 
             if (numberOfNewGrades <= 0) {
                 getView().onRefreshSuccessNoGrade();
@@ -112,24 +97,22 @@ public class GradesPresenter extends BasePresenter<GradesContract.View>
                 getView().onRefreshSuccess(numberOfNewGrades);
             }
         } else {
-            getView().onError(getRepository().getResRepo().getErrorLoginMessage(exception));
+            getView().onError(getRepository().getErrorLoginMessage(exception));
         }
         getView().hideRefreshingBar();
     }
 
     @Override
-    public void onDoInBackgroundLoading() {
-        List<Subject> subjectList = getRepository().getDbRepo().getSubjectList(semesterName);
-        boolean isShowSummary = getRepository().getSharedRepo().isShowGradesSummary();
+    public void onDoInBackgroundLoading() throws Exception {
+        List<Subject> subjectList = getRepository().getCurrentUser().getSubjectList();
 
         headerItems = new ArrayList<>();
 
         for (Subject subject : subjectList) {
-            subject.resetGradeList();
             List<Grade> gradeList = subject.getGradeList();
 
             if (!gradeList.isEmpty()) {
-                GradeHeaderItem headerItem = new GradeHeaderItem(subject, isShowSummary);
+                GradeHeaderItem headerItem = new GradeHeaderItem(subject);
 
                 List<GradesSubItem> subItems = new ArrayList<>();
 
@@ -151,8 +134,12 @@ public class GradesPresenter extends BasePresenter<GradesContract.View>
 
     @Override
     public void onEndLoadingAsync(boolean result, Exception exception) {
-        getView().showNoItem(headerItems.isEmpty());
-        getView().updateAdapterList(headerItems);
+        if (headerItems.isEmpty()) {
+            getView().showNoItem(true);
+        } else {
+            getView().updateAdapterList(headerItems);
+            getView().showNoItem(false);
+        }
         listener.onFragmentIsReady();
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/grades/GradesSubItem.java b/app/src/main/java/io/github/wulkanowy/ui/main/grades/GradesSubItem.java
index de9c54c6..102a232f 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/grades/GradesSubItem.java
+++ b/app/src/main/java/io/github/wulkanowy/ui/main/grades/GradesSubItem.java
@@ -18,7 +18,6 @@ import eu.davidea.flexibleadapter.items.AbstractSectionableItem;
 import eu.davidea.viewholders.FlexibleViewHolder;
 import io.github.wulkanowy.R;
 import io.github.wulkanowy.data.db.dao.entities.Grade;
-import io.github.wulkanowy.utils.GradeUtils;
 
 public class GradesSubItem
         extends AbstractSectionableItem<GradesSubItem.SubItemViewHolder, GradeHeaderItem> {
@@ -38,7 +37,7 @@ public class GradesSubItem
         return grade;
     }
 
-    void setSubjectAlertImage(View subjectAlertImage) {
+    public void setSubjectAlertImage(View subjectAlertImage) {
         this.subjectAlertImage = subjectAlertImage;
     }
 
@@ -109,7 +108,7 @@ public class GradesSubItem
             this.subjectAlertImage = subjectAlertImage;
 
             value.setText(item.getValue());
-            value.setBackgroundResource(GradeUtils.getValueColor(item.getValue()));
+            value.setBackgroundResource(item.getValueColor());
             date.setText(item.getDate());
             description.setText(getDescriptionString());
             alert.setVisibility(item.getRead() ? View.INVISIBLE : View.VISIBLE);
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/settings/AboutScreen.java b/app/src/main/java/io/github/wulkanowy/ui/main/settings/AboutScreen.java
deleted file mode 100644
index fe677de4..00000000
--- a/app/src/main/java/io/github/wulkanowy/ui/main/settings/AboutScreen.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package io.github.wulkanowy.ui.main.settings;
-
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.support.v7.preference.Preference;
-import android.widget.Toast;
-
-import com.google.android.gms.oss.licenses.OssLicensesMenuActivity;
-
-import io.github.wulkanowy.BuildConfig;
-import io.github.wulkanowy.R;
-import io.github.wulkanowy.utils.AppConstant;
-
-public class AboutScreen extends SettingsFragment {
-
-    public static final String SHARED_KEY_ABOUT_VERSION = "about_version";
-
-    public static final String SHARED_KEY_ABOUT_LICENSES = "about_osl";
-
-    public static final String SHARED_KEY_ABOUT_REPO = "about_repo";
-
-    private Preference.OnPreferenceClickListener onProgrammerListener = new Preference.OnPreferenceClickListener() {
-        private int clicks = 0;
-
-        @Override
-        public boolean onPreferenceClick(Preference preference) {
-            Toast.makeText(getActivity(), getVersionToast(clicks++), Toast.LENGTH_SHORT).show();
-            return true;
-        }
-
-        private int getVersionToast(int click) {
-            if (0 == click) {
-                return R.string.about_programmer_step1;
-            }
-
-            if (1 == click) {
-                return R.string.about_programmer_step2;
-            }
-
-            if (9 > click) {
-                return R.string.about_programmer_step3;
-            }
-
-            return R.string.about_programmer;
-        }
-    };
-
-    public AboutScreen() {
-        // silence is golden
-    }
-
-    @Override
-    public void onCreate(final Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        findPreference(SHARED_KEY_ABOUT_VERSION).setSummary(BuildConfig.VERSION_NAME);
-        findPreference(SHARED_KEY_ABOUT_VERSION).setOnPreferenceClickListener(onProgrammerListener);
-        findPreference(SHARED_KEY_ABOUT_REPO).setIntent(new Intent(Intent.ACTION_VIEW, Uri.parse(AppConstant.REPO_URL)));
-        findPreference(SHARED_KEY_ABOUT_LICENSES).setIntent(new Intent(getActivity(), OssLicensesMenuActivity.class)
-                .putExtra("title", getString(R.string.pref_about_osl)));
-    }
-
-    @Override
-    public void onCreatePreferences(Bundle bundle, String rootKey) {
-        setPreferencesFromResource(R.xml.preferences, rootKey);
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/settings/SettingsFragment.java b/app/src/main/java/io/github/wulkanowy/ui/main/settings/SettingsFragment.java
deleted file mode 100644
index e08a4902..00000000
--- a/app/src/main/java/io/github/wulkanowy/ui/main/settings/SettingsFragment.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package io.github.wulkanowy.ui.main.settings;
-
-import android.content.SharedPreferences;
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v7.preference.PreferenceFragmentCompat;
-import android.support.v7.preference.PreferenceScreen;
-
-import io.github.wulkanowy.R;
-import io.github.wulkanowy.services.jobs.SyncJob;
-
-public class SettingsFragment extends PreferenceFragmentCompat
-        implements SharedPreferences.OnSharedPreferenceChangeListener,
-        PreferenceFragmentCompat.OnPreferenceStartScreenCallback{
-
-    public static final String SHARED_KEY_START_TAB = "startup_tab";
-
-    public static final String SHARED_KEY_GRADES_SUMMARY = "grades_summary";
-
-    public static final String SHARED_KEY_ATTENDANCE_PRESENT = "attendance_present";
-
-    public static final String SHARED_KEY_SERVICES_ENABLE = "services_enable";
-
-    public static final String SHARED_KEY_NOTIFY_ENABLE = "notify_enable";
-
-    public static final String SHARED_KEY_SERVICES_INTERVAL = "services_interval";
-
-    public static final String SHARED_KEY_SERVICES_MOBILE_DISABLED = "services_disable_mobile";
-
-    @Override
-    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-        addPreferencesFromResource(R.xml.preferences);
-    }
-
-    @Override
-    public void onCreate(final Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-    }
-
-    @Override
-    public Fragment getCallbackFragment() {
-        return this;
-    }
-
-    @Override
-    public boolean onPreferenceStartScreen(PreferenceFragmentCompat preferenceFragmentCompat,
-                                           PreferenceScreen preferenceScreen) {
-        FragmentTransaction ft = getActivity().getSupportFragmentManager().beginTransaction();
-        AboutScreen fragment = new AboutScreen();
-        Bundle args = new Bundle();
-        args.putString(PreferenceFragmentCompat.ARG_PREFERENCE_ROOT, preferenceScreen.getKey());
-        fragment.setArguments(args);
-        ft.add(R.id.main_activity_container, fragment, preferenceScreen.getKey());
-        ft.addToBackStack(preferenceScreen.getKey());
-        ft.commit();
-
-        return true;
-    }
-
-    @Override
-    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
-        if (key.equals(SHARED_KEY_SERVICES_ENABLE) || key.equals(SHARED_KEY_SERVICES_INTERVAL)
-                || key.equals(SHARED_KEY_SERVICES_MOBILE_DISABLED)) {
-            launchServices(sharedPreferences.getBoolean(SHARED_KEY_SERVICES_ENABLE, true),
-                    sharedPreferences);
-        }
-    }
-
-    private void launchServices(boolean start, SharedPreferences sharedPref) {
-        if (start) {
-            int newInterval = Integer.parseInt(sharedPref.getString(SHARED_KEY_SERVICES_INTERVAL, "60"));
-            boolean useOnlyWifi = sharedPref.getBoolean(SHARED_KEY_SERVICES_MOBILE_DISABLED, false);
-
-            SyncJob.stop(getContext());
-            SyncJob.start(getContext(), newInterval, useOnlyWifi);
-        } else {
-            SyncJob.stop(getContext());
-        }
-    }
-
-    @Override
-    public void setMenuVisibility(boolean menuVisible) {
-        super.setMenuVisibility(menuVisible);
-        if (menuVisible) {
-            getActivity().setTitle(R.string.settings_text);
-        }
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        getPreferenceScreen().getSharedPreferences()
-                .registerOnSharedPreferenceChangeListener(this);
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        getPreferenceScreen().getSharedPreferences()
-                .unregisterOnSharedPreferenceChangeListener(this);
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetableContract.java b/app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetableContract.java
index 57eca17e..eaad0505 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetableContract.java
+++ b/app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetableContract.java
@@ -1,8 +1,9 @@
 package io.github.wulkanowy.ui.main.timetable;
 
-import io.github.wulkanowy.di.annotations.PerFragment;
+import io.github.wulkanowy.di.annotations.PerActivity;
 import io.github.wulkanowy.ui.base.BaseContract;
 import io.github.wulkanowy.ui.main.OnFragmentIsReadyListener;
+import io.github.wulkanowy.ui.main.TabsData;
 
 public interface TimetableContract {
 
@@ -12,22 +13,24 @@ public interface TimetableContract {
 
         void scrollViewPagerToPosition(int position);
 
-        void setTabDataToAdapter(String date);
+        void setTabDataToAdapter(TabsData tabsData);
 
         void setAdapterWithTabLayout();
 
-        boolean isMenuVisible();
+        void setChildFragmentSelected(int position, boolean selected);
 
-        void setThemeForTab(int position);
+        boolean isMenuVisible();
     }
 
-    @PerFragment
+    @PerActivity
     interface Presenter extends BaseContract.Presenter<View> {
 
-        void onFragmentActivated(boolean isVisible);
+        void onFragmentVisible(boolean isVisible);
+
+        void onTabSelected(int position);
+
+        void onTabUnselected(int position);
 
         void onStart(View view, OnFragmentIsReadyListener listener);
-
-        void setRestoredPosition(int position);
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetableDialogFragment.java b/app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetableDialogFragment.java
index cc668dc2..b9390195 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetableDialogFragment.java
+++ b/app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetableDialogFragment.java
@@ -91,8 +91,8 @@ public class TimetableDialogFragment extends DialogFragment {
             teacherLabel.setVisibility(View.GONE);
         }
 
-        if (!lesson.getGroup().isEmpty()) {
-            group.setText(lesson.getGroup());
+        if (!lesson.getGroupName().isEmpty()) {
+            group.setText(lesson.getGroupName());
         } else {
             group.setVisibility(View.GONE);
             groupLabel.setVisibility(View.GONE);
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetableFragment.java b/app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetableFragment.java
index 6c5fd501..8bef4fb2 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetableFragment.java
+++ b/app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetableFragment.java
@@ -17,12 +17,10 @@ import butterknife.ButterKnife;
 import io.github.wulkanowy.R;
 import io.github.wulkanowy.di.component.FragmentComponent;
 import io.github.wulkanowy.ui.base.BaseFragment;
-import io.github.wulkanowy.ui.base.BasePagerAdapter;
 import io.github.wulkanowy.ui.main.OnFragmentIsReadyListener;
+import io.github.wulkanowy.ui.main.TabsData;
 
-public class TimetableFragment extends BaseFragment implements TimetableContract.View {
-
-    private static final String CURRENT_ITEM_KEY = "CurrentItem";
+public class TimetableFragment extends BaseFragment implements TimetableContract.View, TabLayout.OnTabSelectedListener {
 
     @BindView(R.id.timetable_fragment_viewpager)
     ViewPager viewPager;
@@ -31,7 +29,7 @@ public class TimetableFragment extends BaseFragment implements TimetableContract
     TabLayout tabLayout;
 
     @Inject
-    BasePagerAdapter pagerAdapter;
+    TimetablePagerAdapter pagerAdapter;
 
     @Inject
     TimetableContract.Presenter presenter;
@@ -46,10 +44,6 @@ public class TimetableFragment extends BaseFragment implements TimetableContract
             component.inject(this);
             setButterKnife(ButterKnife.bind(this, view));
             presenter.onStart(this, (OnFragmentIsReadyListener) getActivity());
-
-            if (savedInstanceState != null) {
-                presenter.setRestoredPosition(savedInstanceState.getInt(CURRENT_ITEM_KEY));
-            }
         }
         return view;
     }
@@ -58,19 +52,41 @@ public class TimetableFragment extends BaseFragment implements TimetableContract
     public void setMenuVisibility(boolean menuVisible) {
         super.setMenuVisibility(menuVisible);
         if (presenter != null) {
-            presenter.onFragmentActivated(menuVisible);
+            presenter.onFragmentVisible(menuVisible);
         }
     }
 
     @Override
-    public void setTabDataToAdapter(String date) {
-        pagerAdapter.addFragment(TimetableTabFragment.newInstance(date), date);
+    public void onTabSelected(TabLayout.Tab tab) {
+        presenter.onTabSelected(tab.getPosition());
+    }
+
+    @Override
+    public void onTabUnselected(TabLayout.Tab tab) {
+        presenter.onTabUnselected(tab.getPosition());
+    }
+
+    @Override
+    public void onTabReselected(TabLayout.Tab tab) {
+        //do nothing
+    }
+
+    @Override
+    public void setTabDataToAdapter(TabsData tabsData) {
+        pagerAdapter.setTabsData(tabsData);
     }
 
     @Override
     public void setAdapterWithTabLayout() {
         viewPager.setAdapter(pagerAdapter);
+
         tabLayout.setupWithViewPager(viewPager);
+        tabLayout.addOnTabSelectedListener(this);
+    }
+
+    @Override
+    public void setChildFragmentSelected(int position, boolean selected) {
+        ((TimetableTabFragment) pagerAdapter.getItem(position)).setSelected(selected);
     }
 
     @Override
@@ -78,17 +94,9 @@ public class TimetableFragment extends BaseFragment implements TimetableContract
         viewPager.setCurrentItem(position, false);
     }
 
-    @Override
-    public void setThemeForTab(int position) {
-        TabLayout.Tab tab = tabLayout.getTabAt(position);
-        if (tab != null) {
-            tab.setCustomView(R.layout.current_week_tab);
-        }
-    }
-
     @Override
     public void setActivityTitle() {
-        setTitle(getString(R.string.timetable_text));
+        setTitle(getString(R.string.lessonplan_text));
     }
 
     @Override
@@ -99,12 +107,6 @@ public class TimetableFragment extends BaseFragment implements TimetableContract
         }
     }
 
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        outState.putInt(CURRENT_ITEM_KEY, viewPager.getCurrentItem());
-        super.onSaveInstanceState(outState);
-    }
-
     @Override
     public void onDestroyView() {
         presenter.onDestroy();
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetableHeaderItem.java b/app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetableHeaderItem.java
index b98636b1..39a8f012 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetableHeaderItem.java
+++ b/app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetableHeaderItem.java
@@ -1,8 +1,5 @@
 package io.github.wulkanowy.ui.main.timetable;
 
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.graphics.drawable.Drawable;
 import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
@@ -19,7 +16,6 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 import eu.davidea.flexibleadapter.FlexibleAdapter;
 import eu.davidea.flexibleadapter.items.AbstractExpandableHeaderItem;
-import eu.davidea.flexibleadapter.items.IFlexible;
 import eu.davidea.viewholders.ExpandableViewHolder;
 import io.github.wulkanowy.R;
 import io.github.wulkanowy.data.db.dao.entities.Day;
@@ -59,13 +55,12 @@ public class TimetableHeaderItem
     }
 
     @Override
-    public HeaderViewHolder createViewHolder(View view, FlexibleAdapter<IFlexible> adapter) {
+    public HeaderViewHolder createViewHolder(View view, FlexibleAdapter adapter) {
         return new HeaderViewHolder(view, adapter);
     }
 
     @Override
-    public void bindViewHolder(FlexibleAdapter<IFlexible> adapter, HeaderViewHolder holder,
-                               int position, List<Object> payloads) {
+    public void bindViewHolder(FlexibleAdapter adapter, HeaderViewHolder holder, int position, List payloads) {
         holder.onBind(day, getSubItems());
     }
 
@@ -89,53 +84,32 @@ public class TimetableHeaderItem
         @BindColor(R.color.free_day)
         int backgroundFreeDay;
 
-        @BindColor(android.R.color.black)
-        int black;
-
-        private Context context;
-
         HeaderViewHolder(View view, FlexibleAdapter adapter) {
             super(view, adapter);
             view.setOnClickListener(this);
             ButterKnife.bind(this, view);
-            context = view.getContext();
         }
 
         void onBind(Day item, List<TimetableSubItem> subItems) {
             dayName.setText(StringUtils.capitalize(item.getDayName()));
             date.setText(item.getDate());
             alert.setVisibility(isSubItemNewMovedInOrChanged(subItems) ? View.VISIBLE : View.INVISIBLE);
-            freeName.setVisibility(item.getFreeDay() ? View.VISIBLE : View.INVISIBLE);
+            freeName.setVisibility(item.getIsFreeDay() ? View.VISIBLE : View.INVISIBLE);
             freeName.setText(item.getFreeDayName());
-            setInactiveHeader(item.getFreeDay());
-        }
 
-        private void setInactiveHeader(boolean inactive) {
-            ((FrameLayout) getContentView()).setForeground(inactive ? null : getSelectableDrawable());
-            dayName.setTextColor(inactive ? secondaryColor : black);
-
-            if (inactive) {
+            if (item.getIsFreeDay()) {
+                ((FrameLayout) getContentView()).setForeground(null);
                 getContentView().setBackgroundColor(backgroundFreeDay);
-            } else {
-                getContentView().setBackgroundDrawable(context.getResources()
-                        .getDrawable(R.drawable.ic_border));
+                dayName.setTextColor(secondaryColor);
             }
         }
 
-        private Drawable getSelectableDrawable() {
-            int[] attrs = new int[]{R.attr.selectableItemBackground};
-            TypedArray typedArray = context.obtainStyledAttributes(attrs);
-            Drawable drawable = typedArray.getDrawable(0);
-            typedArray.recycle();
-            return drawable;
-        }
-
         private boolean isSubItemNewMovedInOrChanged(List<TimetableSubItem> subItems) {
             boolean isAlertActive = false;
 
             for (TimetableSubItem subItem : subItems) {
-                if (subItem.getLesson().getMovedOrCanceled() ||
-                        subItem.getLesson().getNewMovedInOrChanged()) {
+                if (subItem.getLesson().getIsMovedOrCanceled() ||
+                        subItem.getLesson().getIsNewMovedInOrChanged()) {
                     isAlertActive = true;
                 }
             }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetablePagerAdapter.java b/app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetablePagerAdapter.java
new file mode 100644
index 00000000..0b852342
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetablePagerAdapter.java
@@ -0,0 +1,38 @@
+package io.github.wulkanowy.ui.main.timetable;
+
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentStatePagerAdapter;
+
+import io.github.wulkanowy.ui.main.TabsData;
+
+public class TimetablePagerAdapter extends FragmentStatePagerAdapter {
+
+    private TabsData tabsData;
+
+    public TimetablePagerAdapter(FragmentManager fragmentManager) {
+        super(fragmentManager);
+    }
+
+    void setTabsData(TabsData tabsData) {
+        this.tabsData = tabsData;
+    }
+
+    @Override
+    public Fragment getItem(int position) {
+        return tabsData.getFragment(position);
+    }
+
+
+    @Override
+    public int getCount() {
+        return tabsData.getFragmentsCount();
+    }
+
+    @Nullable
+    @Override
+    public CharSequence getPageTitle(int position) {
+        return tabsData.getTitle(position);
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetablePresenter.java b/app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetablePresenter.java
index d9c9c9c6..e816a190 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetablePresenter.java
+++ b/app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetablePresenter.java
@@ -8,6 +8,7 @@ import javax.inject.Inject;
 import io.github.wulkanowy.data.RepositoryContract;
 import io.github.wulkanowy.ui.base.BasePresenter;
 import io.github.wulkanowy.ui.main.OnFragmentIsReadyListener;
+import io.github.wulkanowy.ui.main.TabsData;
 import io.github.wulkanowy.utils.TimeUtils;
 import io.github.wulkanowy.utils.async.AbstractTask;
 import io.github.wulkanowy.utils.async.AsyncListeners;
@@ -19,9 +20,11 @@ public class TimetablePresenter extends BasePresenter<TimetableContract.View>
 
     private List<String> dates = new ArrayList<>();
 
+    private TabsData tabsData = new TabsData();
+
     private OnFragmentIsReadyListener listener;
 
-    private int positionToScroll = 0;
+    private int positionToScroll;
 
     private boolean isFirstSight = false;
 
@@ -42,10 +45,7 @@ public class TimetablePresenter extends BasePresenter<TimetableContract.View>
         if (dates.isEmpty()) {
             dates = TimeUtils.getMondaysFromCurrentSchoolYear();
         }
-
-        if (positionToScroll == 0) {
-            positionToScroll = dates.indexOf(TimeUtils.getDateOfCurrentMonday(true));
-        }
+        positionToScroll = dates.indexOf(TimeUtils.getDateOfCurrentMonday(true));
 
         if (!isFirstSight) {
             isFirstSight = true;
@@ -57,39 +57,46 @@ public class TimetablePresenter extends BasePresenter<TimetableContract.View>
     }
 
     @Override
-    public void onFragmentActivated(boolean isVisible) {
+    public void onFragmentVisible(boolean isVisible) {
         if (isVisible) {
             getView().setActivityTitle();
         }
     }
 
+    @Override
+    public void onTabSelected(int position) {
+        getView().setChildFragmentSelected(position, true);
+    }
+
+    @Override
+    public void onTabUnselected(int position) {
+        getView().setChildFragmentSelected(position, false);
+    }
+
     @Override
     public void onDoInBackgroundLoading() throws Exception {
         for (String date : dates) {
-            getView().setTabDataToAdapter(date);
+            tabsData.addTitle(date);
+            tabsData.addFragment(TimetableTabFragment.newInstance(date));
         }
     }
 
     @Override
     public void onCanceledLoadingAsync() {
         //do nothing
+
     }
 
     @Override
     public void onEndLoadingAsync(boolean result, Exception exception) {
         if (result) {
+            getView().setTabDataToAdapter(tabsData);
             getView().setAdapterWithTabLayout();
-            getView().setThemeForTab(positionToScroll);
             getView().scrollViewPagerToPosition(positionToScroll);
             listener.onFragmentIsReady();
         }
     }
 
-    @Override
-    public void setRestoredPosition(int position) {
-        this.positionToScroll = position;
-    }
-
     @Override
     public void onDestroy() {
         isFirstSight = false;
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetableSubItem.java b/app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetableSubItem.java
index a3e84dfa..ca82f783 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetableSubItem.java
+++ b/app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetableSubItem.java
@@ -17,7 +17,6 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 import eu.davidea.flexibleadapter.FlexibleAdapter;
 import eu.davidea.flexibleadapter.items.AbstractSectionableItem;
-import eu.davidea.flexibleadapter.items.IFlexible;
 import eu.davidea.viewholders.FlexibleViewHolder;
 import io.github.wulkanowy.R;
 import io.github.wulkanowy.data.db.dao.entities.TimetableLesson;
@@ -28,7 +27,7 @@ public class TimetableSubItem
 
     private TimetableLesson lesson;
 
-    TimetableSubItem(TimetableHeaderItem header, TimetableLesson lesson) {
+    public TimetableSubItem(TimetableHeaderItem header, TimetableLesson lesson) {
         super(header);
         this.lesson = lesson;
     }
@@ -63,13 +62,12 @@ public class TimetableSubItem
     }
 
     @Override
-    public SubItemViewHolder createViewHolder(View view, FlexibleAdapter<IFlexible> adapter) {
+    public SubItemViewHolder createViewHolder(View view, FlexibleAdapter adapter) {
         return new SubItemViewHolder(view, adapter);
     }
 
     @Override
-    public void bindViewHolder(FlexibleAdapter<IFlexible> adapter, SubItemViewHolder holder,
-                               int position, List<Object> payloads) {
+    public void bindViewHolder(FlexibleAdapter adapter, SubItemViewHolder holder, int position, List payloads) {
         holder.onBind(lesson);
     }
 
@@ -106,11 +104,11 @@ public class TimetableSubItem
 
             lessonName.setText(lesson.getSubject());
             lessonTime.setText(getLessonTimeString());
-            numberOfLesson.setText(String.valueOf(lesson.getNumber()));
+            numberOfLesson.setText(lesson.getNumber());
             room.setText(getRoomString());
-            alert.setVisibility(lesson.getMovedOrCanceled() || lesson.getNewMovedInOrChanged()
+            alert.setVisibility(lesson.getIsMovedOrCanceled() || lesson.getIsNewMovedInOrChanged()
                     ? View.VISIBLE : View.INVISIBLE);
-            lessonName.setPaintFlags(lesson.getMovedOrCanceled() ? lessonName.getPaintFlags()
+            lessonName.setPaintFlags(lesson.getIsMovedOrCanceled() ? lessonName.getPaintFlags()
                     | Paint.STRIKE_THRU_TEXT_FLAG :
                     lessonName.getPaintFlags() & (~Paint.STRIKE_THRU_TEXT_FLAG));
             room.setText(getRoomString());
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetableTabContract.java b/app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetableTabContract.java
index 0d6bdf2a..d17e6e55 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetableTabContract.java
+++ b/app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetableTabContract.java
@@ -23,10 +23,12 @@ public interface TimetableTabContract {
 
     interface Presenter extends BaseContract.Presenter<View> {
 
-        void onFragmentActivated(boolean isSelected);
+        void onFragmentSelected(boolean isSelected);
 
         void setArgumentDate(String date);
 
+        void onStart(View view, boolean isPrimary);
+
         void onRefresh();
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetableTabFragment.java b/app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetableTabFragment.java
index 53d9a67b..65841247 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetableTabFragment.java
+++ b/app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetableTabFragment.java
@@ -28,6 +28,12 @@ public class TimetableTabFragment extends BaseFragment implements TimetableTabCo
 
     private static final String ARGUMENT_KEY = "date";
 
+    private static final String SAVED_KEY = "isSelected";
+
+    private boolean isPrimary = false;
+
+    private boolean isSelected = false;
+
     @BindView(R.id.timetable_tab_fragment_recycler)
     RecyclerView recyclerView;
 
@@ -49,8 +55,6 @@ public class TimetableTabFragment extends BaseFragment implements TimetableTabCo
     @Inject
     FlexibleAdapter<TimetableHeaderItem> adapter;
 
-    private boolean isFragmentVisible = false;
-
     public static TimetableTabFragment newInstance(String date) {
         TimetableTabFragment fragmentTab = new TimetableTabFragment();
 
@@ -61,6 +65,14 @@ public class TimetableTabFragment extends BaseFragment implements TimetableTabCo
         return fragmentTab;
     }
 
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (savedInstanceState != null) {
+            isSelected = savedInstanceState.getBoolean(SAVED_KEY, isSelected);
+        }
+    }
+
     @Nullable
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
@@ -74,8 +86,8 @@ public class TimetableTabFragment extends BaseFragment implements TimetableTabCo
             if (getArguments() != null) {
                 presenter.setArgumentDate(getArguments().getString(ARGUMENT_KEY));
             }
-            presenter.onStart(this);
-            presenter.onFragmentActivated(isFragmentVisible);
+
+            presenter.onStart(this, isPrimary);
         }
         return view;
     }
@@ -102,9 +114,10 @@ public class TimetableTabFragment extends BaseFragment implements TimetableTabCo
     @Override
     public void setMenuVisibility(boolean menuVisible) {
         super.setMenuVisibility(menuVisible);
-        isFragmentVisible = menuVisible;
-        if (presenter != null) {
-            presenter.onFragmentActivated(menuVisible);
+        if (presenter != null && getView() != null) {
+            presenter.onFragmentSelected(isSelected);
+        } else if (isSelected) {
+            isPrimary = true;
         }
     }
 
@@ -120,7 +133,7 @@ public class TimetableTabFragment extends BaseFragment implements TimetableTabCo
 
     @Override
     public void onRefreshSuccess() {
-        onError(R.string.sync_completed);
+        onError(R.string.timetable_refresh_success);
     }
 
     @Override
@@ -138,6 +151,10 @@ public class TimetableTabFragment extends BaseFragment implements TimetableTabCo
         noItemView.setVisibility(show ? View.VISIBLE : View.INVISIBLE);
     }
 
+    public void setSelected(boolean selected) {
+        isSelected = selected;
+    }
+
     @Override
     public void onError(String message) {
         if (getActivity() != null) {
@@ -146,8 +163,15 @@ public class TimetableTabFragment extends BaseFragment implements TimetableTabCo
         }
     }
 
+    @Override
+    public void onSaveInstanceState(@NonNull Bundle outState) {
+        outState.putBoolean(SAVED_KEY, isSelected);
+        super.onSaveInstanceState(outState);
+    }
+
     @Override
     public void onDestroyView() {
+        isPrimary = false;
         presenter.onDestroy();
         super.onDestroyView();
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetableTabPresenter.java b/app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetableTabPresenter.java
index ca582726..e5eb499f 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetableTabPresenter.java
+++ b/app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetableTabPresenter.java
@@ -36,22 +36,21 @@ public class TimetableTabPresenter extends BasePresenter<TimetableTabContract.Vi
     }
 
     @Override
-    public void onStart(TimetableTabContract.View view) {
+    public void onStart(TimetableTabContract.View view, boolean isPrimary) {
         super.onStart(view);
         getView().showProgressBar(true);
         getView().showNoItem(false);
+        onFragmentSelected(isPrimary);
     }
 
     @Override
-    public void onFragmentActivated(boolean isSelected) {
-        if (!isFirstSight && isSelected && isViewAttached()) {
+    public void onFragmentSelected(boolean isSelected) {
+        if (!isFirstSight && isSelected) {
             isFirstSight = true;
 
             loadingTask = new AbstractTask();
             loadingTask.setOnFirstLoadingListener(this);
             loadingTask.execute();
-        } else if (!isSelected) {
-            cancelAsyncTasks();
         }
     }
 
@@ -88,21 +87,20 @@ public class TimetableTabPresenter extends BasePresenter<TimetableTabContract.Vi
 
             getView().onRefreshSuccess();
         } else {
-            getView().onError(getRepository().getResRepo().getErrorLoginMessage(exception));
+            getView().onError(getRepository().getErrorLoginMessage(exception));
         }
         getView().hideRefreshingBar();
     }
 
     @Override
     public void onDoInBackgroundLoading() throws Exception {
-        Week week = getRepository().getDbRepo().getWeek(date);
+        Week week = getRepository().getWeek(date);
 
-        if (week == null || !week.getTimetableSynced()) {
+        if (week == null || !week.getIsTimetableSynced()) {
             syncData();
-            week = getRepository().getDbRepo().getWeek(date);
+            week = getRepository().getWeek(date);
         }
 
-        week.resetDayList();
         List<Day> dayList = week.getDayList();
 
         headerItems = new ArrayList<>();
@@ -110,11 +108,10 @@ public class TimetableTabPresenter extends BasePresenter<TimetableTabContract.Vi
         boolean isFreeWeek = true;
 
         for (Day day : dayList) {
-            day.resetTimetableLessons();
             TimetableHeaderItem headerItem = new TimetableHeaderItem(day);
 
             if (isFreeWeek) {
-                isFreeWeek = day.getFreeDay();
+                isFreeWeek = day.getIsFreeDay();
             }
 
             List<TimetableLesson> lessonList = day.getTimetableLessons();
@@ -160,10 +157,13 @@ public class TimetableTabPresenter extends BasePresenter<TimetableTabContract.Vi
     }
 
     private void syncData() throws Exception {
-        getRepository().getSyncRepo().syncTimetable(0, date);
+        getRepository().syncTimetable(date);
     }
 
-    private void cancelAsyncTasks() {
+    @Override
+    public void onDestroy() {
+        isFirstSight = false;
+
         if (refreshTask != null) {
             refreshTask.cancel(true);
             refreshTask = null;
@@ -172,12 +172,6 @@ public class TimetableTabPresenter extends BasePresenter<TimetableTabContract.Vi
             loadingTask.cancel(true);
             loadingTask = null;
         }
-    }
-
-    @Override
-    public void onDestroy() {
-        isFirstSight = false;
-        cancelAsyncTasks();
         super.onDestroy();
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/splash/SplashActivity.java b/app/src/main/java/io/github/wulkanowy/ui/splash/SplashActivity.java
index 53994a16..c9f98d5e 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/splash/SplashActivity.java
+++ b/app/src/main/java/io/github/wulkanowy/ui/splash/SplashActivity.java
@@ -5,7 +5,7 @@ import android.os.Bundle;
 import javax.inject.Inject;
 
 import butterknife.ButterKnife;
-import io.github.wulkanowy.services.notifies.NotificationService;
+import io.github.wulkanowy.services.SyncJob;
 import io.github.wulkanowy.ui.base.BaseActivity;
 import io.github.wulkanowy.ui.login.LoginActivity;
 import io.github.wulkanowy.ui.main.MainActivity;
@@ -44,7 +44,7 @@ public class SplashActivity extends BaseActivity implements SplashContract.View
     }
 
     @Override
-    public void cancelNotifications() {
-        new NotificationService(getApplicationContext()).cancelAll();
+    public void startSyncService() {
+        SyncJob.start(getApplicationContext());
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/splash/SplashContract.java b/app/src/main/java/io/github/wulkanowy/ui/splash/SplashContract.java
index 58d4447c..a69deb03 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/splash/SplashContract.java
+++ b/app/src/main/java/io/github/wulkanowy/ui/splash/SplashContract.java
@@ -12,7 +12,7 @@ public interface SplashContract {
 
         void openMainActivity();
 
-        void cancelNotifications();
+        void startSyncService();
     }
 
     @PerActivity
diff --git a/app/src/main/java/io/github/wulkanowy/ui/splash/SplashPresenter.java b/app/src/main/java/io/github/wulkanowy/ui/splash/SplashPresenter.java
index 8d20226f..d617b4af 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/splash/SplashPresenter.java
+++ b/app/src/main/java/io/github/wulkanowy/ui/splash/SplashPresenter.java
@@ -6,6 +6,7 @@ import javax.inject.Inject;
 
 import io.github.wulkanowy.data.RepositoryContract;
 import io.github.wulkanowy.ui.base.BasePresenter;
+import io.github.wulkanowy.utils.LogUtils;
 
 public class SplashPresenter extends BasePresenter<SplashContract.View>
         implements SplashContract.Presenter {
@@ -18,12 +19,17 @@ public class SplashPresenter extends BasePresenter<SplashContract.View>
     @Override
     public void onStart(@NonNull SplashContract.View activity) {
         super.onStart(activity);
-        getView().cancelNotifications();
+        getView().startSyncService();
 
-        if (getRepository().getSharedRepo().isUserLoggedIn()) {
-            getView().openMainActivity();
-        } else {
+        if (getRepository().getCurrentUserId() == 0) {
             getView().openLoginActivity();
+        } else {
+            try {
+                getRepository().initLastUser();
+                getView().openMainActivity();
+            } catch (Exception e) {
+                LogUtils.error("An error occurred when the application was started", e);
+            }
         }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/widgets/TimetableWidgetFactory.java b/app/src/main/java/io/github/wulkanowy/ui/widgets/TimetableWidgetFactory.java
deleted file mode 100644
index 78e80580..00000000
--- a/app/src/main/java/io/github/wulkanowy/ui/widgets/TimetableWidgetFactory.java
+++ /dev/null
@@ -1,138 +0,0 @@
-package io.github.wulkanowy.ui.widgets;
-
-import android.content.Context;
-import android.content.Intent;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.RemoteViews;
-import android.widget.RemoteViewsService;
-
-import org.apache.commons.lang3.StringUtils;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.inject.Inject;
-
-import io.github.wulkanowy.R;
-import io.github.wulkanowy.WulkanowyApp;
-import io.github.wulkanowy.data.RepositoryContract;
-import io.github.wulkanowy.data.db.dao.entities.TimetableLesson;
-import io.github.wulkanowy.data.db.dao.entities.Week;
-import io.github.wulkanowy.utils.TimeUtils;
-
-public class TimetableWidgetFactory implements RemoteViewsService.RemoteViewsFactory {
-
-    private Context context;
-
-    private List<TimetableLesson> lessonList = new ArrayList<>();
-
-    @Inject
-    RepositoryContract repository;
-
-    public TimetableWidgetFactory(Context context) {
-        this.context = context;
-    }
-
-    private void inject() {
-        if (repository == null) {
-            ((WulkanowyApp) context).getApplicationComponent().inject(this);
-        }
-    }
-
-    @Override
-    public void onCreate() {
-        // do nothing
-    }
-
-    @Override
-    public void onDataSetChanged() {
-        inject();
-        lessonList = new ArrayList<>();
-
-        if (repository.getSharedRepo().isUserLoggedIn()) {
-
-            Week week = repository.getDbRepo().getWeek(TimeUtils.getDateOfCurrentMonday(true));
-            int valueOfDay = TimeUtils.getTodayOrNextDayValue(repository.getSharedRepo().getTimetableWidgetState());
-
-            if (valueOfDay != 5 && valueOfDay != 6 && week != null) {
-                week.resetDayList();
-                lessonList = week.getDayList().get(valueOfDay).getTimetableLessons();
-            }
-        }
-    }
-
-    @Override
-    public void onDestroy() {
-        // do nothing
-    }
-
-    @Override
-    public int getCount() {
-        return lessonList.size();
-    }
-
-    @Override
-    public RemoteViews getViewAt(int position) {
-        if (position == AdapterView.INVALID_POSITION) {
-            return null;
-        }
-
-        RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.timetable_widget_item);
-        views.setTextViewText(R.id.timetable_widget_item_subject, getSubjectName(position));
-        views.setTextViewText(R.id.timetable_widget_item_time, getTimeText(position));
-        views.setTextViewText(R.id.timetable_widget_item_room, getRoomText(position));
-
-        if (!getDescriptionText(position).isEmpty()) {
-            views.setTextViewText(R.id.timetable_widget_item_description, getDescriptionText(position));
-        } else {
-            views.setViewVisibility(R.id.timetable_widget_item_description, View.GONE);
-        }
-
-        views.setOnClickFillInIntent(R.id.timetable_widget_item_container, new Intent());
-
-        return views;
-    }
-
-    @Override
-    public RemoteViews getLoadingView() {
-        return null;
-    }
-
-    @Override
-    public int getViewTypeCount() {
-        return 1;
-    }
-
-    @Override
-    public long getItemId(int position) {
-        return position;
-    }
-
-    @Override
-    public boolean hasStableIds() {
-        return true;
-    }
-
-    private String getSubjectName(int position) {
-        return lessonList.get(position).getSubject();
-    }
-
-    private String getRoomText(int position) {
-        TimetableLesson lesson = lessonList.get(position);
-        if (!lesson.getRoom().isEmpty()) {
-            return context.getString(R.string.timetable_dialog_room) + " " + lesson.getRoom();
-        }
-        return lesson.getRoom();
-    }
-
-    private String getTimeText(int position) {
-        TimetableLesson lesson = lessonList.get(position);
-        return lesson.getStartTime() + " - " + lesson.getEndTime();
-    }
-
-    private String getDescriptionText(int position) {
-        return StringUtils.capitalize(lessonList.get(position).getDescription());
-    }
-
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/widgets/TimetableWidgetProvider.java b/app/src/main/java/io/github/wulkanowy/ui/widgets/TimetableWidgetProvider.java
deleted file mode 100644
index d68c7e9a..00000000
--- a/app/src/main/java/io/github/wulkanowy/ui/widgets/TimetableWidgetProvider.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package io.github.wulkanowy.ui.widgets;
-
-import android.app.PendingIntent;
-import android.appwidget.AppWidgetManager;
-import android.appwidget.AppWidgetProvider;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.support.v4.app.TaskStackBuilder;
-import android.widget.RemoteViews;
-
-import javax.inject.Inject;
-
-import io.github.wulkanowy.R;
-import io.github.wulkanowy.WulkanowyApp;
-import io.github.wulkanowy.data.RepositoryContract;
-import io.github.wulkanowy.services.widgets.TimetableWidgetServices;
-import io.github.wulkanowy.ui.main.MainActivity;
-import io.github.wulkanowy.utils.TimeUtils;
-
-public class TimetableWidgetProvider extends AppWidgetProvider {
-
-    private static final String ACTION_TIMETABLE_TOGGLE = "timetable_toggle";
-
-    @Inject
-    RepositoryContract repository;
-
-    @Override
-
-    public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
-        inject(context);
-
-        for (int appWidgetId : appWidgetIds) {
-            RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.timetable_widget);
-
-            setViews(views, context, appWidgetId);
-            setToggleIntent(views, context);
-            setTemplateIntent(views, context);
-            updateWidget(views, appWidgetManager, appWidgetId);
-        }
-        super.onUpdate(context, appWidgetManager, appWidgetIds);
-    }
-
-    @Override
-    public void onReceive(final Context context, Intent intent) {
-        super.onReceive(context, intent);
-        inject(context);
-
-        if (ACTION_TIMETABLE_TOGGLE.equals(intent.getAction())) {
-            AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(context);
-            ComponentName thisWidget = new ComponentName(context.getPackageName(),
-                    TimetableWidgetProvider.class.getName());
-            int[] appWidgetIds = appWidgetManager.getAppWidgetIds(thisWidget);
-
-            repository.getSharedRepo().setTimetableWidgetState(!repository.getSharedRepo().getTimetableWidgetState());
-            onUpdate(context, appWidgetManager, appWidgetIds);
-        }
-    }
-
-    @Override
-    public void onDisabled(Context context) {
-        super.onDisabled(context);
-        inject(context);
-        repository.getSharedRepo().setTimetableWidgetState(false);
-    }
-
-    private void setToggleIntent(RemoteViews views, Context context) {
-        Intent refreshIntent = new Intent(context, TimetableWidgetProvider.class);
-        refreshIntent.setAction(ACTION_TIMETABLE_TOGGLE);
-        PendingIntent pendingIntent = PendingIntent.getBroadcast(context, 1,
-                refreshIntent, PendingIntent.FLAG_UPDATE_CURRENT);
-        views.setOnClickPendingIntent(R.id.timetable_widget_toggle, pendingIntent);
-    }
-
-    private void setTemplateIntent(RemoteViews views, Context context) {
-        Intent intent = MainActivity.getStartIntent(context);
-        intent.putExtra(MainActivity.EXTRA_CARD_ID_KEY, 3);
-
-        PendingIntent pendingIntent = TaskStackBuilder.create(context)
-                .addNextIntentWithParentStack(intent)
-                .getPendingIntent(0, PendingIntent.FLAG_UPDATE_CURRENT);
-
-        views.setPendingIntentTemplate(R.id.timetable_widget_list, pendingIntent);
-    }
-
-    private void setViews(RemoteViews views, Context context, int appWidgetId) {
-        Intent intent = new Intent(context, TimetableWidgetServices.class);
-        intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
-
-        views.setRemoteAdapter(appWidgetId, R.id.timetable_widget_list, intent);
-        views.setEmptyView(R.id.timetable_widget_list, R.id.timetable_widget_empty);
-
-        boolean nextDay = repository.getSharedRepo().getTimetableWidgetState();
-
-        String toggleText = context.getString(nextDay ? R.string.widget_timetable_tomorrow
-                : R.string.widget_timetable_today);
-
-        views.setTextViewText(R.id.timetable_widget_toggle, toggleText);
-        views.setTextViewText(R.id.timetable_widget_date, TimeUtils.getTodayOrNextDay(nextDay));
-    }
-
-    private void updateWidget(RemoteViews views, AppWidgetManager appWidgetManager, int appWidgetId) {
-        appWidgetManager.notifyAppWidgetViewDataChanged(appWidgetId, R.id.timetable_widget_list);
-        appWidgetManager.updateAppWidget(appWidgetId, views);
-    }
-
-    private void inject(Context context) {
-        if (repository == null) {
-            ((WulkanowyApp) context.getApplicationContext()).getApplicationComponent().inject(this);
-        }
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/utils/AnimationUtils.java b/app/src/main/java/io/github/wulkanowy/utils/AnimationUtils.java
deleted file mode 100644
index 04116423..00000000
--- a/app/src/main/java/io/github/wulkanowy/utils/AnimationUtils.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package io.github.wulkanowy.utils;
-
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
-import android.view.View;
-
-public final class AnimationUtils {
-
-    public static void slideDown(final View view) {
-        view.setVisibility(View.VISIBLE);
-        view.setAlpha(0.f);
-
-        view.setTranslationY(-(view.getHeight() / 2));
-        view.animate()
-                .translationY(0)
-                .alpha(1.f)
-                .setListener(new AnimatorListenerAdapter() {
-                    @Override
-                    public void onAnimationEnd(Animator animation) {
-                        view.setVisibility(View.VISIBLE);
-                        view.setAlpha(1.f);
-                    }
-                });
-    }
-
-    public static void slideUp(final View view) {
-        view.animate()
-                .translationY(-(view.getHeight() / 2))
-                .alpha(0.f)
-                .setListener(new AnimatorListenerAdapter() {
-                    @Override
-                    public void onAnimationEnd(Animator animation) {
-                        // superfluous restoration
-                        view.setVisibility(View.GONE);
-                        view.setAlpha(1.f);
-                        view.setTranslationY(0.f);
-                    }
-                });
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/utils/AppConstant.java b/app/src/main/java/io/github/wulkanowy/utils/AppConstant.java
index 2499974d..27d76e75 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/AppConstant.java
+++ b/app/src/main/java/io/github/wulkanowy/utils/AppConstant.java
@@ -19,8 +19,6 @@ public final class AppConstant {
 
     public static final String DATE_PATTERN = "yyyy-MM-dd";
 
-    public static final String REPO_URL = "https://github.com/wulkanowy/wulkanowy";
-
     private AppConstant() {
         throw new IllegalStateException("Utility class");
     }
diff --git a/app/src/main/java/io/github/wulkanowy/utils/GradeUtils.java b/app/src/main/java/io/github/wulkanowy/utils/AverageCalculator.java
similarity index 63%
rename from app/src/main/java/io/github/wulkanowy/utils/GradeUtils.java
rename to app/src/main/java/io/github/wulkanowy/utils/AverageCalculator.java
index 32bc5cd0..cc33e65a 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/GradeUtils.java
+++ b/app/src/main/java/io/github/wulkanowy/utils/AverageCalculator.java
@@ -1,18 +1,12 @@
 package io.github.wulkanowy.utils;
 
 import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
-import io.github.wulkanowy.R;
 import io.github.wulkanowy.data.db.dao.entities.Grade;
 
-public final class GradeUtils {
+public final class AverageCalculator {
 
-    private final static Pattern validGradePattern = Pattern.compile("^(\\++|-|--|=)?[0-6](\\++|-|--|=)?$");
-    private final static Pattern simpleGradeValuePattern = Pattern.compile("([0-6])");
-
-    private GradeUtils() {
+    private AverageCalculator() {
         throw new IllegalStateException("Utility class");
     }
 
@@ -64,33 +58,4 @@ public final class GradeUtils {
     private static int getIntegerForWeightOfGrade(String weightOfGrade) {
         return Integer.valueOf(weightOfGrade.substring(0, weightOfGrade.length() - 3));
     }
-
-    public static int getValueColor(String value) {
-        Matcher m1 = validGradePattern.matcher(value);
-        if (!m1.find()) {
-            return R.color.default_grade;
-        }
-
-        Matcher m2 = simpleGradeValuePattern.matcher(m1.group());
-        if (!m2.find()) {
-            return R.color.default_grade;
-        }
-
-        switch (Integer.parseInt(m2.group())) {
-            case 6:
-                return R.color.six_grade;
-            case 5:
-                return R.color.five_grade;
-            case 4:
-                return R.color.four_grade;
-            case 3:
-                return R.color.three_grade;
-            case 2:
-                return R.color.two_grade;
-            case 1:
-                return R.color.one_grade;
-            default:
-                return R.color.default_grade;
-        }
-    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/utils/DataObjectConverter.java b/app/src/main/java/io/github/wulkanowy/utils/DataObjectConverter.java
index 3f733ad6..a22e4d8b 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/DataObjectConverter.java
+++ b/app/src/main/java/io/github/wulkanowy/utils/DataObjectConverter.java
@@ -6,11 +6,7 @@ import java.util.List;
 
 import io.github.wulkanowy.data.db.dao.entities.AttendanceLesson;
 import io.github.wulkanowy.data.db.dao.entities.Day;
-import io.github.wulkanowy.data.db.dao.entities.Diary;
-import io.github.wulkanowy.data.db.dao.entities.Exam;
 import io.github.wulkanowy.data.db.dao.entities.Grade;
-import io.github.wulkanowy.data.db.dao.entities.Semester;
-import io.github.wulkanowy.data.db.dao.entities.Student;
 import io.github.wulkanowy.data.db.dao.entities.Subject;
 import io.github.wulkanowy.data.db.dao.entities.TimetableLesson;
 import io.github.wulkanowy.data.db.dao.entities.Week;
@@ -21,56 +17,12 @@ public final class DataObjectConverter {
         throw new IllegalStateException("Utility class");
     }
 
-    public static List<Student> studentsToStudentEntities(List<io.github.wulkanowy.api.Student> students, Long symbolId) {
-        List<Student> studentList = new ArrayList<>();
+    public static List<Subject> subjectsToSubjectEntities(List<io.github.wulkanowy.api.grades.Subject> subjectList) {
 
-        for (io.github.wulkanowy.api.Student student : students) {
-            studentList.add(new Student()
-                    .setName(student.getName())
-                    .setCurrent(student.isCurrent())
-                    .setRealId(student.getId())
-                    .setSymbolId(symbolId)
-            );
-        }
-
-        return studentList;
-    }
-
-    public static List<Diary> diariesToDiaryEntities(List<io.github.wulkanowy.api.Diary> diaryList, Long studentId) {
-        List<Diary> diaryEntityList = new ArrayList<>();
-
-        for (io.github.wulkanowy.api.Diary diary : diaryList) {
-            diaryEntityList.add(new Diary()
-                    .setStudentId(studentId)
-                    .setValue(diary.getId())
-                    .setName(diary.getName())
-                    .setCurrent(diary.isCurrent()));
-        }
-
-        return diaryEntityList;
-    }
-
-    public static List<Semester> semestersToSemesterEntities(List<io.github.wulkanowy.api.Semester> semesters, long diaryId) {
-        List<Semester> semesterList = new ArrayList<>();
-
-        for (io.github.wulkanowy.api.Semester semester : semesters) {
-            semesterList.add(new Semester()
-                    .setDiaryId(diaryId)
-                    .setName(semester.getName())
-                    .setCurrent(semester.isCurrent())
-                    .setValue(semester.getId())
-            );
-        }
-
-        return semesterList;
-    }
-
-    public static List<Subject> subjectsToSubjectEntities(List<io.github.wulkanowy.api.grades.Subject> subjectList, long semesterId) {
         List<Subject> subjectEntityList = new ArrayList<>();
 
         for (io.github.wulkanowy.api.grades.Subject subject : subjectList) {
             Subject subjectEntity = new Subject()
-                    .setSemesterId(semesterId)
                     .setName(subject.getName())
                     .setPredictedRating(subject.getPredictedRating())
                     .setFinalRating(subject.getFinalRating());
@@ -80,11 +32,12 @@ public final class DataObjectConverter {
         return subjectEntityList;
     }
 
-    public static List<Grade> gradesToGradeEntities(List<io.github.wulkanowy.api.grades.Grade> gradeList, long semesterId) {
+    public static List<Grade> gradesToGradeEntities(List<io.github.wulkanowy.api.grades.Grade> gradeList) {
+
         List<Grade> gradeEntityList = new ArrayList<>();
 
         for (io.github.wulkanowy.api.grades.Grade grade : gradeList) {
-            gradeEntityList.add(new Grade()
+            Grade gradeEntity = new Grade()
                     .setSubject(grade.getSubject())
                     .setValue(grade.getValue())
                     .setColor(grade.getColor())
@@ -93,9 +46,10 @@ public final class DataObjectConverter {
                     .setWeight(grade.getWeight())
                     .setDate(grade.getDate())
                     .setTeacher(grade.getTeacher())
-                    .setSemesterId(semesterId));
-        }
+                    .setSemester(grade.getSemester());
 
+            gradeEntityList.add(gradeEntity);
+        }
         return gradeEntityList;
     }
 
@@ -104,20 +58,16 @@ public final class DataObjectConverter {
     }
 
     public static Day dayToDayEntity(io.github.wulkanowy.api.generic.Day day) {
-        return new Day()
-                .setDate(day.getDate())
-                .setDayName(day.getDayName());
-    }
-
-    public static Day timetableDayToDayEntity(io.github.wulkanowy.api.timetable.TimetableDay day) {
         return new Day()
                 .setDate(day.getDate())
                 .setDayName(day.getDayName())
-                .setFreeDay(day.isFreeDay())
+                .setIsFreeDay(day.isFreeDay())
                 .setFreeDayName(day.getFreeDayName());
     }
 
+
     public static List<Day> daysToDaysEntities(List<io.github.wulkanowy.api.generic.Day> dayList) {
+
         List<Day> dayEntityList = new ArrayList<>();
 
         for (io.github.wulkanowy.api.generic.Day day : dayList) {
@@ -126,61 +76,56 @@ public final class DataObjectConverter {
         return dayEntityList;
     }
 
+    public static TimetableLesson lessonToTimetableLessonEntity(io.github.wulkanowy.api.generic.Lesson lesson) {
+        return new TimetableLesson()
+                .setNumber(lesson.getNumber())
+                .setSubject(lesson.getSubject())
+                .setTeacher(lesson.getTeacher())
+                .setRoom(lesson.getRoom())
+                .setDescription(lesson.getDescription())
+                .setGroupName(lesson.getGroupName())
+                .setStartTime(lesson.getStartTime())
+                .setEndTime(lesson.getEndTime())
+                .setDate(lesson.getDate())
+                .setEmpty(lesson.isEmpty())
+                .setDivisionIntoGroups(lesson.isDivisionIntoGroups())
+                .setPlanning(lesson.isPlanning())
+                .setRealized(lesson.isRealized())
+                .setMovedOrCanceled(lesson.isMovedOrCanceled())
+                .setNewMovedInOrChanged(lesson.isNewMovedInOrChanged());
+    }
+
+    public static AttendanceLesson lessonToAttendanceLessonEntity(io.github.wulkanowy.api.generic.Lesson lesson) {
+        return new AttendanceLesson()
+                .setNumber(Integer.valueOf(lesson.getNumber()))
+                .setSubject(lesson.getSubject())
+                .setDate(lesson.getDate())
+                .setIsPresence(lesson.isPresence())
+                .setIsAbsenceUnexcused(lesson.isAbsenceUnexcused())
+                .setIsAbsenceExcused(lesson.isAbsenceExcused())
+                .setIsUnexcusedLateness(lesson.isUnexcusedLateness())
+                .setIsAbsenceForSchoolReasons(lesson.isAbsenceForSchoolReasons())
+                .setIsExcusedLateness(lesson.isExcusedLateness())
+                .setIsExemption(lesson.isExemption());
+    }
+
     public static List<TimetableLesson> lessonsToTimetableLessonsEntities(List<io.github.wulkanowy.api.generic.Lesson> lessonList) {
+
         List<TimetableLesson> lessonEntityList = new ArrayList<>();
 
         for (io.github.wulkanowy.api.generic.Lesson lesson : lessonList) {
-            lessonEntityList.add(new TimetableLesson()
-                    .setNumber(lesson.getNumber())
-                    .setSubject(lesson.getSubject())
-                    .setTeacher(lesson.getTeacher())
-                    .setRoom(lesson.getRoom())
-                    .setDescription(lesson.getDescription())
-                    .setGroup(lesson.getGroupName())
-                    .setStartTime(lesson.getStartTime())
-                    .setEndTime(lesson.getEndTime())
-                    .setDate(lesson.getDate())
-                    .setEmpty(lesson.isEmpty())
-                    .setDivisionIntoGroups(lesson.isDivisionIntoGroups())
-                    .setPlanning(lesson.isPlanning())
-                    .setRealized(lesson.isRealized())
-                    .setMovedOrCanceled(lesson.isMovedOrCanceled())
-                    .setNewMovedInOrChanged(lesson.isNewMovedInOrChanged()));
+            lessonEntityList.add(lessonToTimetableLessonEntity(lesson));
         }
-
         return lessonEntityList;
     }
 
     public static List<AttendanceLesson> lessonsToAttendanceLessonsEntities(List<io.github.wulkanowy.api.generic.Lesson> lessonList) {
+
         List<AttendanceLesson> lessonEntityList = new ArrayList<>();
 
         for (io.github.wulkanowy.api.generic.Lesson lesson : lessonList) {
-            lessonEntityList.add(new AttendanceLesson()
-                    .setNumber(lesson.getNumber())
-                    .setSubject(lesson.getSubject())
-                    .setDate(lesson.getDate())
-                    .setPresence(lesson.isPresence())
-                    .setAbsenceUnexcused(lesson.isAbsenceUnexcused())
-                    .setAbsenceExcused(lesson.isAbsenceExcused())
-                    .setUnexcusedLateness(lesson.isUnexcusedLateness())
-                    .setAbsenceForSchoolReasons(lesson.isAbsenceForSchoolReasons())
-                    .setExcusedLateness(lesson.isExcusedLateness())
-                    .setExemption(lesson.isExemption()));
+            lessonEntityList.add(lessonToAttendanceLessonEntity(lesson));
         }
         return lessonEntityList;
     }
-
-    public static List<Exam> examsToExamsEntity(List<io.github.wulkanowy.api.exams.Exam> examList) {
-        List<Exam> examEntityList = new ArrayList<>();
-
-        for (io.github.wulkanowy.api.exams.Exam exam : examList) {
-            examEntityList.add(new Exam()
-                    .setDescription(exam.getDescription())
-                    .setEntryDate(exam.getEntryDate())
-                    .setSubjectAndGroup(exam.getSubjectAndGroup())
-                    .setTeacher(exam.getTeacher())
-                    .setType(exam.getType()));
-        }
-        return examEntityList;
-    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/utils/RootChecker.java b/app/src/main/java/io/github/wulkanowy/utils/RootChecker.java
new file mode 100644
index 00000000..9c23c217
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/utils/RootChecker.java
@@ -0,0 +1,38 @@
+package io.github.wulkanowy.utils;
+
+import android.os.Build;
+
+import java.io.File;
+
+public final class RootChecker {
+
+    private RootChecker() {
+        throw new IllegalStateException("Utility class");
+    }
+
+    public static boolean isRooted() {
+        return checkOne() || checkTwo() || checkThree();
+    }
+
+    private static boolean checkOne() {
+        return Build.TAGS != null && Build.TAGS.contains("test-keys");
+    }
+
+    private static boolean checkTwo() {
+        return new File("/system/app/Superuser.apk").exists();
+    }
+
+    private static boolean checkThree() {
+        String[] commands = {"/system/xbin/which su", "/system/bin/which su", "which su"};
+        for (String command : commands) {
+            try {
+                Runtime.getRuntime().exec(command);
+                return true;
+            } catch (Exception e) {
+                // ignore
+            }
+        }
+        return false;
+    }
+
+}
diff --git a/app/src/main/java/io/github/wulkanowy/utils/TimeUtils.java b/app/src/main/java/io/github/wulkanowy/utils/TimeUtils.java
index de5d136f..717ed42a 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/TimeUtils.java
+++ b/app/src/main/java/io/github/wulkanowy/utils/TimeUtils.java
@@ -1,8 +1,8 @@
 package io.github.wulkanowy.utils;
 
-import org.threeten.bp.DayOfWeek;
-import org.threeten.bp.LocalDate;
-import org.threeten.bp.format.DateTimeFormatter;
+import org.joda.time.DateTime;
+import org.joda.time.DateTimeConstants;
+import org.joda.time.LocalDate;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -13,14 +13,14 @@ import java.util.List;
 import java.util.Locale;
 import java.util.TimeZone;
 
+import static io.github.wulkanowy.utils.AppConstant.DATE_PATTERN;
+
 public final class TimeUtils {
 
     private static final long TICKS_AT_EPOCH = 621355968000000000L;
 
     private static final long TICKS_PER_MILLISECOND = 10000;
 
-    private static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern(AppConstant.DATE_PATTERN);
-
     private TimeUtils() {
         throw new IllegalStateException("Utility class");
     }
@@ -33,7 +33,7 @@ public final class TimeUtils {
     }
 
     public static long getNetTicks(String dateString) throws ParseException {
-        return getNetTicks(dateString, AppConstant.DATE_PATTERN);
+        return getNetTicks(dateString, DATE_PATTERN);
     }
 
     public static long getNetTicks(String dateString, String dateFormat) throws ParseException {
@@ -49,12 +49,12 @@ public final class TimeUtils {
     }
 
     public static List<String> getMondaysFromCurrentSchoolYear() {
-        LocalDate startDate = LocalDate.of(getCurrentSchoolYear(), 9, 1);
-        LocalDate endDate = LocalDate.of(getCurrentSchoolYear() + 1, 8, 31);
+        LocalDate startDate = new LocalDate(getCurrentSchoolYear(), 9, 1);
+        LocalDate endDate = new LocalDate(getCurrentSchoolYear() + 1, 8, 31);
 
         List<String> dateList = new ArrayList<>();
 
-        LocalDate thisMonday = startDate.with(DayOfWeek.MONDAY);
+        LocalDate thisMonday = startDate.withDayOfWeek(DateTimeConstants.MONDAY);
 
         if (startDate.isAfter(thisMonday)) {
             startDate = thisMonday.plusWeeks(1);
@@ -63,43 +63,27 @@ public final class TimeUtils {
         }
 
         while (startDate.isBefore(endDate)) {
-            dateList.add(startDate.format(formatter));
+            dateList.add(startDate.toString(DATE_PATTERN));
             startDate = startDate.plusWeeks(1);
         }
         return dateList;
     }
 
     public static int getCurrentSchoolYear() {
-        LocalDate localDate = LocalDate.now();
-        return localDate.getMonthValue() <= 8 ? localDate.getYear() - 1 : localDate.getYear();
+        DateTime dateTime = new DateTime();
+        return dateTime.getMonthOfYear() <= 8 ? dateTime.getYear() - 1 : dateTime.getYear();
     }
 
     public static String getDateOfCurrentMonday(boolean normalize) {
-        LocalDate currentDate = LocalDate.now();
+        DateTime currentDate = new DateTime();
 
-        if (currentDate.getDayOfWeek() == DayOfWeek.SATURDAY && normalize) {
+        if (currentDate.getDayOfWeek() == DateTimeConstants.SATURDAY && normalize) {
             currentDate = currentDate.plusDays(2);
-        } else if (currentDate.getDayOfWeek() == DayOfWeek.SUNDAY && normalize) {
+        } else if (currentDate.getDayOfWeek() == DateTimeConstants.SUNDAY && normalize) {
             currentDate = currentDate.plusDays(1);
         } else {
-            currentDate = currentDate.with(DayOfWeek.MONDAY);
+            currentDate = currentDate.withDayOfWeek(DateTimeConstants.MONDAY);
         }
-        return currentDate.format(formatter);
-    }
-
-    public static int getTodayOrNextDayValue(boolean nextDay) {
-        DayOfWeek day = LocalDate.now().getDayOfWeek();
-        if (nextDay) {
-            if (day == DayOfWeek.SUNDAY) {
-                return 0;
-            }
-            return day.getValue();
-        }
-        return day.getValue() - 1;
-    }
-
-    public static String getTodayOrNextDay(boolean nextDay) {
-        LocalDate current = LocalDate.now();
-        return nextDay ? current.plusDays(1).format(formatter) : current.format(formatter);
+        return currentDate.toString(DATE_PATTERN);
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/utils/security/Scrambler.java b/app/src/main/java/io/github/wulkanowy/utils/security/Scrambler.java
index dc0c409a..93da1d0b 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/security/Scrambler.java
+++ b/app/src/main/java/io/github/wulkanowy/utils/security/Scrambler.java
@@ -27,6 +27,7 @@ import javax.crypto.CipherOutputStream;
 import javax.security.auth.x500.X500Principal;
 
 import io.github.wulkanowy.utils.LogUtils;
+import io.github.wulkanowy.utils.RootChecker;
 
 public final class Scrambler {
 
@@ -45,16 +46,23 @@ public final class Scrambler {
             loadKeyStore();
             generateNewKey(email, context);
             return encryptString(email, plainText);
+        } else {
+            if (RootChecker.isRooted()) {
+                return new String(Base64.encode(plainText.getBytes(), Base64.DEFAULT));
+            } else {
+                throw new UnsupportedOperationException("Stored data in this devices " +
+                        "isn't safe because android is rooted");
+            }
         }
-        return new String(Base64.encode(plainText.getBytes(), Base64.DEFAULT));
     }
 
     public static String decrypt(String email, String encryptedText) throws CryptoException {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
             loadKeyStore();
             return decryptString(email, encryptedText);
+        } else {
+            return new String(Base64.decode(encryptedText, Base64.DEFAULT));
         }
-        return new String(Base64.decode(encryptedText, Base64.DEFAULT));
     }
 
     private static void loadKeyStore() throws CryptoException {
diff --git a/app/src/main/play/contactEmail b/app/src/main/play/contactEmail
deleted file mode 100644
index 851521eb..00000000
--- a/app/src/main/play/contactEmail
+++ /dev/null
@@ -1 +0,0 @@
-wulkanowyinc@gmail.com
diff --git a/app/src/main/play/contactPhone b/app/src/main/play/contactPhone
deleted file mode 100644
index 552e53a5..00000000
--- a/app/src/main/play/contactPhone
+++ /dev/null
@@ -1 +0,0 @@
-+48733393622
diff --git a/app/src/main/play/contactWebsite b/app/src/main/play/contactWebsite
deleted file mode 100644
index 53f7bee6..00000000
--- a/app/src/main/play/contactWebsite
+++ /dev/null
@@ -1 +0,0 @@
-https://wulkanowy.github.io/
diff --git a/app/src/main/play/defaultLanguage b/app/src/main/play/defaultLanguage
deleted file mode 100644
index 1134c4d5..00000000
--- a/app/src/main/play/defaultLanguage
+++ /dev/null
@@ -1 +0,0 @@
-pl-PL
diff --git a/app/src/main/play/pl-PL/listing/featureGraphic/feature.png b/app/src/main/play/pl-PL/listing/featureGraphic/feature.png
deleted file mode 100644
index 15e6ebbf..00000000
Binary files a/app/src/main/play/pl-PL/listing/featureGraphic/feature.png and /dev/null differ
diff --git a/app/src/main/play/pl-PL/listing/fulldescription b/app/src/main/play/pl-PL/listing/fulldescription
deleted file mode 100644
index 4af6238a..00000000
--- a/app/src/main/play/pl-PL/listing/fulldescription
+++ /dev/null
@@ -1,10 +0,0 @@
-Aplikacja jest we wczesnej fazie rozwoju, ciągle pracujemy nad kolejnymi funkcjami.
-
-Wyróżnione cechy i funkcje:
-- Całkowicie darmowa i otwarta (brak jakichkolwiek reklam i mikropłatności)
-- Powiadomienia
-- Tryb offline
-- Aktywne wsparcie i rozwój
-
-GitHub: https://github.com/wulkanowy/wulkanowy
-Discord: https://discord.gg/vccAQBr
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 7cad5c2f..00000000
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/phoneScreenshots/attendance-dialog.png b/app/src/main/play/pl-PL/listing/phoneScreenshots/attendance-dialog.png
deleted file mode 100644
index 3f4ceb7e..00000000
Binary files a/app/src/main/play/pl-PL/listing/phoneScreenshots/attendance-dialog.png and /dev/null differ
diff --git a/app/src/main/play/pl-PL/listing/phoneScreenshots/exams.png b/app/src/main/play/pl-PL/listing/phoneScreenshots/exams.png
deleted file mode 100644
index 5a055ff4..00000000
Binary files a/app/src/main/play/pl-PL/listing/phoneScreenshots/exams.png and /dev/null differ
diff --git a/app/src/main/play/pl-PL/listing/phoneScreenshots/grades.png b/app/src/main/play/pl-PL/listing/phoneScreenshots/grades.png
deleted file mode 100644
index 58c22c51..00000000
Binary files a/app/src/main/play/pl-PL/listing/phoneScreenshots/grades.png and /dev/null differ
diff --git a/app/src/main/play/pl-PL/listing/phoneScreenshots/timetable-widget.png b/app/src/main/play/pl-PL/listing/phoneScreenshots/timetable-widget.png
deleted file mode 100644
index 832db0b6..00000000
Binary files a/app/src/main/play/pl-PL/listing/phoneScreenshots/timetable-widget.png and /dev/null differ
diff --git a/app/src/main/play/pl-PL/listing/phoneScreenshots/timetable.png b/app/src/main/play/pl-PL/listing/phoneScreenshots/timetable.png
deleted file mode 100644
index e9e66bbb..00000000
Binary files a/app/src/main/play/pl-PL/listing/phoneScreenshots/timetable.png and /dev/null differ
diff --git a/app/src/main/play/pl-PL/listing/shortdescription b/app/src/main/play/pl-PL/listing/shortdescription
deleted file mode 100644
index b5fc7491..00000000
--- a/app/src/main/play/pl-PL/listing/shortdescription
+++ /dev/null
@@ -1 +0,0 @@
-Nieoficjalna aplikacja dla dziennika VULCAN UONET+.
diff --git a/app/src/main/play/pl-PL/listing/title b/app/src/main/play/pl-PL/listing/title
deleted file mode 100644
index e5160837..00000000
--- a/app/src/main/play/pl-PL/listing/title
+++ /dev/null
@@ -1 +0,0 @@
-Wulkanowy Dziennik UONET+
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 e69de29b..00000000
diff --git a/app/src/main/play/pl-PL/whatsnew b/app/src/main/play/pl-PL/whatsnew
deleted file mode 100644
index 8bce40fa..00000000
--- a/app/src/main/play/pl-PL/whatsnew
+++ /dev/null
@@ -1,4 +0,0 @@
-Wersja 0.4.3:
-- naprawiono błąd z pokazywaniem usuniętych lekcji w planie
-- naprawiono drobne błędy z wyrównaniem tekstu na starszych urządzeniach
-- poprawiono synchronizację w tle spowodowaną błędem w komunikacji z serwerem
diff --git a/app/src/main/res/drawable-hdpi/ic_notify_grade.png b/app/src/main/res/drawable-hdpi/ic_notify_grade.png
deleted file mode 100644
index ea5b85c8..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_notify_grade.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_stat_notify.png b/app/src/main/res/drawable-hdpi/ic_stat_notify.png
new file mode 100644
index 00000000..34544980
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_stat_notify.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_notify_grade.png b/app/src/main/res/drawable-mdpi/ic_notify_grade.png
deleted file mode 100644
index 64fd285d..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_notify_grade.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_stat_notify.png b/app/src/main/res/drawable-mdpi/ic_stat_notify.png
new file mode 100644
index 00000000..5564049a
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_stat_notify.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_notify_grade.png b/app/src/main/res/drawable-xhdpi/ic_notify_grade.png
deleted file mode 100644
index 83b2c443..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_notify_grade.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_stat_notify.png b/app/src/main/res/drawable-xhdpi/ic_stat_notify.png
new file mode 100644
index 00000000..fabb8760
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_stat_notify.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_notify_grade.png b/app/src/main/res/drawable-xxhdpi/ic_notify_grade.png
deleted file mode 100644
index cba48ec2..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_notify_grade.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_stat_notify.png b/app/src/main/res/drawable-xxhdpi/ic_stat_notify.png
new file mode 100644
index 00000000..c1d78d46
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_stat_notify.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_stat_notify.png b/app/src/main/res/drawable-xxxhdpi/ic_stat_notify.png
new file mode 100644
index 00000000..ee89e601
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_stat_notify.png differ
diff --git a/app/src/main/res/drawable/ic_filter_list_black_24dp.xml b/app/src/main/res/drawable/ic_filter_list_black_24dp.xml
deleted file mode 100644
index 5d4ec18e..00000000
--- a/app/src/main/res/drawable/ic_filter_list_black_24dp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M10,18h4v-2h-4v2zM3,6v2h18L21,6L3,6zM6,13h12v-2L6,11v2z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_menu_dashboard_24dp.xml b/app/src/main/res/drawable/ic_menu_dashboard_24dp.xml
new file mode 100644
index 00000000..50726abd
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu_dashboard_24dp.xml
@@ -0,0 +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">
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M3 13h8V3H3v10zm0 8h8v-6H3v6zm10 0h8V11h-8v10zm0-18v6h8V3h-8z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_menu_exams_24dp.xml b/app/src/main/res/drawable/ic_menu_exams_24dp.xml
deleted file mode 100644
index 66294598..00000000
--- a/app/src/main/res/drawable/ic_menu_exams_24dp.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="#FFF"
-        android:pathData="M17,12h-5v5h5v-5zM16,1v2L8,3L8,1L6,1v2L5,3a2,2 0,0 0,-2 2v14c0,1.1 0.9,2
-            2,2h14a2,2 0,0 0,2 -2L21,5a2,2 0,0 0,-2 -2h-1L18,1h-2zM19,19L5,19L5,8h14v11z" />
-</vector>
diff --git a/app/src/main/res/drawable/widget_timetable_preview.png b/app/src/main/res/drawable/widget_timetable_preview.png
deleted file mode 100644
index d9f3538c..00000000
Binary files a/app/src/main/res/drawable/widget_timetable_preview.png and /dev/null differ
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index ec3872da..67095982 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -25,7 +25,7 @@
             style="?android:attr/progressBarStyleHorizontal"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@id/login_activity_progress_text"
+            android:layout_alignParentTop="true"
             android:layout_centerHorizontal="true"
             android:indeterminate="true"
             android:minHeight="30dp"
@@ -35,9 +35,9 @@
             android:id="@+id/login_activity_progress_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_alignBottom="@+id/login_activity_progress_bar"
             android:layout_centerHorizontal="true"
-            android:layout_marginBottom="15dp"
-            android:text="@string/app_name" />
+            android:layout_marginBottom="42dp" />
     </RelativeLayout>
 
     <ScrollView
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index f9201ad4..a39a3b57 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,62 +1,33 @@
 <?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"
+<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/main_activity_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:weightSum="1"
-    tools:context="io.github.wulkanowy.ui.main.MainActivity"
-    >
+    tools:context="io.github.wulkanowy.ui.main.MainActivity">
 
-    <android.support.design.widget.AppBarLayout
+    <RelativeLayout
+        android:id="@+id/main_activity_progress_bar"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center">
+
+        <ProgressBar
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:indeterminate="true" />
+    </RelativeLayout>
+
+    <com.aurelhubert.ahbottomnavigation.AHBottomNavigationViewPager
+        android:id="@+id/main_activity_view_pager"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-        >
+        android:layout_marginBottom="@dimen/bottom_navigation_height" />
 
-        <android.support.v7.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
-            />
-
-    </android.support.design.widget.AppBarLayout>
-
-    <android.support.design.widget.CoordinatorLayout
+    <com.aurelhubert.ahbottomnavigation.AHBottomNavigation
+        android:id="@+id/main_activity_nav"
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        app:layout_behavior="android.support.design.widget.AppBarLayout$ScrollingViewBehavior"
-        >
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom" />
 
-        <RelativeLayout
-            android:id="@+id/main_activity_progress_bar"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:gravity="center">
-
-            <ProgressBar
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:indeterminate="true" />
-        </RelativeLayout>
-
-        <com.aurelhubert.ahbottomnavigation.AHBottomNavigationViewPager
-            android:id="@+id/main_activity_view_pager"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/bottom_navigation_height" />
-
-        <com.aurelhubert.ahbottomnavigation.AHBottomNavigation
-            android:id="@+id/main_activity_nav"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom" />
-
-    </android.support.design.widget.CoordinatorLayout>
-
-</LinearLayout>
+</android.support.design.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/current_week_tab.xml b/app/src/main/res/layout/current_week_tab.xml
deleted file mode 100644
index d139a483..00000000
--- a/app/src/main/res/layout/current_week_tab.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@android:id/text1"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center"
-    android:textColor="@color/colorPrimaryDark"
-    android:textSize="14sp" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/exams_dialog.xml b/app/src/main/res/layout/exams_dialog.xml
deleted file mode 100644
index 47fd7bb7..00000000
--- a/app/src/main/res/layout/exams_dialog.xml
+++ /dev/null
@@ -1,177 +0,0 @@
-<?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">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:minWidth="300dp"
-        android:orientation="vertical">
-
-        <RelativeLayout
-            android:id="@+id/timetable_dialog_relative_layout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingBottom="20dp"
-            android:paddingEnd="20dp"
-            android:paddingLeft="20dp"
-            android:paddingRight="20dp"
-            android:paddingStart="20dp"
-            android:paddingTop="10dp"
-            tools:ignore="UselessParent">
-
-            <TextView
-                android:id="@+id/exams_dialog_details"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentTop="true"
-                android:layout_gravity="start"
-                android:gravity="center_vertical"
-                android:maxLines="5"
-                android:minHeight="60dp"
-                android:minLines="2"
-                android:paddingTop="10dp"
-                android:text="@string/generic_dialog_details"
-                android:textIsSelectable="true"
-                android:textSize="20sp" />
-
-            <TextView
-                android:id="@+id/exams_dialog_subject"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
-                android:layout_below="@+id/exams_dialog_details"
-                android:layout_marginTop="10dp"
-                android:text="@string/attendance_dialog_subject"
-                android:textIsSelectable="true"
-                android:textSize="17sp" />
-
-            <TextView
-                android:id="@+id/exams_dialog_subject_value"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
-                android:layout_below="@+id/exams_dialog_subject"
-                android:layout_marginTop="3dp"
-                android:text="@string/generic_app_no_data"
-                android:textIsSelectable="true"
-                android:textSize="12sp" />
-
-            <TextView
-                android:id="@+id/exams_dialog_type"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
-                android:layout_below="@+id/exams_dialog_subject_value"
-                android:layout_marginTop="10dp"
-                android:text="@string/exams_type"
-                android:textIsSelectable="true"
-                android:textSize="17sp" />
-
-            <TextView
-                android:id="@+id/exams_dialog_type_value"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
-                android:layout_below="@+id/exams_dialog_type"
-                android:layout_marginTop="3dp"
-                android:text="@string/generic_app_no_data"
-                android:textIsSelectable="true"
-                android:textSize="12sp" />
-
-            <TextView
-                android:id="@+id/exams_dialog_teacher"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
-                android:layout_below="@+id/exams_dialog_type_value"
-                android:layout_marginTop="10dp"
-                android:text="@string/generic_dialog_teacher"
-                android:textSize="17sp" />
-
-            <TextView
-                android:id="@+id/exams_dialog_teacher_value"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
-                android:layout_below="@+id/exams_dialog_teacher"
-                android:layout_marginTop="3dp"
-                android:text="@string/generic_app_no_data"
-                android:textIsSelectable="true"
-                android:textSize="12sp" />
-
-            <TextView
-                android:id="@+id/exams_dialog_date"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
-                android:layout_below="@+id/exams_dialog_teacher_value"
-                android:layout_marginTop="10dp"
-                android:text="@string/exams_dialog_entry_date"
-                android:textSize="17sp" />
-
-            <TextView
-                android:id="@+id/exams_dialog_date_value"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
-                android:layout_below="@+id/exams_dialog_date"
-                android:layout_marginTop="3dp"
-                android:text="@string/generic_app_no_data"
-                android:textIsSelectable="true"
-                android:textSize="12sp" />
-
-            <TextView
-                android:id="@+id/exams_dialog_description"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
-                android:layout_below="@+id/exams_dialog_date_value"
-                android:layout_marginTop="10dp"
-                android:text="@string/dialog_description_text"
-                android:textSize="17sp" />
-
-            <TextView
-                android:id="@+id/exams_dialog_description_value"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
-                android:layout_below="@+id/exams_dialog_description"
-                android:layout_marginTop="3dp"
-                android:text="@string/generic_app_no_data"
-                android:textIsSelectable="true"
-                android:textSize="12sp" />
-
-
-            <Button
-                android:id="@+id/exams_dialog_close"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentBottom="true"
-                android:layout_alignParentEnd="true"
-                android:layout_alignParentRight="true"
-                android:layout_alignTop="@+id/exams_dialog_description_value"
-                android:layout_marginTop="25dp"
-                android:background="?attr/selectableItemBackground"
-                android:focusable="true"
-                android:text="@string/generic_dialog_close"
-                android:textAllCaps="true"
-                android:textSize="15sp" />
-
-        </RelativeLayout>
-    </LinearLayout>
-</ScrollView>
diff --git a/app/src/main/res/layout/exams_header.xml b/app/src/main/res/layout/exams_header.xml
deleted file mode 100644
index 3895ae2e..00000000
--- a/app/src/main/res/layout/exams_header.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="#EEE"
-    android:minHeight="40dp"
-    android:paddingBottom="10dp"
-    android:paddingLeft="20dp"
-    android:paddingRight="20dp"
-    android:paddingTop="10dp">
-
-    <TextView
-        android:id="@+id/exams_header_name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
-        android:text="@string/app_name"
-        android:textSize="18sp" />
-
-    <TextView
-        android:id="@+id/exams_header_date"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
-        android:layout_centerVertical="true"
-        android:layout_marginLeft="10dp"
-        android:layout_marginStart="10dp"
-        android:layout_toEndOf="@id/exams_header_name"
-        android:layout_toRightOf="@id/exams_header_name"
-        android:gravity="end"
-        android:text="@string/app_name"
-        android:textSize="13sp" />
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/exams_subitem.xml b/app/src/main/res/layout/exams_subitem.xml
deleted file mode 100644
index 52386de4..00000000
--- a/app/src/main/res/layout/exams_subitem.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:card_view="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/exams_subitem_container"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:minHeight="60dp"
-    card_view:cardElevation="0dp">
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@drawable/ic_border"
-        android:foreground="?attr/selectableItemBackgroundBorderless">
-
-        <TextView
-            android:id="@+id/exams_subitem_subject"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="20dp"
-            android:layout_marginStart="20dp"
-            android:layout_marginTop="10dp"
-            android:text="@string/app_name"
-            android:textSize="15sp" />
-
-        <TextView
-            android:id="@+id/exams_subitems_type"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignLeft="@id/exams_subitem_subject"
-            android:layout_alignStart="@id/exams_subitem_subject"
-            android:layout_below="@id/exams_subitem_subject"
-            android:layout_marginBottom="5dp"
-            android:layout_marginTop="5dp"
-            android:text="@string/app_name"
-            android:textSize="13sp" />
-
-        <TextView
-            android:id="@+id/exams_subitems_teacher"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
-            android:layout_alignParentRight="true"
-            android:layout_below="@id/exams_subitem_subject"
-            android:layout_marginBottom="10dp"
-            android:layout_marginEnd="20dp"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="20dp"
-            android:layout_marginStart="10dp"
-            android:layout_marginTop="5dp"
-            android:layout_toEndOf="@id/exams_subitems_type"
-            android:layout_toRightOf="@id/exams_subitems_type"
-            android:gravity="end"
-            android:text="@string/app_name"
-            android:textSize="13sp" />
-    </RelativeLayout>
-</android.support.v7.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_attendance_tab.xml b/app/src/main/res/layout/fragment_attendance_tab.xml
index f98e7280..d859102d 100644
--- a/app/src/main/res/layout/fragment_attendance_tab.xml
+++ b/app/src/main/res/layout/fragment_attendance_tab.xml
@@ -44,7 +44,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="46dp"
             android:text="@string/attendance_no_entries"
-            android:gravity="center"
+            android:textAlignment="center"
             android:textSize="20sp" />
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/fragment_board.xml b/app/src/main/res/layout/fragment_board.xml
new file mode 100644
index 00000000..5ac9685a
--- /dev/null
+++ b/app/src/main/res/layout/fragment_board.xml
@@ -0,0 +1,36 @@
+<android.support.design.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"
+    tools:context="io.github.wulkanowy.ui.main.dashboard.DashboardFragment">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center">
+
+        <ImageView
+            android:id="@+id/wrench_under_construction"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/textView3"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="45dp"
+            android:contentDescription="@string/activity_dashboard_text"
+            android:minHeight="100dp"
+            android:minWidth="100dp"
+            app:srcCompat="@drawable/ic_wrench_24dp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="47dp"
+            android:text="@string/activity_under_construction"
+            android:textSize="17sp"
+            android:gravity="center"
+            android:textAlignment="center"
+            android:id="@+id/textView3" />
+    </RelativeLayout>
+
+</android.support.design.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_exams.xml b/app/src/main/res/layout/fragment_exams.xml
deleted file mode 100644
index 1819be15..00000000
--- a/app/src/main/res/layout/fragment_exams.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/exams_fragment_container"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_alignParentBottom="true">
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <android.support.design.widget.TabLayout
-            android:id="@+id/exams_fragment_tab_layout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:tabMinWidth="125dp"
-            app:tabMode="scrollable" />
-
-        <android.support.v4.view.ViewPager
-            android:id="@+id/exams_fragment_viewpager"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_below="@id/exams_fragment_tab_layout" />
-    </RelativeLayout>
-</android.support.design.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_exams_tab.xml b/app/src/main/res/layout/fragment_exams_tab.xml
deleted file mode 100644
index e446b2fb..00000000
--- a/app/src/main/res/layout/fragment_exams_tab.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<android.support.design.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:id="@+id/exams_tab_fragment_container"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context="io.github.wulkanowy.ui.main.grades.GradesFragment">
-
-    <RelativeLayout
-        android:id="@+id/exams_tab_fragment_progress_bar"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:visibility="gone">
-
-        <ProgressBar
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:indeterminate="true" />
-    </RelativeLayout>
-
-    <RelativeLayout
-        android:id="@+id/exams_tab_fragment_no_item_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center">
-
-        <ImageView
-            android:id="@+id/exams_tab_fragment_no_item_image"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/exams_tab_fragment_no_item_text"
-            android:layout_centerHorizontal="true"
-            android:layout_marginTop="40dp"
-            android:minHeight="100dp"
-            android:minWidth="100dp"
-            android:tint="@android:color/black"
-            app:srcCompat="@drawable/ic_menu_exams_24dp"
-            tools:ignore="contentDescription" />
-
-        <TextView
-            android:id="@+id/exams_tab_fragment_no_item_text"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="46dp"
-            android:gravity="center"
-            android:text="@string/exams_no_entries"
-            android:textSize="20sp" />
-
-    </RelativeLayout>
-
-    <android.support.v4.widget.SwipeRefreshLayout
-        android:id="@+id/exams_tab_fragment_swipe_refresh"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <android.support.v7.widget.RecyclerView
-            android:id="@+id/exams_tab_fragment_recycler"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-
-    </android.support.v4.widget.SwipeRefreshLayout>
-
-</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_grades.xml b/app/src/main/res/layout/fragment_grades.xml
index f00b3108..f1ab1fbe 100644
--- a/app/src/main/res/layout/fragment_grades.xml
+++ b/app/src/main/res/layout/fragment_grades.xml
@@ -31,7 +31,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="46dp"
             android:text="@string/fragment_no_grades"
-            android:gravity="center"
+            android:textAlignment="center"
             android:textSize="20sp" />
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/fragment_timetable_tab.xml b/app/src/main/res/layout/fragment_timetable_tab.xml
index 47aa5101..749a6b34 100644
--- a/app/src/main/res/layout/fragment_timetable_tab.xml
+++ b/app/src/main/res/layout/fragment_timetable_tab.xml
@@ -1,6 +1,6 @@
 <android.support.design.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"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/timetable_tab_fragment_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -43,19 +43,19 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="46dp"
-            android:gravity="center"
             android:text="@string/info_free_week"
+            android:textAlignment="center"
             android:textSize="20sp" />
 
         <TextView
             android:id="@+id/timetable_tab_fragment_no_item_name"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@id/timetable_tab_fragment_no_item_image"
-            android:layout_marginTop="15dp"
             android:text="@string/app_name"
+            android:textSize="20sp"
+            android:layout_below="@id/timetable_tab_fragment_no_item_image"
             android:textAlignment="center"
-            android:textSize="20sp" />
+            android:layout_marginTop="15dp" />
     </RelativeLayout>
 
     <android.support.v4.widget.SwipeRefreshLayout
diff --git a/app/src/main/res/layout/grade_header.xml b/app/src/main/res/layout/grade_header.xml
index 032ad675..2dcf12e8 100644
--- a/app/src/main/res/layout/grade_header.xml
+++ b/app/src/main/res/layout/grade_header.xml
@@ -46,30 +46,6 @@
         android:textColor="@color/secondary_text"
         android:textSize="12sp" />
 
-    <TextView
-        android:id="@+id/grade_header_predicted_rating_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/grade_header_average_text"
-        android:layout_marginTop="5dp"
-        android:text="@string/info_grades_predicted_rating"
-        android:textColor="@color/secondary_text"
-        android:textSize="12sp" />
-
-    <TextView
-        android:id="@+id/grade_header_final_rating_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/grade_header_average_text"
-        android:layout_marginLeft="10dp"
-        android:layout_marginStart="10dp"
-        android:layout_marginTop="5dp"
-        android:layout_toEndOf="@+id/grade_header_predicted_rating_text"
-        android:layout_toRightOf="@+id/grade_header_predicted_rating_text"
-        android:text="@string/info_grades_final_rating"
-        android:textColor="@color/secondary_text"
-        android:textSize="12sp" />
-
     <ImageView
         android:id="@+id/grade_header_alert_image"
         android:layout_width="wrap_content"
@@ -79,4 +55,4 @@
         android:layout_marginTop="10dp"
         app:srcCompat="@drawable/ic_alert_24dp"
         tool:ignore="contentDescription" />
-</RelativeLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/timetable_widget.xml b/app/src/main/res/layout/timetable_widget.xml
deleted file mode 100644
index c2f146ae..00000000
--- a/app/src/main/res/layout/timetable_widget.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@android:color/white">
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/widget_bar_height"
-        android:background="@color/colorPrimary">
-
-        <Button
-            android:id="@+id/timetable_widget_toggle"
-            android:layout_width="100dp"
-            android:layout_height="40dp"
-            android:layout_alignParentEnd="true"
-            android:layout_alignParentRight="true"
-            android:layout_alignParentTop="true"
-            android:layout_marginEnd="10dp"
-            android:layout_marginRight="10dp"
-            android:backgroundTint="@color/colorPrimaryDark"
-            android:text="@string/widget_timetable_today"
-            android:textColor="@android:color/white"
-            android:textSize="12sp" />
-
-        <TextView
-            android:id="@+id/timetable_widget_date"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:layout_alignParentEnd="true"
-            android:layout_alignParentRight="true"
-            android:layout_marginBottom="5dp"
-            android:layout_marginEnd="10dp"
-            android:layout_marginRight="10dp"
-            android:layout_toEndOf="@id/timetable_widget_title"
-            android:layout_toRightOf="@id/timetable_widget_title"
-            android:ellipsize="end"
-            android:gravity="center"
-            android:maxLines="1"
-            android:text="@string/app_name"
-            android:textColor="@android:color/white"
-            android:textSize="13sp" />
-
-        <TextView
-            android:id="@+id/timetable_widget_title"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/widget_bar_height"
-            android:layout_marginLeft="10dp"
-            android:layout_marginStart="10dp"
-            android:layout_toLeftOf="@id/timetable_widget_toggle"
-            android:layout_toStartOf="@id/timetable_widget_toggle"
-            android:ellipsize="end"
-            android:gravity="center_vertical"
-            android:maxLines="1"
-            android:text="@string/timetable_text"
-            android:textColor="@android:color/white"
-            android:textSize="20sp" />
-    </RelativeLayout>
-
-    <ListView
-        android:id="@+id/timetable_widget_list"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginTop="@dimen/widget_bar_height" />
-
-    <TextView
-        android:id="@+id/timetable_widget_empty"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:text="@string/widget_timetable_no_lesson"
-        android:textColor="@android:color/black"
-        android:textSize="20sp" />
-</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/timetable_widget_item.xml b/app/src/main/res/layout/timetable_widget_item.xml
deleted file mode 100644
index d97be4af..00000000
--- a/app/src/main/res/layout/timetable_widget_item.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/timetable_widget_item_container"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:minHeight="45dp"
-    android:orientation="horizontal">
-
-    <TextView
-        android:id="@+id/timetable_widget_item_time"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_marginLeft="10dp"
-        android:layout_marginStart="10dp"
-        android:layout_marginTop="5dp"
-        android:text="@string/app_name"
-        android:textColor="@color/second_text_color"
-        android:textSize="14sp" />
-
-    <TextView
-        android:id="@+id/timetable_widget_item_subject"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="25dp"
-        android:layout_marginLeft="15dp"
-        android:layout_marginRight="25dp"
-        android:layout_marginStart="15dp"
-        android:layout_marginTop="5dp"
-        android:layout_toEndOf="@id/timetable_widget_item_time"
-        android:layout_toRightOf="@id/timetable_widget_item_time"
-        android:text="@string/app_name"
-        android:textColor="@color/second_text_color"
-        android:textSize="14sp" />
-
-    <TextView
-        android:id="@+id/timetable_widget_item_description"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/timetable_widget_item_subject"
-        android:layout_marginBottom="5dp"
-        android:layout_marginEnd="25dp"
-        android:layout_marginLeft="15dp"
-        android:layout_marginRight="25dp"
-        android:layout_marginStart="15dp"
-        android:layout_marginTop="3dp"
-        android:layout_toEndOf="@id/timetable_widget_item_time"
-        android:layout_toRightOf="@id/timetable_widget_item_time"
-        android:text="@string/app_name"
-        android:textColor="@color/colorPrimaryDark"
-        android:textSize="12sp" />
-
-    <TextView
-        android:id="@+id/timetable_widget_item_room"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/timetable_widget_item_time"
-        android:layout_marginBottom="5dp"
-        android:layout_marginLeft="10dp"
-        android:layout_marginStart="10dp"
-        android:layout_marginTop="3dp"
-        android:text="@string/app_name"
-        android:textColor="@color/second_text_color"
-        android:textSize="12sp" />
-
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/semester_switch.xml b/app/src/main/res/menu/semester_switch.xml
deleted file mode 100644
index 6f8a027e..00000000
--- a/app/src/main/res/menu/semester_switch.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<menu 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"
-    tools:context="io.github.wulkanowy.timetable.MainActivity"
-    >
-    <item
-        android:id="@+id/action_filter"
-        android:orderInCategory="100"
-        android:title="@string/switch_semester"
-        android:icon="@drawable/ic_filter_list_black_24dp"
-        app:showAsAction="always"
-        />
-</menu>
diff --git a/app/src/main/res/values-pl/prefernces_array.xml b/app/src/main/res/values-pl/prefernces_array.xml
deleted file mode 100644
index 4e66a373..00000000
--- a/app/src/main/res/values-pl/prefernces_array.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string-array name="services_interval_entries">
-        <item>10 minut</item>
-        <item>30 minut</item>
-        <item>1 godzinę</item>
-        <item>2 godziny</item>
-        <item>6 godzin</item>
-        <item>12 godzin</item>
-        <item>24 godzin</item>
-    </string-array>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index aeb828d1..9642a53d 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -19,7 +19,7 @@
     <string name="login_accepted_text">Pomyślnie zalogowano</string>
     <string name="login_bad_credentials_text">Niepoprawny e-mail lub hasło</string>
     <string name="login_bad_account_permission_text">Brak uprawnień do otwarcia dziennika. Sprawdź wprowadzoną nazwę powiatu</string>
-    <string name="login_failed_text">Logowanie nie powiodło się. Spróbuj ponownie lub zrestartuj aplikację</string>
+    <string name="login_denied_text">Logowanie nie powiodło się. Spróbuj zrestartować aplikację</string>
     <string name="action_create_account">Nie masz jeszcze konta? Załóż je</string>
     <string name="action_forgot_password">Zapomniałeś hasła?</string>
 
@@ -30,15 +30,16 @@
     <string name="noColor_text">Brak koloru</string>
 
     <string name="activity_dashboard_text">Aktywność dashboard</string>
-    <string name="exams_text">Sprawdziany</string>
+    <string name="dashboard_text">Dashboard</string>
     <string name="grades_text">Oceny</string>
     <string name="attendance_text">Frekwencja</string>
-    <string name="timetable_text">Plan lekcji</string>
+    <string name="lessonplan_text">Plan lekcji</string>
     <string name="settings_text">Ustawienia</string>
     <string name="activity_under_construction">Ta część aplikacji jest w budowie</string>
     <string name="fragment_no_grades">Brak ocen</string>
 
     <string name="noInternet_text">Brak połączenia z internetem</string>
+    <string name="error_host_offline">Przerwa techniczna. Spróbuj ponownie później</string>
     <string name="encrypt_failed_text">Szyfrowanie nie powiodło się. Automatyczne logowanie zostało wyłączone</string>
     <string name="version_text">Wersja %1$s</string>
     <string name="refresh_error_text">"Podczas odświeżania zawartości wystąpił błąd. "</string>
@@ -52,17 +53,13 @@
     <string name="dialog_date_text">Data</string>
     <string name="dialog_color_text">Kolor</string>
 
-    <string name="switch_semester">Zmień semestr</string>
-    <string name="semester_text">Semestr %d</string>
-    <string name="cancel">Anuluj</string>
-
     <string name="timetable_dialog_lesson">Lekcja</string>
     <string name="timetable_dialog_room">Sala</string>
     <string name="timetable_dialog_group">Grupa</string>
     <string name="timetable_dialog_time">Godziny</string>
     <string name="timetable_dialog_description">Zmiany</string>
 
-    <string name="sync_completed">Synchronizacja zakończona</string>
+    <string name="timetable_refresh_success">Poprawnie zsynchronizowano</string>
 
     <string name="generic_dialog_details">Szczegóły</string>
     <string name="generic_dialog_close">Zamknij</string>
@@ -76,8 +73,6 @@
 
     <string name="info_average_grades">Średnia: %1$.2f</string>
     <string name="info_no_average">Brak średniej</string>
-    <string name="info_grades_predicted_rating">Przewidywana: %1$s</string>
-    <string name="info_grades_final_rating">Końcowa: %1$s</string>
     <string name="info_free_week">Brak lekcji w tym tygodniu</string>
     <string name="timetable_subitem_room">Sala %s</string>
 
@@ -119,39 +114,4 @@
         <item quantity="few">%1$d nieobecności</item>
         <item quantity="many">%1$d nieobecności</item>
     </plurals>
-
-
-    <string name="pref_view_header">Widok</string>
-    <string name="pref_tab_list">Domyślny widok</string>
-    <string name="pref_grades_summary_line_show">Pokazuj podsumowanie w ocenach</string>
-    <string name="pref_attendance_present_show">Pokazuj obecność we frekwencji</string>
-    <string name="required_restart">Wymagany restart</string>
-
-    <string name="pref_notify_header">Powiadomienia</string>
-    <string name="pref_notify_switch">Pokazuj powiadomienia</string>
-
-    <string name="pref_services_header">Usługi</string>
-    <string name="pref_services_switch">Włącz odświeżanie danych w tle</string>
-    <string name="pref_services_interval">Interwał między odświeżaniem danych</string>
-    <string name="pref_services_mobile_data">Synchronizacja tylko przez WiFi</string>
-
-    <string name="pref_about_header">O aplikacji</string>
-    <string name="pref_about">Informacje o Wulkanowym</string>
-    <string name="pref_about_summary">Wulkanowy to nieoficjalny klient dziennika VULCAN UONET+</string>
-    <string name="pref_about_version">Wersja</string>
-    <string name="pref_about_osl">Licencje open source</string>
-    <string name="pref_about_osl_summary">Szczegóły licencji na oprogramowanie open source</string>
-    <string name="pref_about_support">Kod źródłowy i feedback</string>
-    <string name="about_programmer_step1">Nie, nie zostaniesz programistą!</string>
-    <string name="about_programmer_step2">Musisz bardziej się postarać!</string>
-    <string name="about_programmer_step3">Kliknij jeszcze parę razy</string>
-    <string name="about_programmer">Odwiedź zakładkę Kod źródłowy i pokaż jaki z ciebie programista!</string>
-
-    <string name="notify_grade_channel">Nowe oceny</string>
-    <string name="widget_timetable_no_lesson">Brak lekcji</string>
-    <string name="widget_timetable_today">Dziś</string>
-    <string name="widget_timetable_tomorrow">Jutro</string>
-    <string name="exams_no_entries">Brak sprawdzianów w tym tygodniu</string>
-    <string name="exams_type">Typ</string>
-    <string name="exams_dialog_entry_date">Data wpisu</string>
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 90f8c15e..cc1dab22 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -11,7 +11,6 @@
     <color name="two_grade">#CE9AD2</color>
     <color name="one_grade">#d32f2f</color>
     <color name="secondary_text">#4c4c4c</color>
-    <color name="second_text_color">#333</color>
     <color name="default_grade">#cdcdcd</color>
     <color name="free_day">#eee</color>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 34b8adab..42a5b9ad 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -4,5 +4,4 @@
     <!-- Default screen margins, per the Android Design guidelines. -->
     <dimen name="activity_horizontal_margin">16dp</dimen>
     <dimen name="activity_vertical_margin">16dp</dimen>
-    <dimen name="widget_bar_height">60dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/prefernces_array.xml b/app/src/main/res/values/prefernces_array.xml
deleted file mode 100644
index 346b57c3..00000000
--- a/app/src/main/res/values/prefernces_array.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string-array name="startup_tab_entries" translatable="false">
-        <item>@string/grades_text</item>
-        <item>@string/attendance_text</item>
-        <item>@string/exams_text</item>
-        <item>@string/timetable_text</item>
-    </string-array>
-    <string-array name="startup_tab_value" translatable="false">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-    </string-array>
-    <string-array name="services_interval_entries">
-        <item>10 minutes</item>
-        <item>30 minutes</item>
-        <item>1 hour</item>
-        <item>2 hours</item>
-        <item>6 hours</item>
-        <item>12 hours</item>
-        <item>24 hours</item>
-    </string-array>
-    <string-array name="services_interval_value" translatable="false">
-        <item>10</item>
-        <item>30</item>
-        <item>60</item>
-        <item>120</item>
-        <item>360</item>
-        <item>720</item>
-        <item>1440</item>
-    </string-array>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1ffea541..315fee4f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -19,7 +19,7 @@
     <string name="login_accepted_text">Login is successful</string>
     <string name="login_bad_credentials_text">Bad e-mail or password</string>
     <string name="login_bad_account_permission_text">No permission to open log. Check entered symbol</string>
-    <string name="login_failed_text">Login is failed. Try again or restart the app</string>
+    <string name="login_denied_text">Login is failed. Try restart the app</string>
     <string name="action_create_account">No account yet? Create one</string>
     <string name="action_forgot_password">Forgot password?</string>
 
@@ -30,10 +30,10 @@
     <string name="noColor_text">No color</string>
 
     <string name="activity_dashboard_text">Dashboard Activity</string>
-    <string name="exams_text">Exams</string>
+    <string name="dashboard_text">Dashboard</string>
     <string name="grades_text">Grades</string>
     <string name="attendance_text">Attendance</string>
-    <string name="timetable_text">Timetable</string>
+    <string name="lessonplan_text">Timetable</string>
     <string name="settings_text">Settings</string>
     <string name="activity_under_construction">This section of app is under construction.</string>
     <string name="fragment_no_grades">No grades</string>
@@ -52,17 +52,13 @@
     <string name="dialog_date_text">Date</string>
     <string name="dialog_color_text">Color</string>
 
-    <string name="switch_semester">Switch semester</string>
-    <string name="semester_text">Semester %d</string>
-    <string name="cancel">Cancel</string>
-
     <string name="timetable_dialog_lesson">Lesson</string>
     <string name="timetable_dialog_room">Room</string>
     <string name="timetable_dialog_group">Group</string>
     <string name="timetable_dialog_time">Times</string>
     <string name="timetable_dialog_description">Changes</string>
 
-    <string name="sync_completed">Synchronization completed</string>
+    <string name="timetable_refresh_success">Successful synchronisation</string>
 
     <string name="generic_dialog_details">Details</string>
     <string name="generic_dialog_close">Close</string>
@@ -76,9 +72,8 @@
 
     <string name="info_average_grades">Average: %1$.2f</string>
     <string name="info_no_average">No average</string>
-    <string name="info_grades_predicted_rating">Predicted: %1$s</string>
-    <string name="info_grades_final_rating">Final: %1$s</string>
     <string name="info_free_week">No lesson in this week</string>
+    <string name="error_host_offline">Technical break</string>
 
     <string name="timetable_subitem_room">Room %s</string>
 
@@ -115,38 +110,4 @@
         <item quantity="many">%1$d absences</item>
         <item quantity="other">%1$d absences</item>
     </plurals>
-
-    <string name="pref_view_header">View</string>
-    <string name="pref_tab_list">Default view after startup</string>
-    <string name="pref_grades_summary_line_show">Show summary in grades</string>
-    <string name="pref_attendance_present_show">Show present in attendance</string>
-    <string name="required_restart">Required restart</string>
-
-    <string name="pref_notify_header">Notifications</string>
-    <string name="pref_notify_switch">Show the notifications</string>
-
-    <string name="pref_services_header">Services</string>
-    <string name="pref_services_switch">Enable background data refreshing</string>
-    <string name="pref_services_interval">Interval between data refreshing</string>
-    <string name="pref_services_mobile_data">Synchronization via WiFi only</string>
-
-    <string name="pref_about_header">About</string>
-    <string name="pref_about">About Wulkanowy</string>
-    <string name="pref_about_summary">Wulkanowy is an unofficial VULCAN UONET+ log client</string>
-    <string name="pref_about_version">Version</string>
-    <string name="pref_about_osl">Open source licenses</string>
-    <string name="pref_about_osl_summary">License details for open source software</string>
-    <string name="pref_about_support">Source code &amp; feedback</string>
-    <string name="about_programmer_step1">No, you will not become a programmer!</string>
-    <string name="about_programmer_step2">You must try harder!</string>
-    <string name="about_programmer_step3">Click a few more times</string>
-    <string name="about_programmer">Visit the Source code tab and show how good a programmer you are!</string>
-
-    <string name="notify_grade_channel">New grades</string>
-    <string name="widget_timetable_no_lesson">No lessons</string>
-    <string name="widget_timetable_today">Today</string>
-    <string name="widget_timetable_tomorrow">Tomorrow</string>
-    <string name="exams_no_entries">No exams in this week</string>
-    <string name="exams_type">Type</string>
-    <string name="exams_dialog_entry_date">Date of entry</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index d72afb53..ed5c249d 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,22 +1,6 @@
 <resources>
 
-    <style name="WulkanowyTheme" parent="@style/Theme.AppCompat.Light.NoActionBar">
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorPrimary</item>
-        <item name="actionMenuTextColor">@android:color/primary_text_dark</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>
-        <item name="android:textColorTertiary">@android:color/primary_text_light</item>
-        <item name="android:textColorTertiaryInverse">@android:color/primary_text_dark</item>
-        <item name="titleTextColor">@android:color/primary_text_dark</item>
-        <item name="subtitleTextColor">@android:color/primary_text_dark</item>
-        <item name="android:colorBackground">@android:color/white</item>
-        <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
-    </style>
-
-    <style name="WulkanowyTheme.LoginTheme" parent="@style/Theme.AppCompat.Light.DarkActionBar">
+    <style name="WulkanowyTheme" parent="Base.Theme.AppCompat.Light">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorPrimary</item>
@@ -32,6 +16,8 @@
     </style>
 
     <style name="WulkanowyTheme.SplashTheme" parent="WulkanowyTheme">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
         <item name="android:windowBackground">@drawable/splash_background</item>
     </style>
 
diff --git a/app/src/main/res/xml/backup_rules.xml b/app/src/main/res/xml/backup_rules.xml
new file mode 100644
index 00000000..f7579446
--- /dev/null
+++ b/app/src/main/res/xml/backup_rules.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<full-backup-content>
+    <include
+        domain="sharedpref"
+        path="." />
+    <include
+        domain="database"
+        path="." />
+</full-backup-content>
\ No newline at end of file
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
deleted file mode 100644
index a2b1b368..00000000
--- a/app/src/main/res/xml/preferences.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <PreferenceCategory android:title="@string/pref_view_header">
-        <ListPreference
-            android:defaultValue="0"
-            android:entries="@array/startup_tab_entries"
-            android:entryValues="@array/startup_tab_value"
-            android:key="startup_tab"
-            android:summary="%s"
-            android:title="@string/pref_tab_list" />
-        <SwitchPreference
-            android:defaultValue="false"
-            android:key="grades_summary"
-            android:title="@string/pref_grades_summary_line_show"
-            android:summary="@string/required_restart" />
-        <SwitchPreference
-            android:defaultValue="true"
-            android:key="attendance_present"
-            android:title="@string/pref_attendance_present_show"
-            android:summary="@string/required_restart" />
-    </PreferenceCategory>
-    <PreferenceCategory android:title="@string/pref_services_header">
-        <SwitchPreference
-            android:defaultValue="true"
-            android:key="services_enable"
-            android:title="@string/pref_services_switch" />
-        <ListPreference
-            android:defaultValue="60"
-            android:dependency="services_enable"
-            android:entries="@array/services_interval_entries"
-            android:entryValues="@array/services_interval_value"
-            android:key="services_interval"
-            android:summary="%s"
-            android:title="@string/pref_services_interval" />
-        <SwitchPreference
-            android:defaultValue="false"
-            android:key="services_disable_mobile"
-            android:title="@string/pref_services_mobile_data"
-            android:dependency="services_enable" />
-    </PreferenceCategory>
-    <PreferenceCategory android:title="@string/pref_notify_header">
-        <SwitchPreference
-            android:defaultValue="true"
-            android:dependency="services_enable"
-            android:key="notify_enable"
-            android:title="@string/pref_notify_switch" />
-    </PreferenceCategory>
-    <PreferenceCategory android:title="@string/pref_about_header">
-        <PreferenceScreen
-            android:key="pref_about"
-            android:title="@string/pref_about"
-            android:persistent="false">
-            <PreferenceCategory android:title="@string/pref_about">
-                <Preference
-                    android:selectable="false"
-                    android:summary="@string/pref_about_summary"/>
-                <Preference
-                    android:key="about_version"
-                    android:title="@string/pref_about_version"/>
-                <Preference
-                    android:key="about_osl"
-                    android:title="@string/pref_about_osl"
-                    android:summary="@string/pref_about_osl_summary"/>
-                <Preference
-                    android:key="about_repo"
-                    android:title="@string/pref_about_support">
-                </Preference>
-            </PreferenceCategory>
-        </PreferenceScreen>
-    </PreferenceCategory>
-</PreferenceScreen>
diff --git a/app/src/main/res/xml/widget_provider.xml b/app/src/main/res/xml/widget_provider.xml
deleted file mode 100644
index a140a6c1..00000000
--- a/app/src/main/res/xml/widget_provider.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
-    android:initialLayout="@layout/timetable_widget"
-    android:minHeight="100dp"
-    android:minWidth="150dp"
-    android:previewImage="@drawable/widget_timetable_preview"
-    android:resizeMode="horizontal|vertical"
-    android:updatePeriodMillis="3600000"
-    android:widgetCategory="home_screen" />
\ No newline at end of file
diff --git a/app/src/test/java/io/github/wulkanowy/data/db/dao/entities/GradeTest.java b/app/src/test/java/io/github/wulkanowy/data/db/dao/entities/GradeTest.java
index 580ffdf5..45a1d502 100644
--- a/app/src/test/java/io/github/wulkanowy/data/db/dao/entities/GradeTest.java
+++ b/app/src/test/java/io/github/wulkanowy/data/db/dao/entities/GradeTest.java
@@ -7,6 +7,21 @@ import io.github.wulkanowy.R;
 
 public class GradeTest {
 
+    @Test
+    public void getValueColorTest() {
+        Assert.assertEquals(R.color.six_grade, new Grade().setValue("-6").getValueColor());
+        Assert.assertEquals(R.color.five_grade, new Grade().setValue("--5").getValueColor());
+        Assert.assertEquals(R.color.four_grade, new Grade().setValue("=4").getValueColor());
+        Assert.assertEquals(R.color.three_grade, new Grade().setValue("3-").getValueColor());
+        Assert.assertEquals(R.color.two_grade, new Grade().setValue("2--").getValueColor());
+        Assert.assertEquals(R.color.two_grade, new Grade().setValue("2=").getValueColor());
+        Assert.assertEquals(R.color.one_grade, new Grade().setValue("1+").getValueColor());
+        Assert.assertEquals(R.color.one_grade, new Grade().setValue("+1").getValueColor());
+        Assert.assertEquals(R.color.default_grade, new Grade().setValue("Np").getValueColor());
+        Assert.assertEquals(R.color.default_grade, new Grade().setValue("7").getValueColor());
+        Assert.assertEquals(R.color.default_grade, new Grade().setValue("").getValueColor());
+    }
+
     @Test
     public void equalsTest() {
         Assert.assertTrue(new Grade().setSubject("Religia").setValue("5")
diff --git a/app/src/test/java/io/github/wulkanowy/utils/GradeUtilsTest.java b/app/src/test/java/io/github/wulkanowy/utils/AverageCalculatorTest.java
similarity index 51%
rename from app/src/test/java/io/github/wulkanowy/utils/GradeUtilsTest.java
rename to app/src/test/java/io/github/wulkanowy/utils/AverageCalculatorTest.java
index 92a0b42c..581495d6 100644
--- a/app/src/test/java/io/github/wulkanowy/utils/GradeUtilsTest.java
+++ b/app/src/test/java/io/github/wulkanowy/utils/AverageCalculatorTest.java
@@ -6,10 +6,9 @@ import org.junit.Test;
 import java.util.ArrayList;
 import java.util.List;
 
-import io.github.wulkanowy.R;
 import io.github.wulkanowy.data.db.dao.entities.Grade;
 
-public class GradeUtilsTest {
+public class AverageCalculatorTest {
 
     @Test
     public void averageTest() {
@@ -29,8 +28,8 @@ public class GradeUtilsTest {
         gradeList1.add(new Grade().setValue("5+").setWeight("10,00"));
         gradeList1.add(new Grade().setValue("5").setWeight("10,00"));
 
-        Assert.assertEquals(4.8f, GradeUtils.calculate(gradeList), 0.0f);
-        Assert.assertEquals(4.8f, GradeUtils.calculate(gradeList1), 0.0f);
+        Assert.assertEquals(4.8f, AverageCalculator.calculate(gradeList), 0.0f);
+        Assert.assertEquals(4.8f, AverageCalculator.calculate(gradeList1), 0.0f);
     }
 
     @Test
@@ -38,22 +37,6 @@ public class GradeUtilsTest {
         List<Grade> gradeList = new ArrayList<>();
         gradeList.add(new Grade().setValue("np.").setWeight("1,00"));
 
-        Assert.assertEquals(-1f, GradeUtils.calculate(gradeList), 0.0f);
-    }
-
-    @Test
-    public void getValueColor() {
-        Assert.assertEquals(R.color.six_grade, GradeUtils.getValueColor("-6"));
-        Assert.assertEquals(R.color.five_grade, GradeUtils.getValueColor("--5"));
-        Assert.assertEquals(R.color.four_grade, GradeUtils.getValueColor("=4"));
-        Assert.assertEquals(R.color.three_grade, GradeUtils.getValueColor("3-"));
-        Assert.assertEquals(R.color.two_grade, GradeUtils.getValueColor("2--"));
-        Assert.assertEquals(R.color.two_grade, GradeUtils.getValueColor("2="));
-        Assert.assertEquals(R.color.one_grade, GradeUtils.getValueColor("1+"));
-        Assert.assertEquals(R.color.one_grade, GradeUtils.getValueColor("+1"));
-        Assert.assertEquals(R.color.default_grade, GradeUtils.getValueColor("6 (.XI)"));
-        Assert.assertEquals(R.color.default_grade, GradeUtils.getValueColor("Np"));
-        Assert.assertEquals(R.color.default_grade, GradeUtils.getValueColor("7"));
-        Assert.assertEquals(R.color.default_grade, GradeUtils.getValueColor(""));
+        Assert.assertEquals(-1f, AverageCalculator.calculate(gradeList), 0.0f);
     }
 }
diff --git a/app/src/test/java/io/github/wulkanowy/utils/DataObjectConverterTest.java b/app/src/test/java/io/github/wulkanowy/utils/DataObjectConverterTest.java
index 3b08672b..b0335f62 100644
--- a/app/src/test/java/io/github/wulkanowy/utils/DataObjectConverterTest.java
+++ b/app/src/test/java/io/github/wulkanowy/utils/DataObjectConverterTest.java
@@ -19,7 +19,7 @@ public class DataObjectConverterTest {
         List<Subject> subjectList = new ArrayList<>();
         subjectList.add(new Subject().setName("Matematyka"));
         List<io.github.wulkanowy.data.db.dao.entities.Subject> subjectEntitiesList =
-                DataObjectConverter.subjectsToSubjectEntities(subjectList, 1L);
+                DataObjectConverter.subjectsToSubjectEntities(subjectList);
 
         Assert.assertEquals("Matematyka", subjectEntitiesList.get(0).getName());
     }
@@ -27,7 +27,7 @@ public class DataObjectConverterTest {
     @Test
     public void subjectConversionEmptyTest() {
         Assert.assertEquals(new ArrayList<>(),
-                DataObjectConverter.subjectsToSubjectEntities(new ArrayList<Subject>(), 1L));
+                DataObjectConverter.subjectsToSubjectEntities(new ArrayList<Subject>()));
     }
 
     @Test
@@ -35,7 +35,7 @@ public class DataObjectConverterTest {
         List<Grade> gradeList = new ArrayList<>();
         gradeList.add(new Grade().setDescription("Lorem ipsum"));
         List<io.github.wulkanowy.data.db.dao.entities.Grade> gradeEntitiesList =
-                DataObjectConverter.gradesToGradeEntities(gradeList, 1L);
+                DataObjectConverter.gradesToGradeEntities(gradeList);
 
         Assert.assertEquals("Lorem ipsum", gradeEntitiesList.get(0).getDescription());
     }
@@ -43,7 +43,7 @@ public class DataObjectConverterTest {
     @Test
     public void gradeConversionEmptyTest() {
         Assert.assertEquals(new ArrayList<>(),
-                DataObjectConverter.gradesToGradeEntities(new ArrayList<Grade>(), 1L));
+                DataObjectConverter.gradesToGradeEntities(new ArrayList<Grade>()));
     }
 
     @Test
diff --git a/app/src/test/java/io/github/wulkanowy/utils/EntitiesCompareTest.java b/app/src/test/java/io/github/wulkanowy/utils/EntitiesCompareTest.java
index 3c8bfd7c..b8b00c14 100644
--- a/app/src/test/java/io/github/wulkanowy/utils/EntitiesCompareTest.java
+++ b/app/src/test/java/io/github/wulkanowy/utils/EntitiesCompareTest.java
@@ -30,7 +30,8 @@ public class EntitiesCompareTest {
                 .setDescription("Lorem ipsum")
                 .setWeight("10")
                 .setDate("01.01.2017")
-                .setTeacher("Andrzej");
+                .setTeacher("Andrzej")
+                .setSemester("777");
 
         grade2 = new Grade()
                 .setSubject("Religia")
@@ -40,7 +41,8 @@ public class EntitiesCompareTest {
                 .setDescription("Wolna wola")
                 .setWeight("10")
                 .setDate("01.01.2017")
-                .setTeacher("Andrzej");
+                .setTeacher("Andrzej")
+                .setSemester("777");
     }
 
     @Test
diff --git a/app/upload-key-encrypted.jks b/app/upload-key-encrypted.jks
deleted file mode 100644
index 6ad925d8..00000000
Binary files a/app/upload-key-encrypted.jks and /dev/null differ
diff --git a/build.gradle b/build.gradle
index 3fbed0fd..999f91de 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,16 +6,14 @@ buildscript {
         maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.2'
-        classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.6.2"
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
-    }
-}
+        classpath 'com.android.tools.build:gradle:3.0.1'
 
-plugins {
-    // gradle dependencyUpdates -Drevision=release
-    id "com.github.ben-manes.versions" version "0.17.0"
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+        classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.6.1"
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
+    }
 }
 
 project.ext.preDexLibs = !project.hasProperty("disablePreDex")
@@ -31,35 +29,6 @@ subprojects {
 
 ext {
     GROUP_ID = "io.github.wulkanowy"
-
-    supportVersion = "26.1.0"
-    flexibleAdapter = "5.0.2"
-    flexibleUi = "1.0.0-b2"
-
-    firebaseJob = "0.8.5"
-    apacheLang = "3.7"
-    apacheCollections = "4.1"
-    greenDao = "3.2.2"
-    greenDaoHelper = "v2.0.2"
-    greenDaoGradle = "3.2.2"
-    butterknife = "8.8.1"
-    threeTenABP = "1.1.0"
-    dagger2 = "2.16"
-    ahbottom = "2.2.0"
-    jsoup = "1.11.3"
-    gson = "2.8.4"
-    ossLicenses = "15.0.1"
-
-    debugDb = "1.0.3"
-    sqlcipher = "3.5.9"
-
-    junit = "4.12"
-    mockito = "2.18.3"
-    testRunner = "1.0.2"
-
-    fabricGradle = "1.25.3"
-    crashlyticsSdk = "2.9.2"
-    crashlyticsAnswers = "1.4.1"
 }
 
 allprojects {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8a440624..28bd184f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Mar 27 02:10:44 CEST 2018
+#Thu Oct 27 17:19:04 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
diff --git a/jacoco.gradle b/jacoco.gradle
index 84a0ce97..47a077ca 100644
--- a/jacoco.gradle
+++ b/jacoco.gradle
@@ -1,11 +1,7 @@
 apply plugin: "jacoco"
 
 jacoco {
-    toolVersion "0.8.1"
-}
-
-tasks.withType(Test) {
-    jacoco.includeNoLocationClasses = true
+    toolVersion "0.7.4.201502262128"
 }
 
 // run ./gradlew clean createDebugCoverageReport jacocoTestReport