diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryPresenter.kt
index cbd4169d..bab64632 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryPresenter.kt
@@ -36,6 +36,7 @@ class GradeSummaryPresenter @Inject constructor(
             .flatMap { semesterRepository.getSemesters(it).map { semesters -> it to semesters } }
             .flatMap { (student, semesters) ->
                 gradeSummaryRepository.getGradesSummary(semesters.first { it.semesterId == semesterId }, forceRefresh)
+                    .map { it.sortedBy { subject -> subject.subject } }
                     .flatMap { gradesSummary ->
                         averageProvider.getGradeAverage(student, semesters, semesterId, forceRefresh)
                             .map { averages -> createGradeSummaryItemsAndHeader(gradesSummary, averages) }
diff --git a/app/src/main/res/layout/item_grade_summary.xml b/app/src/main/res/layout/item_grade_summary.xml
index a650e9dc..726a4d9c 100644
--- a/app/src/main/res/layout/item_grade_summary.xml
+++ b/app/src/main/res/layout/item_grade_summary.xml
@@ -3,7 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    tools:context=".ui.modules.grade.summary.GradeSummaryItem">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -79,7 +80,7 @@
             android:layout_marginStart="20dp"
             android:layout_marginLeft="20dp"
             android:layout_weight="1"
-            android:text="@string/grade_summary_final_average"
+            android:text="@string/grade_summary_final_grade"
             android:textSize="14sp" />
 
         <TextView