diff --git a/src/components/Party/index.tsx b/src/components/Party/index.tsx
index 596496ee..328c81bb 100644
--- a/src/components/Party/index.tsx
+++ b/src/components/Party/index.tsx
@@ -218,7 +218,7 @@ const Party = (props: Props) => {
     function storeSummon(summon: Summon, position: number) {
         if (position == -1) {
             setMainSummon(summon)
-        } else if (position == 4) {
+        } else if (position == 6) {
             setFriendSummon(summon)
         } else {
             // Store the grid unit summon at the correct position
@@ -235,7 +235,7 @@ const Party = (props: Props) => {
                 'summon_id': summon.id,
                 'position': position,
                 'main': (position == -1),
-                'friend': (position == 4)
+                'friend': (position == 6)
             }
         }, headers)
     }
diff --git a/src/components/SummonGrid/index.tsx b/src/components/SummonGrid/index.tsx
index 02703f97..1904947c 100644
--- a/src/components/SummonGrid/index.tsx
+++ b/src/components/SummonGrid/index.tsx
@@ -53,7 +53,7 @@ const SummonGrid = (props: Props) => {
                         editable={props.editable}
                         key="grid_friend_summon"
                         onReceiveData={receiveSummon}
-                        position={4}
+                        position={6}
                         unitType={2}
                         summon={props.friend}
                     />
@@ -83,14 +83,10 @@ const SummonGrid = (props: Props) => {
             
             <ExtraSummons 
                 grid={props.grid} 
-                editable={false} 
+                editable={props.editable} 
                 exists={false} 
                 offset={numSummons}
-                onSelect={
-                    function (type: GridType, summon: Summon, position: number): void {
-                        throw new Error('Function not implemented.')
-                    } 
-                } 
+                onSelect={props.onSelect} 
             />
         </div>
     )
diff --git a/src/components/WeaponGrid/index.tsx b/src/components/WeaponGrid/index.tsx
index 7f42d108..9097de53 100644
--- a/src/components/WeaponGrid/index.tsx
+++ b/src/components/WeaponGrid/index.tsx
@@ -34,11 +34,7 @@ const WeaponGrid = (props: Props) => {
             editable={props.editable} 
             exists={false}
             offset={numWeapons}
-            onSelect={
-                function (type: GridType, weapon: Weapon, position: number): void {
-                    throw new Error('Function not implemented.')
-                } 
-            } 
+            onSelect={props.onSelect}
         />
     )