diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 0000000..7643783
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,123 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <JetCodeStyleSettings>
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </JetCodeStyleSettings>
+    <codeStyleSettings language="XML">
+      <option name="FORCE_REARRANGE_MODE" value="1" />
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      </indentOptions>
+      <arrangement>
+        <rules>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:android</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:id</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>style</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>ANDROID_ATTRIBUTE_ORDER</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>.*</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+        </rules>
+      </arrangement>
+    </codeStyleSettings>
+    <codeStyleSettings language="kotlin">
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </codeStyleSettings>
+  </code_scheme>
+</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 0000000..79ee123
--- /dev/null
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 0ad17cb..9f71c83 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 271b11e..610e9a2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -16,7 +16,7 @@
             android:theme="@style/Theme.SSAU_Schedule"
             tools:targetApi="31">
         <activity
-            android:name=".MainActivity"
+            android:name=".AuthActivity"
             android:exported="true"
             android:theme="@style/Theme.SSAU_Schedule"
             android:screenOrientation="portrait">
@@ -27,7 +27,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".AuthActivity"
+            android:name=".MainActivity"
             android:exported="true"
             android:theme="@style/Theme.SSAU_Schedule"
             android:screenOrientation="portrait">
diff --git a/app/src/main/java/com/example/ssau_schedule/AuthActivity.kt b/app/src/main/java/com/example/ssau_schedule/AuthActivity.kt
index 3b0c422..4a4b46a 100644
--- a/app/src/main/java/com/example/ssau_schedule/AuthActivity.kt
+++ b/app/src/main/java/com/example/ssau_schedule/AuthActivity.kt
@@ -21,9 +21,7 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.imePadding
-import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.ButtonDefaults
diff --git a/app/src/main/java/com/example/ssau_schedule/MainActivity.kt b/app/src/main/java/com/example/ssau_schedule/MainActivity.kt
index c41dfbd..740f0dc 100644
--- a/app/src/main/java/com/example/ssau_schedule/MainActivity.kt
+++ b/app/src/main/java/com/example/ssau_schedule/MainActivity.kt
@@ -95,38 +95,38 @@ class MainActivity : ComponentActivity() {
         val pagerState = rememberPagerState(
             initialPage = currentDayOfWeek.intValue-1, pageCount = {Int.MAX_VALUE})
 
-        LaunchedEffect(false) {
-            lessons.value = database.lessonDao().getAll()
-        }
-
 //        LaunchedEffect(false) {
-//            val generalData = StoreUtils.getGeneralData(applicationContext)
-//            if(generalData == null)
-//                startActivity(Intent(applicationContext, AuthActivity::class.java))
-//            else {
-//                val week = generalData.year.getWeekOfDate(Date())
-//                val (apiLessons, apiError) = lessonAPI.getLessons(
-//                    generalData.token, generalData.group, generalData.year, week)
-//                if(apiLessons != null && apiError == null) {
-//                    val (databaseLessons, converterErrors) = apiLessons.toLessons(week)
-//                    Log.i("Lessons", Json.encodeToString(apiLessons))
-//                    database.lessonDao().insert(*databaseLessons.toTypedArray())
-//                    converterErrors.forEach { error ->
-//                        val message = error.getMessage(applicationContext)
-//                        if(message != null) snackbarHostState.showSnackbar(message)
-//                    }
-//                    lessons.value = databaseLessons
-//                } else {
-//                    if(apiError == LessonAPIErrorMessage.USER_NOT_AUTHORIZED) {
-//                        startActivity(Intent(applicationContext, AuthActivity::class.java))
-//                    } else {
-//                        val message = apiError?.getMessage(applicationContext)
-//                        if(message != null) snackbarHostState.showSnackbar(message)
-//                    }
-//                }
-//            }
+//            lessons.value = database.lessonDao().getAll()
 //        }
 
+        LaunchedEffect(false) {
+            val generalData = StoreUtils.getGeneralData(applicationContext)
+            if(generalData == null)
+                startActivity(Intent(applicationContext, AuthActivity::class.java))
+            else {
+                val week = generalData.year.getWeekOfDate(Date())
+                val (apiLessons, apiError) = lessonAPI.getLessons(
+                    generalData.token, generalData.group, generalData.year, week)
+                if(apiLessons != null && apiError == null) {
+                    val (databaseLessons, converterErrors) = apiLessons.toLessons(week)
+                    Log.i("Lessons", Json.encodeToString(apiLessons))
+                    database.lessonDao().insert(*databaseLessons.toTypedArray())
+                    converterErrors.forEach { error ->
+                        val message = error.getMessage(applicationContext)
+                        if(message != null) snackbarHostState.showSnackbar(message)
+                    }
+                    lessons.value = databaseLessons
+                } else {
+                    if(apiError == LessonAPIErrorMessage.USER_NOT_AUTHORIZED) {
+                        startActivity(Intent(applicationContext, AuthActivity::class.java))
+                    } else {
+                        val message = apiError?.getMessage(applicationContext)
+                        if(message != null) snackbarHostState.showSnackbar(message)
+                    }
+                }
+            }
+        }
+
         Scaffold(
             snackbarHost = {
                 SnackbarHost(hostState = snackbarHostState) {