diff --git a/SharedProject/Models/SongBestData.cs b/SharedProject/Models/SongBestData.cs
index 4872661..fed0613 100644
--- a/SharedProject/Models/SongBestData.cs
+++ b/SharedProject/Models/SongBestData.cs
@@ -42,8 +42,8 @@ public class SongBestData
     public uint HitCount { get; set; }
     
     public uint DrumrollCount { get; set; }
-    
-    public List<AiSectionBestData> AiSectionBestData { get; set; }
 
-    public bool ShowAiData { get; set; } = false;
+    public List<AiSectionBestData> AiSectionBestData { get; set; } = new();
+
+    public bool ShowAiData { get; set; }
 }
\ No newline at end of file
diff --git a/TaikoWebUI/Pages/HighScores.razor b/TaikoWebUI/Pages/HighScores.razor
index 35f47a4..aa54e55 100644
--- a/TaikoWebUI/Pages/HighScores.razor
+++ b/TaikoWebUI/Pages/HighScores.razor
@@ -29,7 +29,7 @@
                                      Icon="@GetDifficultyIcon(difficulty)">
                             @if (songBestDataMap.ContainsKey(difficulty))
                             {
-                                <MudDataGrid Items="@songBestDataMap[difficulty]"
+                                <MudDataGrid Items="@songBestDataMap[difficulty]" RowClick="(DataGridRowClickEventArgs<SongBestData> _) => { return;}"
                                              ColumnResizeMode="ResizeMode.None" RowsPerPage="25" Elevation="0">
                                     <Columns>
                                         <Column T="SongBestData" Field="@nameof(SongBestData.SongId)" Title="Song" StickyLeft="true">
@@ -89,7 +89,11 @@
                                         <Column T="SongBestData" Field="@nameof(SongBestData.ComboCount)" Title="MAX Combo" Sortable="false" />
                                         <Column T="SongBestData" Field="@nameof(SongBestData.ShowAiData)" Title="AI Battle Data">
                                             <CellTemplate>
-                                                <MudButton Variant="Variant.Outlined" Size="Size.Small" OnClick="@(()=> ToggleShowAiData(context.Item))" Disabled="@(!IsAiDataPresent(context.Item))">@(context.Item.ShowAiData ? "Hide" : "Show")</MudButton>
+                                                <MudButton Variant="Variant.Outlined" Size="Size.Small" 
+                                                           OnClick="@(() => ToggleShowAiData(context.Item))" 
+                                                           Disabled="@(!IsAiDataPresent(context.Item))">
+                                                    @(context.Item.ShowAiData ? "Hide" : "Show")
+                                                </MudButton>
                                             </CellTemplate>
                                         </Column>
                                         <Column T="SongBestData" Field="@nameof(SongBestData.LastPlayTime)" Title="Last Played" Hideable="true" />
@@ -101,14 +105,14 @@
                                     <ChildRowContent>
 		                            @if (context.Item.ShowAiData)
 				                    {
-                                        <MudTr>
+                                        <tr>
                                             <td colspan="1" class="pa-3 ai-battle-td">
                                                 <MudText Typo="Typo.body2" Style="font-weight: bold">
                                                     AI Battle Data
                                                 </MudText>
                                             </td>
                                             <td colspan="16">
-                                                <MudTable Elevation="0" ReadOnly="true" 
+                                                <MudTable Elevation="0" ReadOnly="true"
                                                           Items="@context.Item.AiSectionBestData" Context="aiSectionContext">
                                                     <HeaderContent>
                                                         <MudTh>Section No.</MudTh>
@@ -142,7 +146,7 @@
                                                     </RowTemplate>
                                                 </MudTable>
                                             </td>
-                                        </MudTr>
+                                        </tr>
                                     }
 	                                </ChildRowContent>
                                     <PagerContent>