diff --git a/view/src/main/java/se/su/dsv/scipro/grading/SupervisorGradingReportPage.html b/view/src/main/java/se/su/dsv/scipro/grading/SupervisorGradingReportPage.html
index cc14776e74..fe1a93f27e 100644
--- a/view/src/main/java/se/su/dsv/scipro/grading/SupervisorGradingReportPage.html
+++ b/view/src/main/java/se/su/dsv/scipro/grading/SupervisorGradingReportPage.html
@@ -35,18 +35,7 @@
             <div class="card" wicket:id="tabs"></div>
         </div>
         <div class="col-lg-6">
-            <ul class="nav nav-tabs" role="tablist">
-                <li class="nav-item active"><a class="nav-link active" href="#discussion" role="tab" data-bs-toggle="tab">Interact with reviewer</a></li>
-                <li class="nav-item">
-                    <a class="nav-link" href="#examiner-timeline" role="tab" data-bs-toggle="tab">
-                        Interactions with examiner
-                    </a>
-                </li>
-            </ul>
-            <div class="tab-content">
-                <div id="discussion" class="tab-pane active bordered" wicket:id="discussion"></div>
-                <div id="examiner-timeline" class="tab-pane bordered" wicket:id="examiner_timeline"></div>
-            </div>
+            <div class="card" wicket:id="interact"></div>
         </div>
     </div>
 </wicket:extend>
diff --git a/view/src/main/java/se/su/dsv/scipro/grading/SupervisorGradingReportPage.java b/view/src/main/java/se/su/dsv/scipro/grading/SupervisorGradingReportPage.java
index b4590290a6..2f9ac6b1be 100644
--- a/view/src/main/java/se/su/dsv/scipro/grading/SupervisorGradingReportPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/grading/SupervisorGradingReportPage.java
@@ -136,6 +136,15 @@ public class SupervisorGradingReportPage extends AbstractSupervisorProjectDetail
         TabbedPanel<ITab> tabbedPanel = new BootstrapCardTabbedPanel<>("tabs", tabs);
         add(tabbedPanel);
 
+        List<ITab> interactTabs = new ArrayList<>();
+        interactTabs.add(createTab(Model.of("Interact with reviewer"),
+                panelId -> new TimelinePanel(panelId, projectModel)));
+        interactTabs.add(createTab(Model.of("Interactions with examiner"),
+                panelId -> new ExaminerTimelinePanel(panelId, projectModel)));
+
+        TabbedPanel<ITab> tabbedPanelInteract = new BootstrapCardTabbedPanel<>("interact", interactTabs);
+        add(tabbedPanelInteract);
+
         final String externalGradingURL = generalSystemSettingsService.getGeneralSystemSettingsInstance().getExternalGradingURL();
         add(new ExternalLink("moreInformation", externalGradingURL) {
             @Override
@@ -145,8 +154,6 @@ public class SupervisorGradingReportPage extends AbstractSupervisorProjectDetail
             }
         });
 
-        add(new TimelinePanel("discussion", projectModel));
-        add(new ExaminerTimelinePanel("examiner_timeline", projectModel));
     }
 
     private Component newGreenHighlight(String id, IModel<Boolean> completed, IModel<String> text) {