diff --git a/components/AwakeningSelect/index.tsx b/components/AwakeningSelect/index.tsx
index ec90f169..b3feeebf 100644
--- a/components/AwakeningSelect/index.tsx
+++ b/components/AwakeningSelect/index.tsx
@@ -41,6 +41,7 @@ const AwakeningSelect = (props: Props) => {
             en: 'No awakening',
             ja: '覚醒なし',
           },
+          granblue_id: '',
           slug: 'no-awakening',
           minValue: 0,
           maxValue: 0,
diff --git a/components/AxSelect/index.tsx b/components/AxSelect/index.tsx
index 99ab9c7e..265eb536 100644
--- a/components/AxSelect/index.tsx
+++ b/components/AxSelect/index.tsx
@@ -219,7 +219,7 @@ const AXSelect = (props: Props) => {
     if (modifierSet == 0) {
       axOptionElements = axOptions.map((ax, i) => {
         return (
-          <SelectItem key={i} value={ax.id}>
+          <SelectItem key={i} value={ax.id} data-granblue-id={ax.granblue_id}>
             {ax.name[locale]}
           </SelectItem>
         )
diff --git a/components/Header/index.tsx b/components/Header/index.tsx
index a2d86abb..011362a4 100644
--- a/components/Header/index.tsx
+++ b/components/Header/index.tsx
@@ -12,6 +12,7 @@ import { accountState, initialAccountState } from '~utils/accountState'
 import { appState, initialAppState } from '~utils/appState'
 import { getLocalId } from '~utils/localId'
 import { retrieveLocaleCookies } from '~utils/retrieveCookies'
+import { setEditKey, storeEditKey } from '~utils/userToken'
 
 import {
   DropdownMenu,
@@ -196,6 +197,13 @@ const Header = () => {
         .remix({ shortcode: partySnapshot.shortcode, body: body })
         .then((response) => {
           const remix = response.data.party
+
+          // Store the edit key in local storage
+          if (remix.edit_key) {
+            storeEditKey(remix.id, remix.edit_key)
+            setEditKey(remix.id, remix.user)
+          }
+
           router.push(`/p/${remix.shortcode}`)
           setRemixToastOpen(true)
         })
diff --git a/components/Hovercard/index.scss b/components/Hovercard/index.scss
index c0c803bb..ed4e6fa5 100644
--- a/components/Hovercard/index.scss
+++ b/components/Hovercard/index.scss
@@ -1,3 +1,7 @@
+div[data-radix-popper-content-wrapper] {
+  z-index: 10 !important;
+}
+
 .HovercardContent {
   animation: scaleIn $duration-zoom ease-out;
   transform-origin: var(--radix-hover-card-content-transform-origin);
diff --git a/components/Party/index.tsx b/components/Party/index.tsx
index 3bc61ce1..900898fb 100644
--- a/components/Party/index.tsx
+++ b/components/Party/index.tsx
@@ -3,7 +3,6 @@ import { getCookie } from 'cookies-next'
 import { useRouter } from 'next/router'
 import { subscribe, useSnapshot } from 'valtio'
 import clonedeep from 'lodash.clonedeep'
-import ls from 'local-storage'
 
 import PartySegmentedControl from '~components/PartySegmentedControl'
 import PartyDetails from '~components/PartyDetails'
@@ -17,7 +16,7 @@ import { appState, initialAppState } from '~utils/appState'
 import { getLocalId } from '~utils/localId'
 import { GridType } from '~utils/enums'
 import { retrieveCookies } from '~utils/retrieveCookies'
-import { setEditKey, unsetEditKey } from '~utils/userToken'
+import { setEditKey, storeEditKey, unsetEditKey } from '~utils/userToken'
 
 import type { DetailsObject } from '~types'
 
@@ -240,10 +239,6 @@ const Party = (props: Props) => {
     return team
   }
 
-  const storeEditKey = (id: string, key: string) => {
-    ls(id, key)
-  }
-
   const storeCharacters = (list: Array<GridCharacter>) => {
     list.forEach((object: GridCharacter) => {
       if (object.position != null)
diff --git a/components/RingSelect/index.tsx b/components/RingSelect/index.tsx
index 0c339766..25727a32 100644
--- a/components/RingSelect/index.tsx
+++ b/components/RingSelect/index.tsx
@@ -54,6 +54,7 @@ const RingSelect = ({ gridCharacter, sendValues }: Props) => {
         ja: 'EXリミットボーナスなし',
       },
       id: 0,
+      granblue_id: '',
       slug: 'no-bonus',
       minValue: 0,
       maxValue: 0,
diff --git a/components/UpdatesPage/index.tsx b/components/UpdatesPage/index.tsx
index e79f3139..c810f67b 100644
--- a/components/UpdatesPage/index.tsx
+++ b/components/UpdatesPage/index.tsx
@@ -64,7 +64,7 @@ const UpdatesPage = () => {
           character: ['3040451000', '3040452000', '3040453000', '3040454000'],
           weapon: ['1040914600', '1040116800', '1040515900', '1040712300'],
         }}
-        numNotes={5}
+        numNotes={7}
       />
       <ContentUpdate
         version="2023-02L"
diff --git a/components/WeaponKeySelect/index.tsx b/components/WeaponKeySelect/index.tsx
index fac77fe8..d1b735d5 100644
--- a/components/WeaponKeySelect/index.tsx
+++ b/components/WeaponKeySelect/index.tsx
@@ -79,7 +79,11 @@ const WeaponKeySelect = React.forwardRef<HTMLButtonElement, Props>(
         keys[index].length > 0 &&
         keys[index].sort(sortByOrder).map((item, i) => {
           return (
-            <SelectItem key={i} value={item.id}>
+            <SelectItem
+              key={i}
+              value={item.id}
+              data-granblue-id={item.granblue_id}
+            >
               {item.name.en}
             </SelectItem>
           )
diff --git a/data/awakening.tsx b/data/awakening.tsx
index 938db371..217acf63 100644
--- a/data/awakening.tsx
+++ b/data/awakening.tsx
@@ -9,6 +9,7 @@ export type Awakening = {
 export const characterAwakening: ItemSkill[] = [
   {
     id: 1,
+    granblue_id: '',
     name: {
       en: 'Balanced',
       ja: 'バランス',
@@ -20,6 +21,7 @@ export const characterAwakening: ItemSkill[] = [
   },
   {
     id: 2,
+    granblue_id: '',
     name: {
       en: 'Attack',
       ja: '攻撃',
@@ -31,6 +33,7 @@ export const characterAwakening: ItemSkill[] = [
   },
   {
     id: 3,
+    granblue_id: '',
     name: {
       en: 'Defense',
       ja: '防御',
@@ -42,6 +45,7 @@ export const characterAwakening: ItemSkill[] = [
   },
   {
     id: 4,
+    granblue_id: '',
     name: {
       en: 'Multiattack',
       ja: '連続攻撃',
@@ -56,6 +60,7 @@ export const characterAwakening: ItemSkill[] = [
 export const weaponAwakening: ItemSkill[] = [
   {
     id: 1,
+    granblue_id: '',
     name: {
       en: 'Attack',
       ja: '攻撃',
@@ -67,6 +72,7 @@ export const weaponAwakening: ItemSkill[] = [
   },
   {
     id: 2,
+    granblue_id: '',
     name: {
       en: 'Defense',
       ja: '防御',
@@ -78,6 +84,7 @@ export const weaponAwakening: ItemSkill[] = [
   },
   {
     id: 3,
+    granblue_id: '',
     name: {
       en: 'Special',
       ja: '特殊',
diff --git a/data/ax.tsx b/data/ax.tsx
index 15e10ea2..8ac03486 100644
--- a/data/ax.tsx
+++ b/data/ax.tsx
@@ -6,6 +6,7 @@ const ax: ItemSkill[][] = [
         ja: '攻撃',
       },
       id: 0,
+      granblue_id: '1589',
       slug: 'atk',
       minValue: 1,
       maxValue: 3.5,
@@ -18,6 +19,7 @@ const ax: ItemSkill[][] = [
             ja: '奥義ダメ',
           },
           id: 3,
+          granblue_id: '1591',
           slug: 'ca-dmg',
           minValue: 2,
           maxValue: 4,
@@ -30,6 +32,7 @@ const ax: ItemSkill[][] = [
             ja: 'DA確率',
           },
           id: 5,
+          granblue_id: '1596',
           slug: 'da',
           minValue: 1,
           maxValue: 2,
@@ -42,6 +45,7 @@ const ax: ItemSkill[][] = [
             ja: 'TA確率',
           },
           id: 6,
+          granblue_id: '1597',
           slug: 'ta',
           minValue: 1,
           maxValue: 2,
@@ -54,6 +58,7 @@ const ax: ItemSkill[][] = [
             ja: 'アビ上限',
           },
           id: 7,
+          granblue_id: '1588',
           slug: 'skill-cap',
           minValue: 1,
           maxValue: 2,
@@ -68,6 +73,7 @@ const ax: ItemSkill[][] = [
         ja: '防御',
       },
       id: 1,
+      granblue_id: '1590',
       slug: 'def',
       minValue: 1,
       maxValue: 8,
@@ -80,6 +86,7 @@ const ax: ItemSkill[][] = [
             ja: 'HP',
           },
           id: 2,
+          granblue_id: '1588',
           slug: 'hp',
           minValue: 1,
           maxValue: 3,
@@ -92,6 +99,7 @@ const ax: ItemSkill[][] = [
             ja: '弱体耐性',
           },
           id: 9,
+          granblue_id: '1593',
           slug: 'debuff',
           minValue: 1,
           maxValue: 3,
@@ -104,6 +112,7 @@ const ax: ItemSkill[][] = [
             ja: '回復性能',
           },
           id: 10,
+          granblue_id: '1595',
           slug: 'healing',
           minValue: 2,
           maxValue: 5,
@@ -116,6 +125,7 @@ const ax: ItemSkill[][] = [
             ja: '背水',
           },
           id: 11,
+          granblue_id: '1601',
           slug: 'enmity',
           minValue: 1,
           maxValue: 3,
@@ -129,6 +139,7 @@ const ax: ItemSkill[][] = [
         ja: 'HP',
       },
       id: 2,
+      granblue_id: '1588',
       slug: 'hp',
       minValue: 1,
       maxValue: 11,
@@ -141,6 +152,7 @@ const ax: ItemSkill[][] = [
             ja: '防御',
           },
           id: 1,
+          granblue_id: '1590',
           slug: 'def',
           minValue: 1,
           maxValue: 3,
@@ -153,6 +165,7 @@ const ax: ItemSkill[][] = [
             ja: '弱体耐性',
           },
           id: 9,
+          granblue_id: '1593',
           slug: 'debuff',
           minValue: 1,
           maxValue: 3,
@@ -165,6 +178,7 @@ const ax: ItemSkill[][] = [
             ja: '回復性能',
           },
           id: 10,
+          granblue_id: '1595',
           slug: 'healing',
           minValue: 2,
           maxValue: 5,
@@ -177,6 +191,7 @@ const ax: ItemSkill[][] = [
             ja: '渾身',
           },
           id: 12,
+          granblue_id: '1600',
           slug: 'stamina',
           minValue: 1,
           maxValue: 3,
@@ -190,6 +205,7 @@ const ax: ItemSkill[][] = [
         ja: '奥義ダメ',
       },
       id: 3,
+      granblue_id: '1591',
       slug: 'ca-dmg',
       minValue: 2,
       maxValue: 8.5,
@@ -202,6 +218,7 @@ const ax: ItemSkill[][] = [
             ja: '攻撃',
           },
           id: 0,
+          granblue_id: '1589',
           slug: 'atk',
           minValue: 1,
           maxValue: 1.5,
@@ -214,6 +231,7 @@ const ax: ItemSkill[][] = [
             ja: '全属性攻撃力',
           },
           id: 13,
+          granblue_id: '1594',
           slug: 'ele-atk',
           minValue: 1,
           maxValue: 5,
@@ -226,6 +244,7 @@ const ax: ItemSkill[][] = [
             ja: '奥義上限',
           },
           id: 8,
+          granblue_id: '1599',
           slug: 'ca-cap',
           minValue: 1,
           maxValue: 2,
@@ -238,6 +257,7 @@ const ax: ItemSkill[][] = [
             ja: '渾身',
           },
           id: 12,
+          granblue_id: '1600',
           slug: 'stamina',
           minValue: 1,
           maxValue: 3,
@@ -251,6 +271,7 @@ const ax: ItemSkill[][] = [
         ja: '連撃率',
       },
       id: 4,
+      granblue_id: '1592',
       slug: 'ta',
       minValue: 1,
       maxValue: 4,
@@ -263,6 +284,7 @@ const ax: ItemSkill[][] = [
             ja: '奥義ダメ',
           },
           id: 3,
+          granblue_id: '1591',
           slug: 'ca-dmg',
           minValue: 2,
           maxValue: 4,
@@ -275,6 +297,7 @@ const ax: ItemSkill[][] = [
             ja: '全属性攻撃力',
           },
           id: 13,
+          granblue_id: '1594',
           slug: 'ele-atk',
           minValue: 1,
           maxValue: 5,
@@ -287,6 +310,7 @@ const ax: ItemSkill[][] = [
             ja: 'DA確率',
           },
           id: 5,
+          granblue_id: '1596',
           slug: 'da',
           minValue: 1,
           maxValue: 2,
@@ -299,6 +323,7 @@ const ax: ItemSkill[][] = [
             ja: 'TA確率',
           },
           id: 6,
+          granblue_id: '1597',
           slug: 'ta',
           minValue: 1,
           maxValue: 2,
@@ -315,6 +340,7 @@ const ax: ItemSkill[][] = [
         ja: '攻撃',
       },
       id: 0,
+      granblue_id: '1589',
       slug: 'atk',
       minValue: 1,
       maxValue: 3.5,
@@ -327,6 +353,7 @@ const ax: ItemSkill[][] = [
             ja: '奥義ダメ',
           },
           id: 3,
+          granblue_id: '1591',
           slug: 'ca-dmg',
           minValue: 2,
           maxValue: 8.5,
@@ -339,6 +366,7 @@ const ax: ItemSkill[][] = [
             ja: '連撃確率',
           },
           id: 4,
+          granblue_id: '1592',
           slug: 'ta',
           minValue: 1.5,
           maxValue: 4,
@@ -351,6 +379,7 @@ const ax: ItemSkill[][] = [
             ja: '通常ダメ上限',
           },
           id: 14,
+          granblue_id: '1722',
           slug: 'na-dmg',
           minValue: 0.5,
           maxValue: 1.5,
@@ -363,6 +392,7 @@ const ax: ItemSkill[][] = [
             ja: 'アビ与ダメ上昇',
           },
           id: 15,
+          granblue_id: '1719',
           slug: 'skill-supp',
           minValue: 1,
           maxValue: 5,
@@ -376,6 +406,7 @@ const ax: ItemSkill[][] = [
         ja: '防御',
       },
       id: 1,
+      granblue_id: '1590',
       slug: 'def',
       minValue: 1,
       maxValue: 8,
@@ -388,6 +419,7 @@ const ax: ItemSkill[][] = [
             ja: '属性ダメ軽減',
           },
           id: 17,
+          granblue_id: '1721',
           slug: 'ele-def',
           minValue: 1,
           maxValue: 5,
@@ -400,6 +432,7 @@ const ax: ItemSkill[][] = [
             ja: '弱体耐性',
           },
           id: 9,
+          granblue_id: '1593',
           slug: 'debuff',
           minValue: 1,
           maxValue: 3,
@@ -412,6 +445,7 @@ const ax: ItemSkill[][] = [
             ja: '回復性能',
           },
           id: 10,
+          granblue_id: '1595',
           slug: 'healing',
           minValue: 2,
           maxValue: 5,
@@ -424,6 +458,7 @@ const ax: ItemSkill[][] = [
             ja: '背水',
           },
           id: 11,
+          granblue_id: '1601',
           slug: 'enmity',
           minValue: 1,
           maxValue: 3,
@@ -437,6 +472,7 @@ const ax: ItemSkill[][] = [
         ja: 'HP',
       },
       id: 2,
+      granblue_id: '1588',
       slug: 'hp',
       minValue: 1,
       maxValue: 11,
@@ -449,6 +485,7 @@ const ax: ItemSkill[][] = [
             ja: '属性ダメ軽減',
           },
           id: 17,
+          granblue_id: '1721',
           slug: 'ele-def',
           minValue: 1,
           maxValue: 5,
@@ -461,6 +498,7 @@ const ax: ItemSkill[][] = [
             ja: '弱体耐性',
           },
           id: 9,
+          granblue_id: '1593',
           slug: 'debuff',
           minValue: 1,
           maxValue: 3,
@@ -473,6 +511,7 @@ const ax: ItemSkill[][] = [
             ja: '回復性能',
           },
           id: 10,
+          granblue_id: '1595',
           slug: 'healing',
           minValue: 2,
           maxValue: 5,
@@ -485,6 +524,7 @@ const ax: ItemSkill[][] = [
             ja: '渾身',
           },
           id: 12,
+          granblue_id: '1600',
           slug: 'stamina',
           minValue: 1,
           maxValue: 3,
@@ -498,6 +538,7 @@ const ax: ItemSkill[][] = [
         ja: '奥義ダメ',
       },
       id: 3,
+      granblue_id: '1591',
       slug: 'ca-dmg',
       minValue: 2,
       maxValue: 8.5,
@@ -510,6 +551,7 @@ const ax: ItemSkill[][] = [
             ja: '連撃率',
           },
           id: 4,
+          granblue_id: '1592',
           slug: 'ta',
           minValue: 1.5,
           maxValue: 4,
@@ -522,6 +564,7 @@ const ax: ItemSkill[][] = [
             ja: 'アビ与ダメ上昇',
           },
           id: 15,
+          granblue_id: '1719',
           slug: 'skill-supp',
           minValue: 1,
           maxValue: 5,
@@ -533,6 +576,7 @@ const ax: ItemSkill[][] = [
             ja: '奥義与ダメ上昇',
           },
           id: 16,
+          granblue_id: '1720',
           slug: 'ca-supp',
           minValue: 1,
           maxValue: 5,
@@ -544,6 +588,7 @@ const ax: ItemSkill[][] = [
             ja: '渾身',
           },
           id: 12,
+          granblue_id: '1600',
           slug: 'stamina',
           minValue: 1,
           maxValue: 3,
@@ -557,6 +602,7 @@ const ax: ItemSkill[][] = [
         ja: '連撃率',
       },
       id: 4,
+      granblue_id: '1592',
       slug: 'ta',
       minValue: 1,
       maxValue: 4,
@@ -569,6 +615,7 @@ const ax: ItemSkill[][] = [
             ja: '奥義与ダメ上昇',
           },
           id: 16,
+          granblue_id: '1720',
           slug: 'ca-supp',
           minValue: 1,
           maxValue: 5,
@@ -580,6 +627,7 @@ const ax: ItemSkill[][] = [
             ja: '通常ダメ上限',
           },
           id: 14,
+          granblue_id: '1722',
           slug: 'na-cap',
           minValue: 0.5,
           maxValue: 1.5,
@@ -592,6 +640,7 @@ const ax: ItemSkill[][] = [
             ja: '渾身',
           },
           id: 12,
+          granblue_id: '1600',
           slug: 'stamina',
           minValue: 1,
           maxValue: 3,
@@ -603,6 +652,7 @@ const ax: ItemSkill[][] = [
             ja: '背水',
           },
           id: 11,
+          granblue_id: '1601',
           slug: 'enmity',
           minValue: 1,
           maxValue: 3,
@@ -618,6 +668,7 @@ const ax: ItemSkill[][] = [
         ja: '攻撃',
       },
       id: 0,
+      granblue_id: '1589',
       slug: 'atk',
       minValue: 1,
       maxValue: 3.5,
@@ -630,6 +681,7 @@ const ax: ItemSkill[][] = [
             ja: '奥義ダメ',
           },
           id: 3,
+          granblue_id: '1591',
           slug: 'ca-dmg',
           minValue: 2,
           maxValue: 4,
@@ -642,6 +694,7 @@ const ax: ItemSkill[][] = [
             ja: 'DA確率',
           },
           id: 5,
+          granblue_id: '1596',
           slug: 'da',
           minValue: 1,
           maxValue: 2,
@@ -654,6 +707,7 @@ const ax: ItemSkill[][] = [
             ja: 'TA確率',
           },
           id: 6,
+          granblue_id: '1597',
           slug: 'ta',
           minValue: 1,
           maxValue: 2,
@@ -666,6 +720,7 @@ const ax: ItemSkill[][] = [
             ja: 'アビ上限',
           },
           id: 7,
+          granblue_id: '1588',
           slug: 'skill-cap',
           minValue: 1,
           maxValue: 2,
@@ -680,6 +735,7 @@ const ax: ItemSkill[][] = [
         ja: '防御',
       },
       id: 1,
+      granblue_id: '1590',
       slug: 'def',
       minValue: 1,
       maxValue: 8,
@@ -692,6 +748,7 @@ const ax: ItemSkill[][] = [
             ja: 'HP',
           },
           id: 2,
+          granblue_id: '1588',
           slug: 'hp',
           minValue: 1,
           maxValue: 3,
@@ -704,6 +761,7 @@ const ax: ItemSkill[][] = [
             ja: '弱体耐性',
           },
           id: 9,
+          granblue_id: '1593',
           slug: 'debuff',
           minValue: 1,
           maxValue: 3,
@@ -716,6 +774,7 @@ const ax: ItemSkill[][] = [
             ja: '回復性能',
           },
           id: 10,
+          granblue_id: '1595',
           slug: 'healing',
           minValue: 2,
           maxValue: 5,
@@ -728,6 +787,7 @@ const ax: ItemSkill[][] = [
             ja: '背水',
           },
           id: 11,
+          granblue_id: '1601',
           slug: 'enmity',
           minValue: 1,
           maxValue: 3,
@@ -741,6 +801,7 @@ const ax: ItemSkill[][] = [
         ja: 'HP',
       },
       id: 2,
+      granblue_id: '1588',
       slug: 'hp',
       minValue: 1,
       maxValue: 11,
@@ -753,6 +814,7 @@ const ax: ItemSkill[][] = [
             ja: '防御',
           },
           id: 1,
+          granblue_id: '1590',
           slug: 'def',
           minValue: 1,
           maxValue: 3,
@@ -765,6 +827,7 @@ const ax: ItemSkill[][] = [
             ja: '弱体耐性',
           },
           id: 9,
+          granblue_id: '1593',
           slug: 'debuff',
           minValue: 1,
           maxValue: 3,
@@ -777,6 +840,7 @@ const ax: ItemSkill[][] = [
             ja: '回復性能',
           },
           id: 10,
+          granblue_id: '1595',
           slug: 'healing',
           minValue: 2,
           maxValue: 5,
@@ -789,6 +853,7 @@ const ax: ItemSkill[][] = [
             ja: '渾身',
           },
           id: 12,
+          granblue_id: '1600',
           slug: 'stamina',
           minValue: 1,
           maxValue: 3,
@@ -802,6 +867,7 @@ const ax: ItemSkill[][] = [
         ja: '奥義ダメ',
       },
       id: 3,
+      granblue_id: '1591',
       slug: 'ca-dmg',
       minValue: 2,
       maxValue: 8.5,
@@ -814,6 +880,7 @@ const ax: ItemSkill[][] = [
             ja: '攻撃',
           },
           id: 0,
+          granblue_id: '1589',
           slug: 'atk',
           minValue: 1,
           maxValue: 1.5,
@@ -826,6 +893,7 @@ const ax: ItemSkill[][] = [
             ja: '全属性攻撃力',
           },
           id: 13,
+          granblue_id: '1594',
           slug: 'ele-atk',
           minValue: 1,
           maxValue: 5,
@@ -838,6 +906,7 @@ const ax: ItemSkill[][] = [
             ja: '奥義上限',
           },
           id: 8,
+          granblue_id: '1599',
           slug: 'ca-dmg',
           minValue: 1,
           maxValue: 2,
@@ -850,6 +919,7 @@ const ax: ItemSkill[][] = [
             ja: '渾身',
           },
           id: 12,
+          granblue_id: '1600',
           slug: 'stamina',
           minValue: 1,
           maxValue: 3,
@@ -863,6 +933,7 @@ const ax: ItemSkill[][] = [
         ja: '連撃率',
       },
       id: 4,
+      granblue_id: '1592',
       slug: 'ta',
       minValue: 1,
       maxValue: 4,
@@ -875,6 +946,7 @@ const ax: ItemSkill[][] = [
             ja: '奥義ダメ',
           },
           id: 3,
+          granblue_id: '1591',
           slug: 'ca-dmg',
           minValue: 2,
           maxValue: 4,
@@ -887,6 +959,7 @@ const ax: ItemSkill[][] = [
             ja: '全属性攻撃力',
           },
           id: 13,
+          granblue_id: '1594',
           slug: 'ele-atk',
           minValue: 1,
           maxValue: 5,
@@ -899,6 +972,7 @@ const ax: ItemSkill[][] = [
             ja: 'DA確率',
           },
           id: 5,
+          granblue_id: '1596',
           slug: 'da',
           minValue: 1,
           maxValue: 2,
@@ -911,6 +985,7 @@ const ax: ItemSkill[][] = [
             ja: 'TA確率',
           },
           id: 6,
+          granblue_id: '1597',
           slug: 'ta',
           minValue: 1,
           maxValue: 2,
@@ -921,10 +996,11 @@ const ax: ItemSkill[][] = [
     },
     {
       name: {
-        en: 'EXP Up',
+        en: 'EXP Gain',
         ja: 'EXP UP',
       },
       id: 18,
+      granblue_id: '1837',
       slug: 'exp',
       minValue: 5,
       maxValue: 10,
@@ -933,10 +1009,11 @@ const ax: ItemSkill[][] = [
     },
     {
       name: {
-        en: 'Rupies',
+        en: 'Rupie Gain',
         ja: '獲得ルピ',
       },
       id: 19,
+      granblue_id: '1838',
       slug: 'rupie',
       minValue: 10,
       maxValue: 20,
diff --git a/data/overMastery.tsx b/data/overMastery.tsx
index 969dc942..197ac2e5 100644
--- a/data/overMastery.tsx
+++ b/data/overMastery.tsx
@@ -5,6 +5,7 @@ const overMasteryPrimary: ItemSkill[] = [
       ja: '攻撃',
     },
     id: 1,
+    granblue_id: '',
     slug: 'atk',
     minValue: 300,
     maxValue: 3000,
@@ -18,6 +19,7 @@ const overMasteryPrimary: ItemSkill[] = [
       ja: 'HP',
     },
     id: 2,
+    granblue_id: '',
     slug: 'hp',
     minValue: 150,
     maxValue: 1500,
@@ -34,6 +36,7 @@ const overMasterySecondary: ItemSkill[] = [
       ja: '弱体成功率',
     },
     id: 3,
+    granblue_id: '',
     slug: 'debuff-success',
     minValue: 6,
     maxValue: 15,
@@ -47,6 +50,7 @@ const overMasterySecondary: ItemSkill[] = [
       ja: 'アビダメ上限',
     },
     id: 4,
+    granblue_id: '',
     slug: 'skill-cap',
     minValue: 6,
     maxValue: 15,
@@ -60,6 +64,7 @@ const overMasterySecondary: ItemSkill[] = [
       ja: '奥義ダメージ',
     },
     id: 5,
+    granblue_id: '',
     slug: 'ca-dmg',
     minValue: 10,
     maxValue: 30,
@@ -73,6 +78,7 @@ const overMasterySecondary: ItemSkill[] = [
       ja: '奥義ダメージ上限',
     },
     id: 6,
+    granblue_id: '',
     slug: 'ca-cap',
     minValue: 6,
     maxValue: 15,
@@ -86,6 +92,7 @@ const overMasterySecondary: ItemSkill[] = [
       ja: '渾身',
     },
     id: 7,
+    granblue_id: '',
     slug: 'stamina',
     minValue: 1,
     maxValue: 10,
@@ -99,6 +106,7 @@ const overMasterySecondary: ItemSkill[] = [
       ja: '背水',
     },
     id: 8,
+    granblue_id: '',
     slug: 'enmity',
     minValue: 1,
     maxValue: 10,
@@ -112,6 +120,7 @@ const overMasterySecondary: ItemSkill[] = [
       ja: 'クリティカル確率',
     },
     id: 9,
+    granblue_id: '',
     slug: 'crit',
     minValue: 10,
     maxValue: 30,
@@ -128,6 +137,7 @@ const overMasteryTertiary: ItemSkill[] = [
       ja: 'ダブルアタック確率',
     },
     id: 10,
+    granblue_id: '',
     slug: 'da',
     minValue: 6,
     maxValue: 15,
@@ -141,6 +151,7 @@ const overMasteryTertiary: ItemSkill[] = [
       ja: 'トリプルアタック確率',
     },
     id: 11,
+    granblue_id: '',
     slug: 'ta',
     minValue: 1,
     maxValue: 10,
@@ -154,6 +165,7 @@ const overMasteryTertiary: ItemSkill[] = [
       ja: '防御',
     },
     id: 12,
+    granblue_id: '',
     slug: 'def',
     minValue: 6,
     maxValue: 20,
@@ -167,6 +179,7 @@ const overMasteryTertiary: ItemSkill[] = [
       ja: '回復性能',
     },
     id: 13,
+    granblue_id: '',
     slug: 'heal',
     minValue: 3,
     maxValue: 30,
@@ -180,6 +193,7 @@ const overMasteryTertiary: ItemSkill[] = [
       ja: '弱体耐性',
     },
     id: 14,
+    granblue_id: '',
     slug: 'debuff-resist',
     minValue: 6,
     maxValue: 15,
@@ -193,6 +207,7 @@ const overMasteryTertiary: ItemSkill[] = [
       ja: '回避',
     },
     id: 15,
+    granblue_id: '',
     slug: 'dodge',
     minValue: 1,
     maxValue: 10,
@@ -215,6 +230,7 @@ export const aetherialMastery: ItemSkill[] = [
       ja: 'ダブルアタック確率',
     },
     id: 1,
+    granblue_id: '',
     slug: 'da',
     minValue: 10,
     maxValue: 17,
@@ -227,6 +243,7 @@ export const aetherialMastery: ItemSkill[] = [
       ja: 'トリプルアタック確率',
     },
     id: 2,
+    granblue_id: '',
     slug: 'ta',
     minValue: 5,
     maxValue: 12,
@@ -239,6 +256,7 @@ export const aetherialMastery: ItemSkill[] = [
       ja: '{属性}攻撃',
     },
     id: 3,
+    granblue_id: '',
     slug: 'element-atk',
     minValue: 15,
     maxValue: 22,
@@ -251,6 +269,7 @@ export const aetherialMastery: ItemSkill[] = [
       ja: '{属性}軽減',
     },
     id: 4,
+    granblue_id: '',
     slug: 'element-resist',
     minValue: 5,
     maxValue: 12,
@@ -263,6 +282,7 @@ export const aetherialMastery: ItemSkill[] = [
       ja: '渾身',
     },
     id: 5,
+    granblue_id: '',
     slug: 'stamina',
     minValue: 5,
     maxValue: 12,
@@ -275,6 +295,7 @@ export const aetherialMastery: ItemSkill[] = [
       ja: '背水',
     },
     id: 6,
+    granblue_id: '',
     slug: 'enmity',
     minValue: 5,
     maxValue: 12,
@@ -287,6 +308,7 @@ export const aetherialMastery: ItemSkill[] = [
       ja: '与ダメ上昇',
     },
     id: 7,
+    granblue_id: '',
     slug: 'supplemental',
     minValue: 5,
     maxValue: 12,
@@ -299,6 +321,7 @@ export const aetherialMastery: ItemSkill[] = [
       ja: 'クリティカル',
     },
     id: 8,
+    granblue_id: '',
     slug: 'crit',
     minValue: 18,
     maxValue: 35,
@@ -311,6 +334,7 @@ export const aetherialMastery: ItemSkill[] = [
       ja: 'カウンター(回避)',
     },
     id: 9,
+    granblue_id: '',
     slug: 'counter-dodge',
     minValue: 5,
     maxValue: 12,
@@ -323,6 +347,7 @@ export const aetherialMastery: ItemSkill[] = [
       ja: 'カウンター(被ダメ)',
     },
     id: 10,
+    granblue_id: '',
     slug: 'counter-dmg',
     minValue: 10,
     maxValue: 17,
@@ -338,6 +363,7 @@ export const permanentMastery: ItemSkill[] = [
       ja: 'LB強化回数上限',
     },
     id: 1,
+    granblue_id: '',
     slug: 'star-cap',
     minValue: 10,
     maxValue: 10,
@@ -350,6 +376,7 @@ export const permanentMastery: ItemSkill[] = [
       ja: '攻撃',
     },
     id: 2,
+    granblue_id: '',
     slug: 'atk',
     minValue: 10,
     maxValue: 10,
@@ -362,6 +389,7 @@ export const permanentMastery: ItemSkill[] = [
       ja: 'HP',
     },
     id: 3,
+    granblue_id: '',
     slug: 'hp',
     minValue: 10,
     maxValue: 10,
@@ -374,6 +402,7 @@ export const permanentMastery: ItemSkill[] = [
       ja: 'ダメージ上限',
     },
     id: 4,
+    granblue_id: '',
     slug: 'dmg-cap',
     minValue: 5,
     maxValue: 5,
diff --git a/public/locales/en/updates.json b/public/locales/en/updates.json
index 2a1f1671..5435e29e 100644
--- a/public/locales/en/updates.json
+++ b/public/locales/en/updates.json
@@ -24,7 +24,9 @@
         "Added Ultimate Mastery skills for classes: Berserker, Apsaras, Nekomancer, Kengo",
         "Added raids for Dread Barrage",
         "Renamed \"Guild Wars\" in raid list to \"Unite and Fight\"",
-        "Fixed sorting of raids for Dread Barrage and Unite and Fight"
+        "Fixed sorting of raids for Dread Barrage and Unite and Fight",
+        "Fixed character hovercard showing up behind class image",
+        "Fixed an issue where users couldn't edit remixed teams"
       ]
     },
     "2023-02-U2": {
diff --git a/public/locales/ja/updates.json b/public/locales/ja/updates.json
index 0a32347f..53a6e859 100644
--- a/public/locales/ja/updates.json
+++ b/public/locales/ja/updates.json
@@ -24,7 +24,9 @@
         "「ベルセルク」「アプサラス」「黒猫道士」「剣豪」の極致の証スキルを追加",
         "ドレッドバラージュのマルチバトルをリストに追加",
         "英語のリストに\"Guild Wars\"のラベルを\"Unite and Fight\"に変更",
-        "「ドレッドバラージュ」と「星の古戦場」のマルチバトルを並び替えました"
+        "「ドレッドバラージュ」と「星の古戦場」のマルチバトルを並び替えました",
+        "キャラクタータブにキャラクター用のハバーカードがジョブ画像の下に表示する不具合を修正",
+        "リミックスされた編成を編集できない不具合を修正"
       ]
     },
     "2023-02-U2": {
diff --git a/types/ItemSkill.d.ts b/types/ItemSkill.d.ts
index 598cb6c4..56690ec3 100644
--- a/types/ItemSkill.d.ts
+++ b/types/ItemSkill.d.ts
@@ -5,6 +5,7 @@ interface ItemSkill {
     ja: string
   }
   id: number
+  granblue_id: string
   slug: string
   minValue: number
   maxValue: number
diff --git a/types/Job.d.ts b/types/Job.d.ts
index d4d5e43b..1f435177 100644
--- a/types/Job.d.ts
+++ b/types/Job.d.ts
@@ -2,7 +2,8 @@ interface Job {
   id: string
   granblue_id: string
   row: string
-  ml: boolean
+  master_level: boolean
+  ultimate_mastery: boolean
   order: number
   name: {
     [key: string]: string
diff --git a/types/Party.d.ts b/types/Party.d.ts
index 3a41e705..c42fe769 100644
--- a/types/Party.d.ts
+++ b/types/Party.d.ts
@@ -20,6 +20,8 @@ interface Party {
   chain_count?: number
   source_party?: Party
   job: Job
+  master_level?: number
+  ultimate_mastery?: number
   job_skills: JobSkillObject
   accessory: JobAccessory
   shortcode: string
diff --git a/types/WeaponKey.d.ts b/types/WeaponKey.d.ts
index 95c45ea9..b56221b7 100644
--- a/types/WeaponKey.d.ts
+++ b/types/WeaponKey.d.ts
@@ -1,5 +1,6 @@
 interface WeaponKey {
   id: string
+  granblue_id: string
   name: {
     [key: string]: string
     en: string
diff --git a/utils/appState.tsx b/utils/appState.tsx
index d9e9db07..29f41bf4 100644
--- a/utils/appState.tsx
+++ b/utils/appState.tsx
@@ -6,7 +6,8 @@ const emptyJob: Job = {
   id: '-1',
   granblue_id: '-1',
   row: '',
-  ml: false,
+  master_level: false,
+  ultimate_mastery: false,
   order: 0,
   name: {
     en: '',
diff --git a/utils/elementalizeAetherialMastery.tsx b/utils/elementalizeAetherialMastery.tsx
index c84fdcaf..aac12755 100644
--- a/utils/elementalizeAetherialMastery.tsx
+++ b/utils/elementalizeAetherialMastery.tsx
@@ -40,6 +40,7 @@ export default function elementalizeAetherialMastery(
 
   elementalized.unshift({
     id: 0,
+    granblue_id: '',
     name: {
       en: 'No aetherial mastery',
       ja: 'エーテリアルプラス',
diff --git a/utils/userToken.tsx b/utils/userToken.tsx
index 08563bda..aebd920e 100644
--- a/utils/userToken.tsx
+++ b/utils/userToken.tsx
@@ -26,6 +26,10 @@ export const setHeaders = (
   }
 }
 
+export const storeEditKey = (id: string, key: string) => {
+  ls(id, key)
+}
+
 export const setEditKey = (id: string, user?: User) => {
   if (!user) {
     const edit_key = get<string>(id)