diff --git a/components/AccountModal/index.scss b/components/AccountModal/index.scss
index d77eed85..c8135020 100644
--- a/components/AccountModal/index.scss
+++ b/components/AccountModal/index.scss
@@ -1,13 +1,14 @@
-.Account.Dialog {
+.Account.DialogContent {
   display: flex;
   flex-direction: column;
-  gap: $unit * 2;
+  gap: $unit-2x;
   width: $unit * 64;
 
-  form {
+  .Fields {
     display: flex;
     flex-direction: column;
-    gap: $unit * 2;
+    gap: $unit-2x;
+    padding: 0 $unit-4x;
   }
 
   .DialogDescription {
diff --git a/components/AccountModal/index.tsx b/components/AccountModal/index.tsx
index c5da21ef..1824bb1e 100644
--- a/components/AccountModal/index.tsx
+++ b/components/AccountModal/index.tsx
@@ -2,14 +2,15 @@ import React, { useEffect, useState } from 'react'
 import { getCookie, setCookie } from 'cookies-next'
 import { useRouter } from 'next/router'
 import { useTranslation } from 'next-i18next'
+import { useTheme } from 'next-themes'
 
 import {
   Dialog,
   DialogClose,
-  DialogContent,
   DialogTitle,
   DialogTrigger,
 } from '~components/Dialog'
+import DialogContent from '~components/DialogContent'
 import Button from '~components/Button'
 import SelectItem from '~components/SelectItem'
 import PictureSelectItem from '~components/PictureSelectItem'
@@ -23,7 +24,6 @@ import { pictureData } from '~utils/pictureData'
 
 import CrossIcon from '~public/icons/Cross.svg'
 import './index.scss'
-import { useTheme } from 'next-themes'
 
 type StateVariables = {
   [key: string]: boolean
@@ -285,7 +285,7 @@ const AccountModal = (props: Props) => {
         </li>
       </DialogTrigger>
       <DialogContent
-        className="Account Dialog"
+        className="Account"
         onOpenAutoFocus={(event: Event) => {}}
         onEscapeKeyDown={onEscapeKeyDown}
       >
@@ -304,14 +304,18 @@ const AccountModal = (props: Props) => {
         </div>
 
         <form onSubmit={update}>
-          {pictureField()}
-          {genderField()}
-          {languageField()}
-          {themeField()}
-          <Button
-            contained={true}
-            text={t('modals.settings.buttons.confirm')}
-          />
+          <div className="Fields">
+            {pictureField()}
+            {genderField()}
+            {languageField()}
+            {themeField()}
+          </div>
+          <div className="DialogFooter">
+            <Button
+              contained={true}
+              text={t('modals.settings.buttons.confirm')}
+            />
+          </div>
         </form>
       </DialogContent>
     </Dialog>
diff --git a/components/Alert/index.scss b/components/Alert/index.scss
index d8fdc1ea..33f92d99 100644
--- a/components/Alert/index.scss
+++ b/components/Alert/index.scss
@@ -7,46 +7,31 @@
   width: 100vw;
   top: 0;
   left: 0;
-  z-index: 21;
+  z-index: 31;
 }
 
 .Alert {
-  background: $grey-100;
+  background: var(--dialog-bg);
   border-radius: $unit;
   display: flex;
   flex-direction: column;
-  gap: $unit;
-  min-width: $unit * 20;
-  max-width: $unit * 40;
+  gap: $unit-2x;
+  min-width: 20vw;
+  max-width: 30vw;
   padding: $unit * 4;
 
   .description {
     font-size: $font-regular;
-    line-height: 1.26;
+    line-height: 1.4;
+
+    strong {
+      font-weight: $bold;
+    }
   }
 
   .buttons {
+    display: flex;
     align-self: flex-end;
-  }
-
-  .Button {
-    font-size: $font-regular;
-    padding: ($unit * 1.5) ($unit * 2);
-    margin-top: $unit * 2;
-
-    &.btn-disabled {
-      background: $grey-90;
-      color: $grey-70;
-      cursor: not-allowed;
-    }
-
-    &:not(.btn-disabled) {
-      background: $grey-90;
-      color: $grey-50;
-
-      &:hover {
-        background: $grey-80;
-      }
-    }
+    gap: $unit;
   }
 }
diff --git a/components/Alert/index.tsx b/components/Alert/index.tsx
index 21a1a1a7..a9564424 100644
--- a/components/Alert/index.tsx
+++ b/components/Alert/index.tsx
@@ -3,12 +3,13 @@ import * as AlertDialog from '@radix-ui/react-alert-dialog'
 
 import './index.scss'
 import Button from '~components/Button'
+import Overlay from '~components/Overlay'
 
 // Props
 interface Props {
   open: boolean
   title?: string
-  message: string
+  message: string | React.ReactNode
   primaryAction?: () => void
   primaryActionText?: string
   cancelAction: () => void
@@ -29,13 +30,18 @@ const Alert = (props: Props) => {
             <div className="buttons">
               <AlertDialog.Cancel asChild>
                 <Button
+                  contained={true}
                   onClick={props.cancelAction}
                   text={props.cancelActionText}
                 />
               </AlertDialog.Cancel>
               {props.primaryAction ? (
-                <AlertDialog.Action onClick={props.primaryAction}>
-                  {props.primaryActionText}
+                <AlertDialog.Action asChild>
+                  <Button
+                    contained={true}
+                    onClick={props.primaryAction}
+                    text={props.primaryActionText}
+                  />
                 </AlertDialog.Action>
               ) : (
                 ''
@@ -43,6 +49,7 @@ const Alert = (props: Props) => {
             </div>
           </AlertDialog.Content>
         </div>
+        <Overlay open={props.open} visible={true} />
       </AlertDialog.Portal>
     </AlertDialog.Root>
   )
diff --git a/components/AwakeningSelect/index.tsx b/components/AwakeningSelect/index.tsx
index 2debb197..ec90f169 100644
--- a/components/AwakeningSelect/index.tsx
+++ b/components/AwakeningSelect/index.tsx
@@ -1,198 +1,94 @@
-import React, { ForwardedRef, useEffect, useState } from 'react'
-import { useRouter } from 'next/router'
-import { useTranslation } from 'next-i18next'
+import React, { useEffect, useState } from 'react'
+import cloneDeep from 'lodash.clonedeep'
 
-import Input from '~components/LabelledInput'
-import Select from '~components/Select'
-import SelectItem from '~components/SelectItem'
-
-import classNames from 'classnames'
-
-import { weaponAwakening, characterAwakening } from '~utils/awakening'
-import type { Awakening } from '~utils/awakening'
+import SelectWithInput from '~components/SelectWithInput'
+import { weaponAwakening, characterAwakening } from '~data/awakening'
 
 import './index.scss'
 
 interface Props {
   object: 'character' | 'weapon'
-  awakeningType?: number
-  awakeningLevel?: number
-  onOpenChange: (open: boolean) => void
+  type?: number
+  level?: number
+  onOpenChange?: (open: boolean) => void
   sendValidity: (isValid: boolean) => void
   sendValues: (type: number, level: number) => void
 }
 
 const AwakeningSelect = (props: Props) => {
-  const router = useRouter()
-  const locale =
-    router.locale && ['en', 'ja'].includes(router.locale) ? router.locale : 'en'
-  const { t } = useTranslation('common')
-
-  const [open, setOpen] = useState(false)
-
-  // Refs
-  const awakeningLevelInput = React.createRef<HTMLInputElement>()
-
-  // States
-  const [awakeningType, setAwakeningType] = useState(-1)
+  // Data states
+  const [awakeningType, setAwakeningType] = useState(
+    props.object === 'weapon' ? 0 : 1
+  )
   const [awakeningLevel, setAwakeningLevel] = useState(1)
 
-  const [maxValue, setMaxValue] = useState(1)
+  // Data
+  const chooseDataset = () => {
+    let list: ItemSkill[] = []
 
-  const [error, setError] = useState('')
+    switch (props.object) {
+      case 'character':
+        list = characterAwakening
+        break
+      case 'weapon':
+        // WARNING: Clonedeep is masking a deeper error
+        // which is running this method every time this component is rerendered
+        // causing multiple "No awakening" items to be added
+        const awakening = cloneDeep(weaponAwakening)
+        awakening.unshift({
+          id: 0,
+          name: {
+            en: 'No awakening',
+            ja: '覚醒なし',
+          },
+          slug: 'no-awakening',
+          minValue: 0,
+          maxValue: 0,
+          fractional: false,
+        })
+        list = awakening
+        break
+    }
 
-  // Classes
-  const inputClasses = classNames({
-    Bound: true,
-    Hidden: awakeningType === -1,
-  })
-
-  const errorClasses = classNames({
-    errors: true,
-    visible: error !== '',
-  })
-
-  // Set max value based on object type
-  useEffect(() => {
-    if (props.object === 'character') setMaxValue(9)
-    else if (props.object === 'weapon') setMaxValue(15)
-  }, [props.object])
+    return list
+  }
 
   // Set default awakening and level based on object type
   useEffect(() => {
-    let defaultAwakening = 0
-    if (props.object === 'weapon') defaultAwakening = -1
+    const defaultAwakening = props.object === 'weapon' ? 0 : 1
+    const type = props.type != undefined ? props.type : defaultAwakening
 
-    setAwakeningType(
-      props.awakeningType != undefined ? props.awakeningType : defaultAwakening
-    )
-    setAwakeningLevel(props.awakeningLevel ? props.awakeningLevel : 1)
-  }, [props.object, props.awakeningType, props.awakeningLevel])
-
-  // Send awakening type and level when changed
-  useEffect(() => {
-    props.sendValues(awakeningType, awakeningLevel)
-  }, [props.sendValues, awakeningType, awakeningLevel])
+    setAwakeningType(type)
+    setAwakeningLevel(props.level ? props.level : 1)
+  }, [props.object, props.type, props.level])
 
   // Send validity of form when awakening level changes
   useEffect(() => {
-    props.sendValidity(awakeningLevel > 0 && error === '')
-  }, [props.sendValidity, awakeningLevel, error])
+    props.sendValidity(awakeningLevel > 0)
+  }, [props.sendValidity, awakeningLevel])
 
   // Classes
-  function changeOpen() {
-    setOpen(!open)
-    props.onOpenChange(!open)
+  function changeOpen(open: boolean) {
+    if (props.onOpenChange) props.onOpenChange(open)
   }
 
-  function onClose() {
-    props.onOpenChange(false)
-  }
-
-  function generateOptions(object: 'character' | 'weapon') {
-    let options: Awakening[] = []
-    if (object === 'character') options = characterAwakening
-    else if (object === 'weapon') options = weaponAwakening
-    else return
-
-    let optionElements: React.ReactNode[] = options.map((awakening, i) => {
-      return (
-        <SelectItem key={i} value={awakening.id}>
-          {awakening.name[locale]}
-        </SelectItem>
-      )
-    })
-
-    if (object === 'weapon') {
-      optionElements?.unshift(
-        <SelectItem key={-1} value={-1}>
-          {t('awakening.no_type')}
-        </SelectItem>
-      )
-    }
-
-    return optionElements
-  }
-
-  function handleSelectChange(rawValue: string) {
-    const value = parseInt(rawValue)
-    setAwakeningType(value)
-  }
-
-  function handleInputChange(event: React.ChangeEvent<HTMLInputElement>) {
-    const value = parseFloat(event.target.value)
-    if (handleLevelError(value)) setAwakeningLevel(value)
-  }
-
-  function handleLevelError(value: number) {
-    let error = ''
-    if (value < 1) {
-      error = t('awakening.errors.value_too_low', {
-        minValue: 1,
-      })
-    } else if (value > maxValue) {
-      error = t('awakening.errors.value_too_high', {
-        maxValue: maxValue,
-      })
-    } else if (value % 1 != 0) {
-      error = t('awakening.errors.value_not_whole')
-    } else if (!value || value <= 0) {
-      error = t('awakening.errors.value_empty')
-    } else {
-      error = ''
-    }
-
-    setError(error)
-
-    return error.length === 0
-  }
-
-  const rangeString = (object: 'character' | 'weapon') => {
-    let minValue = 1
-    let maxValue = 1
-
-    if (object === 'weapon') {
-      minValue = 1
-      maxValue = 15
-    } else if (object === 'character') {
-      minValue = 1
-      maxValue = 9
-    } else return
-
-    return `${minValue}~${maxValue}`
+  function handleValueChange(type: number, level: number) {
+    setAwakeningType(type)
+    setAwakeningLevel(level)
+    props.sendValues(type, level)
   }
 
   return (
-    <div className="AwakeningSelect">
-      <div className="AwakeningSet">
-        <div className="fields">
-          <Select
-            key="awakening_type"
-            value={`${awakeningType}`}
-            open={open}
-            onValueChange={handleSelectChange}
-            onOpenChange={() => changeOpen()}
-            onClose={onClose}
-            triggerClass="modal"
-          >
-            {generateOptions(props.object)}
-          </Select>
-
-          <Input
-            value={awakeningLevel}
-            className={inputClasses}
-            type="number"
-            placeholder={rangeString(props.object)}
-            min={1}
-            max={maxValue}
-            step="1"
-            onChange={handleInputChange}
-            visible={awakeningType !== -1 ? true : false}
-            ref={awakeningLevelInput}
-          />
-        </div>
-        <p className={errorClasses}>{error}</p>
-      </div>
+    <div className="Awakening">
+      <SelectWithInput
+        object={`${props.object}_awakening`}
+        dataSet={chooseDataset()}
+        selectValue={awakeningType}
+        inputValue={awakeningLevel}
+        onOpenChange={changeOpen}
+        sendValidity={props.sendValidity}
+        sendValues={handleValueChange}
+      />
     </div>
   )
 }
diff --git a/components/AxSelect/index.tsx b/components/AxSelect/index.tsx
index 01c9c17e..50ef3156 100644
--- a/components/AxSelect/index.tsx
+++ b/components/AxSelect/index.tsx
@@ -7,7 +7,7 @@ import SelectItem from '~components/SelectItem'
 
 import classNames from 'classnames'
 
-import { axData } from '~utils/axData'
+import ax from '~data/ax'
 
 import './index.scss'
 
@@ -155,7 +155,7 @@ const AXSelect = (props: Props) => {
 
       if (props.currentSkills[0].modifier > -1 && primaryAxValueInput.current) {
         const modifier = props.currentSkills[0].modifier
-        const axSkill = axData[props.axType - 1][modifier]
+        const axSkill = ax[props.axType - 1][modifier]
         setupInput(axSkill, primaryAxValueInput.current)
       }
     }
@@ -169,7 +169,7 @@ const AXSelect = (props: Props) => {
       props.currentSkills[1].modifier != null
     ) {
       const firstSkill = props.currentSkills[0]
-      const primaryAxSkill = axData[props.axType - 1][firstSkill.modifier]
+      const primaryAxSkill = ax[props.axType - 1][firstSkill.modifier]
       const secondaryAxSkill = findSecondaryAxSkill(
         primaryAxSkill,
         props.currentSkills[1]
@@ -185,7 +185,7 @@ const AXSelect = (props: Props) => {
   }
 
   function findSecondaryAxSkill(
-    axSkill: AxSkill | undefined,
+    axSkill: ItemSkill | undefined,
     skillAtIndex: SimpleAxSkill
   ) {
     if (axSkill)
@@ -213,7 +213,7 @@ const AXSelect = (props: Props) => {
   }
 
   function generateOptions(modifierSet: number) {
-    const axOptions = axData[props.axType - 1]
+    const axOptions = ax[props.axType - 1]
 
     let axOptionElements: React.ReactNode[] = []
     if (modifierSet == 0) {
@@ -264,7 +264,7 @@ const AXSelect = (props: Props) => {
       secondaryAxModifierSelect.current &&
       secondaryAxValueInput.current
     ) {
-      setupInput(axData[props.axType - 1][value], primaryAxValueInput.current)
+      setupInput(ax[props.axType - 1][value], primaryAxValueInput.current)
       setPrimaryAxValue(0)
       primaryAxValueInput.current.value = ''
 
@@ -280,7 +280,7 @@ const AXSelect = (props: Props) => {
     const value = parseInt(rawValue)
     setSecondaryAxModifier(value)
 
-    const primaryAxSkill = axData[props.axType - 1][primaryAxModifier]
+    const primaryAxSkill = ax[props.axType - 1][primaryAxModifier]
     const currentAxSkill = primaryAxSkill.secondary
       ? primaryAxSkill.secondary.find((skill) => skill.id == value)
       : undefined
@@ -304,7 +304,7 @@ const AXSelect = (props: Props) => {
   }
 
   function handlePrimaryErrors(value: number) {
-    const primaryAxSkill = axData[props.axType - 1][primaryAxModifier]
+    const primaryAxSkill = ax[props.axType - 1][primaryAxModifier]
     let newErrors = { ...errors }
 
     if (value < primaryAxSkill.minValue) {
@@ -333,7 +333,7 @@ const AXSelect = (props: Props) => {
   }
 
   function handleSecondaryErrors(value: number) {
-    const primaryAxSkill = axData[props.axType - 1][primaryAxModifier]
+    const primaryAxSkill = ax[props.axType - 1][primaryAxModifier]
     let newErrors = { ...errors }
 
     if (primaryAxSkill.secondary) {
@@ -373,7 +373,7 @@ const AXSelect = (props: Props) => {
     return newErrors.axValue2.length === 0
   }
 
-  function setupInput(ax: AxSkill | undefined, element: HTMLInputElement) {
+  function setupInput(ax: ItemSkill | undefined, element: HTMLInputElement) {
     if (ax) {
       const rangeString = `${ax.minValue}~${ax.maxValue}${ax.suffix || ''}`
 
diff --git a/components/Button/index.scss b/components/Button/index.scss
index 4c6415e5..aedae8c2 100644
--- a/components/Button/index.scss
+++ b/components/Button/index.scss
@@ -8,6 +8,7 @@
   font-size: $font-button;
   font-weight: $normal;
   gap: 6px;
+  transition: 0.18s opacity ease-in-out;
 
   &:hover,
   &.Blended:hover,
@@ -61,6 +62,14 @@
     }
   }
 
+  &.Options {
+    box-shadow: 0px 1px 3px rgb(0 0 0 / 14%);
+    position: absolute;
+    left: 8px;
+    top: 8px;
+    z-index: 3;
+  }
+
   &:disabled {
     background-color: var(--button-bg-disabled);
     color: var(--button-text-disabled);
diff --git a/components/CharacterConflictModal/index.tsx b/components/CharacterConflictModal/index.tsx
index b14fed31..285260a5 100644
--- a/components/CharacterConflictModal/index.tsx
+++ b/components/CharacterConflictModal/index.tsx
@@ -2,7 +2,8 @@ import React, { useEffect, useState } from 'react'
 import { useRouter } from 'next/router'
 import { Trans, useTranslation } from 'next-i18next'
 
-import { Dialog, DialogContent } from '~components/Dialog'
+import { Dialog } from '~components/Dialog'
+import DialogContent from '~components/DialogContent'
 import Button from '~components/Button'
 import Overlay from '~components/Overlay'
 
@@ -71,7 +72,7 @@ const CharacterConflictModal = (props: Props) => {
   return (
     <Dialog open={open} onOpenChange={openChange}>
       <DialogContent
-        className="Conflict Dialog"
+        className="Conflict"
         onOpenAutoFocus={(event) => event.preventDefault()}
         onEscapeKeyDown={close}
       >
diff --git a/components/CharacterGrid/index.tsx b/components/CharacterGrid/index.tsx
index 48cc0ca8..3532caf0 100644
--- a/components/CharacterGrid/index.tsx
+++ b/components/CharacterGrid/index.tsx
@@ -171,6 +171,15 @@ const CharacterGrid = (props: Props) => {
     setIncoming(undefined)
   }
 
+  async function removeCharacter(id: string) {
+    try {
+      const response = await api.endpoints.grid_characters.destroy({ id: id })
+      appState.grid.characters[response.data.position] = undefined
+    } catch (error) {
+      console.error(error)
+    }
+  }
+
   // Methods: Saving job and job skills
   const saveJob = async function (job?: Job) {
     const payload = {
@@ -371,6 +380,7 @@ const CharacterGrid = (props: Props) => {
                   position={i}
                   updateObject={receiveCharacterFromSearch}
                   updateUncap={initiateUncapUpdate}
+                  removeCharacter={removeCharacter}
                 />
               </li>
             )
diff --git a/components/CharacterModal/index.scss b/components/CharacterModal/index.scss
new file mode 100644
index 00000000..31b1e9aa
--- /dev/null
+++ b/components/CharacterModal/index.scss
@@ -0,0 +1,78 @@
+.Character.DialogContent {
+  gap: $unit;
+  min-width: 480px;
+
+  @include breakpoint(phone) {
+    min-width: inherit;
+  }
+
+  .DialogHeader {
+    transition: 0.18s padding-top ease-in-out;
+    position: sticky;
+    top: 0;
+
+    &.Scrolled {
+      border-bottom: 1px solid rgba(0, 0, 0, 0.2);
+      box-shadow: 0 1px 12px rgba(0, 0, 0, 0.34);
+      padding-top: $unit-2x;
+    }
+
+    img {
+      transition: 0.2s width ease-in-out;
+      width: $unit-6x !important;
+    }
+
+    .DialogTitle {
+      font-size: $font-large;
+    }
+
+    .SubTitle {
+      display: none;
+    }
+  }
+
+  .mods {
+    display: flex;
+    flex-direction: column;
+    gap: $unit-4x;
+    padding: 0 $unit-4x;
+
+    section {
+      display: flex;
+      flex-direction: column;
+      gap: $unit-half;
+
+      &.inline {
+        align-items: center;
+        flex-direction: row;
+        justify-content: space-between;
+
+        h3 {
+          margin: 0;
+        }
+      }
+
+      h3 {
+        color: $grey-55;
+        font-size: $font-small;
+        margin-bottom: $unit;
+      }
+
+      select {
+        background-color: $grey-90;
+      }
+    }
+
+    .Button {
+      font-size: $font-regular;
+      padding: ($unit * 1.5) ($unit-2x);
+      width: 100%;
+
+      &.btn-disabled {
+        background: $grey-90;
+        color: $grey-70;
+        cursor: not-allowed;
+      }
+    }
+  }
+}
diff --git a/components/CharacterModal/index.tsx b/components/CharacterModal/index.tsx
new file mode 100644
index 00000000..c1b9b90d
--- /dev/null
+++ b/components/CharacterModal/index.tsx
@@ -0,0 +1,327 @@
+// Core dependencies
+import React, {
+  PropsWithChildren,
+  useCallback,
+  useEffect,
+  useState,
+} from 'react'
+import { useRouter } from 'next/router'
+import { useTranslation } from 'next-i18next'
+import { AxiosResponse } from 'axios'
+import classNames from 'classnames'
+
+// UI dependencies
+import {
+  Dialog,
+  DialogClose,
+  DialogTitle,
+  DialogTrigger,
+} from '~components/Dialog'
+import DialogContent from '~components/DialogContent'
+import Button from '~components/Button'
+import SelectWithInput from '~components/SelectWithInput'
+import AwakeningSelect from '~components/AwakeningSelect'
+import RingSelect from '~components/RingSelect'
+import Switch from '~components/Switch'
+
+// Utilities
+import api from '~utils/api'
+import { appState } from '~utils/appState'
+import { retrieveCookies } from '~utils/retrieveCookies'
+import elementalizeAetherialMastery from '~utils/elementalizeAetherialMastery'
+
+// Data
+const emptyExtendedMastery: ExtendedMastery = {
+  modifier: 0,
+  strength: 0,
+}
+
+// Styles and icons
+import CrossIcon from '~public/icons/Cross.svg'
+import './index.scss'
+
+// Types
+import { CharacterOverMastery, ExtendedMastery } from '~types'
+
+interface GridCharacterObject {
+  character: {
+    ring1: ExtendedMastery
+    ring2: ExtendedMastery
+    ring3: ExtendedMastery
+    ring4: ExtendedMastery
+    earring: ExtendedMastery
+    awakening: {
+      type?: number
+      level?: number
+    }
+    transcendence_step: number
+    perpetuity: boolean
+  }
+}
+
+interface Props {
+  gridCharacter: GridCharacter
+  open: boolean
+  onOpenChange: (open: boolean) => void
+}
+
+const CharacterModal = ({
+  gridCharacter,
+  children,
+  open: modalOpen,
+  onOpenChange,
+}: PropsWithChildren<Props>) => {
+  const router = useRouter()
+  const locale =
+    router.locale && ['en', 'ja'].includes(router.locale) ? router.locale : 'en'
+  const { t } = useTranslation('common')
+
+  // Cookies
+  const cookies = retrieveCookies()
+
+  // UI state
+  const [open, setOpen] = useState(false)
+  const [formValid, setFormValid] = useState(false)
+
+  // Classes
+  const headerClasses = classNames({
+    DialogHeader: true,
+    Scrolled: scrolled,
+  })
+  useEffect(() => {
+    setOpen(modalOpen)
+  }, [modalOpen])
+
+  // Character properties: Perpetuity
+  const [perpetuity, setPerpetuity] = useState(false)
+
+  // Character properties: Ring
+  const [rings, setRings] = useState<CharacterOverMastery>({
+    1: { ...emptyExtendedMastery, modifier: 1 },
+    2: { ...emptyExtendedMastery, modifier: 2 },
+    3: emptyExtendedMastery,
+    4: emptyExtendedMastery,
+  })
+
+  // Character properties: Earrings
+  const [earring, setEarring] = useState<ExtendedMastery>(emptyExtendedMastery)
+
+  // Character properties: Awakening
+  const [awakeningType, setAwakeningType] = useState(0)
+  const [awakeningLevel, setAwakeningLevel] = useState(0)
+
+  // Character properties: Transcendence
+  const [transcendenceStep, setTranscendenceStep] = useState(0)
+
+  // Hooks
+  useEffect(() => {
+    if (gridCharacter.aetherial_mastery) {
+      setEarring({
+        modifier: gridCharacter.aetherial_mastery.modifier,
+        strength: gridCharacter.aetherial_mastery.strength,
+      })
+    }
+
+    setAwakeningType(gridCharacter.awakening.type)
+    setAwakeningLevel(gridCharacter.awakening.level)
+    setPerpetuity(gridCharacter.perpetuity)
+  }, [gridCharacter])
+
+  // Methods: UI state management
+  function handleOpenChange(open: boolean) {
+    setOpen(open)
+    onOpenChange(open)
+  }
+
+  // Methods: Receive data from components
+  function receiveRingValues(overMastery: CharacterOverMastery) {
+    setRings(overMastery)
+  }
+
+  function receiveEarringValues(
+    earringModifier: number,
+    earringStrength: number
+  ) {
+    setEarring({
+      modifier: earringModifier,
+      strength: earringStrength,
+    })
+  }
+
+  function handleCheckedChange(checked: boolean) {
+    setPerpetuity(checked)
+  }
+
+  function receiveAwakeningValues(type: number, level: number) {
+    setAwakeningType(type)
+    setAwakeningLevel(level)
+  }
+
+  function receiveValidity(isValid: boolean) {
+    setFormValid(isValid)
+  }
+
+  // Methods: Data syncing
+
+  // Prepare the GridWeaponObject to send to the server
+  function prepareObject() {
+    let object: GridCharacterObject = {
+      character: {
+        ring1: {
+          modifier: rings[1].modifier,
+          strength: rings[1].strength,
+        },
+        ring2: {
+          modifier: rings[2].modifier,
+          strength: rings[2].strength,
+        },
+        ring3: {
+          modifier: rings[3].modifier,
+          strength: rings[3].strength,
+        },
+        ring4: {
+          modifier: rings[4].modifier,
+          strength: rings[4].strength,
+        },
+        earring: {
+          modifier: earring.modifier,
+          strength: earring.strength,
+        },
+        awakening: {
+          type: awakeningType,
+          level: awakeningLevel,
+        },
+        transcendence_step: transcendenceStep,
+        perpetuity: perpetuity,
+      },
+    }
+
+    return object
+  }
+
+  // Send the GridWeaponObject to the server
+  async function updateCharacter() {
+    const updateObject = prepareObject()
+
+    return await api.endpoints.grid_characters
+      .update(gridCharacter.id, updateObject)
+      .then((response) => processResult(response))
+      .catch((error) => processError(error))
+  }
+
+  // Save the server's response to state
+  function processResult(response: AxiosResponse) {
+    const gridCharacter: GridCharacter = response.data
+    appState.grid.characters[gridCharacter.position] = gridCharacter
+
+    setOpen(false)
+    if (onOpenChange) onOpenChange(false)
+  }
+
+  function processError(error: any) {
+    console.error(error)
+  }
+
+  const ringSelect = () => {
+    return (
+      <section>
+        <h3>{t('modals.characters.subtitles.ring')}</h3>
+        <RingSelect
+          gridCharacter={gridCharacter}
+          sendValues={receiveRingValues}
+        />
+      </section>
+    )
+  }
+
+  const earringSelect = () => {
+    const earringData = elementalizeAetherialMastery(gridCharacter)
+
+    return (
+      <section>
+        <h3>{t('modals.characters.subtitles.earring')}</h3>
+        <SelectWithInput
+          object="earring"
+          dataSet={earringData}
+          selectValue={earring.modifier ? earring.modifier : 0}
+          inputValue={earring.strength ? earring.strength : 0}
+          sendValidity={receiveValidity}
+          sendValues={receiveEarringValues}
+        />
+      </section>
+    )
+  }
+
+  const awakeningSelect = () => {
+    return (
+      <section>
+        <h3>{t('modals.characters.subtitles.awakening')}</h3>
+        <AwakeningSelect
+          object="character"
+          type={awakeningType}
+          level={awakeningLevel}
+          sendValidity={receiveValidity}
+          sendValues={receiveAwakeningValues}
+        />
+      </section>
+    )
+  }
+
+  const perpetuitySwitch = () => {
+    return (
+      <section className="inline">
+        <h3>{t('modals.characters.subtitles.permanent')}</h3>
+        <Switch onCheckedChange={handleCheckedChange} checked={perpetuity} />
+      </section>
+    )
+  }
+
+  return (
+    <Dialog open={open} onOpenChange={handleOpenChange}>
+      <DialogTrigger asChild>{children}</DialogTrigger>
+      <DialogContent
+        className="Character"
+        onOpenAutoFocus={(event) => event.preventDefault()}
+        onEscapeKeyDown={() => {}}
+      >
+        <div className={headerClasses}>
+          <img
+            alt={gridCharacter.object.name[locale]}
+            className="DialogImage"
+            src={`${process.env.NEXT_PUBLIC_SIERO_IMG_URL}/chara-square/${gridCharacter.object.granblue_id}_01.jpg`}
+          />
+          <div className="DialogTop">
+            <DialogTitle className="SubTitle">
+              {t('modals.characters.title')}
+            </DialogTitle>
+            <DialogTitle className="DialogTitle">
+              {gridCharacter.object.name[locale]}
+            </DialogTitle>
+          </div>
+          <DialogClose className="DialogClose" asChild>
+            <span>
+              <CrossIcon />
+            </span>
+          </DialogClose>
+        </div>
+
+        <div className="mods">
+          {perpetuitySwitch()}
+          {ringSelect()}
+          {earringSelect()}
+          {awakeningSelect()}
+        </div>
+        <div className="DialogFooter">
+          <Button
+            contained={true}
+            onClick={updateCharacter}
+            disabled={!formValid}
+            text={t('modals.characters.buttons.confirm')}
+          />
+        </div>
+      </DialogContent>
+    </Dialog>
+  )
+}
+
+export default CharacterModal
diff --git a/components/CharacterUnit/index.scss b/components/CharacterUnit/index.scss
index 0cf54982..52863998 100644
--- a/components/CharacterUnit/index.scss
+++ b/components/CharacterUnit/index.scss
@@ -5,6 +5,7 @@
   gap: calc($unit / 2);
   // min-height: 320px;
   // max-width: 200px;
+  position: relative;
   margin-bottom: $unit * 4;
 
   &.editable .CharacterImage:hover {
@@ -22,6 +23,17 @@
     display: flex;
   }
 
+  .Button {
+    pointer-events: none;
+    opacity: 0;
+  }
+
+  &:hover .Button,
+  .Button.Clicked {
+    pointer-events: initial;
+    opacity: 1;
+  }
+
   h3,
   ul {
     display: none;
@@ -57,9 +69,11 @@
     align-items: center;
     justify-content: center;
     overflow: hidden;
-    transition: all 0.18s ease-in-out;
+    transition: $duration-zoom all ease-in-out;
     height: auto;
     width: 100%;
+    -webkit-user-select: none; /* Safari */
+    user-select: none;
 
     &:hover .icon svg {
       fill: var(--icon-secondary-hover);
@@ -72,6 +86,7 @@
       z-index: 1;
 
       svg {
+        transition: $duration-color-fade fill ease-in-out;
         fill: var(--icon-secondary);
       }
     }
diff --git a/components/CharacterUnit/index.tsx b/components/CharacterUnit/index.tsx
index 7dbce073..3e6ec5b0 100644
--- a/components/CharacterUnit/index.tsx
+++ b/components/CharacterUnit/index.tsx
@@ -1,15 +1,26 @@
-import React, { useEffect, useState } from 'react'
+import React, { MouseEvent, useEffect, useState } from 'react'
 import { useRouter } from 'next/router'
 import { useSnapshot } from 'valtio'
-import { useTranslation } from 'next-i18next'
-import classnames from 'classnames'
+import { Trans, useTranslation } from 'next-i18next'
+import classNames from 'classnames'
+
+import Alert from '~components/Alert'
+import Button from '~components/Button'
+import CharacterHovercard from '~components/CharacterHovercard'
+import CharacterModal from '~components/CharacterModal'
+import {
+  ContextMenu,
+  ContextMenuTrigger,
+  ContextMenuContent,
+} from '~components/ContextMenu'
+import ContextMenuItem from '~components/ContextMenuItem'
+import SearchModal from '~components/SearchModal'
+import UncapIndicator from '~components/UncapIndicator'
 
 import { appState } from '~utils/appState'
 
-import CharacterHovercard from '~components/CharacterHovercard'
-import SearchModal from '~components/SearchModal'
-import UncapIndicator from '~components/UncapIndicator'
 import PlusIcon from '~public/icons/Add.svg'
+import SettingsIcon from '~public/icons/Settings.svg'
 
 import type { SearchableObject } from '~types'
 
@@ -19,48 +30,112 @@ interface Props {
   gridCharacter?: GridCharacter
   position: number
   editable: boolean
+  removeCharacter: (id: string) => void
   updateObject: (object: SearchableObject, position: number) => void
   updateUncap: (id: string, position: number, uncap: number) => void
 }
 
-const CharacterUnit = (props: Props) => {
+const CharacterUnit = ({
+  gridCharacter,
+  position,
+  editable,
+  removeCharacter: sendCharacterToRemove,
+  updateObject,
+  updateUncap,
+}: Props) => {
+  // Translations and locale
   const { t } = useTranslation('common')
-
-  const { party, grid } = useSnapshot(appState)
-
   const router = useRouter()
   const locale =
     router.locale && ['en', 'ja'].includes(router.locale) ? router.locale : 'en'
 
+  // State snapshot
+  const { party, grid } = useSnapshot(appState)
+
+  // State: UI
+  const [detailsModalOpen, setDetailsModalOpen] = useState(false)
+  const [searchModalOpen, setSearchModalOpen] = useState(false)
+  const [contextMenuOpen, setContextMenuOpen] = useState(false)
+  const [alertOpen, setAlertOpen] = useState(false)
+
+  // State: Other
   const [imageUrl, setImageUrl] = useState('')
 
-  const classes = classnames({
+  // Classes
+  const classes = classNames({
     CharacterUnit: true,
-    editable: props.editable,
-    filled: props.gridCharacter !== undefined,
+    editable: editable,
+    filled: gridCharacter !== undefined,
   })
 
-  const gridCharacter = props.gridCharacter
+  const buttonClasses = classNames({
+    Options: true,
+    Clicked: contextMenuOpen,
+  })
+
+  // Other
   const character = gridCharacter?.object
 
+  // Hooks
   useEffect(() => {
     generateImageUrl()
   })
 
+  // Methods: Open layer
+  function openCharacterModal(event: Event) {
+    setDetailsModalOpen(true)
+  }
+
+  function openSearchModal(event: MouseEvent<HTMLDivElement>) {
+    if (editable) setSearchModalOpen(true)
+  }
+
+  function openRemoveCharacterAlert() {
+    setAlertOpen(true)
+  }
+
+  // Methods: Handle button clicked
+  function handleButtonClicked() {
+    setContextMenuOpen(!contextMenuOpen)
+  }
+
+  // Methods: Handle open change
+  function handleCharacterModalOpenChange(open: boolean) {
+    setDetailsModalOpen(open)
+  }
+
+  function handleSearchModalOpenChange(open: boolean) {
+    setSearchModalOpen(open)
+  }
+
+  function handleContextMenuOpenChange(open: boolean) {
+    if (!open) setContextMenuOpen(false)
+  }
+
+  // Methods: Mutate data
+  function passUncapData(uncap: number) {
+    if (gridCharacter) updateUncap(gridCharacter.id, position, uncap)
+  }
+
+  function removeCharacter() {
+    if (gridCharacter) sendCharacterToRemove(gridCharacter.id)
+  }
+
+  // Methods: Image string generation
   function generateImageUrl() {
     let imgSrc = ''
 
-    if (props.gridCharacter) {
-      const character = props.gridCharacter.object!
+    if (gridCharacter) {
+      const character = gridCharacter.object!
 
       // Change the image based on the uncap level
       let suffix = '01'
-      if (props.gridCharacter.uncap_level == 6) suffix = '04'
-      else if (props.gridCharacter.uncap_level == 5) suffix = '03'
-      else if (props.gridCharacter.uncap_level > 2) suffix = '02'
+      if (gridCharacter.uncap_level == 6) suffix = '04'
+      else if (gridCharacter.uncap_level == 5) suffix = '03'
+      else if (gridCharacter.uncap_level > 2) suffix = '02'
 
       // Special casing for Lyria (and Young Cat eventually)
-      if (props.gridCharacter.object.granblue_id === '3030182000') {
+      if (gridCharacter.object.granblue_id === '3030182000') {
         let element = 1
         if (grid.weapons.mainWeapon && grid.weapons.mainWeapon.element) {
           element = grid.weapons.mainWeapon.element
@@ -77,15 +152,86 @@ const CharacterUnit = (props: Props) => {
     setImageUrl(imgSrc)
   }
 
-  function passUncapData(uncap: number) {
-    if (props.gridCharacter)
-      props.updateUncap(props.gridCharacter.id, props.position, uncap)
+  // Methods: Layer element rendering
+  const characterModal = () => {
+    if (gridCharacter) {
+      return (
+        <CharacterModal
+          gridCharacter={gridCharacter}
+          open={detailsModalOpen}
+          onOpenChange={handleCharacterModalOpenChange}
+        />
+      )
+    }
   }
 
+  const contextMenu = () => {
+    if (editable && gridCharacter && gridCharacter.id) {
+      return (
+        <>
+          <ContextMenu onOpenChange={handleContextMenuOpenChange}>
+            <ContextMenuTrigger asChild>
+              <Button
+                accessoryIcon={<SettingsIcon />}
+                className={buttonClasses}
+                onClick={handleButtonClicked}
+              />
+            </ContextMenuTrigger>
+            <ContextMenuContent align="start">
+              <ContextMenuItem onSelect={openCharacterModal}>
+                {t('context.modify.character')}
+              </ContextMenuItem>
+              <ContextMenuItem onSelect={openRemoveCharacterAlert}>
+                {t('context.remove')}
+              </ContextMenuItem>
+            </ContextMenuContent>
+          </ContextMenu>
+          {characterModal()}
+          {removeAlert()}
+        </>
+      )
+    }
+  }
+
+  const removeAlert = () => {
+    return (
+      <Alert
+        open={alertOpen}
+        primaryAction={removeCharacter}
+        primaryActionText={t('modals.characters.buttons.remove')}
+        cancelAction={() => setAlertOpen(false)}
+        cancelActionText={t('buttons.cancel')}
+        message={
+          <Trans i18nKey="modals.characters.messages.remove">
+            Are you sure you want to remove{' '}
+            <strong>{{ character: gridCharacter?.object.name[locale] }}</strong>{' '}
+            from your team?
+          </Trans>
+        }
+      />
+    )
+  }
+
+  const searchModal = () => {
+    if (editable) {
+      return (
+        <SearchModal
+          placeholderText={t('search.placeholders.character')}
+          fromPosition={position}
+          object="characters"
+          open={searchModalOpen}
+          onOpenChange={handleSearchModalOpenChange}
+          send={updateObject}
+        />
+      )
+    }
+  }
+
+  // Methods: Core element rendering
   const image = (
-    <div className="CharacterImage">
+    <div className="CharacterImage" onClick={openSearchModal}>
       <img alt={character?.name.en} className="grid_image" src={imageUrl} />
-      {props.editable ? (
+      {editable ? (
         <span className="icon">
           <PlusIcon />
         </span>
@@ -95,43 +241,36 @@ const CharacterUnit = (props: Props) => {
     </div>
   )
 
-  const editableImage = (
-    <SearchModal
-      placeholderText={t('search.placeholders.character')}
-      fromPosition={props.position}
-      object="characters"
-      send={props.updateObject}
-    >
-      {image}
-    </SearchModal>
-  )
-
   const unitContent = (
-    <div className={classes}>
-      {props.editable ? editableImage : image}
-      {gridCharacter && character ? (
-        <UncapIndicator
-          type="character"
-          flb={character.uncap.flb || false}
-          ulb={character.uncap.ulb || false}
-          uncapLevel={gridCharacter.uncap_level}
-          updateUncap={passUncapData}
-          special={character.special}
-        />
-      ) : (
-        ''
-      )}
-      <h3 className="CharacterName">{character?.name[locale]}</h3>
-    </div>
+    <>
+      <div className={classes}>
+        {contextMenu()}
+        {image}
+        {gridCharacter && character ? (
+          <UncapIndicator
+            type="character"
+            flb={character.uncap.flb || false}
+            ulb={character.uncap.ulb || false}
+            uncapLevel={gridCharacter.uncap_level}
+            updateUncap={passUncapData}
+            special={character.special}
+          />
+        ) : (
+          ''
+        )}
+        <h3 className="CharacterName">{character?.name[locale]}</h3>
+      </div>
+      {searchModal()}
+    </>
   )
 
-  const withHovercard = (
+  const unitContentWithHovercard = (
     <CharacterHovercard gridCharacter={gridCharacter!}>
       {unitContent}
     </CharacterHovercard>
   )
 
-  return gridCharacter && !props.editable ? withHovercard : unitContent
+  return gridCharacter && !editable ? unitContentWithHovercard : unitContent
 }
 
 export default CharacterUnit
diff --git a/components/ContextMenu/index.scss b/components/ContextMenu/index.scss
new file mode 100644
index 00000000..c011889c
--- /dev/null
+++ b/components/ContextMenu/index.scss
@@ -0,0 +1,6 @@
+.ContextMenu {
+  background: var(--menu-bg);
+  border-radius: $input-corner;
+  padding: $unit 0;
+  margin-top: $unit-fourth;
+}
diff --git a/components/ContextMenu/index.tsx b/components/ContextMenu/index.tsx
new file mode 100644
index 00000000..c3787dd9
--- /dev/null
+++ b/components/ContextMenu/index.tsx
@@ -0,0 +1,36 @@
+import React from 'react'
+import classNames from 'classnames'
+import * as DropdownMenu from '@radix-ui/react-dropdown-menu'
+
+import './index.scss'
+
+interface Props
+  extends React.DetailedHTMLProps<
+    React.DialogHTMLAttributes<HTMLDivElement>,
+    HTMLDivElement
+  > {
+  align?: 'start' | 'center' | 'end'
+}
+
+export const ContextMenuContent = React.forwardRef<HTMLDivElement, Props>(
+  function ContextMenu({ children, ...props }, forwardedRef) {
+    const classes = classNames(
+      {
+        ContextMenu: true,
+      },
+      props.className
+    )
+
+    return (
+      <DropdownMenu.Portal>
+        <DropdownMenu.Content className={classes} {...props} ref={forwardedRef}>
+          {children}
+        </DropdownMenu.Content>
+      </DropdownMenu.Portal>
+    )
+  }
+)
+
+export const ContextMenu = DropdownMenu.Root
+export const ContextMenuGroup = DropdownMenu.Group
+export const ContextMenuTrigger = DropdownMenu.Trigger
diff --git a/components/ContextMenuItem/index.scss b/components/ContextMenuItem/index.scss
new file mode 100644
index 00000000..ee14622d
--- /dev/null
+++ b/components/ContextMenuItem/index.scss
@@ -0,0 +1,11 @@
+.ContextItem {
+  color: var(--menu-text);
+  font-size: $font-regular;
+  padding: ($unit * 1.5) $unit-2x;
+
+  &:hover {
+    background: var(--menu-bg-item-hover);
+    color: var(--text-primary);
+    cursor: pointer;
+  }
+}
diff --git a/components/ContextMenuItem/index.tsx b/components/ContextMenuItem/index.tsx
new file mode 100644
index 00000000..be1b7ec9
--- /dev/null
+++ b/components/ContextMenuItem/index.tsx
@@ -0,0 +1,30 @@
+import React from 'react'
+import classNames from 'classnames'
+import { DropdownMenuItem } from '@radix-ui/react-dropdown-menu'
+
+import './index.scss'
+
+interface Props {
+  className?: string
+  onSelect?: (event: Event) => void
+  children: React.ReactNode
+}
+
+const ContextMenuItem = React.forwardRef<HTMLDivElement, Props>(
+  function ContextMenu({ children, ...props }, forwardedRef) {
+    const classes = classNames(
+      {
+        ContextItem: true,
+      },
+      props.className
+    )
+
+    return (
+      <DropdownMenuItem className={classes} onSelect={props.onSelect}>
+        {children}
+      </DropdownMenuItem>
+    )
+  }
+)
+
+export default ContextMenuItem
diff --git a/components/Dialog/index.scss b/components/Dialog/index.scss
index b93fbc55..e69de29b 100644
--- a/components/Dialog/index.scss
+++ b/components/Dialog/index.scss
@@ -1,211 +0,0 @@
-.Dialog {
-  $multiplier: 4;
-
-  animation: 0.5s cubic-bezier(0.16, 1, 0.3, 1) 0s 1 normal none running
-    openModalDesktop;
-  background: var(--dialog-bg);
-  border-radius: $card-corner;
-  box-sizing: border-box;
-  display: flex;
-  flex-direction: column;
-  gap: $unit * $multiplier;
-  height: auto;
-  min-width: $unit * 48;
-  min-height: $unit-12x;
-  min-width: 580px;
-  padding: $unit * $multiplier;
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
-  z-index: 40;
-
-  a:hover {
-    text-decoration: underline;
-  }
-
-  @include breakpoint(phone) {
-    animation: 0.5s cubic-bezier(0.16, 1, 0.3, 1) 0s 1 normal forwards running
-      openModalMobile;
-    min-width: inherit;
-    min-height: 80vh;
-    transform: initial;
-    left: 0;
-    right: 0;
-    top: 0;
-    height: auto;
-    width: 100%;
-  }
-
-  .DialogHeader {
-    display: flex;
-    align-items: center;
-    gap: $unit;
-    justify-content: space-between;
-
-    .left {
-      display: flex;
-      flex-direction: column;
-      flex-grow: 1;
-      gap: $unit;
-
-      p {
-        font-size: $font-small;
-        line-height: 1.25;
-      }
-    }
-  }
-
-  .DialogClose {
-    background: transparent;
-    border: none;
-
-    &:hover {
-      cursor: pointer;
-
-      svg {
-        fill: $error;
-      }
-    }
-
-    svg {
-      fill: $grey-50;
-      float: right;
-      height: 24px;
-      width: 24px;
-    }
-  }
-
-  .DialogTitle {
-    color: var(--text-primary);
-    font-size: $font-xlarge;
-
-    h1 {
-      color: var(--text-primary);
-      font-size: $font-xlarge;
-      font-weight: $medium;
-      text-align: left;
-    }
-  }
-
-  .DialogTop {
-    display: flex;
-    flex-direction: column;
-    flex-grow: 1;
-    gap: calc($unit / 2);
-
-    .SubTitle {
-      color: var(--text-secondary);
-      font-size: $font-small;
-      font-weight: $medium;
-    }
-  }
-
-  .DialogDescription {
-    color: var(--text-secondary);
-    flex-grow: 1;
-  }
-
-  .actions {
-    display: flex;
-    justify-content: flex-end;
-    width: 100%;
-  }
-
-  &.Conflict.Dialog {
-    $weapon-diameter: 14rem;
-
-    & > p {
-      line-height: 1.2;
-      max-width: 400px;
-
-      strong {
-        font-weight: $bold;
-      }
-
-      &:lang(ja) {
-        line-height: 1.4;
-      }
-    }
-
-    .weapon,
-    .character {
-      display: flex;
-      flex-direction: column;
-      gap: $unit;
-      text-align: center;
-      width: $weapon-diameter;
-      font-weight: $medium;
-
-      img {
-        border-radius: 1rem;
-        width: $weapon-diameter;
-        height: auto;
-      }
-
-      span {
-        line-height: 1.3;
-      }
-    }
-
-    .Diagram {
-      display: grid;
-      grid-template-columns: 1fr auto 1fr;
-      align-items: flex-start;
-
-      &.CharacterDiagram {
-        align-items: center;
-      }
-
-      ul {
-        align-items: center;
-        display: flex;
-        flex-direction: column;
-        gap: $unit * 2;
-      }
-
-      .wrapper {
-        display: flex;
-        justify-content: center;
-        width: 100%;
-      }
-
-      .arrow {
-        align-items: center;
-        color: $grey-55;
-        display: flex;
-        font-size: 4rem;
-        text-align: center;
-        height: $weapon-diameter;
-        justify-content: center;
-      }
-    }
-
-    footer {
-      display: flex;
-      flex-direction: row;
-      gap: $unit;
-
-      .Button {
-        font-size: $font-regular;
-        padding: ($unit * 1.5) ($unit * 2);
-        width: 100%;
-
-        &.btn-disabled {
-          background: $grey-90;
-          color: $grey-70;
-          cursor: not-allowed;
-        }
-
-        &:not(.btn-disabled) {
-          background: $grey-90;
-          color: $grey-50;
-
-          &:hover {
-            background: $grey-80;
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/components/Dialog/index.tsx b/components/Dialog/index.tsx
index 8f544fa8..bd814d0f 100644
--- a/components/Dialog/index.tsx
+++ b/components/Dialog/index.tsx
@@ -1,46 +1,37 @@
-import React from 'react'
+import React, { PropsWithChildren, useEffect, useState } from 'react'
 import * as DialogPrimitive from '@radix-ui/react-dialog'
-import classNames from 'classnames'
+import { useLockedBody } from 'usehooks-ts'
 
 import './index.scss'
-import Overlay from '~components/Overlay'
 
-interface Props
-  extends React.DetailedHTMLProps<
-    React.DialogHTMLAttributes<HTMLDivElement>,
-    HTMLDivElement
-  > {
-  onEscapeKeyDown: (event: KeyboardEvent) => void
-  onOpenAutoFocus: (event: Event) => void
+interface Props extends DialogPrimitive.DialogProps {}
+
+export const Dialog = ({ children, ...props }: PropsWithChildren<Props>) => {
+  const [locked, setLocked] = useLockedBody(false, 'root')
+  const [open, setOpen] = useState(false)
+
+  useEffect(() => {
+    if (props.open != undefined) {
+      toggleLocked(props.open)
+      setOpen(props.open)
+    }
+  }, [props.open])
+
+  function toggleLocked(open: boolean) {
+    setLocked(open)
+  }
+
+  function handleOpenChange(open: boolean) {
+    if (props.onOpenChange) props.onOpenChange(open)
+  }
+
+  return (
+    <DialogPrimitive.Root open={props.open} onOpenChange={handleOpenChange}>
+      {children}
+    </DialogPrimitive.Root>
+  )
 }
 
-export const DialogContent = React.forwardRef<HTMLDivElement, Props>(
-  function dialog({ children, ...props }, forwardedRef) {
-    const classes = classNames(
-      {
-        Dialog: true,
-      },
-      props.className
-    )
-
-    return (
-      <DialogPrimitive.Portal>
-        <DialogPrimitive.Content
-          className={classes}
-          {...props}
-          onOpenAutoFocus={props.onOpenAutoFocus}
-          onEscapeKeyDown={props.onEscapeKeyDown}
-          ref={forwardedRef}
-        >
-          {children}
-        </DialogPrimitive.Content>
-        <Overlay visible={true} open={true} />
-      </DialogPrimitive.Portal>
-    )
-  }
-)
-
-export const Dialog = DialogPrimitive.Root
 export const DialogTitle = DialogPrimitive.Title
 export const DialogTrigger = DialogPrimitive.Trigger
 export const DialogClose = DialogPrimitive.Close
diff --git a/components/DialogContent/index.scss b/components/DialogContent/index.scss
new file mode 100644
index 00000000..5e64706f
--- /dev/null
+++ b/components/DialogContent/index.scss
@@ -0,0 +1,243 @@
+.Dialog {
+  // animation: 0.5s cubic-bezier(0.16, 1, 0.3, 1) 0s 1 normal none running
+  //   openModalDesktop;
+  position: fixed;
+  background: none;
+  border: 0;
+  inset: 0;
+  display: grid;
+  place-items: center;
+  min-height: 100vh;
+  min-width: 100vw;
+  overflow-y: auto;
+  color: inherit;
+  z-index: 40;
+
+  .DialogContent {
+    $multiplier: 4;
+
+    background: var(--dialog-bg);
+    border-radius: $card-corner;
+    box-sizing: border-box;
+    display: flex;
+    flex-direction: column;
+    gap: $unit * $multiplier;
+    height: auto;
+    min-width: $unit * 48;
+    // min-height: $unit-12x;
+    overflow-y: scroll;
+    max-height: 80vh;
+    min-width: 580px;
+    // padding: $unit * $multiplier;
+    position: relative;
+
+    a:hover {
+      text-decoration: underline;
+    }
+
+    @include breakpoint(phone) {
+      animation: 0.5s cubic-bezier(0.16, 1, 0.3, 1) 0s 1 normal forwards running
+        openModalMobile;
+      min-width: inherit;
+      min-height: 80vh;
+      transform: initial;
+      left: 0;
+      right: 0;
+      top: 0;
+      height: auto;
+      width: 100%;
+    }
+
+    .DialogHeader {
+      background: var(--dialog-bg);
+      display: flex;
+      align-items: center;
+      gap: $unit-2x;
+      justify-content: space-between;
+      padding: $unit-3x ($unit * $multiplier);
+      position: sticky;
+      top: 0;
+      z-index: 10;
+
+      .left {
+        display: flex;
+        flex-direction: column;
+        flex-grow: 1;
+        gap: $unit;
+
+        p {
+          font-size: $font-small;
+          line-height: 1.25;
+        }
+      }
+
+      .DialogImage {
+        border-radius: $input-corner;
+        width: $unit-10x;
+      }
+    }
+
+    .DialogClose {
+      background: transparent;
+      border: none;
+
+      &:hover {
+        cursor: pointer;
+
+        svg {
+          fill: $error;
+        }
+      }
+
+      svg {
+        fill: $grey-50;
+        float: right;
+        height: 24px;
+        width: 24px;
+      }
+    }
+
+    .DialogTitle {
+      color: var(--text-primary);
+      font-size: $font-xlarge;
+
+      h1 {
+        color: var(--text-primary);
+        font-size: $font-xlarge;
+        font-weight: $medium;
+        text-align: left;
+      }
+    }
+
+    .DialogTop {
+      display: flex;
+      flex-direction: column;
+      flex-grow: 1;
+      gap: calc($unit / 2);
+
+      .SubTitle {
+        color: var(--text-secondary);
+        font-size: $font-small;
+        font-weight: $medium;
+      }
+    }
+
+    .DialogDescription {
+      color: var(--text-secondary);
+      flex-grow: 1;
+    }
+
+    .DialogFooter {
+      align-items: flex-end;
+      background: var(--dialog-bg);
+      bottom: 0;
+      display: flex;
+      flex-direction: column;
+      padding: ($unit * 1.5) ($unit * $multiplier) $unit-3x;
+      position: sticky;
+    }
+
+    .actions {
+      display: flex;
+      justify-content: flex-end;
+      width: 100%;
+    }
+
+    &.Conflict {
+      $weapon-diameter: 14rem;
+
+      & > p {
+        line-height: 1.2;
+        max-width: 400px;
+
+        strong {
+          font-weight: $bold;
+        }
+
+        &:lang(ja) {
+          line-height: 1.4;
+        }
+      }
+
+      .weapon,
+      .character {
+        display: flex;
+        flex-direction: column;
+        gap: $unit;
+        text-align: center;
+        width: $weapon-diameter;
+        font-weight: $medium;
+
+        img {
+          border-radius: 1rem;
+          width: $weapon-diameter;
+          height: auto;
+        }
+
+        span {
+          line-height: 1.3;
+        }
+      }
+
+      .Diagram {
+        display: grid;
+        grid-template-columns: 1fr auto 1fr;
+        align-items: flex-start;
+
+        &.CharacterDiagram {
+          align-items: center;
+        }
+
+        ul {
+          align-items: center;
+          display: flex;
+          flex-direction: column;
+          gap: $unit * 2;
+        }
+
+        .wrapper {
+          display: flex;
+          justify-content: center;
+          width: 100%;
+        }
+
+        .arrow {
+          align-items: center;
+          color: $grey-55;
+          display: flex;
+          font-size: 4rem;
+          text-align: center;
+          height: $weapon-diameter;
+          justify-content: center;
+        }
+      }
+
+      footer {
+        display: flex;
+        flex-direction: row;
+        gap: $unit;
+
+        .Button {
+          font-size: $font-regular;
+          padding: ($unit * 1.5) ($unit * 2);
+          width: 100%;
+
+          &.btn-disabled {
+            background: $grey-90;
+            color: $grey-70;
+            cursor: not-allowed;
+          }
+
+          &:not(.btn-disabled) {
+            background: $grey-90;
+            color: $grey-50;
+
+            &:hover {
+              background: $grey-80;
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/components/DialogContent/index.tsx b/components/DialogContent/index.tsx
new file mode 100644
index 00000000..6086da4c
--- /dev/null
+++ b/components/DialogContent/index.tsx
@@ -0,0 +1,43 @@
+import React from 'react'
+import * as DialogPrimitive from '@radix-ui/react-dialog'
+import classNames from 'classnames'
+
+import './index.scss'
+import Overlay from '~components/Overlay'
+
+interface Props
+  extends React.DetailedHTMLProps<
+    React.DialogHTMLAttributes<HTMLDivElement>,
+    HTMLDivElement
+  > {
+  onEscapeKeyDown: (event: KeyboardEvent) => void
+  onOpenAutoFocus: (event: Event) => void
+}
+
+const DialogContent = React.forwardRef<HTMLDivElement, Props>(function dialog(
+  { children, ...props },
+  forwardedRef
+) {
+  const classes = classNames(props.className, {
+    DialogContent: true,
+  })
+
+  return (
+    <DialogPrimitive.Portal>
+      <dialog className="Dialog">
+        <DialogPrimitive.Content
+          {...props}
+          className={classes}
+          onOpenAutoFocus={props.onOpenAutoFocus}
+          onEscapeKeyDown={props.onEscapeKeyDown}
+          ref={forwardedRef}
+        >
+          {children}
+        </DialogPrimitive.Content>
+      </dialog>
+      <Overlay visible={true} open={true} />
+    </DialogPrimitive.Portal>
+  )
+})
+
+export default DialogContent
diff --git a/components/ExtendedMasterySelect/index.scss b/components/ExtendedMasterySelect/index.scss
new file mode 100644
index 00000000..4ce3e5d0
--- /dev/null
+++ b/components/ExtendedMasterySelect/index.scss
@@ -0,0 +1,17 @@
+.SelectSet {
+  display: flex;
+  flex-direction: row;
+  gap: $unit;
+  width: 100%;
+
+  .SelectTrigger.Left {
+    flex-grow: 1;
+    width: 100%;
+  }
+
+  .SelectTrigger.Right {
+    flex-grow: 0;
+    text-align: right;
+    min-width: 12rem;
+  }
+}
diff --git a/components/ExtendedMasterySelect/index.tsx b/components/ExtendedMasterySelect/index.tsx
new file mode 100644
index 00000000..ff9cc218
--- /dev/null
+++ b/components/ExtendedMasterySelect/index.tsx
@@ -0,0 +1,163 @@
+// Core dependencies
+import React, { useEffect, useState } from 'react'
+import { useRouter } from 'next/router'
+import { useTranslation } from 'next-i18next'
+import classNames from 'classnames'
+
+// UI Dependencies
+import Select from '~components/Select'
+import SelectItem from '~components/SelectItem'
+
+// Styles and icons
+import './index.scss'
+
+// Types
+interface Props {
+  name: string
+  object: 'ring'
+  dataSet: ItemSkill[]
+  leftSelectValue: number
+  leftSelectDisabled: boolean
+  rightSelectValue: number
+  sendValues: (left: number, right: number) => void
+}
+
+const defaultProps = {
+  selectDisabled: false,
+}
+
+const ExtendedMasterySelect = ({
+  name,
+  object,
+  dataSet,
+  leftSelectDisabled,
+  leftSelectValue,
+  rightSelectValue,
+  sendValues,
+}: Props) => {
+  const router = useRouter()
+  const locale =
+    router.locale && ['en', 'ja'].includes(router.locale) ? router.locale : 'en'
+  const { t } = useTranslation('common')
+
+  // UI state
+  const [leftSelectOpen, setLeftSelectOpen] = useState(false)
+  const [rightSelectOpen, setRightSelectOpen] = useState(false)
+
+  // Field properties
+  // prettier-ignore
+  const [currentItemSkill, setCurrentItemSkill] = useState<ItemSkill | undefined>(undefined)
+  const [currentItemValue, setCurrentItemValue] = useState(rightSelectValue)
+
+  // Hooks
+  // if (currentItemSkill) sendValues(currentItemSkill.id, currentItemValue)
+
+  // Set default values from props
+  useEffect(() => {
+    setCurrentItemSkill(dataSet.find((sk) => sk.id === leftSelectValue))
+    setCurrentItemValue(rightSelectValue)
+  }, [leftSelectValue, rightSelectValue])
+
+  // Methods: UI state management
+  function changeOpen(side: 'left' | 'right') {
+    if (side === 'left' && !leftSelectDisabled) {
+      setLeftSelectOpen(!leftSelectOpen)
+    } else if (side === 'right') {
+      setRightSelectOpen(!rightSelectOpen)
+    }
+  }
+
+  function onClose() {
+    setLeftSelectOpen(false)
+    setRightSelectOpen(false)
+  }
+
+  // Methods: Rendering
+  function generateLeftOptions() {
+    let options: React.ReactNode[] = dataSet.map((skill, i) => {
+      return (
+        <SelectItem key={`${name}-key-${i}`} value={skill.id}>
+          {skill.name[locale]}
+        </SelectItem>
+      )
+    })
+
+    return options
+  }
+
+  function generateRightOptions() {
+    if (currentItemSkill && currentItemSkill.values) {
+      let options = currentItemSkill.values.map((value, i) => {
+        return (
+          <SelectItem key={`${name}-values-${i + 1}`} value={value}>
+            {value}
+            {currentItemSkill.suffix ? currentItemSkill.suffix : ''}
+          </SelectItem>
+        )
+      })
+
+      options.unshift(
+        <SelectItem key={`${name}-values-0`} value="no-value">
+          {t('no_value')}
+        </SelectItem>
+      )
+
+      return options
+    }
+  }
+
+  // Methods: User input detection
+  function handleLeftSelectChange(rawValue: string) {
+    const value = parseInt(rawValue)
+    const skill = dataSet.find((sk) => sk.id === value)
+
+    setCurrentItemSkill(skill)
+    setCurrentItemValue(0)
+
+    if (skill) sendValues(skill.id, 0)
+  }
+
+  function handleRightSelectChange(rawValue: string) {
+    const value = parseFloat(rawValue)
+    setCurrentItemValue(value)
+
+    if (currentItemSkill) sendValues(currentItemSkill.id, value)
+  }
+
+  return (
+    <div className="SelectSet">
+      <Select
+        key={`${name}_type`}
+        value={`${currentItemSkill ? currentItemSkill.id : 0}`}
+        open={leftSelectOpen}
+        disabled={leftSelectDisabled}
+        onValueChange={handleLeftSelectChange}
+        onOpenChange={() => changeOpen('left')}
+        onClose={onClose}
+        triggerClass="Left modal"
+      >
+        {generateLeftOptions()}
+      </Select>
+
+      <Select
+        key={`${name}_value`}
+        value={`${currentItemValue > 0 ? currentItemValue : 'no-value'}`}
+        open={rightSelectOpen}
+        onValueChange={handleRightSelectChange}
+        onOpenChange={() => changeOpen('right')}
+        onClose={onClose}
+        triggerClass={classNames({
+          Right: true,
+          modal: true,
+          hidden: currentItemSkill?.id === 0,
+        })}
+      >
+        {generateRightOptions()}
+      </Select>
+    </div>
+  )
+}
+
+ExtendedMasterySelect.defaultProps = defaultProps
+
+export default ExtendedMasterySelect
diff --git a/components/Input/index.scss b/components/Input/index.scss
index f26aa1ef..897a2779 100644
--- a/components/Input/index.scss
+++ b/components/Input/index.scss
@@ -2,10 +2,10 @@
   -webkit-font-smoothing: antialiased;
   background-color: var(--input-bg);
   border: 2px solid transparent;
-  border-radius: 6px;
+  border-radius: $input-corner;
   box-sizing: border-box;
   display: block;
-  padding: $unit-2x;
+  padding: calc($unit-2x - 2px);
   width: 100%;
 
   &[type='number']::-webkit-inner-spin-button {
diff --git a/components/JobDropdown/index.tsx b/components/JobDropdown/index.tsx
index 9e7843ef..d9c9d891 100644
--- a/components/JobDropdown/index.tsx
+++ b/components/JobDropdown/index.tsx
@@ -8,7 +8,7 @@ import SelectItem from '~components/SelectItem'
 import SelectGroup from '~components/SelectGroup'
 
 import { appState } from '~utils/appState'
-import { jobGroups } from '~utils/jobGroups'
+import { jobGroups } from '~data/jobGroups'
 
 import './index.scss'
 
diff --git a/components/JobSection/index.tsx b/components/JobSection/index.tsx
index 13e84a9f..e7ec6893 100644
--- a/components/JobSection/index.tsx
+++ b/components/JobSection/index.tsx
@@ -146,7 +146,7 @@ const JobSection = (props: Props) => {
             ref={selectRef}
           />
         ) : (
-          <h3>{party.job?.name[locale]}</h3>
+          <h3>{party.job ? party.job.name[locale] : t('no_job')}</h3>
         )}
 
         <ul className="JobSkills">
diff --git a/components/JobSkillResult/index.tsx b/components/JobSkillResult/index.tsx
index 66d9333b..508a3684 100644
--- a/components/JobSkillResult/index.tsx
+++ b/components/JobSkillResult/index.tsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useState } from 'react'
 import { useRouter } from 'next/router'
-import { SkillGroup, skillClassification } from '~utils/skillGroups'
+import { SkillGroup, skillClassification } from '~data/skillGroups'
 
 import './index.scss'
 
diff --git a/components/LoginModal/index.scss b/components/LoginModal/index.scss
index f51192e5..18611ce8 100644
--- a/components/LoginModal/index.scss
+++ b/components/LoginModal/index.scss
@@ -1,6 +1,16 @@
-.Login.Dialog form {
-  display: flex;
-  flex-direction: column;
-  gap: calc($unit / 2);
-  margin-bottom: $unit;
+.Login.DialogContent {
+  gap: $unit;
+  min-width: $unit * 52;
+
+  .DialogHeader {
+    padding: $unit-4x $unit-3x;
+  }
+
+  form {
+    display: flex;
+    flex-direction: column;
+    gap: calc($unit / 2);
+    margin-bottom: $unit-3x;
+    padding: 0 $unit-3x;
+  }
 }
diff --git a/components/LoginModal/index.tsx b/components/LoginModal/index.tsx
index 5c4b454b..60252c43 100644
--- a/components/LoginModal/index.tsx
+++ b/components/LoginModal/index.tsx
@@ -10,13 +10,8 @@ import { accountState } from '~utils/accountState'
 
 import Button from '~components/Button'
 import Input from '~components/LabelledInput'
-import {
-  Dialog,
-  DialogTrigger,
-  DialogContent,
-  DialogClose,
-} from '~components/Dialog'
-
+import { Dialog, DialogTrigger, DialogClose } from '~components/Dialog'
+import DialogContent from '~components/DialogContent'
 import changeLanguage from '~utils/changeLanguage'
 
 import CrossIcon from '~public/icons/Cross.svg'
@@ -203,7 +198,7 @@ const LoginModal = () => {
         </li>
       </DialogTrigger>
       <DialogContent
-        className="Login Dialog"
+        className="Login"
         onEscapeKeyDown={onEscapeKeyDown}
         onOpenAutoFocus={onOpenAutoFocus}
       >
diff --git a/components/PartyDetails/index.tsx b/components/PartyDetails/index.tsx
index ffc3f99e..ee7440df 100644
--- a/components/PartyDetails/index.tsx
+++ b/components/PartyDetails/index.tsx
@@ -632,9 +632,7 @@ const PartyDetails = (props: Props) => {
     <section className="DetailsWrapper">
       <div className="PartyInfo">
         <div className="Left">
-          <h1 className={name === '' ? 'empty' : ''}>
-            {name !== '' ? name : 'Untitled'}
-          </h1>
+          <h1 className={name ? '' : 'empty'}>{name ? name : t('no_title')}</h1>
           <div className="attribution">
             {renderUserBlock()}
             {party.raid ? linkedRaidBlock(party.raid) : ''}
diff --git a/components/RaidDropdown/index.tsx b/components/RaidDropdown/index.tsx
index 52bfcc76..a1ef9ad6 100644
--- a/components/RaidDropdown/index.tsx
+++ b/components/RaidDropdown/index.tsx
@@ -8,7 +8,7 @@ import SelectGroup from '~components/SelectGroup'
 import api from '~utils/api'
 import organizeRaids from '~utils/organizeRaids'
 import { appState } from '~utils/appState'
-import { raidGroups } from '~utils/raidGroups'
+import { raidGroups } from '~data/raidGroups'
 
 import './index.scss'
 
diff --git a/components/RingSelect/index.scss b/components/RingSelect/index.scss
new file mode 100644
index 00000000..8a080fd1
--- /dev/null
+++ b/components/RingSelect/index.scss
@@ -0,0 +1,5 @@
+.Rings {
+  display: flex;
+  flex-direction: column;
+  gap: $unit;
+}
diff --git a/components/RingSelect/index.tsx b/components/RingSelect/index.tsx
new file mode 100644
index 00000000..0c339766
--- /dev/null
+++ b/components/RingSelect/index.tsx
@@ -0,0 +1,150 @@
+// Core dependencies
+import React, { useEffect, useState } from 'react'
+
+// UI dependencies
+import ExtendedMasterySelect from '~components/ExtendedMasterySelect'
+
+// Data
+import { overMastery } from '~data/overMastery'
+
+// Styles and icons
+import './index.scss'
+
+// Types
+import { CharacterOverMastery, ExtendedMastery } from '~types'
+
+const emptyRing: ExtendedMastery = {
+  modifier: 0,
+  strength: 0,
+}
+
+interface Props {
+  gridCharacter: GridCharacter
+  sendValues: (overMastery: CharacterOverMastery) => void
+}
+
+const RingSelect = ({ gridCharacter, sendValues }: Props) => {
+  // Ring value states
+  const [rings, setRings] = useState<CharacterOverMastery>({
+    1: { ...emptyRing, modifier: 1 },
+    2: { ...emptyRing, modifier: 2 },
+    3: emptyRing,
+    4: emptyRing,
+  })
+
+  useEffect(() => {
+    if (gridCharacter.over_mastery) {
+      setRings({
+        1: gridCharacter.over_mastery[0],
+        2: gridCharacter.over_mastery[1],
+        3: gridCharacter.over_mastery[2],
+        4: gridCharacter.over_mastery[3],
+      })
+    }
+  }, [gridCharacter])
+
+  useEffect(() => {
+    sendValues(rings)
+  }, [rings])
+
+  function dataSet(index: number) {
+    const noValue = {
+      name: {
+        en: 'No over mastery bonus',
+        ja: 'EXリミットボーナスなし',
+      },
+      id: 0,
+      slug: 'no-bonus',
+      minValue: 0,
+      maxValue: 0,
+      suffix: '',
+      fractional: false,
+      secondary: [],
+    }
+
+    switch (index) {
+      case 1:
+        return overMastery.a ? [overMastery.a[0]] : []
+      case 2:
+        return overMastery.a ? [overMastery.a[1]] : []
+      case 3:
+        return overMastery.b ? [noValue, ...overMastery.b] : []
+      case 4:
+        return overMastery.c ? [noValue, ...overMastery.c] : []
+      default:
+        return []
+    }
+  }
+
+  function receiveRingValues(index: number, left: number, right: number) {
+    console.log(`Receiving values from ${index}: ${left} ${right}`)
+    if (index == 1 || index == 2) {
+      setSyncedRingValues(index, right)
+    } else if (index == 3 && left == 0) {
+      setRings({
+        ...rings,
+        3: {
+          modifier: 0,
+          strength: 0,
+        },
+        4: {
+          modifier: 0,
+          strength: 0,
+        },
+      })
+    } else {
+      setRings({
+        ...rings,
+        [index]: {
+          modifier: left,
+          strength: right,
+        },
+      })
+    }
+  }
+
+  function setSyncedRingValues(index: 1 | 2, value: number) {
+    console.log(`Setting synced value for ${index} with value ${value}`)
+    const atkValues = (dataSet(1)[0] as ItemSkill).values ?? []
+    const hpValues = (dataSet(2)[0] as ItemSkill).values ?? []
+
+    let found = index === 1 ? atkValues.indexOf(value) : hpValues.indexOf(value)
+
+    setRings({
+      ...rings,
+      1: {
+        modifier: 1,
+        strength: atkValues[found],
+      },
+      2: {
+        modifier: 2,
+        strength: hpValues[found],
+      },
+    })
+  }
+
+  return (
+    <div className="Rings">
+      {[...Array(4)].map((e, i) => {
+        const ringIndex = i + 1
+        const ringStat = rings[ringIndex]
+        return (
+          <ExtendedMasterySelect
+            name={`ring-${ringIndex}`}
+            object="ring"
+            key={`ring-${ringIndex}`}
+            dataSet={dataSet(ringIndex)}
+            leftSelectDisabled={i === 0 || i === 1}
+            leftSelectValue={ringStat.modifier ? ringStat.modifier : 0}
+            rightSelectValue={ringStat.strength ? ringStat.strength : 0}
+            sendValues={(left: number, right: number) => {
+              receiveRingValues(ringIndex, left, right)
+            }}
+          />
+        )
+      })}
+    </div>
+  )
+}
+
+export default RingSelect
diff --git a/components/SearchModal/index.scss b/components/SearchModal/index.scss
index 288a4456..94eaa0b9 100644
--- a/components/SearchModal/index.scss
+++ b/components/SearchModal/index.scss
@@ -1,4 +1,4 @@
-.Search.Dialog {
+.Search.DialogContent {
   box-sizing: border-box;
   display: flex;
   flex-direction: column;
@@ -94,7 +94,7 @@
   }
 }
 
-.Search.Dialog #NoResults {
+.Search.DialogContent #NoResults {
   display: flex;
   flex-direction: column;
   align-items: center;
@@ -102,7 +102,7 @@
   flex-grow: 1;
 }
 
-.Search.Dialog #NoResults h2 {
+.Search.DialogContent #NoResults h2 {
   color: var(--text-secondary);
   font-size: $font-large;
   font-weight: 500;
diff --git a/components/SearchModal/index.tsx b/components/SearchModal/index.tsx
index cf1a396a..c478c988 100644
--- a/components/SearchModal/index.tsx
+++ b/components/SearchModal/index.tsx
@@ -3,16 +3,12 @@ import { getCookie, setCookie } from 'cookies-next'
 import { useRouter } from 'next/router'
 import { useTranslation } from 'react-i18next'
 import InfiniteScroll from 'react-infinite-scroll-component'
+import cloneDeep from 'lodash.clonedeep'
 
 import api from '~utils/api'
 
-import {
-  Dialog,
-  DialogTrigger,
-  DialogContent,
-  DialogClose,
-} from '~components/Dialog'
-
+import { Dialog, DialogTrigger, DialogClose } from '~components/Dialog'
+import DialogContent from '~components/DialogContent'
 import Input from '~components/LabelledInput'
 import CharacterSearchFilterBar from '~components/CharacterSearchFilterBar'
 import WeaponSearchFilterBar from '~components/WeaponSearchFilterBar'
@@ -24,19 +20,18 @@ import WeaponResult from '~components/WeaponResult'
 import SummonResult from '~components/SummonResult'
 import JobSkillResult from '~components/JobSkillResult'
 
+import type { DialogProps } from '@radix-ui/react-dialog'
 import type { SearchableObject, SearchableObjectArray } from '~types'
 
 import './index.scss'
 import CrossIcon from '~public/icons/Cross.svg'
-import cloneDeep from 'lodash.clonedeep'
 
-interface Props {
+interface Props extends DialogProps {
   send: (object: SearchableObject, position: number) => any
   placeholderText: string
   fromPosition: number
   job?: Job
   object: 'weapons' | 'characters' | 'summons' | 'job_skills'
-  children: React.ReactNode
 }
 
 const SearchModal = (props: Props) => {
@@ -65,6 +60,10 @@ const SearchModal = (props: Props) => {
     if (searchInput.current) searchInput.current.focus()
   }, [searchInput])
 
+  useEffect(() => {
+    if (props.open !== undefined) setOpen(props.open)
+  })
+
   function inputChanged(event: React.ChangeEvent<HTMLInputElement>) {
     const text = event.target.value
     if (text.length) {
@@ -335,8 +334,10 @@ const SearchModal = (props: Props) => {
       setRecordCount(0)
       setCurrentPage(1)
       setOpen(false)
+      if (props.onOpenChange) props.onOpenChange(false)
     } else {
       setOpen(true)
+      if (props.onOpenChange) props.onOpenChange(true)
     }
   }
 
@@ -354,7 +355,7 @@ const SearchModal = (props: Props) => {
     <Dialog open={open} onOpenChange={openChange}>
       <DialogTrigger asChild>{props.children}</DialogTrigger>
       <DialogContent
-        className="Search Dialog"
+        className="Search"
         onEscapeKeyDown={onEscapeKeyDown}
         onOpenAutoFocus={onOpenAutoFocus}
       >
diff --git a/components/Select/index.scss b/components/Select/index.scss
index 4bcfa38c..e93026b7 100644
--- a/components/Select/index.scss
+++ b/components/Select/index.scss
@@ -14,6 +14,10 @@
     }
   }
 
+  &.hidden {
+    display: none;
+  }
+
   &:hover {
     background-color: var(--input-bg-hover);
     color: var(--text-primary);
@@ -24,6 +28,11 @@
     }
   }
 
+  &.Disabled:hover {
+    background-color: var(--input-bg);
+    cursor: not-allowed;
+  }
+
   &[data-placeholder] > span:not(.SelectIcon) {
     color: var(--text-secondary);
   }
diff --git a/components/Select/index.tsx b/components/Select/index.tsx
index 8d8945e1..ca0e0cf9 100644
--- a/components/Select/index.tsx
+++ b/components/Select/index.tsx
@@ -30,6 +30,14 @@ const Select = React.forwardRef<HTMLButtonElement, Props>(function Select(
   const [open, setOpen] = useState(false)
   const [value, setValue] = useState('')
 
+  const triggerClasses = classNames(
+    {
+      SelectTrigger: true,
+      Disabled: props.disabled,
+    },
+    props.triggerClass
+  )
+
   useEffect(() => {
     setOpen(props.open)
   }, [props.open])
@@ -67,14 +75,18 @@ const Select = React.forwardRef<HTMLButtonElement, Props>(function Select(
       onOpenChange={props.onOpenChange}
     >
       <RadixSelect.Trigger
-        className={classNames('SelectTrigger', props.triggerClass)}
+        className={triggerClasses}
         placeholder={props.placeholder}
         ref={forwardedRef}
       >
         <RadixSelect.Value placeholder={props.placeholder} />
-        <RadixSelect.Icon className="SelectIcon">
-          <ArrowIcon />
-        </RadixSelect.Icon>
+        {!props.disabled ? (
+          <RadixSelect.Icon className="SelectIcon">
+            <ArrowIcon />
+          </RadixSelect.Icon>
+        ) : (
+          ''
+        )}
       </RadixSelect.Trigger>
 
       <RadixSelect.Portal className="Select">
diff --git a/components/SelectWithInput/index.scss b/components/SelectWithInput/index.scss
new file mode 100644
index 00000000..659676be
--- /dev/null
+++ b/components/SelectWithInput/index.scss
@@ -0,0 +1,29 @@
+.SelectWithItem {
+  .InputSet {
+    display: flex;
+    flex-direction: row;
+    gap: $unit;
+    width: 100%;
+
+    .SelectTrigger {
+      flex-grow: 1;
+      width: 100%;
+    }
+
+    .Input {
+      flex-grow: 0;
+      text-align: right;
+      width: 13rem;
+    }
+  }
+
+  .errors {
+    color: $error;
+    display: none;
+    padding: $unit 0;
+
+    &.visible {
+      display: block;
+    }
+  }
+}
diff --git a/components/SelectWithInput/index.tsx b/components/SelectWithInput/index.tsx
new file mode 100644
index 00000000..7c88dfc6
--- /dev/null
+++ b/components/SelectWithInput/index.tsx
@@ -0,0 +1,200 @@
+// Core dependencies
+import React, { useEffect, useState } from 'react'
+import { useRouter } from 'next/router'
+import { useTranslation } from 'next-i18next'
+import classNames from 'classnames'
+
+// UI Dependencies
+import Input from '~components/Input'
+import Select from '~components/Select'
+import SelectItem from '~components/SelectItem'
+
+// Styles and icons
+import './index.scss'
+
+// Types
+interface Props {
+  object: 'ax' | 'weapon_awakening' | 'character_awakening' | 'ring' | 'earring'
+  dataSet: ItemSkill[]
+  selectValue: number
+  selectDisabled: boolean
+  inputValue: number
+  awakeningLevel?: number
+  onOpenChange?: (open: boolean) => void
+  sendValidity: (isValid: boolean) => void
+  sendValues: (type: number, level: number) => void
+}
+
+const defaultProps = {
+  selectDisabled: false,
+}
+
+const SelectWithInput = ({
+  object,
+  dataSet,
+  selectDisabled,
+  selectValue,
+  inputValue,
+  onOpenChange,
+  sendValidity,
+  sendValues,
+}: Props) => {
+  const router = useRouter()
+  const locale =
+    router.locale && ['en', 'ja'].includes(router.locale) ? router.locale : 'en'
+  const { t } = useTranslation('common')
+
+  // UI state
+  const [open, setOpen] = useState(false)
+
+  // Field properties
+  // prettier-ignore
+  const [currentItemSkill, setCurrentItemSkill] = useState<ItemSkill | undefined>(undefined)
+  const [fieldInputValue, setFieldInputValue] = useState(inputValue)
+
+  const [error, setError] = useState('')
+
+  // Refs
+  const input = React.createRef<HTMLInputElement>()
+
+  // Classes
+  const inputClasses = classNames({
+    Bound: true,
+    Hidden: currentItemSkill?.id === 0,
+  })
+
+  const errorClasses = classNames({
+    errors: true,
+    visible: error !== '',
+  })
+
+  // Hooks
+
+  // Set default values from props
+  useEffect(() => {
+    const found = dataSet.find((sk) => sk.id === selectValue)
+    if (found) {
+      setCurrentItemSkill(found)
+      setFieldInputValue(inputValue)
+    }
+  }, [selectValue, inputValue])
+
+  // Methods: UI state management
+  function changeOpen() {
+    if (!selectDisabled) {
+      setOpen(!open)
+      if (onOpenChange) onOpenChange(!open)
+    }
+  }
+
+  function onClose() {
+    if (onOpenChange) onOpenChange(false)
+  }
+
+  // Methods: Rendering
+  function generateOptions() {
+    let options: React.ReactNode[] = dataSet.map((skill, i) => {
+      return (
+        <SelectItem key={i} value={skill.id}>
+          {skill.name[locale]}
+        </SelectItem>
+      )
+    })
+
+    return options
+  }
+
+  // Methods: User input detection
+  function handleSelectChange(rawValue: string) {
+    const value = parseInt(rawValue)
+    const skill = dataSet.find((sk) => sk.id === value)
+
+    if (skill) {
+      setCurrentItemSkill(skill)
+      sendValues(skill.id, fieldInputValue)
+    }
+  }
+
+  function handleInputChange(event: React.ChangeEvent<HTMLInputElement>) {
+    const value = parseFloat(event.target.value)
+    if (handleInputError(value)) setFieldInputValue(value)
+
+    if (currentItemSkill) sendValues(currentItemSkill.id, value)
+  }
+
+  // Methods: Handle error
+  function handleInputError(value: number) {
+    let error = ''
+
+    if (currentItemSkill) {
+      if (value < currentItemSkill.minValue) {
+        error = t(`${object}.errors.value_too_low`, {
+          minValue: currentItemSkill.minValue,
+        })
+      } else if (value > currentItemSkill.maxValue) {
+        error = t(`${object}.errors.value_too_high`, {
+          maxValue: currentItemSkill.maxValue,
+        })
+      } else if (!currentItemSkill.fractional && value % 1 != 0) {
+        error = t(`${object}.errors.value_not_whole`)
+      } else if (!value || value <= 0) {
+        error = t(`${object}.errors.value_empty`)
+      } else {
+        error = ''
+      }
+    }
+
+    setError(error)
+
+    return error.length === 0
+  }
+
+  const rangeString = () => {
+    let placeholder = ''
+
+    if (currentItemSkill) {
+      const minValue = currentItemSkill.minValue
+      const maxValue = currentItemSkill.maxValue
+      placeholder = `${minValue}~${maxValue}`
+    }
+
+    return placeholder
+  }
+
+  return (
+    <div className="SelectWithItem">
+      <div className="InputSet">
+        <Select
+          key={`${currentItemSkill?.name.en}_type`}
+          value={`${currentItemSkill ? currentItemSkill.id : 0}`}
+          open={open}
+          disabled={selectDisabled}
+          onValueChange={handleSelectChange}
+          onOpenChange={changeOpen}
+          onClose={onClose}
+          triggerClass="modal"
+        >
+          {generateOptions()}
+        </Select>
+
+        <Input
+          value={fieldInputValue}
+          className={inputClasses}
+          type="number"
+          placeholder={rangeString()}
+          min={currentItemSkill?.minValue}
+          max={currentItemSkill?.maxValue}
+          step="1"
+          onChange={handleInputChange}
+          visible={currentItemSkill ? 'true' : 'false'}
+          ref={input}
+        />
+      </div>
+      <p className={errorClasses}>{error}</p>
+    </div>
+  )
+}
+
+SelectWithInput.defaultProps = defaultProps
+
+export default SelectWithInput
diff --git a/components/SignupModal/index.scss b/components/SignupModal/index.scss
index a7db71a9..7a7fc66a 100644
--- a/components/SignupModal/index.scss
+++ b/components/SignupModal/index.scss
@@ -1,21 +1,31 @@
-.Signup.Dialog form {
-  display: flex;
-  flex-direction: column;
-  gap: calc($unit / 2);
-  margin-bottom: $unit;
+.Signup.DialogContent {
+  gap: $unit;
+  min-width: $unit * 52;
 
-  .terms {
-    color: $grey-50;
-    font-size: $font-small;
-    line-height: 1.2;
-    margin-top: $unit;
-    text-align: center;
+  .DialogHeader {
+    padding: $unit-4x $unit-3x;
+  }
 
-    a {
-      color: $blue;
+  form {
+    display: flex;
+    flex-direction: column;
+    gap: calc($unit / 2);
+    margin-bottom: $unit-2x;
+    padding: 0 $unit-3x;
 
-      &:hover {
-        color: darken($blue, 30);
+    .terms {
+      color: $grey-50;
+      font-size: $font-small;
+      line-height: 1.2;
+      margin-top: $unit;
+      text-align: center;
+
+      a {
+        color: $blue;
+
+        &:hover {
+          color: darken($blue, 30);
+        }
       }
     }
   }
diff --git a/components/SignupModal/index.tsx b/components/SignupModal/index.tsx
index 95ab5bd3..3c745913 100644
--- a/components/SignupModal/index.tsx
+++ b/components/SignupModal/index.tsx
@@ -10,13 +10,8 @@ import { accountState } from '~utils/accountState'
 
 import Button from '~components/Button'
 import Input from '~components/LabelledInput'
-import {
-  Dialog,
-  DialogTrigger,
-  DialogContent,
-  DialogClose,
-} from '~components/Dialog'
-
+import { Dialog, DialogTrigger, DialogClose } from '~components/Dialog'
+import DialogContent from '~components/DialogContent'
 import CrossIcon from '~public/icons/Cross.svg'
 import './index.scss'
 
@@ -283,7 +278,7 @@ const SignupModal = (props: Props) => {
         </li>
       </DialogTrigger>
       <DialogContent
-        className="Signup Dialog"
+        className="Signup"
         onEscapeKeyDown={onEscapeKeyDown}
         onOpenAutoFocus={onOpenAutoFocus}
       >
diff --git a/components/SummonUnit/index.scss b/components/SummonUnit/index.scss
index 398d3ae3..efc7f263 100644
--- a/components/SummonUnit/index.scss
+++ b/components/SummonUnit/index.scss
@@ -42,7 +42,7 @@
     align-items: center;
     justify-content: center;
     overflow: hidden;
-    transition: all 0.18s ease-in-out;
+    transition: $duration-zoom all ease-in-out;
 
     &:hover .icon svg {
       fill: var(--icon-secondary-hover);
@@ -55,6 +55,7 @@
       z-index: 1;
 
       svg {
+        transition: $duration-color-fade fill ease-in-out;
         fill: var(--icon-secondary);
       }
     }
diff --git a/components/WeaponConflictModal/index.tsx b/components/WeaponConflictModal/index.tsx
index ce7b6620..d1a9a3c7 100644
--- a/components/WeaponConflictModal/index.tsx
+++ b/components/WeaponConflictModal/index.tsx
@@ -2,7 +2,8 @@ import React, { useEffect, useState } from 'react'
 import { useRouter } from 'next/router'
 import { Trans, useTranslation } from 'react-i18next'
 
-import { Dialog, DialogContent } from '~components/Dialog'
+import { Dialog } from '~components/Dialog'
+import DialogContent from '~components/DialogContent'
 import Button from '~components/Button'
 import Overlay from '~components/Overlay'
 
@@ -65,7 +66,7 @@ const WeaponConflictModal = (props: Props) => {
   return (
     <Dialog open={open} onOpenChange={openChange}>
       <DialogContent
-        className="Conflict Dialog"
+        className="Conflict"
         onOpenAutoFocus={(event) => event.preventDefault()}
         onEscapeKeyDown={close}
       >
diff --git a/components/WeaponGrid/index.tsx b/components/WeaponGrid/index.tsx
index f9312a5d..8ffc549f 100644
--- a/components/WeaponGrid/index.tsx
+++ b/components/WeaponGrid/index.tsx
@@ -7,18 +7,18 @@ import { useTranslation } from 'next-i18next'
 import { AxiosResponse } from 'axios'
 import debounce from 'lodash.debounce'
 
+import Alert from '~components/Alert'
 import WeaponUnit from '~components/WeaponUnit'
 import ExtraWeapons from '~components/ExtraWeapons'
+import WeaponConflictModal from '~components/WeaponConflictModal'
 
 import api from '~utils/api'
 import { appState } from '~utils/appState'
+import { accountState } from '~utils/accountState'
 
 import type { DetailsObject, SearchableObject } from '~types'
 
 import './index.scss'
-import WeaponConflictModal from '~components/WeaponConflictModal'
-import Alert from '~components/Alert'
-import { accountState } from '~utils/accountState'
 
 // Props
 interface Props {
@@ -198,6 +198,21 @@ const WeaponGrid = (props: Props) => {
     setIncoming(undefined)
   }
 
+  async function removeWeapon(id: string) {
+    try {
+      const response = await api.endpoints.grid_weapons.destroy({ id: id })
+      const data = response.data
+
+      if (data.position === -1) {
+        appState.grid.weapons.mainWeapon = undefined
+      } else {
+        appState.grid.weapons.allWeapons[response.data.position] = undefined
+      }
+    } catch (error) {
+      console.error(error)
+    }
+  }
+
   // Methods: Updating uncap level
   // Note: Saves, but debouncing is not working properly
   async function saveUncap(id: string, position: number, uncapLevel: number) {
@@ -254,7 +269,7 @@ const WeaponGrid = (props: Props) => {
   )
 
   const updateUncapLevel = (position: number, uncapLevel: number) => {
-    console.log(`Updating uncap level at position ${position} to ${uncapLevel}`)
+    // console.log(`Updating uncap level at position ${position} to ${uncapLevel}`)
     if (appState.grid.weapons.mainWeapon && position == -1)
       appState.grid.weapons.mainWeapon.uncap_level = uncapLevel
     else {
@@ -292,6 +307,7 @@ const WeaponGrid = (props: Props) => {
       key="grid_mainhand"
       position={-1}
       unitType={0}
+      removeWeapon={removeWeapon}
       updateObject={receiveWeaponFromSearch}
       updateUncap={initiateUncapUpdate}
     />
@@ -305,6 +321,7 @@ const WeaponGrid = (props: Props) => {
           editable={party.editable}
           position={i}
           unitType={1}
+          removeWeapon={removeWeapon}
           updateObject={receiveWeaponFromSearch}
           updateUncap={initiateUncapUpdate}
         />
diff --git a/components/WeaponHovercard/index.tsx b/components/WeaponHovercard/index.tsx
index fa9afe3b..02a373e2 100644
--- a/components/WeaponHovercard/index.tsx
+++ b/components/WeaponHovercard/index.tsx
@@ -7,7 +7,7 @@ import * as HoverCard from '@radix-ui/react-hover-card'
 import WeaponLabelIcon from '~components/WeaponLabelIcon'
 import UncapIndicator from '~components/UncapIndicator'
 
-import { axData } from '~utils/axData'
+import ax from '~data/ax'
 
 import './index.scss'
 
@@ -80,7 +80,7 @@ const WeaponHovercard = (props: Props) => {
   }
 
   const createPrimaryAxSkillString = () => {
-    const primaryAxSkills = axData[props.gridWeapon.object.ax_type - 1]
+    const primaryAxSkills = ax[props.gridWeapon.object.ax_type - 1]
 
     if (props.gridWeapon.ax) {
       const simpleAxSkill = props.gridWeapon.ax[0]
@@ -97,7 +97,7 @@ const WeaponHovercard = (props: Props) => {
   }
 
   const createSecondaryAxSkillString = () => {
-    const primaryAxSkills = axData[props.gridWeapon.object.ax_type - 1]
+    const primaryAxSkills = ax[props.gridWeapon.object.ax_type - 1]
 
     if (props.gridWeapon.ax) {
       const primarySimpleAxSkill = props.gridWeapon.ax[0]
diff --git a/components/WeaponModal/index.scss b/components/WeaponModal/index.scss
index 0983755d..690a8864 100644
--- a/components/WeaponModal/index.scss
+++ b/components/WeaponModal/index.scss
@@ -1,14 +1,41 @@
-.Weapon.Dialog {
+.Weapon.DialogContent {
+  gap: $unit;
   min-width: 480px;
 
   @include breakpoint(phone) {
     min-width: inherit;
   }
 
+  .DialogHeader {
+    transition: 0.18s padding-top ease-in-out;
+    position: sticky;
+    top: 0;
+
+    &.Scrolled {
+      border-bottom: 1px solid rgba(0, 0, 0, 0.2);
+      box-shadow: 0 1px 12px rgba(0, 0, 0, 0.34);
+      padding-top: $unit-2x;
+    }
+
+    img {
+      transition: 0.2s width ease-in-out;
+      width: $unit-6x !important;
+    }
+
+    .DialogTitle {
+      font-size: $font-large;
+    }
+
+    .SubTitle {
+      display: none;
+    }
+  }
+
   .mods {
     display: flex;
     flex-direction: column;
     gap: $unit * 4;
+    padding: 0 $unit-4x;
 
     section {
       display: flex;
diff --git a/components/WeaponModal/index.tsx b/components/WeaponModal/index.tsx
index cb88311f..00569c73 100644
--- a/components/WeaponModal/index.tsx
+++ b/components/WeaponModal/index.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react'
+import React, { PropsWithChildren, useEffect, useState } from 'react'
 import { getCookie } from 'cookies-next'
 import { useRouter } from 'next/router'
 import { useTranslation } from 'next-i18next'
@@ -7,11 +7,10 @@ import { AxiosResponse } from 'axios'
 import {
   Dialog,
   DialogClose,
-  DialogContent,
   DialogTitle,
   DialogTrigger,
 } from '~components/Dialog'
-
+import DialogContent from '~components/DialogContent'
 import AXSelect from '~components/AxSelect'
 import AwakeningSelect from '~components/AwakeningSelect'
 import ElementToggle from '~components/ElementToggle'
@@ -41,10 +40,16 @@ interface GridWeaponObject {
 
 interface Props {
   gridWeapon: GridWeapon
-  children: React.ReactNode
+  open: boolean
+  onOpenChange: (open: boolean) => void
 }
 
-const WeaponModal = (props: Props) => {
+const WeaponModal = ({
+  gridWeapon,
+  open: modalOpen,
+  children,
+  onOpenChange,
+}: PropsWithChildren<Props>) => {
   const router = useRouter()
   const locale =
     router.locale && ['en', 'ja'].includes(router.locale) ? router.locale : 'en'
@@ -65,7 +70,7 @@ const WeaponModal = (props: Props) => {
 
   const [element, setElement] = useState(-1)
 
-  const [awakeningType, setAwakeningType] = useState(-1)
+  const [awakeningType, setAwakeningType] = useState(0)
   const [awakeningLevel, setAwakeningLevel] = useState(1)
 
   const [primaryAxModifier, setPrimaryAxModifier] = useState(-1)
@@ -89,10 +94,14 @@ const WeaponModal = (props: Props) => {
   const [awakeningOpen, setAwakeningOpen] = useState(false)
 
   useEffect(() => {
-    setElement(props.gridWeapon.element)
+    setOpen(modalOpen)
+  }, [modalOpen])
 
-    if (props.gridWeapon.weapon_keys) {
-      props.gridWeapon.weapon_keys.forEach((key) => {
+  useEffect(() => {
+    setElement(gridWeapon.element)
+
+    if (gridWeapon.weapon_keys) {
+      gridWeapon.weapon_keys.forEach((key) => {
         if (key.slot + 1 === 1) {
           setWeaponKey1(key)
         } else if (key.slot + 1 === 2) {
@@ -102,7 +111,7 @@ const WeaponModal = (props: Props) => {
         }
       })
     }
-  }, [props])
+  }, [gridWeapon])
 
   function receiveAxValues(
     primaryAxModifier: number,
@@ -133,29 +142,26 @@ const WeaponModal = (props: Props) => {
   function prepareObject() {
     let object: GridWeaponObject = { weapon: {} }
 
-    if (props.gridWeapon.object.element == 0) object.weapon.element = element
+    if (gridWeapon.object.element == 0) object.weapon.element = element
 
-    if (
-      [2, 3, 17, 24].includes(props.gridWeapon.object.series) &&
-      weaponKey1Id
-    ) {
+    if ([2, 3, 17, 24].includes(gridWeapon.object.series) && weaponKey1Id) {
       object.weapon.weapon_key1_id = weaponKey1Id
     }
 
-    if ([2, 3, 17].includes(props.gridWeapon.object.series) && weaponKey2Id)
+    if ([2, 3, 17].includes(gridWeapon.object.series) && weaponKey2Id)
       object.weapon.weapon_key2_id = weaponKey2Id
 
-    if (props.gridWeapon.object.series == 17 && weaponKey3Id)
+    if (gridWeapon.object.series == 17 && weaponKey3Id)
       object.weapon.weapon_key3_id = weaponKey3Id
 
-    if (props.gridWeapon.object.ax && props.gridWeapon.object.ax_type > 0) {
+    if (gridWeapon.object.ax && gridWeapon.object.ax_type > 0) {
       object.weapon.ax_modifier1 = primaryAxModifier
       object.weapon.ax_modifier2 = secondaryAxModifier
       object.weapon.ax_strength1 = primaryAxValue
       object.weapon.ax_strength2 = secondaryAxValue
     }
 
-    if (props.gridWeapon.object.awakening) {
+    if (gridWeapon.object.awakening) {
       object.weapon.awakening_type = awakeningType
       object.weapon.awakening_level = awakeningLevel
     }
@@ -166,7 +172,7 @@ const WeaponModal = (props: Props) => {
   async function updateWeapon() {
     const updateObject = prepareObject()
     return await api.endpoints.grid_weapons
-      .update(props.gridWeapon.id, updateObject, headers)
+      .update(gridWeapon.id, updateObject, headers)
       .then((response) => processResult(response))
       .catch((error) => processError(error))
   }
@@ -222,11 +228,11 @@ const WeaponModal = (props: Props) => {
     return (
       <section>
         <h3>{t('modals.weapon.subtitles.weapon_keys')}</h3>
-        {[2, 3, 17, 22].includes(props.gridWeapon.object.series) ? (
+        {[2, 3, 17, 22].includes(gridWeapon.object.series) ? (
           <WeaponKeySelect
             open={weaponKey1Open}
             currentValue={weaponKey1 != null ? weaponKey1 : undefined}
-            series={props.gridWeapon.object.series}
+            series={gridWeapon.object.series}
             slot={0}
             onOpenChange={() => openSelect(1)}
             onChange={receiveWeaponKey}
@@ -236,11 +242,11 @@ const WeaponModal = (props: Props) => {
           ''
         )}
 
-        {[2, 3, 17].includes(props.gridWeapon.object.series) ? (
+        {[2, 3, 17].includes(gridWeapon.object.series) ? (
           <WeaponKeySelect
             open={weaponKey2Open}
             currentValue={weaponKey2 != null ? weaponKey2 : undefined}
-            series={props.gridWeapon.object.series}
+            series={gridWeapon.object.series}
             slot={1}
             onOpenChange={() => openSelect(2)}
             onChange={receiveWeaponKey}
@@ -250,11 +256,11 @@ const WeaponModal = (props: Props) => {
           ''
         )}
 
-        {props.gridWeapon.object.series == 17 ? (
+        {gridWeapon.object.series == 17 ? (
           <WeaponKeySelect
             open={weaponKey3Open}
             currentValue={weaponKey3 != null ? weaponKey3 : undefined}
-            series={props.gridWeapon.object.series}
+            series={gridWeapon.object.series}
             slot={2}
             onOpenChange={() => openSelect(3)}
             onChange={receiveWeaponKey}
@@ -264,12 +270,11 @@ const WeaponModal = (props: Props) => {
           ''
         )}
 
-        {props.gridWeapon.object.series == 24 &&
-        props.gridWeapon.object.uncap.ulb ? (
+        {gridWeapon.object.series == 24 && gridWeapon.object.uncap.ulb ? (
           <WeaponKeySelect
             open={weaponKey4Open}
             currentValue={weaponKey1 != null ? weaponKey1 : undefined}
-            series={props.gridWeapon.object.series}
+            series={gridWeapon.object.series}
             slot={0}
             onOpenChange={() => openSelect(4)}
             onChange={receiveWeaponKey}
@@ -287,8 +292,8 @@ const WeaponModal = (props: Props) => {
       <section>
         <h3>{t('modals.weapon.subtitles.ax_skills')}</h3>
         <AXSelect
-          axType={props.gridWeapon.object.ax_type}
-          currentSkills={props.gridWeapon.ax}
+          axType={gridWeapon.object.ax_type}
+          currentSkills={gridWeapon.ax}
           onOpenChange={receiveAxOpen}
           sendValidity={receiveValidity}
           sendValues={receiveAxValues}
@@ -303,8 +308,8 @@ const WeaponModal = (props: Props) => {
         <h3>{t('modals.weapon.subtitles.awakening')}</h3>
         <AwakeningSelect
           object="weapon"
-          awakeningType={props.gridWeapon.awakening?.type}
-          awakeningLevel={props.gridWeapon.awakening?.level}
+          type={gridWeapon.awakening?.type}
+          level={gridWeapon.awakening?.level}
           onOpenChange={receiveAwakeningOpen}
           sendValidity={receiveValidity}
           sendValues={receiveAwakeningValues}
@@ -313,13 +318,14 @@ const WeaponModal = (props: Props) => {
     )
   }
 
-  function openChange(open: boolean) {
-    if (props.gridWeapon.object.ax || props.gridWeapon.object.awakening) {
+  function handleOpenChange(open: boolean) {
+    if (gridWeapon.object.ax || gridWeapon.object.awakening) {
       setFormValid(false)
     } else {
       setFormValid(true)
     }
     setOpen(open)
+    onOpenChange(open)
   }
 
   const anySelectOpen =
@@ -341,20 +347,25 @@ const WeaponModal = (props: Props) => {
 
   return (
     // TODO: Refactor into Dialog component
-    <Dialog open={open} onOpenChange={openChange}>
-      <DialogTrigger asChild>{props.children}</DialogTrigger>
+    <Dialog open={open} onOpenChange={handleOpenChange}>
+      <DialogTrigger asChild>{children}</DialogTrigger>
       <DialogContent
-        className="Weapon Dialog"
+        className="Weapon"
         onOpenAutoFocus={(event) => event.preventDefault()}
         onEscapeKeyDown={onEscapeKeyDown}
       >
         <div className="DialogHeader">
+          <img
+            alt={gridWeapon.object.name[locale]}
+            className="DialogImage"
+            src={`${process.env.NEXT_PUBLIC_SIERO_IMG_URL}/weapon-square/${gridWeapon.object.granblue_id}.jpg`}
+          />
           <div className="DialogTop">
             <DialogTitle className="SubTitle">
               {t('modals.weapon.title')}
             </DialogTitle>
             <DialogTitle className="DialogTitle">
-              {props.gridWeapon.object.name[locale]}
+              {gridWeapon.object.name[locale]}
             </DialogTitle>
           </div>
           <DialogClose className="DialogClose" asChild>
@@ -365,12 +376,12 @@ const WeaponModal = (props: Props) => {
         </div>
 
         <div className="mods">
-          {props.gridWeapon.object.element == 0 ? elementSelect() : ''}
-          {[2, 3, 17, 24].includes(props.gridWeapon.object.series)
-            ? keySelect()
-            : ''}
-          {props.gridWeapon.object.ax ? axSelect() : ''}
-          {props.gridWeapon.awakening ? awakeningSelect() : ''}
+          {gridWeapon.object.element == 0 ? elementSelect() : ''}
+          {[2, 3, 17, 24].includes(gridWeapon.object.series) ? keySelect() : ''}
+          {gridWeapon.object.ax ? axSelect() : ''}
+          {gridWeapon.awakening ? awakeningSelect() : ''}
+        </div>
+        <div className="DialogFooter">
           <Button
             contained={true}
             onClick={updateWeapon}
diff --git a/components/WeaponSearchFilterBar/index.tsx b/components/WeaponSearchFilterBar/index.tsx
index dd7fdba1..3839d7e1 100644
--- a/components/WeaponSearchFilterBar/index.tsx
+++ b/components/WeaponSearchFilterBar/index.tsx
@@ -16,7 +16,7 @@ import {
   emptyWeaponSeriesState,
 } from '~utils/emptyStates'
 import { elements, proficiencies, rarities } from '~utils/stateValues'
-import { weaponSeries } from '~utils/weaponSeries'
+import { weaponSeries } from '~data/weaponSeries'
 
 interface Props {
   sendFilters: (filters: { [key: string]: number[] }) => void
diff --git a/components/WeaponUnit/index.scss b/components/WeaponUnit/index.scss
index c9e20df4..12ec3378 100644
--- a/components/WeaponUnit/index.scss
+++ b/components/WeaponUnit/index.scss
@@ -12,8 +12,16 @@
     min-height: auto;
   }
 
-  &:hover .Button {
-    display: block;
+  .Button {
+    pointer-events: none;
+    opacity: 0;
+    z-index: 10;
+  }
+
+  &:hover .Button,
+  .Button.Clicked {
+    pointer-events: initial;
+    opacity: 1;
   }
 
   &.editable .WeaponImage:hover {
@@ -95,15 +103,6 @@
     display: none;
   }
 
-  .Button {
-    box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.14);
-    display: none;
-    position: absolute;
-    left: $unit;
-    top: $unit;
-    z-index: 10;
-  }
-
   h3 {
     color: var(--text-primary);
     font-size: $font-button;
@@ -123,7 +122,7 @@
     margin-bottom: calc($unit / 4);
     overflow: hidden;
     position: relative;
-    transition: all 0.18s ease-in-out;
+    transition: $duration-zoom all ease-in-out;
 
     &:hover .icon svg {
       fill: var(--icon-secondary-hover);
@@ -170,6 +169,7 @@
       z-index: 1;
 
       svg {
+        transition: $duration-color-fade fill ease-in-out;
         fill: var(--icon-secondary);
       }
     }
diff --git a/components/WeaponUnit/index.tsx b/components/WeaponUnit/index.tsx
index 58cfd80b..2c18cf53 100644
--- a/components/WeaponUnit/index.tsx
+++ b/components/WeaponUnit/index.tsx
@@ -1,18 +1,25 @@
-import React, { useEffect, useState } from 'react'
+import React, { useEffect, useState, MouseEvent } from 'react'
 import { useRouter } from 'next/router'
-import { useTranslation } from 'next-i18next'
+import { Trans, useTranslation } from 'next-i18next'
 import classNames from 'classnames'
 
+import Alert from '~components/Alert'
 import SearchModal from '~components/SearchModal'
 import WeaponModal from '~components/WeaponModal'
+import {
+  ContextMenu,
+  ContextMenuTrigger,
+  ContextMenuContent,
+} from '~components/ContextMenu'
+import ContextMenuItem from '~components/ContextMenuItem'
 import WeaponHovercard from '~components/WeaponHovercard'
 import UncapIndicator from '~components/UncapIndicator'
 import Button from '~components/Button'
 
 import type { SearchableObject } from '~types'
 
-import { axData } from '~utils/axData'
-import { weaponAwakening } from '~utils/awakening'
+import ax from '~data/ax'
+import { weaponAwakening } from '~data/awakening'
 
 import PlusIcon from '~public/icons/Add.svg'
 import SettingsIcon from '~public/icons/Settings.svg'
@@ -23,48 +30,147 @@ interface Props {
   unitType: 0 | 1
   position: number
   editable: boolean
+  removeWeapon: (id: string) => void
   updateObject: (object: SearchableObject, position: number) => void
   updateUncap: (id: string, position: number, uncap: number) => void
 }
 
-const WeaponUnit = (props: Props) => {
+const WeaponUnit = ({
+  gridWeapon,
+  unitType,
+  position,
+  editable,
+  removeWeapon: sendWeaponToRemove,
+  updateObject,
+  updateUncap,
+}: Props) => {
+  // Translations and locale
   const { t } = useTranslation('common')
-
-  const [imageUrl, setImageUrl] = useState('')
-
   const router = useRouter()
   const locale =
     router.locale && ['en', 'ja'].includes(router.locale) ? router.locale : 'en'
 
+  // State: UI
+  const [detailsModalOpen, setDetailsModalOpen] = useState(false)
+  const [searchModalOpen, setSearchModalOpen] = useState(false)
+  const [contextMenuOpen, setContextMenuOpen] = useState(false)
+  const [alertOpen, setAlertOpen] = useState(false)
+
+  // State: Other
+  const [imageUrl, setImageUrl] = useState('')
+
+  // Classes
   const classes = classNames({
     WeaponUnit: true,
-    mainhand: props.unitType == 0,
-    grid: props.unitType == 1,
-    editable: props.editable,
-    filled: props.gridWeapon !== undefined,
-    empty: props.gridWeapon == undefined,
+    mainhand: unitType == 0,
+    grid: unitType == 1,
+    editable: editable,
+    filled: gridWeapon !== undefined,
+    empty: gridWeapon == undefined,
   })
 
-  const gridWeapon = props.gridWeapon
+  const buttonClasses = classNames({
+    Options: true,
+    Clicked: contextMenuOpen,
+  })
+
+  // Other
   const weapon = gridWeapon?.object
 
+  // Hooks
   useEffect(() => {
     generateImageUrl()
   })
 
+  // Methods: Convenience
+  function canBeModified(gridWeapon: GridWeapon) {
+    const weapon = gridWeapon.object
+
+    return (
+      weapon.ax ||
+      weapon.awakening ||
+      (weapon.series && [2, 3, 17, 22, 24].includes(weapon.series))
+    )
+  }
+
+  // Methods: Open layer
+  function openWeaponModal(event: Event) {
+    setDetailsModalOpen(true)
+  }
+
+  function openSearchModal(event: MouseEvent<HTMLDivElement>) {
+    if (editable) setSearchModalOpen(true)
+  }
+
+  function openRemoveWeaponAlert() {
+    setAlertOpen(true)
+  }
+
+  // Methods: Handle button clicked
+  function handleButtonClicked() {
+    setContextMenuOpen(!contextMenuOpen)
+  }
+
+  // Methods: Handle open change
+  function handleContextMenuOpenChange(open: boolean) {
+    if (!open) setContextMenuOpen(false)
+  }
+
+  function handleWeaponModalOpenChange(open: boolean) {
+    setDetailsModalOpen(open)
+  }
+
+  function handleSearchModalOpenChange(open: boolean) {
+    setSearchModalOpen(open)
+  }
+
+  // Methods: Mutate data
+  function passUncapData(index: number) {
+    if (gridWeapon) updateUncap(gridWeapon.id, position, index)
+  }
+
+  function removeWeapon() {
+    if (gridWeapon) sendWeaponToRemove(gridWeapon.id)
+  }
+
+  // Methods: Data fetching and manipulation
+  function getCanonicalAxSkill(index: number) {
+    if (
+      gridWeapon &&
+      gridWeapon.object.ax &&
+      gridWeapon.object.ax_type > 0 &&
+      gridWeapon.ax
+    ) {
+      const axOptions = ax[gridWeapon.object.ax_type - 1]
+      const weaponAxSkill: SimpleAxSkill = gridWeapon.ax[0]
+
+      let axSkill = axOptions.find((ax) => ax.id === weaponAxSkill.modifier)
+
+      if (index !== 0 && axSkill && axSkill.secondary) {
+        const weaponSubAxSkill: SimpleAxSkill = gridWeapon.ax[1]
+        axSkill = axSkill.secondary.find(
+          (ax) => ax.id === weaponSubAxSkill.modifier
+        )
+      }
+
+      return axSkill
+    } else return
+  }
+
+  // Methods: Image string generation
   function generateImageUrl() {
     let imgSrc = ''
-    if (props.gridWeapon) {
-      const weapon = props.gridWeapon.object!
+    if (gridWeapon) {
+      const weapon = gridWeapon.object!
 
-      if (props.unitType == 0) {
-        if (props.gridWeapon.object.element == 0 && props.gridWeapon.element)
-          imgSrc = `${process.env.NEXT_PUBLIC_SIERO_IMG_URL}/weapon-main/${weapon.granblue_id}_${props.gridWeapon.element}.jpg`
+      if (unitType == 0) {
+        if (gridWeapon.object.element == 0 && gridWeapon.element)
+          imgSrc = `${process.env.NEXT_PUBLIC_SIERO_IMG_URL}/weapon-main/${weapon.granblue_id}_${gridWeapon.element}.jpg`
         else
           imgSrc = `${process.env.NEXT_PUBLIC_SIERO_IMG_URL}/weapon-main/${weapon.granblue_id}.jpg`
       } else {
-        if (props.gridWeapon.object.element == 0 && props.gridWeapon.element)
-          imgSrc = `${process.env.NEXT_PUBLIC_SIERO_IMG_URL}/weapon-grid/${weapon.granblue_id}_${props.gridWeapon.element}.jpg`
+        if (gridWeapon.object.element == 0 && gridWeapon.element)
+          imgSrc = `${process.env.NEXT_PUBLIC_SIERO_IMG_URL}/weapon-grid/${weapon.granblue_id}_${gridWeapon.element}.jpg`
         else
           imgSrc = `${process.env.NEXT_PUBLIC_SIERO_IMG_URL}/weapon-grid/${weapon.granblue_id}.jpg`
       }
@@ -74,29 +180,30 @@ const WeaponUnit = (props: Props) => {
   }
 
   function placeholderImageUrl() {
-    return props.unitType == 0
+    return unitType == 0
       ? '/images/placeholders/placeholder-weapon-main.png'
       : '/images/placeholders/placeholder-weapon-grid.png'
   }
 
+  // Methods: Image element rendering
   function awakeningImage() {
     if (
-      props.gridWeapon &&
-      props.gridWeapon.object.awakening &&
-      props.gridWeapon.awakening &&
-      props.gridWeapon.awakening.type >= 0 &&
-      props.gridWeapon.awakening.type != null
+      gridWeapon &&
+      gridWeapon.object.awakening &&
+      gridWeapon.awakening &&
+      gridWeapon.awakening.type > 0 &&
+      gridWeapon.awakening.type != null
     ) {
       const awakening = weaponAwakening.find(
-        (awakening) => awakening.id === props.gridWeapon?.awakening?.type
+        (awakening) => awakening.id === gridWeapon?.awakening?.type
       )
       const name = awakening?.name[locale]
 
       return (
         <img
-          alt={`${name} Lv${props.gridWeapon.awakening.level}`}
+          alt={`${name} Lv${gridWeapon.awakening.level}`}
           className="Awakening"
-          src={`${process.env.NEXT_PUBLIC_SIERO_IMG_URL}/awakening/weapon_${props.gridWeapon.awakening.type}.png`}
+          src={`${process.env.NEXT_PUBLIC_SIERO_IMG_URL}/awakening/weapon_${gridWeapon.awakening.type}.png`}
         />
       )
     }
@@ -109,18 +216,18 @@ const WeaponUnit = (props: Props) => {
 
     // If there is a grid weapon, it is a Draconic Weapon and it has keys
     if (
-      props.gridWeapon &&
-      props.gridWeapon.object.series === 3 &&
-      props.gridWeapon.weapon_keys
+      gridWeapon &&
+      gridWeapon.object.series === 3 &&
+      gridWeapon.weapon_keys
     ) {
-      if (index === 0 && props.gridWeapon.weapon_keys[0]) {
-        altText = `${props.gridWeapon.weapon_keys[0].name[locale]}`
-        filename = `${props.gridWeapon.weapon_keys[0].slug}.png`
-      } else if (index === 1 && props.gridWeapon.weapon_keys[1]) {
-        altText = `${props.gridWeapon.weapon_keys[1].name[locale]}`
+      if (index === 0 && gridWeapon.weapon_keys[0]) {
+        altText = `${gridWeapon.weapon_keys[0].name[locale]}`
+        filename = `${gridWeapon.weapon_keys[0].slug}.png`
+      } else if (index === 1 && gridWeapon.weapon_keys[1]) {
+        altText = `${gridWeapon.weapon_keys[1].name[locale]}`
 
-        const element = props.gridWeapon.object.element
-        filename = `${props.gridWeapon.weapon_keys[1].slug}-${element}.png`
+        const element = gridWeapon.object.element
+        filename = `${gridWeapon.weapon_keys[1].slug}-${element}.png`
       }
 
       return (
@@ -137,12 +244,12 @@ const WeaponUnit = (props: Props) => {
   function telumaImages() {
     let images: JSX.Element[] = []
     if (
-      props.gridWeapon &&
-      props.gridWeapon.object.series === 3 &&
-      props.gridWeapon.weapon_keys &&
-      props.gridWeapon.weapon_keys.length > 0
+      gridWeapon &&
+      gridWeapon.object.series === 3 &&
+      gridWeapon.weapon_keys &&
+      gridWeapon.weapon_keys.length > 0
     ) {
-      for (let i = 0; i < props.gridWeapon.weapon_keys.length; i++) {
+      for (let i = 0; i < gridWeapon.weapon_keys.length; i++) {
         const image = telumaImage(i)
         if (image) images.push(image)
       }
@@ -158,27 +265,27 @@ const WeaponUnit = (props: Props) => {
 
     // If there is a grid weapon, it is a Dark Opus Weapon and it has keys
     if (
-      props.gridWeapon &&
-      props.gridWeapon.object.series === 17 &&
-      props.gridWeapon.weapon_keys
+      gridWeapon &&
+      gridWeapon.object.series === 17 &&
+      gridWeapon.weapon_keys
     ) {
       if (
-        props.gridWeapon.weapon_keys[index] &&
-        (props.gridWeapon.weapon_keys[index].slot === 1 ||
-          props.gridWeapon.weapon_keys[index].slot === 2)
+        gridWeapon.weapon_keys[index] &&
+        (gridWeapon.weapon_keys[index].slot === 1 ||
+          gridWeapon.weapon_keys[index].slot === 2)
       ) {
-        altText = `${props.gridWeapon.weapon_keys[index].name[locale]}`
-        filename = `${props.gridWeapon.weapon_keys[index].slug}.png`
+        altText = `${gridWeapon.weapon_keys[index].name[locale]}`
+        filename = `${gridWeapon.weapon_keys[index].slug}.png`
       } else if (
-        props.gridWeapon.weapon_keys[index] &&
-        props.gridWeapon.weapon_keys[index].slot === 0
+        gridWeapon.weapon_keys[index] &&
+        gridWeapon.weapon_keys[index].slot === 0
       ) {
-        altText = `${props.gridWeapon.weapon_keys[index].name[locale]}`
+        altText = `${gridWeapon.weapon_keys[index].name[locale]}`
 
-        const weapon = props.gridWeapon.object.proficiency
+        const weapon = gridWeapon.object.proficiency
 
         const suffix = `${weapon}`
-        filename = `${props.gridWeapon.weapon_keys[index].slug}-${suffix}.png`
+        filename = `${gridWeapon.weapon_keys[index].slug}-${suffix}.png`
       }
     }
 
@@ -195,12 +302,12 @@ const WeaponUnit = (props: Props) => {
   function ultimaImages() {
     let images: JSX.Element[] = []
     if (
-      props.gridWeapon &&
-      props.gridWeapon.object.series === 17 &&
-      props.gridWeapon.weapon_keys &&
-      props.gridWeapon.weapon_keys.length > 0
+      gridWeapon &&
+      gridWeapon.object.series === 17 &&
+      gridWeapon.weapon_keys &&
+      gridWeapon.weapon_keys.length > 0
     ) {
-      for (let i = 0; i < props.gridWeapon.weapon_keys.length; i++) {
+      for (let i = 0; i < gridWeapon.weapon_keys.length; i++) {
         const image = ultimaImage(i)
         if (image) images.push(image)
       }
@@ -216,29 +323,29 @@ const WeaponUnit = (props: Props) => {
 
     // If there is a grid weapon, it is a Dark Opus Weapon and it has keys
     if (
-      props.gridWeapon &&
-      props.gridWeapon.object.series === 2 &&
-      props.gridWeapon.weapon_keys
+      gridWeapon &&
+      gridWeapon.object.series === 2 &&
+      gridWeapon.weapon_keys
     ) {
       if (
-        props.gridWeapon.weapon_keys[index] &&
-        props.gridWeapon.weapon_keys[index].slot === 0
+        gridWeapon.weapon_keys[index] &&
+        gridWeapon.weapon_keys[index].slot === 0
       ) {
-        altText = `${props.gridWeapon.weapon_keys[index].name[locale]}`
-        filename = `${props.gridWeapon.weapon_keys[index].slug}.png`
+        altText = `${gridWeapon.weapon_keys[index].name[locale]}`
+        filename = `${gridWeapon.weapon_keys[index].slug}.png`
       } else if (
-        props.gridWeapon.weapon_keys[index] &&
-        props.gridWeapon.weapon_keys[index].slot === 1
+        gridWeapon.weapon_keys[index] &&
+        gridWeapon.weapon_keys[index].slot === 1
       ) {
-        altText = `${props.gridWeapon.weapon_keys[index].name[locale]}`
+        altText = `${gridWeapon.weapon_keys[index].name[locale]}`
 
-        const element = props.gridWeapon.object.element
-        const mod = props.gridWeapon.object.name.en.includes('Repudiation')
+        const element = gridWeapon.object.element
+        const mod = gridWeapon.object.name.en.includes('Repudiation')
           ? 'primal'
           : 'magna'
 
         const suffix = `${mod}-${element}`
-        const weaponKey = props.gridWeapon.weapon_keys[index]
+        const weaponKey = gridWeapon.weapon_keys[index]
 
         if (
           [
@@ -250,9 +357,9 @@ const WeaponUnit = (props: Props) => {
             'chain-glorification',
           ].includes(weaponKey.slug)
         ) {
-          filename = `${props.gridWeapon.weapon_keys[index].slug}-${suffix}.png`
+          filename = `${gridWeapon.weapon_keys[index].slug}-${suffix}.png`
         } else {
-          filename = `${props.gridWeapon.weapon_keys[index].slug}.png`
+          filename = `${gridWeapon.weapon_keys[index].slug}.png`
         }
       }
 
@@ -270,12 +377,12 @@ const WeaponUnit = (props: Props) => {
   function opusImages() {
     let images: JSX.Element[] = []
     if (
-      props.gridWeapon &&
-      props.gridWeapon.object.series === 2 &&
-      props.gridWeapon.weapon_keys &&
-      props.gridWeapon.weapon_keys.length > 0
+      gridWeapon &&
+      gridWeapon.object.series === 2 &&
+      gridWeapon.weapon_keys &&
+      gridWeapon.weapon_keys.length > 0
     ) {
-      for (let i = 0; i < props.gridWeapon.weapon_keys.length; i++) {
+      for (let i = 0; i < gridWeapon.weapon_keys.length; i++) {
         const image = opusImage(i)
         if (image) images.push(image)
       }
@@ -288,13 +395,13 @@ const WeaponUnit = (props: Props) => {
     const axSkill = getCanonicalAxSkill(index)
 
     if (
-      props.gridWeapon &&
-      props.gridWeapon.object.ax &&
-      props.gridWeapon.object.ax_type > 0 &&
-      props.gridWeapon.ax &&
+      gridWeapon &&
+      gridWeapon.object.ax &&
+      gridWeapon.object.ax_type > 0 &&
+      gridWeapon.ax &&
       axSkill
     ) {
-      const altText = `${axSkill.name[locale]} Lv${props.gridWeapon.ax[index].strength}`
+      const altText = `${axSkill.name[locale]} Lv${gridWeapon.ax[index].strength}`
       return (
         <img
           alt={altText}
@@ -309,12 +416,12 @@ const WeaponUnit = (props: Props) => {
   function axImages() {
     let images: JSX.Element[] = []
     if (
-      props.gridWeapon &&
-      props.gridWeapon.object.ax &&
-      props.gridWeapon.ax &&
-      props.gridWeapon.ax.length > 0
+      gridWeapon &&
+      gridWeapon.object.ax &&
+      gridWeapon.ax &&
+      gridWeapon.ax.length > 0
     ) {
-      for (let i = 0; i < props.gridWeapon.ax.length; i++) {
+      for (let i = 0; i < gridWeapon.ax.length; i++) {
         const image = axImage(i)
         if (image) images.push(image)
       }
@@ -323,46 +430,86 @@ const WeaponUnit = (props: Props) => {
     return images
   }
 
-  function getCanonicalAxSkill(index: number) {
-    if (
-      props.gridWeapon &&
-      props.gridWeapon.object.ax &&
-      props.gridWeapon.object.ax_type > 0 &&
-      props.gridWeapon.ax
-    ) {
-      const axOptions = axData[props.gridWeapon.object.ax_type - 1]
-      const weaponAxSkill: SimpleAxSkill = props.gridWeapon.ax[0]
-
-      let axSkill = axOptions.find((ax) => ax.id === weaponAxSkill.modifier)
-
-      if (index !== 0 && axSkill && axSkill.secondary) {
-        const weaponSubAxSkill: SimpleAxSkill = props.gridWeapon.ax[1]
-        axSkill = axSkill.secondary.find(
-          (ax) => ax.id === weaponSubAxSkill.modifier
-        )
-      }
-
-      return axSkill
-    } else return
+  // Methods: Layer element rendering
+  const weaponModal = () => {
+    if (gridWeapon) {
+      return (
+        <WeaponModal
+          gridWeapon={gridWeapon}
+          open={detailsModalOpen}
+          onOpenChange={handleWeaponModalOpenChange}
+        />
+      )
+    }
   }
 
-  function passUncapData(index: number) {
-    if (props.gridWeapon)
-      props.updateUncap(props.gridWeapon.id, props.position, index)
+  const contextMenu = () => {
+    if (editable && gridWeapon && gridWeapon.id) {
+      return (
+        <>
+          <ContextMenu onOpenChange={handleContextMenuOpenChange}>
+            <ContextMenuTrigger asChild>
+              <Button
+                accessoryIcon={<SettingsIcon />}
+                className={buttonClasses}
+                onClick={handleButtonClicked}
+              />
+            </ContextMenuTrigger>
+            <ContextMenuContent align="start">
+              {canBeModified(gridWeapon) ? (
+                <ContextMenuItem onSelect={openWeaponModal}>
+                  {t('context.modify.weapon')}
+                </ContextMenuItem>
+              ) : (
+                ''
+              )}
+              <ContextMenuItem onSelect={openRemoveWeaponAlert}>
+                {t('context.remove')}
+              </ContextMenuItem>
+            </ContextMenuContent>
+          </ContextMenu>
+          {weaponModal()}
+          {removeAlert()}
+        </>
+      )
+    }
   }
 
-  function canBeModified(gridWeapon: GridWeapon) {
-    const weapon = gridWeapon.object
-
+  const removeAlert = () => {
     return (
-      weapon.ax ||
-      weapon.awakening ||
-      (weapon.series && [2, 3, 17, 22, 24].includes(weapon.series))
+      <Alert
+        open={alertOpen}
+        primaryAction={removeWeapon}
+        primaryActionText={t('modals.weapon.buttons.remove')}
+        cancelAction={() => setAlertOpen(false)}
+        cancelActionText={t('buttons.cancel')}
+        message={
+          <Trans i18nKey="modals.weapons.messages.remove">
+            Are you sure you want to remove{' '}
+            <strong>{{ weapon: gridWeapon?.object.name[locale] }}</strong> from
+            your team?
+          </Trans>
+        }
+      />
     )
   }
 
+  const searchModal = () => {
+    return (
+      <SearchModal
+        placeholderText={t('search.placeholders.weapon')}
+        fromPosition={position}
+        object="weapons"
+        open={searchModalOpen}
+        onOpenChange={handleSearchModalOpenChange}
+        send={updateObject}
+      />
+    )
+  }
+
+  // Methods: Core element rendering
   const image = (
-    <div className="WeaponImage">
+    <div className="WeaponImage" onClick={openSearchModal}>
       <div className="Modifiers">
         {awakeningImage()}
         <div className="Skills">
@@ -380,7 +527,7 @@ const WeaponUnit = (props: Props) => {
         })}
         src={imageUrl !== '' ? imageUrl : placeholderImageUrl()}
       />
-      {props.editable ? (
+      {editable ? (
         <span className="icon">
           <PlusIcon />
         </span>
@@ -390,51 +537,34 @@ const WeaponUnit = (props: Props) => {
     </div>
   )
 
-  const editableImage = (
-    <SearchModal
-      placeholderText={t('search.placeholders.weapon')}
-      fromPosition={props.position}
-      object="weapons"
-      send={props.updateObject}
-    >
-      {image}
-    </SearchModal>
-  )
-
   const unitContent = (
-    <div className={classes}>
-      {props.editable &&
-      gridWeapon &&
-      gridWeapon.id &&
-      canBeModified(gridWeapon) ? (
-        <WeaponModal gridWeapon={gridWeapon}>
-          <Button accessoryIcon={<SettingsIcon />} />
-        </WeaponModal>
-      ) : (
-        ''
-      )}
-      {props.editable ? editableImage : image}
-      {gridWeapon ? (
-        <UncapIndicator
-          type="weapon"
-          ulb={gridWeapon.object.uncap.ulb || false}
-          flb={gridWeapon.object.uncap.flb || false}
-          uncapLevel={gridWeapon.uncap_level}
-          updateUncap={passUncapData}
-          special={false}
-        />
-      ) : (
-        ''
-      )}
-      <h3 className="WeaponName">{weapon?.name[locale]}</h3>
-    </div>
+    <>
+      <div className={classes}>
+        {contextMenu()}
+        {image}
+        {gridWeapon && weapon ? (
+          <UncapIndicator
+            type="weapon"
+            ulb={gridWeapon.object.uncap.ulb || false}
+            flb={gridWeapon.object.uncap.flb || false}
+            uncapLevel={gridWeapon.uncap_level}
+            updateUncap={passUncapData}
+            special={false}
+          />
+        ) : (
+          ''
+        )}
+        <h3 className="WeaponName">{weapon?.name[locale]}</h3>
+      </div>
+      {searchModal()}
+    </>
   )
 
-  const withHovercard = (
+  const unitContentWithHovercard = (
     <WeaponHovercard gridWeapon={gridWeapon!}>{unitContent}</WeaponHovercard>
   )
 
-  return gridWeapon && !props.editable ? withHovercard : unitContent
+  return gridWeapon && !editable ? unitContentWithHovercard : unitContent
 }
 
 export default WeaponUnit
diff --git a/utils/awakening.tsx b/data/awakening.tsx
similarity index 50%
rename from utils/awakening.tsx
rename to data/awakening.tsx
index 05bfb761..938db371 100644
--- a/utils/awakening.tsx
+++ b/data/awakening.tsx
@@ -6,57 +6,85 @@ export type Awakening = {
     ja: string
   }
 }
-export const characterAwakening: Awakening[] = [
+export const characterAwakening: ItemSkill[] = [
   {
-    id: 0,
+    id: 1,
     name: {
       en: 'Balanced',
       ja: 'バランス',
     },
-  },
-  {
-    id: 1,
-    name: {
-      en: 'Attack',
-      ja: '攻撃',
-    },
+    slug: 'balanced',
+    minValue: 1,
+    maxValue: 9,
+    fractional: false,
   },
   {
     id: 2,
     name: {
-      en: 'Defense',
-      ja: '防御',
+      en: 'Attack',
+      ja: '攻撃',
     },
+    slug: 'attack',
+    minValue: 1,
+    maxValue: 9,
+    fractional: false,
   },
   {
     id: 3,
+    name: {
+      en: 'Defense',
+      ja: '防御',
+    },
+    slug: 'defense',
+    minValue: 1,
+    maxValue: 9,
+    fractional: false,
+  },
+  {
+    id: 4,
     name: {
       en: 'Multiattack',
       ja: '連続攻撃',
     },
+    slug: 'multiattack',
+    minValue: 1,
+    maxValue: 9,
+    fractional: false,
   },
 ]
 
-export const weaponAwakening: Awakening[] = [
+export const weaponAwakening: ItemSkill[] = [
   {
-    id: 0,
+    id: 1,
     name: {
       en: 'Attack',
       ja: '攻撃',
     },
-  },
-  {
-    id: 1,
-    name: {
-      en: 'Defense',
-      ja: '防御',
-    },
+    slug: 'attack',
+    minValue: 1,
+    maxValue: 15,
+    fractional: false,
   },
   {
     id: 2,
+    name: {
+      en: 'Defense',
+      ja: '防御',
+    },
+    slug: 'defense',
+    minValue: 1,
+    maxValue: 15,
+    fractional: false,
+  },
+  {
+    id: 3,
     name: {
       en: 'Special',
       ja: '特殊',
     },
+    slug: 'special',
+    minValue: 1,
+    maxValue: 15,
+    fractional: false,
   },
 ]
diff --git a/utils/axData.tsx b/data/ax.tsx
similarity index 88%
rename from utils/axData.tsx
rename to data/ax.tsx
index 5feb0dec..bb95aede 100644
--- a/utils/axData.tsx
+++ b/data/ax.tsx
@@ -1,4 +1,4 @@
-export const axData: AxSkill[][] = [
+const ax: ItemSkill[][] = [
   [
     {
       name: {
@@ -10,6 +10,7 @@ export const axData: AxSkill[][] = [
       minValue: 1,
       maxValue: 3.5,
       suffix: '%',
+      fractional: true,
       secondary: [
         {
           name: {
@@ -20,6 +21,7 @@ export const axData: AxSkill[][] = [
           slug: 'ca-dmg',
           minValue: 2,
           maxValue: 4,
+          fractional: true,
           suffix: '%',
         },
         {
@@ -31,6 +33,7 @@ export const axData: AxSkill[][] = [
           slug: 'da',
           minValue: 1,
           maxValue: 2,
+          fractional: true,
           suffix: '%',
         },
         {
@@ -42,6 +45,7 @@ export const axData: AxSkill[][] = [
           slug: 'ta',
           minValue: 1,
           maxValue: 2,
+          fractional: true,
           suffix: '%',
         },
         {
@@ -53,6 +57,7 @@ export const axData: AxSkill[][] = [
           slug: 'skill-cap',
           minValue: 1,
           maxValue: 2,
+          fractional: true,
           suffix: '%',
         },
       ],
@@ -67,6 +72,7 @@ export const axData: AxSkill[][] = [
       minValue: 1,
       maxValue: 8,
       suffix: '%',
+      fractional: true,
       secondary: [
         {
           name: {
@@ -77,6 +83,7 @@ export const axData: AxSkill[][] = [
           slug: 'hp',
           minValue: 1,
           maxValue: 3,
+          fractional: true,
           suffix: '%',
         },
         {
@@ -88,6 +95,7 @@ export const axData: AxSkill[][] = [
           slug: 'debuff',
           minValue: 1,
           maxValue: 3,
+          fractional: false,
           suffix: '%',
         },
         {
@@ -99,6 +107,7 @@ export const axData: AxSkill[][] = [
           slug: 'healing',
           minValue: 2,
           maxValue: 5,
+          fractional: true,
           suffix: '%',
         },
         {
@@ -110,6 +119,7 @@ export const axData: AxSkill[][] = [
           slug: 'enmity',
           minValue: 1,
           maxValue: 3,
+          fractional: false,
         },
       ],
     },
@@ -123,6 +133,7 @@ export const axData: AxSkill[][] = [
       minValue: 1,
       maxValue: 11,
       suffix: '%',
+      fractional: true,
       secondary: [
         {
           name: {
@@ -133,6 +144,7 @@ export const axData: AxSkill[][] = [
           slug: 'def',
           minValue: 1,
           maxValue: 3,
+          fractional: true,
           suffix: '%',
         },
         {
@@ -144,6 +156,7 @@ export const axData: AxSkill[][] = [
           slug: 'debuff',
           minValue: 1,
           maxValue: 3,
+          fractional: false,
           suffix: '%',
         },
         {
@@ -156,6 +169,7 @@ export const axData: AxSkill[][] = [
           minValue: 2,
           maxValue: 5,
           suffix: '%',
+          fractional: true,
         },
         {
           name: {
@@ -166,6 +180,7 @@ export const axData: AxSkill[][] = [
           slug: 'stamina',
           minValue: 1,
           maxValue: 3,
+          fractional: false,
         },
       ],
     },
@@ -179,6 +194,7 @@ export const axData: AxSkill[][] = [
       minValue: 2,
       maxValue: 8.5,
       suffix: '%',
+      fractional: true,
       secondary: [
         {
           name: {
@@ -190,6 +206,7 @@ export const axData: AxSkill[][] = [
           minValue: 1,
           maxValue: 1.5,
           suffix: '%',
+          fractional: true,
         },
         {
           name: {
@@ -201,6 +218,7 @@ export const axData: AxSkill[][] = [
           minValue: 1,
           maxValue: 5,
           suffix: '%',
+          fractional: true,
         },
         {
           name: {
@@ -212,6 +230,7 @@ export const axData: AxSkill[][] = [
           minValue: 1,
           maxValue: 2,
           suffix: '%',
+          fractional: true,
         },
         {
           name: {
@@ -222,6 +241,7 @@ export const axData: AxSkill[][] = [
           slug: 'stamina',
           minValue: 1,
           maxValue: 3,
+          fractional: true,
         },
       ],
     },
@@ -235,6 +255,7 @@ export const axData: AxSkill[][] = [
       minValue: 1,
       maxValue: 4,
       suffix: '%',
+      fractional: true,
       secondary: [
         {
           name: {
@@ -246,6 +267,7 @@ export const axData: AxSkill[][] = [
           minValue: 2,
           maxValue: 4,
           suffix: '%',
+          fractional: true,
         },
         {
           name: {
@@ -257,6 +279,7 @@ export const axData: AxSkill[][] = [
           minValue: 1,
           maxValue: 5,
           suffix: '%',
+          fractional: true,
         },
         {
           name: {
@@ -268,6 +291,7 @@ export const axData: AxSkill[][] = [
           minValue: 1,
           maxValue: 2,
           suffix: '%',
+          fractional: true,
         },
         {
           name: {
@@ -279,6 +303,7 @@ export const axData: AxSkill[][] = [
           minValue: 1,
           maxValue: 2,
           suffix: '%',
+          fractional: true,
         },
       ],
     },
@@ -294,6 +319,7 @@ export const axData: AxSkill[][] = [
       minValue: 1,
       maxValue: 3.5,
       suffix: '%',
+      fractional: true,
       secondary: [
         {
           name: {
@@ -305,6 +331,7 @@ export const axData: AxSkill[][] = [
           minValue: 2,
           maxValue: 8.5,
           suffix: '%',
+          fractional: true,
         },
         {
           name: {
@@ -316,6 +343,7 @@ export const axData: AxSkill[][] = [
           minValue: 1.5,
           maxValue: 4,
           suffix: '%',
+          fractional: true,
         },
         {
           name: {
@@ -327,6 +355,7 @@ export const axData: AxSkill[][] = [
           minValue: 0.5,
           maxValue: 1.5,
           suffix: '%',
+          fractional: true,
         },
         {
           name: {
@@ -337,6 +366,7 @@ export const axData: AxSkill[][] = [
           slug: 'skill-supp',
           minValue: 1,
           maxValue: 5,
+          fractional: false,
         },
       ],
     },
@@ -350,6 +380,7 @@ export const axData: AxSkill[][] = [
       minValue: 1,
       maxValue: 8,
       suffix: '%',
+      fractional: true,
       secondary: [
         {
           name: {
@@ -361,6 +392,7 @@ export const axData: AxSkill[][] = [
           minValue: 1,
           maxValue: 5,
           suffix: '%',
+          fractional: true,
         },
         {
           name: {
@@ -372,6 +404,7 @@ export const axData: AxSkill[][] = [
           minValue: 1,
           maxValue: 3,
           suffix: '%',
+          fractional: false,
         },
         {
           name: {
@@ -383,6 +416,7 @@ export const axData: AxSkill[][] = [
           minValue: 2,
           maxValue: 5,
           suffix: '%',
+          fractional: true,
         },
         {
           name: {
@@ -393,6 +427,7 @@ export const axData: AxSkill[][] = [
           slug: 'enmity',
           minValue: 1,
           maxValue: 3,
+          fractional: false,
         },
       ],
     },
@@ -406,6 +441,7 @@ export const axData: AxSkill[][] = [
       minValue: 1,
       maxValue: 11,
       suffix: '%',
+      fractional: true,
       secondary: [
         {
           name: {
@@ -417,6 +453,7 @@ export const axData: AxSkill[][] = [
           minValue: 1,
           maxValue: 5,
           suffix: '%',
+          fractional: true,
         },
         {
           name: {
@@ -428,6 +465,7 @@ export const axData: AxSkill[][] = [
           minValue: 1,
           maxValue: 3,
           suffix: '%',
+          fractional: false,
         },
         {
           name: {
@@ -439,6 +477,7 @@ export const axData: AxSkill[][] = [
           minValue: 2,
           maxValue: 5,
           suffix: '%',
+          fractional: true,
         },
         {
           name: {
@@ -449,6 +488,7 @@ export const axData: AxSkill[][] = [
           slug: 'stamina',
           minValue: 1,
           maxValue: 3,
+          fractional: false,
         },
       ],
     },
@@ -462,6 +502,7 @@ export const axData: AxSkill[][] = [
       minValue: 2,
       maxValue: 8.5,
       suffix: '%',
+      fractional: true,
       secondary: [
         {
           name: {
@@ -472,6 +513,7 @@ export const axData: AxSkill[][] = [
           slug: 'ta',
           minValue: 1.5,
           maxValue: 4,
+          fractional: true,
           suffix: '%',
         },
         {
@@ -483,6 +525,7 @@ export const axData: AxSkill[][] = [
           slug: 'skill-supp',
           minValue: 1,
           maxValue: 5,
+          fractional: false,
         },
         {
           name: {
@@ -493,6 +536,7 @@ export const axData: AxSkill[][] = [
           slug: 'ca-supp',
           minValue: 1,
           maxValue: 5,
+          fractional: false,
         },
         {
           name: {
@@ -503,6 +547,7 @@ export const axData: AxSkill[][] = [
           slug: 'stamina',
           minValue: 1,
           maxValue: 3,
+          fractional: false,
         },
       ],
     },
@@ -516,6 +561,7 @@ export const axData: AxSkill[][] = [
       minValue: 1,
       maxValue: 4,
       suffix: '%',
+      fractional: true,
       secondary: [
         {
           name: {
@@ -526,6 +572,7 @@ export const axData: AxSkill[][] = [
           slug: 'ca-supp',
           minValue: 1,
           maxValue: 5,
+          fractional: false,
         },
         {
           name: {
@@ -536,6 +583,7 @@ export const axData: AxSkill[][] = [
           slug: 'na-cap',
           minValue: 0.5,
           maxValue: 1.5,
+          fractional: true,
           suffix: '%',
         },
         {
@@ -547,6 +595,7 @@ export const axData: AxSkill[][] = [
           slug: 'stamina',
           minValue: 1,
           maxValue: 3,
+          fractional: false,
         },
         {
           name: {
@@ -557,6 +606,7 @@ export const axData: AxSkill[][] = [
           slug: 'enmity',
           minValue: 1,
           maxValue: 3,
+          fractional: false,
         },
       ],
     },
@@ -572,6 +622,7 @@ export const axData: AxSkill[][] = [
       minValue: 1,
       maxValue: 3.5,
       suffix: '%',
+      fractional: true,
       secondary: [
         {
           name: {
@@ -583,6 +634,7 @@ export const axData: AxSkill[][] = [
           minValue: 2,
           maxValue: 4,
           suffix: '%',
+          fractional: true,
         },
         {
           name: {
@@ -605,6 +657,7 @@ export const axData: AxSkill[][] = [
           minValue: 1,
           maxValue: 2,
           suffix: '%',
+          fractional: true,
         },
         {
           name: {
@@ -616,6 +669,7 @@ export const axData: AxSkill[][] = [
           minValue: 1,
           maxValue: 2,
           suffix: '%',
+          fractional: true,
         },
       ],
     },
@@ -629,6 +683,7 @@ export const axData: AxSkill[][] = [
       minValue: 1,
       maxValue: 8,
       suffix: '%',
+      fractional: true,
       secondary: [
         {
           name: {
@@ -640,6 +695,7 @@ export const axData: AxSkill[][] = [
           minValue: 1,
           maxValue: 3,
           suffix: '%',
+          fractional: true,
         },
         {
           name: {
@@ -651,6 +707,7 @@ export const axData: AxSkill[][] = [
           minValue: 1,
           maxValue: 3,
           suffix: '%',
+          fractional: false,
         },
         {
           name: {
@@ -662,6 +719,7 @@ export const axData: AxSkill[][] = [
           minValue: 2,
           maxValue: 5,
           suffix: '%',
+          fractional: true,
         },
         {
           name: {
@@ -672,6 +730,7 @@ export const axData: AxSkill[][] = [
           slug: 'enmity',
           minValue: 1,
           maxValue: 3,
+          fractional: false,
         },
       ],
     },
@@ -685,6 +744,7 @@ export const axData: AxSkill[][] = [
       minValue: 1,
       maxValue: 11,
       suffix: '%',
+      fractional: true,
       secondary: [
         {
           name: {
@@ -696,6 +756,7 @@ export const axData: AxSkill[][] = [
           minValue: 1,
           maxValue: 3,
           suffix: '%',
+          fractional: true,
         },
         {
           name: {
@@ -707,6 +768,7 @@ export const axData: AxSkill[][] = [
           minValue: 1,
           maxValue: 3,
           suffix: '%',
+          fractional: false,
         },
         {
           name: {
@@ -718,6 +780,7 @@ export const axData: AxSkill[][] = [
           minValue: 2,
           maxValue: 5,
           suffix: '%',
+          fractional: true,
         },
         {
           name: {
@@ -728,6 +791,7 @@ export const axData: AxSkill[][] = [
           slug: 'stamina',
           minValue: 1,
           maxValue: 3,
+          fractional: false,
         },
       ],
     },
@@ -741,6 +805,7 @@ export const axData: AxSkill[][] = [
       minValue: 2,
       maxValue: 8.5,
       suffix: '%',
+      fractional: true,
       secondary: [
         {
           name: {
@@ -752,6 +817,7 @@ export const axData: AxSkill[][] = [
           minValue: 1,
           maxValue: 1.5,
           suffix: '%',
+          fractional: true,
         },
         {
           name: {
@@ -763,6 +829,7 @@ export const axData: AxSkill[][] = [
           minValue: 1,
           maxValue: 5,
           suffix: '%',
+          fractional: true,
         },
         {
           name: {
@@ -774,6 +841,7 @@ export const axData: AxSkill[][] = [
           minValue: 1,
           maxValue: 2,
           suffix: '%',
+          fractional: true,
         },
         {
           name: {
@@ -784,6 +852,7 @@ export const axData: AxSkill[][] = [
           slug: 'stamina',
           minValue: 1,
           maxValue: 3,
+          fractional: false,
         },
       ],
     },
@@ -797,6 +866,7 @@ export const axData: AxSkill[][] = [
       minValue: 1,
       maxValue: 4,
       suffix: '%',
+      fractional: true,
       secondary: [
         {
           name: {
@@ -808,6 +878,7 @@ export const axData: AxSkill[][] = [
           minValue: 2,
           maxValue: 4,
           suffix: '%',
+          fractional: true,
         },
         {
           name: {
@@ -819,6 +890,7 @@ export const axData: AxSkill[][] = [
           minValue: 1,
           maxValue: 5,
           suffix: '%',
+          fractional: true,
         },
         {
           name: {
@@ -830,6 +902,7 @@ export const axData: AxSkill[][] = [
           minValue: 1,
           maxValue: 2,
           suffix: '%',
+          fractional: true,
         },
         {
           name: {
@@ -841,6 +914,7 @@ export const axData: AxSkill[][] = [
           minValue: 1,
           maxValue: 2,
           suffix: '%',
+          fractional: true,
         },
       ],
     },
@@ -854,6 +928,7 @@ export const axData: AxSkill[][] = [
       minValue: 5,
       maxValue: 10,
       suffix: '%',
+      fractional: false,
     },
     {
       name: {
@@ -865,6 +940,9 @@ export const axData: AxSkill[][] = [
       minValue: 10,
       maxValue: 20,
       suffix: '%',
+      fractional: false,
     },
   ],
 ]
+
+export default ax
diff --git a/utils/Element.tsx b/data/elements.tsx
similarity index 80%
rename from utils/Element.tsx
rename to data/elements.tsx
index 8c82ec17..133552f8 100644
--- a/utils/Element.tsx
+++ b/data/elements.tsx
@@ -1,5 +1,6 @@
 export const allElement: TeamElement = {
   id: -1,
+  opposite_id: -1,
   name: {
     en: 'All',
     ja: '全s',
@@ -9,6 +10,7 @@ export const allElement: TeamElement = {
 export const elements: TeamElement[] = [
   {
     id: 0,
+    opposite_id: 0,
     name: {
       en: 'Null',
       ja: '無',
@@ -16,6 +18,7 @@ export const elements: TeamElement[] = [
   },
   {
     id: 1,
+    opposite_id: 4,
     name: {
       en: 'Wind',
       ja: '風',
@@ -23,6 +26,7 @@ export const elements: TeamElement[] = [
   },
   {
     id: 2,
+    opposite_id: 1,
     name: {
       en: 'Fire',
       ja: '火',
@@ -30,6 +34,7 @@ export const elements: TeamElement[] = [
   },
   {
     id: 3,
+    opposite_id: 2,
     name: {
       en: 'Water',
       ja: '水',
@@ -37,6 +42,7 @@ export const elements: TeamElement[] = [
   },
   {
     id: 4,
+    opposite_id: 3,
     name: {
       en: 'Earth',
       ja: '土',
@@ -44,6 +50,7 @@ export const elements: TeamElement[] = [
   },
   {
     id: 5,
+    opposite_id: 6,
     name: {
       en: 'Dark',
       ja: '闇',
@@ -51,6 +58,7 @@ export const elements: TeamElement[] = [
   },
   {
     id: 6,
+    opposite_id: 5,
     name: {
       en: 'Light',
       ja: '光',
diff --git a/utils/jobGroups.tsx b/data/jobGroups.tsx
similarity index 100%
rename from utils/jobGroups.tsx
rename to data/jobGroups.tsx
diff --git a/data/overMastery.tsx b/data/overMastery.tsx
new file mode 100644
index 00000000..74aa353d
--- /dev/null
+++ b/data/overMastery.tsx
@@ -0,0 +1,332 @@
+const overMasteryPrimary: ItemSkill[] = [
+  {
+    name: {
+      en: 'ATK',
+      ja: '攻撃',
+    },
+    id: 1,
+    slug: 'atk',
+    minValue: 300,
+    maxValue: 3000,
+    suffix: '',
+    fractional: false,
+    values: [300, 600, 900, 1200, 1500, 1800, 2100, 2400, 2700, 3000],
+  },
+  {
+    name: {
+      en: 'HP',
+      ja: 'HP',
+    },
+    id: 2,
+    slug: 'hp',
+    minValue: 150,
+    maxValue: 1500,
+    suffix: '',
+    fractional: false,
+    values: [150, 300, 450, 600, 750, 900, 1050, 1200, 1350, 1500],
+  },
+]
+
+const overMasterySecondary: ItemSkill[] = [
+  {
+    name: {
+      en: 'Debuff Success',
+      ja: '弱体成功率',
+    },
+    id: 3,
+    slug: 'debuff-success',
+    minValue: 6,
+    maxValue: 15,
+    suffix: '%',
+    fractional: false,
+    values: [6, 7, 8, 9, 10, 11, 12, 13, 14, 15],
+  },
+  {
+    name: {
+      en: 'Skill DMG Cap',
+      ja: 'アビダメ上限',
+    },
+    id: 4,
+    slug: 'skill-cap',
+    minValue: 6,
+    maxValue: 15,
+    suffix: '%',
+    fractional: false,
+    values: [6, 7, 8, 9, 10, 11, 12, 13, 14, 15],
+  },
+  {
+    name: {
+      en: 'C.A. DMG',
+      ja: '奥義ダメージ',
+    },
+    id: 5,
+    slug: 'ca-dmg',
+    minValue: 10,
+    maxValue: 30,
+    suffix: '%',
+    fractional: false,
+    values: [10, 12, 14, 16, 18, 20, 22, 24, 27, 30],
+  },
+  {
+    name: {
+      en: 'C.A. DMG Cap',
+      ja: '奥義ダメージ上限',
+    },
+    id: 6,
+    slug: 'ca-cap',
+    minValue: 6,
+    maxValue: 15,
+    suffix: '%',
+    fractional: false,
+    values: [6, 7, 8, 9, 10, 11, 12, 13, 14, 15],
+  },
+  {
+    name: {
+      en: 'Stamina',
+      ja: '渾身',
+    },
+    id: 7,
+    slug: 'stamina',
+    minValue: 1,
+    maxValue: 10,
+    suffix: '',
+    fractional: false,
+    values: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
+  },
+  {
+    name: {
+      en: 'Enmity',
+      ja: '背水',
+    },
+    id: 8,
+    slug: 'enmity',
+    minValue: 1,
+    maxValue: 10,
+    suffix: '',
+    fractional: false,
+    values: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
+  },
+  {
+    name: {
+      en: 'Critical Hit',
+      ja: 'クリティカル確率',
+    },
+    id: 9,
+    slug: 'crit',
+    minValue: 10,
+    maxValue: 30,
+    suffix: '%',
+    fractional: false,
+    values: [10, 12, 14, 16, 18, 20, 22, 24, 27, 30],
+  },
+]
+
+const overMasteryTertiary: ItemSkill[] = [
+  {
+    name: {
+      en: 'Double Attack',
+      ja: 'ダブルアタック確率',
+    },
+    id: 10,
+    slug: 'da',
+    minValue: 6,
+    maxValue: 15,
+    suffix: '%',
+    fractional: false,
+    values: [6, 7, 8, 9, 10, 11, 12, 13, 14, 15],
+  },
+  {
+    name: {
+      en: 'Triple Attack',
+      ja: 'トリプルアタック確率',
+    },
+    id: 11,
+    slug: 'ta',
+    minValue: 1,
+    maxValue: 10,
+    suffix: '%',
+    fractional: false,
+    values: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
+  },
+  {
+    name: {
+      en: 'DEF',
+      ja: '防御',
+    },
+    id: 12,
+    slug: 'def',
+    minValue: 6,
+    maxValue: 20,
+    suffix: '%',
+    fractional: false,
+    values: [6, 7, 8, 9, 10, 12, 14, 16, 18, 20],
+  },
+  {
+    name: {
+      en: 'Healing',
+      ja: '回復性能',
+    },
+    id: 13,
+    slug: 'heal',
+    minValue: 3,
+    maxValue: 30,
+    suffix: '%',
+    fractional: false,
+    values: [3, 6, 9, 12, 15, 18, 21, 24, 27, 30],
+  },
+  {
+    name: {
+      en: 'Debuff Resistance',
+      ja: '弱体耐性',
+    },
+    id: 14,
+    slug: 'debuff-resist',
+    minValue: 6,
+    maxValue: 15,
+    suffix: '%',
+    fractional: false,
+    values: [6, 7, 8, 9, 10, 11, 12, 13, 14, 15],
+  },
+  {
+    name: {
+      en: 'Dodge',
+      ja: '回避',
+    },
+    id: 15,
+    slug: 'dodge',
+    minValue: 1,
+    maxValue: 10,
+    suffix: '%',
+    fractional: false,
+    values: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
+  },
+]
+
+export const overMastery = {
+  a: overMasteryPrimary,
+  b: overMasterySecondary,
+  c: overMasteryTertiary,
+}
+
+export const aetherialMastery: ItemSkill[] = [
+  {
+    name: {
+      en: 'Double Attack',
+      ja: 'ダブルアタック確率',
+    },
+    id: 1,
+    slug: 'da',
+    minValue: 10,
+    maxValue: 17,
+    suffix: '%',
+    fractional: false,
+  },
+  {
+    name: {
+      en: 'Triple Attack',
+      ja: 'トリプルアタック確率',
+    },
+    id: 2,
+    slug: 'ta',
+    minValue: 5,
+    maxValue: 12,
+    suffix: '%',
+    fractional: false,
+  },
+  {
+    name: {
+      en: '{Element} ATK Up',
+      ja: '{属性}攻撃',
+    },
+    id: 3,
+    slug: 'element-atk',
+    minValue: 15,
+    maxValue: 22,
+    suffix: '%',
+    fractional: false,
+  },
+  {
+    name: {
+      en: '{Element} Resistance',
+      ja: '{属性}軽減',
+    },
+    id: 4,
+    slug: 'element-resist',
+    minValue: 5,
+    maxValue: 12,
+    suffix: '%',
+    fractional: false,
+  },
+  {
+    name: {
+      en: 'Stamina',
+      ja: '渾身',
+    },
+    id: 5,
+    slug: 'stamina',
+    minValue: 5,
+    maxValue: 12,
+    suffix: '',
+    fractional: false,
+  },
+  {
+    name: {
+      en: 'Enmity',
+      ja: '背水',
+    },
+    id: 6,
+    slug: 'enmity',
+    minValue: 5,
+    maxValue: 12,
+    suffix: '',
+    fractional: false,
+  },
+  {
+    name: {
+      en: 'Supplemental DMG',
+      ja: '与ダメ上昇',
+    },
+    id: 7,
+    slug: 'supplemental',
+    minValue: 5,
+    maxValue: 12,
+    suffix: '',
+    fractional: false,
+  },
+  {
+    name: {
+      en: 'Critical Hit',
+      ja: 'クリティカル',
+    },
+    id: 8,
+    slug: 'crit',
+    minValue: 18,
+    maxValue: 35,
+    suffix: '%',
+    fractional: false,
+  },
+  {
+    name: {
+      en: 'Counters on Dodge',
+      ja: 'カウンター(回避)',
+    },
+    id: 9,
+    slug: 'counter-dodge',
+    minValue: 5,
+    maxValue: 12,
+    suffix: '%',
+    fractional: false,
+  },
+  {
+    name: {
+      en: 'Counters on DMG',
+      ja: 'カウンター(被ダメ)',
+    },
+    id: 10,
+    slug: 'counter-dmg',
+    minValue: 10,
+    maxValue: 17,
+    suffix: '%',
+    fractional: false,
+  },
+]
diff --git a/utils/raidGroups.tsx b/data/raidGroups.tsx
similarity index 100%
rename from utils/raidGroups.tsx
rename to data/raidGroups.tsx
diff --git a/utils/skillGroups.tsx b/data/skillGroups.tsx
similarity index 100%
rename from utils/skillGroups.tsx
rename to data/skillGroups.tsx
diff --git a/utils/weaponKeyGroups.tsx b/data/weaponKeyGroups.tsx
similarity index 100%
rename from utils/weaponKeyGroups.tsx
rename to data/weaponKeyGroups.tsx
diff --git a/utils/weaponSeries.tsx b/data/weaponSeries.tsx
similarity index 100%
rename from utils/weaponSeries.tsx
rename to data/weaponSeries.tsx
diff --git a/hooks/useLockedBody.tsx b/hooks/useLockedBody.tsx
new file mode 100644
index 00000000..227938e6
--- /dev/null
+++ b/hooks/useLockedBody.tsx
@@ -0,0 +1,56 @@
+// https://usehooks-ts.com/react-hook/use-locked-body
+
+import { useEffect, useState } from 'react'
+import { useIsomorphicLayoutEffect } from 'usehooks-ts'
+
+type UseLockedBodyOutput = [boolean, (locked: boolean) => void]
+
+function useLockedBody(
+  initialLocked = false,
+  rootId = '___gatsby' // Default to `___gatsby` to not introduce breaking change
+): UseLockedBodyOutput {
+  const [locked, setLocked] = useState(initialLocked)
+
+  // Do the side effect before render
+  useIsomorphicLayoutEffect(() => {
+    if (!locked) {
+      return
+    }
+
+    // Save initial body style
+    const originalOverflow = document.body.style.overflow
+    const originalPaddingRight = document.body.style.paddingRight
+
+    // Lock body scroll
+    document.body.style.overflow = 'hidden'
+
+    // Get the scrollBar width
+    const root = document.getElementById(rootId) // or root
+    const scrollBarWidth = root ? root.offsetWidth - root.scrollWidth : 0
+
+    // Avoid width reflow
+    if (scrollBarWidth) {
+      document.body.style.paddingRight = `${scrollBarWidth}px`
+    }
+
+    return () => {
+      document.body.style.overflow = originalOverflow
+
+      if (scrollBarWidth) {
+        document.body.style.paddingRight = originalPaddingRight
+      }
+    }
+  }, [locked])
+
+  // Update state if initialValue changes
+  useEffect(() => {
+    if (locked !== initialLocked) {
+      setLocked(initialLocked)
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [initialLocked])
+
+  return [locked, setLocked]
+}
+
+export default useLockedBody
diff --git a/package-lock.json b/package-lock.json
index d0c42f68..520ded8a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -40,6 +40,7 @@
         "react-string-replace": "^1.1.0",
         "sanitize-html": "^2.8.1",
         "sass": "^1.49.0",
+        "usehooks-ts": "^2.9.1",
         "valtio": "^1.3.0",
         "youtube-api-v3-wrapper": "^2.3.0"
       },
@@ -7136,6 +7137,19 @@
         "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
       }
     },
+    "node_modules/usehooks-ts": {
+      "version": "2.9.1",
+      "resolved": "https://registry.npmjs.org/usehooks-ts/-/usehooks-ts-2.9.1.tgz",
+      "integrity": "sha512-2FAuSIGHlY+apM9FVlj8/oNhd+1y+Uwv5QNkMQz1oSfdHk4PXo1qoCw9I5M7j0vpH8CSWFJwXbVPeYDjLCx9PA==",
+      "engines": {
+        "node": ">=16.15.0",
+        "npm": ">=8"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0  || ^17.0.0 || ^18.0.0",
+        "react-dom": "^16.8.0  || ^17.0.0 || ^18.0.0"
+      }
+    },
     "node_modules/util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
@@ -12203,6 +12217,12 @@
       "integrity": "sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==",
       "requires": {}
     },
+    "usehooks-ts": {
+      "version": "2.9.1",
+      "resolved": "https://registry.npmjs.org/usehooks-ts/-/usehooks-ts-2.9.1.tgz",
+      "integrity": "sha512-2FAuSIGHlY+apM9FVlj8/oNhd+1y+Uwv5QNkMQz1oSfdHk4PXo1qoCw9I5M7j0vpH8CSWFJwXbVPeYDjLCx9PA==",
+      "requires": {}
+    },
     "util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
diff --git a/package.json b/package.json
index 77715f3f..4771dae9 100644
--- a/package.json
+++ b/package.json
@@ -45,6 +45,7 @@
     "react-string-replace": "^1.1.0",
     "sanitize-html": "^2.8.1",
     "sass": "^1.49.0",
+    "usehooks-ts": "^2.9.1",
     "valtio": "^1.3.0",
     "youtube-api-v3-wrapper": "^2.3.0"
   },
diff --git a/pages/[username].tsx b/pages/[username].tsx
index 148f52d4..805d3acb 100644
--- a/pages/[username].tsx
+++ b/pages/[username].tsx
@@ -13,7 +13,7 @@ import setUserToken from '~utils/setUserToken'
 import extractFilters from '~utils/extractFilters'
 import organizeRaids from '~utils/organizeRaids'
 import useDidMountEffect from '~utils/useDidMountEffect'
-import { elements, allElement } from '~utils/Element'
+import { elements, allElement } from '~data/elements'
 import { emptyPaginationObject } from '~utils/emptyStates'
 
 import GridRep from '~components/GridRep'
diff --git a/pages/saved.tsx b/pages/saved.tsx
index cf8313e4..b6bd1aba 100644
--- a/pages/saved.tsx
+++ b/pages/saved.tsx
@@ -14,7 +14,7 @@ import setUserToken from '~utils/setUserToken'
 import extractFilters from '~utils/extractFilters'
 import organizeRaids from '~utils/organizeRaids'
 import useDidMountEffect from '~utils/useDidMountEffect'
-import { elements, allElement } from '~utils/Element'
+import { elements, allElement } from '~data/elements'
 import { emptyPaginationObject } from '~utils/emptyStates'
 
 import GridRep from '~components/GridRep'
diff --git a/pages/teams.tsx b/pages/teams.tsx
index ec84eea4..03502514 100644
--- a/pages/teams.tsx
+++ b/pages/teams.tsx
@@ -14,7 +14,7 @@ import setUserToken from '~utils/setUserToken'
 import extractFilters from '~utils/extractFilters'
 import organizeRaids from '~utils/organizeRaids'
 import useDidMountEffect from '~utils/useDidMountEffect'
-import { elements, allElement } from '~utils/Element'
+import { elements, allElement } from '~data/elements'
 import { emptyPaginationObject } from '~utils/emptyStates'
 
 import GridRep from '~components/GridRep'
diff --git a/public/locales/en/common.json b/public/locales/en/common.json
index 57edabb9..dbf343fe 100644
--- a/public/locales/en/common.json
+++ b/public/locales/en/common.json
@@ -32,6 +32,14 @@
     "new": "New",
     "wiki": "View more on gbf.wiki"
   },
+  "context": {
+    "modify": {
+      "character": "Modify character",
+      "summon": "Modify summon",
+      "weapon": "Modify weapon"
+    },
+    "remove": "Remove from grid"
+  },
   "filters": {
     "labels": {
       "element": "Element",
@@ -137,6 +145,22 @@
     "changelog": {
       "title": "Changelog"
     },
+    "characters": {
+      "title": "Character",
+      "subtitles": {
+        "ring": "Over Mastery",
+        "earring": "Aetherial Mastery",
+        "permanent": "Permanent Mastery",
+        "awakening": "Awakening"
+      },
+      "messages": {
+        "remove": "Are you sure you want to remove <strong>{{character}}</strong> from your team?"
+      },
+      "buttons": {
+        "confirm": "Save character",
+        "remove": "Remove character"
+      }
+    },
     "conflict": {
       "character": "Only one <strong>version of a character</strong> can be included in each party. Do you want to change your party members?",
       "weapon": {
@@ -229,7 +253,8 @@
     "weapon": {
       "title": "Modify Weapon",
       "buttons": {
-        "confirm": "Save weapon"
+        "confirm": "Save weapon",
+        "remove": "Remove weapon"
       },
       "subtitles": {
         "element": "Element",
@@ -339,5 +364,6 @@
   "no_title": "Untitled",
   "no_raid": "No raid",
   "no_user": "Anonymous",
-  "no_job": "No class"
+  "no_job": "No class",
+  "no_value": "No value"
 }
diff --git a/public/locales/ja/common.json b/public/locales/ja/common.json
index d714ca1f..e5acc9d6 100644
--- a/public/locales/ja/common.json
+++ b/public/locales/ja/common.json
@@ -32,6 +32,14 @@
     "new": "作成",
     "wiki": "gbf.wikiで詳しく見る"
   },
+  "context": {
+    "modify": {
+      "character": "キャラクターを変更",
+      "summon": "召喚石を変更",
+      "weapon": "武器を変更"
+    },
+    "remove": "編成から削除"
+  },
   "filters": {
     "labels": {
       "element": "属性",
@@ -137,6 +145,22 @@
     "changelog": {
       "title": "変更ログ"
     },
+    "characters": {
+      "title": "キャラクター",
+      "subtitles": {
+        "ring": "EXリミットボーナス",
+        "earring": "エーテリアルプラス",
+        "permanent": "マスタリーボーナス",
+        "awakening": "覚醒"
+      },
+      "messages": {
+        "remove": "<strong>{{character}}</strong>を編成から削除しますか？"
+      },
+      "buttons": {
+        "confirm": "キャラクターを変更する",
+        "remove": "キャラクターを削除する"
+      }
+    },
     "conflict": {
       "character": "<strong>同じ名前のキャラクター</strong>がパーティに編成されています。<br />以下のキャラクターを入れ替えますか？",
       "weapon": {
@@ -230,7 +254,8 @@
     "weapon": {
       "title": "武器変更",
       "buttons": {
-        "confirm": "武器を変更する"
+        "confirm": "武器を変更する",
+        "remove": "武器を削除する"
       },
       "subtitles": {
         "element": "属性",
@@ -340,5 +365,6 @@
   "no_title": "無題",
   "no_raid": "マルチなし",
   "no_user": "無名",
-  "no_job": "ジョブなし"
+  "no_job": "ジョブなし",
+  "no_value": "値なし"
 }
diff --git a/styles/variables.scss b/styles/variables.scss
index 6ab6cf5e..f18f0c96 100644
--- a/styles/variables.scss
+++ b/styles/variables.scss
@@ -140,7 +140,7 @@ $dialog--bg--dark: $grey-25;
 
 // Color Definitions: Menu
 $menu--bg--light: $grey-100;
-$menu--bg--dark: $grey-05;
+$menu--bg--dark: $grey-10;
 $menu--text--light: $grey-90;
 $menu--text--dark: $grey-50;
 $menu--separator--light: $grey-90;
@@ -307,3 +307,7 @@ $item-corner: $unit-half;
 // Shadows
 $hover-stroke: 1px solid rgba(0, 0, 0, 0.1);
 $hover-shadow: rgba(0, 0, 0, 0.08) 0px 0px 14px;
+
+// Durations
+$duration-color-fade: 0.24s;
+$duration-zoom: 0.18s;
diff --git a/types/GridCharacter.d.ts b/types/GridCharacter.d.ts
index 8c610406..90905bb2 100644
--- a/types/GridCharacter.d.ts
+++ b/types/GridCharacter.d.ts
@@ -3,8 +3,11 @@ interface GridCharacter {
   position: number
   object: Character
   uncap_level: number
+  over_mastery: CharacterOverMastery
+  aetherial_mastery: ExtendedMastery
   awakening: {
     type: number
     level: number
   }
+  perpetuity: boolean
 }
diff --git a/types/AxSkill.d.ts b/types/ItemSkill.d.ts
similarity index 63%
rename from types/AxSkill.d.ts
rename to types/ItemSkill.d.ts
index 3294cd47..598cb6c4 100644
--- a/types/AxSkill.d.ts
+++ b/types/ItemSkill.d.ts
@@ -1,4 +1,4 @@
-interface AxSkill {
+interface ItemSkill {
   name: {
     [key: string]: string
     en: string
@@ -8,6 +8,8 @@ interface AxSkill {
   slug: string
   minValue: number
   maxValue: number
+  fractional: boolean
   suffix?: string
-  secondary?: AxSkill[]
+  secondary?: ItemSkill[]
+  values?: number[]
 }
diff --git a/types/TeamElement.d.ts b/types/TeamElement.d.ts
index a8275831..43289f6f 100644
--- a/types/TeamElement.d.ts
+++ b/types/TeamElement.d.ts
@@ -1,5 +1,6 @@
 interface TeamElement {
   id: number
+  opposite_id: number
   name: {
     en: string
     ja: string
diff --git a/types/index.d.ts b/types/index.d.ts
index d73e4242..6fe99b61 100644
--- a/types/index.d.ts
+++ b/types/index.d.ts
@@ -35,3 +35,16 @@ export type DetailsObject = {
   job?: Job
   extra?: boolean
 }
+
+export type ExtendedMastery = {
+  modifier?: number
+  strength?: number
+}
+
+export type CharacterOverMastery = {
+  [key: number]: ExtendedMastery
+  1: ExtendedMastery
+  2: ExtendedMastery
+  3: ExtendedMastery
+  4: ExtendedMastery
+}
diff --git a/utils/api.tsx b/utils/api.tsx
index 5dcaa937..5fe6d589 100644
--- a/utils/api.tsx
+++ b/utils/api.tsx
@@ -152,6 +152,7 @@ class Api {
 const api: Api = new Api({ url: process.env.NEXT_PUBLIC_SIERO_API_URL || 'https://localhost:3000/api/v1'})
 api.createEntity({ name: 'users' })
 api.createEntity({ name: 'parties' })
+api.createEntity({ name: 'grid_characters' })
 api.createEntity({ name: 'grid_weapons' })
 api.createEntity({ name: 'characters' })
 api.createEntity({ name: 'weapons' })
diff --git a/utils/elementalizeAetherialMastery.tsx b/utils/elementalizeAetherialMastery.tsx
new file mode 100644
index 00000000..c84fdcaf
--- /dev/null
+++ b/utils/elementalizeAetherialMastery.tsx
@@ -0,0 +1,54 @@
+import { elements } from '~data/elements'
+import { aetherialMastery } from '~data/overMastery'
+
+export default function elementalizeAetherialMastery(
+  gridCharacter: GridCharacter
+) {
+  const elementalized = aetherialMastery.map((modifier) => {
+    const element = elements.find((a) => a.id === gridCharacter.object.element)
+
+    const oppositeElement = elements.find((b) => {
+      if (element) return b.id === element.opposite_id
+    })
+
+    const newModifier = modifier
+
+    if (element && oppositeElement && modifier.name.en.includes('{Element}')) {
+      if (modifier.id === 3) {
+        newModifier.name.en = newModifier.name.en.replace(
+          '{Element}',
+          element.name.en
+        )
+        newModifier.name.ja = newModifier.name.ja.replace(
+          '{属性}',
+          `${element.name.ja}属性`
+        )
+      } else if (modifier.id === 4) {
+        newModifier.name.en = newModifier.name.en.replace(
+          '{Element}',
+          oppositeElement.name.en
+        )
+        newModifier.name.ja = newModifier.name.ja.replace(
+          '{属性}',
+          `${oppositeElement.name.ja}属性`
+        )
+      }
+    }
+
+    return newModifier
+  })
+
+  elementalized.unshift({
+    id: 0,
+    name: {
+      en: 'No aetherial mastery',
+      ja: 'エーテリアルプラス',
+    },
+    slug: 'no-mastery',
+    minValue: 0,
+    maxValue: 0,
+    fractional: false,
+  })
+
+  return elementalized
+}
diff --git a/utils/extractFilters.tsx b/utils/extractFilters.tsx
index efcba098..28f90fdf 100644
--- a/utils/extractFilters.tsx
+++ b/utils/extractFilters.tsx
@@ -1,4 +1,4 @@
-import { elements, allElement } from '~utils/Element'
+import { elements, allElement } from '~data/elements'
 
 export default (query: { [index: string]: string }, raids: Raid[]) => {
   // Extract recency filter
diff --git a/utils/groupWeaponKeys.tsx b/utils/groupWeaponKeys.tsx
index 763bd359..c1ad639c 100644
--- a/utils/groupWeaponKeys.tsx
+++ b/utils/groupWeaponKeys.tsx
@@ -1,4 +1,4 @@
-import { weaponKeyGroups } from './weaponKeyGroups'
+import { weaponKeyGroups } from '../data/weaponKeyGroups'
 
 export type GroupedWeaponKeys = {
   [key: string]: WeaponKey[]
diff --git a/utils/mapWeaponSeries.tsx b/utils/mapWeaponSeries.tsx
index 9bc63448..56980b12 100644
--- a/utils/mapWeaponSeries.tsx
+++ b/utils/mapWeaponSeries.tsx
@@ -1,4 +1,4 @@
-import { weaponSeries } from '~utils/weaponSeries'
+import { weaponSeries } from '~data/weaponSeries'
 
 export default (id: number) =>
   weaponSeries.find((series) => series.id === id)?.slug