diff --git a/client/src/Trade.js b/client/src/Trade.js
index 98d0d70..a75ca98 100644
--- a/client/src/Trade.js
+++ b/client/src/Trade.js
@@ -50,18 +50,18 @@ const Trade = ({table}) => {
 
   const createTransfer = useCallback(resource => {
     return <div key={resource} className="Transfer">
+      <Resource 
+        onClick={() => transfer(resource, 'get')}
+        label={true}
+        type={resource} 
+        count={gets[resource]}/>
+      <div className="Direction">{ gets[resource] === gives[resource] ? '' : (gets[resource] > gives[resource] ? <ArrowDownwardIcon/> : <ArrowUpwardIcon/>)}</div>
       <Resource 
         onClick={() => transfer(resource, 'give')}
         label={true}
         type={resource} 
-        count={gives[resource]}/>
-      <div className="Direction">{ gets[resource] === gives[resource] ? '' : (gets[resource] > gives[resource] ? <ArrowDownwardIcon/> : <ArrowUpwardIcon/>)}</div>
-      <Resource 
-        onClick={() => transfer(resource, 'get')}
-        label={true}
         available={player ? player[resource] - gives[resource] : undefined}
-        type={resource} 
-        count={gets[resource]}/>
+        count={gives[resource]}/>
     </div>;
   }, [ gives, gets, transfer, player]);
 
@@ -338,7 +338,8 @@ const Trade = ({table}) => {
     const isBank = (item.name === 'The bank');
 
     if (isTurn) {
-      isSameOffer = isCompatibleOffer(player, item);
+      isSameOffer = isCompatibleOffer(trade, 
+        { gets: item.gives, gives: item.gets });
     } else {
       isSameOffer = table.game.turn.offer && 
         isCompatibleOffer(player, table.game.turn.offer);
@@ -462,7 +463,7 @@ const Trade = ({table}) => {
 
         { player.haveResources && 
           <div className="Transfers">
-            <div className="GiveGet"><div>Give</div><div>Get</div><div>Have</div></div>
+            <div className="GiveGet"><div>Get</div><div>Give</div><div>Have</div></div>
             { transfers }
           </div>
         }