diff --git a/build.gradle.kts b/build.gradle.kts
index 26cdd8b..76f01f1 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -24,7 +24,6 @@ tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>{
     kotlinOptions{
         languageVersion  = "1.7"
         apiVersion = "1.7"
-        freeCompilerArgs = freeCompilerArgs + "-Xcontext-receivers"
     }
 }
 
diff --git a/src/main/kotlin/ru/mipt/spc/magprog/magProgPage.kt b/src/main/kotlin/ru/mipt/spc/magprog/magProgPage.kt
index 7c411e7..d53b379 100644
--- a/src/main/kotlin/ru/mipt/spc/magprog/magProgPage.kt
+++ b/src/main/kotlin/ru/mipt/spc/magprog/magProgPage.kt
@@ -45,13 +45,7 @@ class MagProgSection(
     val title: String,
     val style: String,
     val content: FlowContent.() -> Unit,
-) {
-    val meta: Meta
-        get() = Meta {
-            "id" put id
-            "title" put title
-        }
-}
+)
 
 private fun wrapSection(
     id: String,
@@ -164,7 +158,7 @@ context(PageContext) private fun FlowContent.team() {
 }
 
 context(PageContext) private fun FlowContent.mentors() {
-    val mentors = findByType("magprog_mentor").mapValues { Person(it.value) }.entries.sortedBy { it.value.order }
+    val mentors = findByType("magprog_mentor").mapValues { Person(it.value) }.entries.sortedBy { it.value.id }
 
     div("header") {
         h1("title") {
@@ -266,10 +260,6 @@ context(PageContext) internal fun BODY.magProgFooter() {
 internal val Person.mentorPageId get() = "mentor-${id}"
 
 internal fun Application.magProgPage(context: Context, rootPath: Path, prefix: String = "/magprog") {
-//    val io = context.io
-//    val content = DirectoryDataTree(io, rootPath.resolve("content"))
-//
-//    val magprogPageContext: PageContext = DataSetPageContext(context, prefix, content)
 
     val snark = context.fetch(SnarkPlugin)
 
diff --git a/src/main/resources/magprog/assets/images/mentors/Dolgonosov.jpg b/src/main/resources/magprog/assets/images/mentors/Dolgonosov.jpg
index 34c6c1c..009234a 100644
Binary files a/src/main/resources/magprog/assets/images/mentors/Dolgonosov.jpg and b/src/main/resources/magprog/assets/images/mentors/Dolgonosov.jpg differ
diff --git a/src/main/resources/magprog/assets/images/mentors/Gertsenberger.jpg b/src/main/resources/magprog/assets/images/mentors/Gertsenberger.jpg
index bf6e426..c793375 100644
Binary files a/src/main/resources/magprog/assets/images/mentors/Gertsenberger.jpg and b/src/main/resources/magprog/assets/images/mentors/Gertsenberger.jpg differ
diff --git a/src/main/resources/magprog/assets/images/mentors/Khokhriakov.jpg b/src/main/resources/magprog/assets/images/mentors/Khokhriakov.jpg
index 754091e..e76b0df 100644
Binary files a/src/main/resources/magprog/assets/images/mentors/Khokhriakov.jpg and b/src/main/resources/magprog/assets/images/mentors/Khokhriakov.jpg differ
diff --git a/src/main/resources/magprog/assets/images/mentors/Kostunin.jpg b/src/main/resources/magprog/assets/images/mentors/Kostunin.jpg
index 849cd0d..dc9d67e 100644
Binary files a/src/main/resources/magprog/assets/images/mentors/Kostunin.jpg and b/src/main/resources/magprog/assets/images/mentors/Kostunin.jpg differ
diff --git a/src/main/resources/magprog/assets/images/mentors/Shagalov.jpg b/src/main/resources/magprog/assets/images/mentors/Shagalov.jpg
index fa8c335..8699277 100644
Binary files a/src/main/resources/magprog/assets/images/mentors/Shagalov.jpg and b/src/main/resources/magprog/assets/images/mentors/Shagalov.jpg differ
diff --git a/src/main/resources/magprog/assets/images/mentors/Skasyrskaya.jpg b/src/main/resources/magprog/assets/images/mentors/Skasyrskaya.jpg
index d42d0b1..7277dc9 100644
Binary files a/src/main/resources/magprog/assets/images/mentors/Skasyrskaya.jpg and b/src/main/resources/magprog/assets/images/mentors/Skasyrskaya.jpg differ
diff --git a/src/main/resources/magprog/assets/images/team/svetlichny.jpeg b/src/main/resources/magprog/assets/images/team/svetlichny.jpeg
index ae0b621..1b3cd3f 100644
Binary files a/src/main/resources/magprog/assets/images/team/svetlichny.jpeg and b/src/main/resources/magprog/assets/images/team/svetlichny.jpeg differ