diff --git a/src/core/classes/site.ts b/src/core/classes/site.ts
index bc20704b5..b90932cd3 100644
--- a/src/core/classes/site.ts
+++ b/src/core/classes/site.ts
@@ -107,6 +107,7 @@ export class CoreSite {
         '3.10': 2020110900,
         '3.11': 2021051700,
         '4.0': 2022041900,
+        '4.1': 2022111100, // @todo [4.1] replace with right value when released. Using a tmp value to be able to test new things.
     };
 
     // Possible cache update frequencies.
diff --git a/src/core/features/grades/pages/course/course.html b/src/core/features/grades/pages/course/course.html
index 3919f3926..3cbbfc4af 100644
--- a/src/core/features/grades/pages/course/course.html
+++ b/src/core/features/grades/pages/course/course.html
@@ -27,7 +27,7 @@
                 </thead>
                 <tbody>
                     <ng-container *ngFor="let row of rows">
-                        <tr *ngIf="!useLegacyLayout && row.itemtype === 'leader'">
+                        <tr *ngIf="row.itemtype === 'leader'">
                             <td [attr.rowspan]="row.rowspan" class="core-grades-table-leader"></td>
                         </tr>
                         <tr [attr.role]="row.expandable && showSummary ? 'button row' : 'row'"
@@ -35,10 +35,9 @@
                             [attr.aria-label]="rowAriaLabel(row)" [attr.aria-controls]="row.detailsid"
                             (ariaButtonClick)="row.expandable && showSummary && toggleRow(row)" [class]="row.rowclass"
                             [class.core-grades-grade-clickable]="row.expandable && showSummary" [id]="'grade-'+row.id"
-                            *ngIf="useLegacyLayout || row.itemtype !== 'leader'">
+                            *ngIf="row.itemtype !== 'leader'">
                             <ng-container *ngIf="row.itemtype">
-                                <td *ngIf="!useLegacyLayout && row.itemtype == 'category'" class="core-grades-table-category"
-                                    [attr.rowspan]="row.rowspan">
+                                <td *ngIf="row.itemtype == 'category'" class="core-grades-table-category" [attr.rowspan]="row.rowspan">
                                 </td>
                                 <th class="core-grades-table-gradeitem ion-text-start" [attr.colspan]="row.colspan">
                                     <ion-icon *ngIf="row.expandable && showSummary" aria-hidden="true" slot="start" name="fas-chevron-right"
diff --git a/src/core/features/grades/pages/course/course.page.ts b/src/core/features/grades/pages/course/course.page.ts
index 2f85483de..4c0bc4880 100644
--- a/src/core/features/grades/pages/course/course.page.ts
+++ b/src/core/features/grades/pages/course/course.page.ts
@@ -54,8 +54,8 @@ export class CoreGradesCoursePage implements AfterViewInit, OnDestroy {
     rows?: CoreGradesFormattedTableRow[];
     totalColumnsSpan?: number;
     withinSplitView?: boolean;
-    useLegacyLayout?: boolean; // Whether to use the layout before 4.1.
 
+    protected useLegacyLayout?: boolean; // Whether to use the layout before 4.1.
     protected fetchSuccess = false;
 
     constructor(
diff --git a/src/core/features/grades/tests/behat/navigation.feature b/src/core/features/grades/tests/behat/navigation.feature
index b47038164..9f3d69054 100644
--- a/src/core/features/grades/tests/behat/navigation.feature
+++ b/src/core/features/grades/tests/behat/navigation.feature
@@ -1,5 +1,5 @@
 @app @javascript
-Feature: Test grades navigation
+Feature: Grades navigation
 
   Background:
     Given the following "users" exist:
diff --git a/src/core/features/grades/tests/behat/view.feature b/src/core/features/grades/tests/behat/view.feature
new file mode 100644
index 000000000..72be6a21e
--- /dev/null
+++ b/src/core/features/grades/tests/behat/view.feature
@@ -0,0 +1,75 @@
+@app @javascript
+Feature: View grades
+
+  Background:
+    Given the following "users" exist:
+      | username  | firstname | lastname |
+      | student1  | Student   | first    |
+    And the following "scales" exist:
+      | name  | scale     |
+      | Scale | Good, Bad |
+    And the following "courses" exist:
+      | fullname | shortname |
+      | Course 1 | C1        |
+    And the following "course enrolments" exist:
+      | user     | course | role    |
+      | student1 | C1     | student |
+    And the following "grade categories" exist:
+      | fullname   | course |
+      | Category 1 | C1     |
+      | Category 2 | C1     |
+    And the following "grade outcomes" exist:
+      | fullname | shortname | course | scale |
+      | Outcome  | outcome   | C1     | Scale |
+    And the following "grade items" exist:
+      | gradecategory | itemname  | course | grademin | grademax |
+      | Category 1    | Item 1.1  | C1     | 60       | 80       |
+      | Category 1    | Item 1.2  | C1     | 10       | 90       |
+      | Category 2    | Item 2.1  | C1     | 0        | 100      |
+    And the following "activities" exist:
+      | gradecategory | name         | course | activity | idnumber | grade | gradepass |
+      | Category 1    | Assignment 1 | C1     | assign   | assign1  | 100   | 50        |
+      | Category 1    | Assignment 2 | C1     | assign   | assign2  | 100   | 50        |
+    And the following "grade items" exist:
+      | gradecategory | itemname | course | outcome |
+      | Category 1    | Outcome  | C1     | outcome |
+    And the following "grade grades" exist:
+      | gradeitem    | user     | grade |
+      | Item 1.1     | student1 | 70    |
+      | Item 1.2     | student1 | 20    |
+      | Item 2.1     | student1 | 40    |
+      | Assignment 1 | student1 | 80    |
+      | Assignment 2 | student1 | 35    |
+      | Outcome      | student1 | 1     |
+    And the following config values are set as admin:
+      | enableoutcomes | 1 |
+
+  Scenario: View individual grades and the grade report
+    Given I entered the course "Course 1" as "student1" in the app
+
+    When I press "Assignment 1" in the app
+    And I press "Information" in the app
+    Then I should find "80" within "Gradebook" "ion-list" in the app
+
+    When I press "Close" in the app
+    And I press the back button in the app
+    And I press "Assignment 2" in the app
+    And I press "Information" in the app
+    Then I should find "35" within "Gradebook" "ion-list" in the app
+
+    When I press "Close" in the app
+    And I press the back button in the app
+    And I press "Grades" in the app
+    Then I should find "Category 1" in the app
+    And I should find "70" within "Item 1.1" "tr" in the app
+    And I should find "20" within "Item 1.2" "tr" in the app
+    And I should find "80" within "Assignment 1" "tr" in the app
+    And I should find "Pass" within "Assignment 1" "tr" in the app
+    And I should find "35" within "Assignment 2" "tr" in the app
+    And I should find "Fail" within "Assignment 2" "tr" in the app
+    And I should find "Good" within "Outcome" "tr" in the app
+    And I should find "205" within "Category 1 total" "tr" in the app
+    And I should find "Category 2" in the app
+    And I should find "40" within "Item 2.1" "tr" in the app
+    And I should find "40" within "Category 2 total" "tr" in the app
+    And I should find "245" within "Course total" "tr" in the app