diff --git a/sdvx@asphyxia/data/exg.ts b/sdvx@asphyxia/data/exg.ts
index 9afaf06..e1e700c 100644
--- a/sdvx@asphyxia/data/exg.ts
+++ b/sdvx@asphyxia/data/exg.ts
@@ -47,11 +47,13 @@ export const MISSINGSONGS6 = [
 ]
 
 export const XRECORDSONGS = [
+  // 1st edition
   '1736', // discordia_penorerihumer
   '1737', // chewingood_toriena
   '1738', // verflucht_tirfing
-  '1847', // 2 beasts unchained
+  // 2nd edition
   '1848', // fegrix
+  '1847', // 2 beasts unchained
   '1849', // piano kyousoukyoku
 ]
 
@@ -80,7 +82,8 @@ export const APRILFOOLSSONGS = [
 ]
 
 export const VALKYRIEEXCLUSIVESONGS = [
-  '1672', '1744', '1855', '1742'
+  '1672', '1744', '1855', '1742',
+  '1736', '1737', '1738', '1848', '1847', '1849' // X-record
 ]
 
 export const ARENA = {
diff --git a/sdvx@asphyxia/handlers/common.ts b/sdvx@asphyxia/handlers/common.ts
index 2d54cfb..0c50ec8 100644
--- a/sdvx@asphyxia/handlers/common.ts
+++ b/sdvx@asphyxia/handlers/common.ts
@@ -112,7 +112,9 @@ export const common: EPR = async (info, data, send) => {
                     if(MISSINGSONGS6.includes(i.toString())) {
                       limitedNo += 1;
                     }
-                    else if(!U.GetConfig('enable_valk_songs') && (VALKYRIEEXCLUSIVESONGS.includes(i.toString()) && (info.model.split(":")[2] != 'G' || info.model.split(":")[2] != 'H'))){
+                    else if(VALKYRIEEXCLUSIVESONGS.includes(i.toString()) && (!U.GetConfig('enable_valk_songs') && info.model.split(":")[2].match(/^(G|H)$/g) == null)){
+                      console.log(U.GetConfig('enable_valk_songs'))
+                      if(info.model.split(":")[2].match(/^(G|H)$/g) == null) console.log("null")
                       limitedNo -= 1;
                     }
                     for(let j = 0; j < 5; j++) {
diff --git a/sdvx@asphyxia/handlers/profiles.ts b/sdvx@asphyxia/handlers/profiles.ts
index a790216..c9e007a 100644
--- a/sdvx@asphyxia/handlers/profiles.ts
+++ b/sdvx@asphyxia/handlers/profiles.ts
@@ -709,7 +709,8 @@ export const load: EPR = async (info, data, send) => {
   }
 
   // Check X-record data and unlock songs based on points
-  if(U.GetConfig('x_record')) {
+  console.log(JSON.stringify(info.model.split(":")[2].match(/^(G|H)$/g)))
+  if(U.GetConfig('x_record') && (info.model.split(":")[2].match(/^(G|H)$/g) != null || U.GetConfig('enable_valk_songs'))) {
     // '1736', // discordia_penorerihumer - 150
     // '1737', // chewingood_toriena - 0
     // '1738', // verflucht_tirfing - 50
diff --git a/sdvx@asphyxia/webui/asset/js/detail.js b/sdvx@asphyxia/webui/asset/js/detail.js
index 668d2d5..ea28cd4 100644
--- a/sdvx@asphyxia/webui/asset/js/detail.js
+++ b/sdvx@asphyxia/webui/asset/js/detail.js
@@ -826,18 +826,18 @@ $(document).ready(function() {
                         $('<span class="icon">').append(
                             $('<i class="mdi mdi-pulse">')
                         )
-                    ).append("Other Data")
+                    ).append("Arena")
                 )
             ).append(
                 $('<div class="card-content">').append(
                     $('<div class="tile is-ancestor">').append(
-                        $('<div class="tile is-parent is-5">').append(
+                        $('<div class="tile is-parent">').append(
                             $('<article class="tile is-child box">').append(
                                 $('<p class="title">').append(
-                                    "X-Record Data"
+                                    "Arena Power"
                                 ).append(
                                     $('<div class="content">').append(
-                                        lm + " LM | " + vm + " VM"
+                                        arenaPower
                                     )
                                 ).css('font-family', "testfont") 
                             )
@@ -853,18 +853,30 @@ $(document).ready(function() {
                         $('<span class="icon">').append(
                             $('<i class="mdi mdi-pulse">')
                         )
-                    ).append("Arena")
+                    ).append("X-record")
                 )
             ).append(
                 $('<div class="card-content">').append(
                     $('<div class="tile is-ancestor">').append(
-                        $('<div class="tile is-parent is-5">').append(
+                        $('<div class="tile is-parent">').append(
                             $('<article class="tile is-child box">').append(
                                 $('<p class="title">').append(
-                                    "Arena Power"
+                                    "LM"
                                 ).append(
                                     $('<div class="content">').append(
-                                        arenaPower
+                                        lm
+                                    )
+                                ).css('font-family', "testfont") 
+                            )
+                        )
+                    ).append(
+                        $('<div class="tile is-parent">').append(
+                            $('<article class="tile is-child box">').append(
+                                $('<p class="title">').append(
+                                    "VM"
+                                ).append(
+                                    $('<div class="content">').append(
+                                        vm
                                     )
                                 ).css('font-family', "testfont") 
                             )
@@ -872,7 +884,6 @@ $(document).ready(function() {
                     ).css('vertical-align', 'middle')
                 )
             )
-
         )
 
         .append(