diff --git a/Assets/Game/Prefabs.meta b/Assets/Game/Prefabs.meta
new file mode 100644
index 000000000..b2a8c43c2
--- /dev/null
+++ b/Assets/Game/Prefabs.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: feac329d9747dd64cb9df687d92d57fd
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Game/Prefabs/UI.meta b/Assets/Game/Prefabs/UI.meta
new file mode 100644
index 000000000..90934e4d1
--- /dev/null
+++ b/Assets/Game/Prefabs/UI.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 300400396184c244bb67c6910dd29897
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Game/Prefabs/UI/Trade_Entry.prefab b/Assets/Game/Prefabs/UI/Trade_Entry.prefab
new file mode 100644
index 000000000..eeb25fafc
--- /dev/null
+++ b/Assets/Game/Prefabs/UI/Trade_Entry.prefab
@@ -0,0 +1,354 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1252522009240052865
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1252522009240052866}
+  - component: {fileID: 1252522009240052877}
+  - component: {fileID: 1252522009240052876}
+  - component: {fileID: 1252522009240052867}
+  m_Layer: 5
+  m_Name: text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1252522009240052866
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1252522009240052865}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 1252522010893454280}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 234.80453, y: -62.99994}
+  m_SizeDelta: {x: 198.95, y: 30.2}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1252522009240052877
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1252522009240052865}
+  m_CullTransparentMesh: 0
+--- !u!114 &1252522009240052876
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1252522009240052865}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_text: 25x ITEM NAME
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: 5094b715585444e90b7306721788dae5, type: 2}
+  m_sharedMaterial: {fileID: 2393364598115949451, guid: 5094b715585444e90b7306721788dae5, type: 2}
+  m_fontSharedMaterials: []
+  m_fontMaterial: {fileID: 0}
+  m_fontMaterials: []
+  m_fontColor32:
+    serializedVersion: 2
+    rgba: 4284567883
+  m_fontColor: {r: 0.29411766, g: 0.31764707, b: 0.38039216, a: 1}
+  m_enableVertexGradient: 0
+  m_colorMode: 3
+  m_fontColorGradient:
+    topLeft: {r: 1, g: 1, b: 1, a: 1}
+    topRight: {r: 1, g: 1, b: 1, a: 1}
+    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+    bottomRight: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColorGradientPreset: {fileID: 0}
+  m_spriteAsset: {fileID: 0}
+  m_tintAllSprites: 0
+  m_StyleSheet: {fileID: 0}
+  m_TextStyleHashCode: -1183493901
+  m_overrideHtmlColors: 0
+  m_faceColor:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontSize: 30
+  m_fontSizeBase: 30
+  m_fontWeight: 400
+  m_enableAutoSizing: 0
+  m_fontSizeMin: 18
+  m_fontSizeMax: 72
+  m_fontStyle: 0
+  m_HorizontalAlignment: 1
+  m_VerticalAlignment: 512
+  m_textAlignment: 65535
+  m_characterSpacing: 0
+  m_wordSpacing: 0
+  m_lineSpacing: 0
+  m_lineSpacingMax: 0
+  m_paragraphSpacing: 0
+  m_charWidthMaxAdj: 0
+  m_enableWordWrapping: 1
+  m_wordWrappingRatios: 0.4
+  m_overflowMode: 0
+  m_linkedTextComponent: {fileID: 0}
+  parentLinkedComponent: {fileID: 0}
+  m_enableKerning: 1
+  m_enableExtraPadding: 0
+  checkPaddingRequired: 0
+  m_isRichText: 1
+  m_parseCtrlCharacters: 1
+  m_isOrthographic: 1
+  m_isCullingEnabled: 0
+  m_horizontalMapping: 0
+  m_verticalMapping: 0
+  m_uvLineOffset: 0
+  m_geometrySortingOrder: 0
+  m_IsTextObjectScaleStatic: 0
+  m_VertexBufferAutoSizeReduction: 1
+  m_useMaxVisibleDescender: 1
+  m_pageToDisplay: 1
+  m_margin: {x: 0, y: 0, z: 0, w: 0}
+  m_isUsingLegacyAnimationComponent: 0
+  m_isVolumetricText: 0
+  m_hasFontAssetChanged: 0
+  m_baseMaterial: {fileID: 0}
+  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!114 &1252522009240052867
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1252522009240052865}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreLayout: 0
+  m_MinWidth: 178
+  m_MinHeight: -1
+  m_PreferredWidth: -1
+  m_PreferredHeight: -1
+  m_FlexibleWidth: -1
+  m_FlexibleHeight: -1
+  m_LayoutPriority: 1
+--- !u!1 &1252522010067516119
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1252522010067516112}
+  - component: {fileID: 1252522010067516114}
+  - component: {fileID: 1252522010067516113}
+  m_Layer: 5
+  m_Name: ItemIcon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1252522010067516112
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1252522010067516119}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.8, y: 0.8, z: 1}
+  m_Children: []
+  m_Father: {fileID: 1252522010893454280}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 102, y: 115}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1252522010067516114
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1252522010067516119}
+  m_CullTransparentMesh: 0
+--- !u!114 &1252522010067516113
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1252522010067516119}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 095a82d638af44a33ab22f40ca1953aa, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 1
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &1252522010893454287
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1252522010893454280}
+  - component: {fileID: 1252522010893454282}
+  - component: {fileID: 1252522010893454281}
+  - component: {fileID: 1252522010893454286}
+  m_Layer: 5
+  m_Name: Trade_Entry
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1252522010893454280
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1252522010893454287}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 1252522010067516112}
+  - {fileID: 1252522009240052866}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1252522010893454282
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1252522010893454287}
+  m_CullTransparentMesh: 0
+--- !u!114 &1252522010893454281
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1252522010893454287}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.9245283, g: 0.9245283, b: 0.9245283, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 3219b4ecaa97f44898f3804d963b932d, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &1252522010893454286
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1252522010893454287}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 1252522010893454281}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
diff --git a/Assets/Game/Prefabs/UI/Trade_Entry.prefab.meta b/Assets/Game/Prefabs/UI/Trade_Entry.prefab.meta
new file mode 100644
index 000000000..34bb71974
--- /dev/null
+++ b/Assets/Game/Prefabs/UI/Trade_Entry.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 786c43b62d0d3a54491a783420458a24
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Game/Scenes/GameScene/GameScene.unity b/Assets/Game/Scenes/GameScene/GameScene.unity
index 90323e1f3..ff50a1bde 100644
--- a/Assets/Game/Scenes/GameScene/GameScene.unity
+++ b/Assets/Game/Scenes/GameScene/GameScene.unity
@@ -5173,9 +5173,9 @@ RectTransform:
   m_Father: {fileID: 7894890879254366206}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 63, y: -96.25}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 200, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &53824407
@@ -42519,9 +42519,9 @@ RectTransform:
   m_Father: {fileID: 1599766262}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 63, y: -96.25}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 200, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &347620291
@@ -74951,13 +74951,14 @@ GameObject:
   - component: {fileID: 638757250}
   - component: {fileID: 638757249}
   - component: {fileID: 638757251}
+  - component: {fileID: 638757252}
   m_Layer: 5
   m_Name: Refreshing
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &638757248
 RectTransform:
   m_ObjectHideFlags: 0
@@ -75028,6 +75029,50 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   rotationVector: {x: 0, y: 0, z: 4}
+--- !u!114 &638757252
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 638757247}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 638757249}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!4 &638857149 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 4561988940605264, guid: fd13f817b6a23c54e852836adcac80ab, type: 3}
@@ -95829,9 +95874,9 @@ RectTransform:
   m_Father: {fileID: 1759333731}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 63, y: -96.25}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 200, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &816038781
@@ -110325,10 +110370,10 @@ RectTransform:
   m_Father: {fileID: 7894890878111630362}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 224, y: -67}
-  m_SizeDelta: {x: 126, y: 126}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &937979876
 MonoBehaviour:
@@ -110737,9 +110782,9 @@ RectTransform:
   m_Father: {fileID: 937979875}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 63, y: -39.75}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 70, y: 70}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &941762341
@@ -123191,9 +123236,9 @@ RectTransform:
   m_Father: {fileID: 1599766262}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 63, y: -39.75}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 70, y: 70}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1031729561
@@ -159630,9 +159675,9 @@ RectTransform:
   m_Father: {fileID: 1759333731}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 63, y: -39.75}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 70, y: 70}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1349387233
@@ -187139,10 +187184,10 @@ RectTransform:
   m_Father: {fileID: 7894890878111630362}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 224, y: -215}
-  m_SizeDelta: {x: 126, y: 126}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1599766263
 MonoBehaviour:
@@ -207281,10 +207326,10 @@ RectTransform:
   m_Father: {fileID: 7894890878111630362}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 76, y: -215}
-  m_SizeDelta: {x: 126, y: 126}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1759333732
 MonoBehaviour:
@@ -209529,9 +209574,9 @@ RectTransform:
   m_Father: {fileID: 937979875}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 63, y: -96.25}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 200, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1776692534
@@ -259450,7 +259495,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!114 &7894890877298988141
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -259464,8 +259509,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   tradeListParent: {fileID: 7894890878383526720}
-  tradeListItem: {fileID: 7894890879221525352}
-  refreshIndicator: {fileID: 638757247}
+  tradeListItem: {fileID: 1252522010893454287, guid: 786c43b62d0d3a54491a783420458a24, type: 3}
+  refreshIndicator: {fileID: 638757252}
   coinsTxt: {fileID: 7894890878275405818}
   gemsTxt: {fileID: 7894890877415590217}
   pooledEntries: []
@@ -259484,6 +259529,8 @@ MonoBehaviour:
   metalsItem: {fileID: 937979874}
   oxygenItem: {fileID: 1599766261}
   itemImg: {fileID: 7894890879018931447}
+  defaultFrame: {fileID: 21300000, guid: 3219b4ecaa97f44898f3804d963b932d, type: 3}
+  mineFrame: {fileID: 21300000, guid: 000a3c204a6224394a9327d3b30a448f, type: 3}
   acceptBtn: {fileID: 7894890877276779025}
   refreshing: 0
 --- !u!222 &7894890877298988144
@@ -259710,10 +259757,10 @@ RectTransform:
   m_Father: {fileID: 7894890877404393233}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 47.5, y: -45}
-  m_SizeDelta: {x: 67, y: 67}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 67}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &7894890877404393232
 MonoBehaviour:
@@ -259748,7 +259795,7 @@ RectTransform:
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: -133.18884, y: -60.569992}
-  m_SizeDelta: {x: 336.81, y: 90}
+  m_SizeDelta: {x: 0, y: 90}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!1 &7894890877404393234
 GameObject:
@@ -259945,10 +259992,10 @@ RectTransform:
   m_Father: {fileID: 7894890878918501834}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 160.07, y: -46.5}
-  m_SizeDelta: {x: 86.14, y: 30.2}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 30.2}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &7894890877415590219
 GameObject:
@@ -260065,10 +260112,10 @@ RectTransform:
   m_Father: {fileID: 7894890877252587938}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 89, y: -25}
-  m_SizeDelta: {x: 178, y: 30.2}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 30.2}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &7894890877465682734
 GameObject:
@@ -260397,161 +260444,6 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!114 &7894890877582918692
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7894890877582918694}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_IgnoreLayout: 0
-  m_MinWidth: 178
-  m_MinHeight: -1
-  m_PreferredWidth: -1
-  m_PreferredHeight: -1
-  m_FlexibleWidth: -1
-  m_FlexibleHeight: -1
-  m_LayoutPriority: 1
---- !u!224 &7894890877582918693
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7894890877582918694}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 7894890879221525359}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 234.80453, y: -62.99994}
-  m_SizeDelta: {x: 198.95, y: 30.2}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!1 &7894890877582918694
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 7894890877582918693}
-  - component: {fileID: 7894890877582918698}
-  - component: {fileID: 7894890877582918699}
-  - component: {fileID: 7894890877582918692}
-  m_Layer: 5
-  m_Name: text
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!222 &7894890877582918698
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7894890877582918694}
-  m_CullTransparentMesh: 0
---- !u!114 &7894890877582918699
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7894890877582918694}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_text: 25x ITEM NAME
-  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 5094b715585444e90b7306721788dae5, type: 2}
-  m_sharedMaterial: {fileID: 2393364598115949451, guid: 5094b715585444e90b7306721788dae5, type: 2}
-  m_fontSharedMaterials: []
-  m_fontMaterial: {fileID: 0}
-  m_fontMaterials: []
-  m_fontColor32:
-    serializedVersion: 2
-    rgba: 4284567883
-  m_fontColor: {r: 0.29411766, g: 0.31764707, b: 0.38039216, a: 1}
-  m_enableVertexGradient: 0
-  m_colorMode: 3
-  m_fontColorGradient:
-    topLeft: {r: 1, g: 1, b: 1, a: 1}
-    topRight: {r: 1, g: 1, b: 1, a: 1}
-    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
-    bottomRight: {r: 1, g: 1, b: 1, a: 1}
-  m_fontColorGradientPreset: {fileID: 0}
-  m_spriteAsset: {fileID: 0}
-  m_tintAllSprites: 0
-  m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: -1183493901
-  m_overrideHtmlColors: 0
-  m_faceColor:
-    serializedVersion: 2
-    rgba: 4294967295
-  m_fontSize: 30
-  m_fontSizeBase: 30
-  m_fontWeight: 400
-  m_enableAutoSizing: 0
-  m_fontSizeMin: 18
-  m_fontSizeMax: 72
-  m_fontStyle: 0
-  m_HorizontalAlignment: 1
-  m_VerticalAlignment: 512
-  m_textAlignment: 65535
-  m_characterSpacing: 0
-  m_wordSpacing: 0
-  m_lineSpacing: 0
-  m_lineSpacingMax: 0
-  m_paragraphSpacing: 0
-  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
-  m_wordWrappingRatios: 0.4
-  m_overflowMode: 0
-  m_linkedTextComponent: {fileID: 0}
-  parentLinkedComponent: {fileID: 0}
-  m_enableKerning: 1
-  m_enableExtraPadding: 0
-  checkPaddingRequired: 0
-  m_isRichText: 1
-  m_parseCtrlCharacters: 1
-  m_isOrthographic: 1
-  m_isCullingEnabled: 0
-  m_horizontalMapping: 0
-  m_verticalMapping: 0
-  m_uvLineOffset: 0
-  m_geometrySortingOrder: 0
-  m_IsTextObjectScaleStatic: 0
-  m_VertexBufferAutoSizeReduction: 1
-  m_useMaxVisibleDescender: 1
-  m_pageToDisplay: 1
-  m_margin: {x: 0, y: 0, z: 0, w: 0}
-  m_isUsingLegacyAnimationComponent: 0
-  m_isVolumetricText: 0
-  m_hasFontAssetChanged: 0
-  m_baseMaterial: {fileID: 0}
-  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
 --- !u!114 &7894890877642002664
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -260758,10 +260650,10 @@ RectTransform:
   m_Father: {fileID: 7894890877426257969}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 114.755, y: -25}
-  m_SizeDelta: {x: 229.51, y: 30.2}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 30.2}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &7894890877775745493
 GameObject:
@@ -260913,10 +260805,10 @@ RectTransform:
   m_Father: {fileID: 7894890879187871410}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 140.115, y: -25}
-  m_SizeDelta: {x: 280.23, y: 30.2}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 30.2}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &7894890877828007737
 GameObject:
@@ -261537,7 +261429,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 298}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!1 &7894890878111630363
 GameObject:
@@ -261761,10 +261653,10 @@ RectTransform:
   m_Father: {fileID: 7894890877404393233}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 210.405, y: -45}
-  m_SizeDelta: {x: 168.81, y: 30.2}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 30.2}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &7894890878383526720
 RectTransform:
@@ -261776,15 +261668,14 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children:
-  - {fileID: 7894890879221525359}
+  m_Children: []
   m_Father: {fileID: 7894890878622662195}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 1}
   m_AnchoredPosition: {x: 13.8, y: -0.000030517578}
-  m_SizeDelta: {x: -173.052, y: -436.534}
+  m_SizeDelta: {x: -173.052, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!1 &7894890878383526721
 GameObject:
@@ -261842,81 +261733,6 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_HorizontalFit: 0
   m_VerticalFit: 2
---- !u!1 &7894890878404090480
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 7894890878404090487}
-  - component: {fileID: 7894890878404090485}
-  - component: {fileID: 7894890878404090486}
-  m_Layer: 5
-  m_Name: ItemIcon
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!222 &7894890878404090485
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7894890878404090480}
-  m_CullTransparentMesh: 0
---- !u!114 &7894890878404090486
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7894890878404090480}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 095a82d638af44a33ab22f40ca1953aa, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 1
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!224 &7894890878404090487
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7894890878404090480}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.8, y: 0.8, z: 1}
-  m_Children: []
-  m_Father: {fileID: 7894890879221525359}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 102, y: 115}
-  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &7894890878426994616
 GameObject:
   m_ObjectHideFlags: 0
@@ -263756,7 +263572,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 276.7, y: 5.43}
-  m_SizeDelta: {x: 215.14, y: 90}
+  m_SizeDelta: {x: 0, y: 90}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &7894890878918501835
 GameObject:
@@ -264074,7 +263890,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 150}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!224 &7894890879018931440
 RectTransform:
@@ -264221,10 +264037,10 @@ RectTransform:
   m_Father: {fileID: 7894890878918501834}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 55, y: -46.5}
-  m_SizeDelta: {x: 66, y: 57}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 57}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7894890879077431092
 CanvasRenderer:
@@ -264433,9 +264249,9 @@ RectTransform:
   m_Father: {fileID: 7894890879254366206}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 63, y: -39.75}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 70, y: 70}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &7894890879143371715
@@ -264515,10 +264331,10 @@ RectTransform:
   m_Father: {fileID: 7894890878998931611}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 227.3215, y: -67}
-  m_SizeDelta: {x: 126, y: 126}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &7894890879148921746
 GameObject:
@@ -264799,128 +264615,6 @@ RectTransform:
   m_AnchoredPosition: {x: 227.3215, y: -215}
   m_SizeDelta: {x: 126, y: 126}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!1 &7894890879221525352
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 7894890879221525359}
-  - component: {fileID: 7894890879221525357}
-  - component: {fileID: 7894890879221525358}
-  - component: {fileID: 7894890879221525353}
-  m_Layer: 5
-  m_Name: Trade_Entry
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!114 &7894890879221525353
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7894890879221525352}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Navigation:
-    m_Mode: 3
-    m_WrapAround: 0
-    m_SelectOnUp: {fileID: 0}
-    m_SelectOnDown: {fileID: 0}
-    m_SelectOnLeft: {fileID: 0}
-    m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
-  m_Colors:
-    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
-    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
-    m_ColorMultiplier: 1
-    m_FadeDuration: 0.1
-  m_SpriteState:
-    m_HighlightedSprite: {fileID: 0}
-    m_PressedSprite: {fileID: 0}
-    m_SelectedSprite: {fileID: 0}
-    m_DisabledSprite: {fileID: 0}
-  m_AnimationTriggers:
-    m_NormalTrigger: Normal
-    m_HighlightedTrigger: Highlighted
-    m_PressedTrigger: Pressed
-    m_SelectedTrigger: Selected
-    m_DisabledTrigger: Disabled
-  m_Interactable: 1
-  m_TargetGraphic: {fileID: 7894890879221525358}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls: []
---- !u!222 &7894890879221525357
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7894890879221525352}
-  m_CullTransparentMesh: 0
---- !u!114 &7894890879221525358
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7894890879221525352}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.9245283, g: 0.9245283, b: 0.9245283, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 3219b4ecaa97f44898f3804d963b932d, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!224 &7894890879221525359
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7894890879221525352}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children:
-  - {fileID: 7894890878404090487}
-  - {fileID: 7894890877582918693}
-  m_Father: {fileID: 7894890878383526720}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: -86.526, y: -67}
-  m_SizeDelta: {x: 126, y: 126}
-  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &7894890879229135540
 GameObject:
   m_ObjectHideFlags: 0
@@ -265153,10 +264847,10 @@ RectTransform:
   m_Father: {fileID: 7894890878111630362}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 76, y: -67}
-  m_SizeDelta: {x: 126, y: 126}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &7894890879254366207
 GameObject:
diff --git a/Assets/Game/Scripts/TradeMenu.cs b/Assets/Game/Scripts/TradeMenu.cs
index ff6be671c..b45f203c9 100644
--- a/Assets/Game/Scripts/TradeMenu.cs
+++ b/Assets/Game/Scripts/TradeMenu.cs
@@ -11,51 +11,57 @@ public class TradeMenu : MonoBehaviour
 {
     public Transform tradeListParent;
     public GameObject tradeListItem;
-    public GameObject refreshIndicator;
+    public Button refreshIndicator;
     public TMP_Text coinsTxt;
     public TMP_Text gemsTxt;
     public List<GameObject> pooledEntries;
     public List<TradeRequest> trades;
     [Header("Selected Trade Data")]
-    public TradeRequest selectedTrade=null;
+    public TradeRequest selectedTrade = null;
     public TMP_Text sellerNameTxt;
     public GameObject coinsItem;
     public GameObject gemsItem;
     public GameObject metalsItem;
     public GameObject oxygenItem;
     public Image itemImg;
+    public Sprite defaultFrame;
+    public Sprite mineFrame;
     public Button acceptBtn;
     void Start()
     {
-        pooledEntries= new List<GameObject>();
-        pooledEntries.Add(tradeListItem);
+        pooledEntries = new List<GameObject>();
+        //pooledEntries.Add(tradeListItem);
+        refreshIndicator.onClick.AddListener(Refresh);
+        acceptBtn.onClick.AddListener(OnAcceptClicked);
         Refresh();
     }
 
     // Update is called once per frame
     void Update()
     {
-        
+
     }
 
     public bool refreshing = false;
-    public async void Refresh(){
+    public async void Refresh()
+    {
         refreshing = true;
-        refreshIndicator.SetActive(true);
+        refreshIndicator.interactable=false;
+        refreshIndicator.GetComponent<Rotator>().enabled = (true);
         //Clean existing entries
-        foreach(GameObject entry in pooledEntries){entry.SetActive(false);}
+        foreach (GameObject entry in pooledEntries) { entry.SetActive(false); }
         coinsTxt.text = DBmanager.Coins.ToString();
         gemsTxt.text = DBmanager.Gems.ToString();
-        selectedTrade=null;
-      //  if(selectedTrade==null){
-            coinsItem.SetActive(false);
-            gemsItem.SetActive(false);
-            metalsItem.SetActive(false);
-            oxygenItem.SetActive(false);
-            acceptBtn.interactable=false;
-            itemImg.sprite = null;
+        selectedTrade = null;
+        //  if(selectedTrade==null){
+        coinsItem.SetActive(false);
+        gemsItem.SetActive(false);
+        metalsItem.SetActive(false);
+        oxygenItem.SetActive(false);
+        acceptBtn.interactable = false;
+        itemImg.sprite = null;
         //}
-        
+
         using (UnityWebRequest www = UnityWebRequest.Get(DBmanager.phpRoot + "get_trades.php"))
         {
             var operation = www.SendWebRequest();
@@ -70,14 +76,22 @@ public class TradeMenu : MonoBehaviour
             }
             else
             {
-                string[] splitChars = {"<td>"};
-                string[] data = www.downloadHandler.text.Split(splitChars,System.StringSplitOptions.RemoveEmptyEntries);
+                string[] splitChars = { "<td>" };
+                string[] data = www.downloadHandler.text.Split(splitChars, System.StringSplitOptions.RemoveEmptyEntries);
                 trades = new List<TradeRequest>();
-                foreach(string row in data){
-                    try{
+                foreach (string row in data)
+                {
+                    try
+                    {
                         TradeRequest trade = JsonConvert.DeserializeObject<TradeRequest>(row);
                         trades.Add(trade);
-                    }catch{
+                        if(trade.seller == DBmanager.username){
+                            trades[trades.Count-1] = trades[0];
+                            trades[0] = trade;
+                        }
+                    }
+                    catch
+                    {
 
                     }
                 }
@@ -88,97 +102,161 @@ public class TradeMenu : MonoBehaviour
 
         //Populate Trade Entries in list
 
-        
+
         //Fill pool if exceeds
-        if(trades.Count > pooledEntries.Count){
-            for(int i =0; i < trades.Count - pooledEntries.Count; i++){
+        int amountToFill = trades.Count - pooledEntries.Count;
+        if (amountToFill > 0)
+        {
+            for (int i = 0; i < amountToFill; i++)
+            {
                 GameObject newEntry = Instantiate(tradeListItem, tradeListParent);
                 newEntry.SetActive(false);
                 pooledEntries.Add(newEntry);
             }
         }
+        if(trades.Count > pooledEntries.Count){Debug.LogError("Somethings wrong, I can feel it");}
         //Set pooled items
-        for(int i = 0; i < trades.Count;i++){
+        for (int i = 0; i < trades.Count; i++)
+        {
             TradeRequest trade = trades[i];
             InventoryItem item = Inventory.GetInventoryItem(trade.item);
-            if(item ==null){Debug.LogError("Couldn't find any inventory item for " + trade.item); continue;}
+            if (item == null) { Debug.LogError("Couldn't find any inventory item for " + trade.item); continue; }
             pooledEntries[i].SetActive(true);
             pooledEntries[i].transform.GetChild(0).GetComponent<Image>().sprite = item.image;
             pooledEntries[i].GetComponentInChildren<TMPro.TMP_Text>().text = trade.item;
             pooledEntries[i].GetComponent<Button>().onClick.RemoveAllListeners();
-            pooledEntries[i].GetComponent<Button>().onClick.AddListener(()=>{SelectTrade(trade.id);});
+            pooledEntries[i].GetComponent<Button>().onClick.AddListener(() => { SelectTrade(trade.id); });
+
+            pooledEntries[i].GetComponent<Image>().sprite = (trade.seller == DBmanager.username) ? mineFrame : defaultFrame;
+
         }
 
+refreshIndicator.interactable=true;
+        refreshIndicator.GetComponentInChildren<Rotator>(true).enabled=(false);
         
-        refreshIndicator.SetActive(false);
-        refreshing=false;
+        refreshing = false;
     }
 
-    public void SelectTrade(TradeRequest trade){
+    public void SelectTrade(TradeRequest trade)
+    {
         SelectTrade(trade.id);
     }
 
-    public void SelectTrade(int id){
+    public void SelectTrade(int id)
+    {
         selectedTrade = null;
-        foreach(TradeRequest trade in trades){
-            if(trade.id == id){
+        foreach (TradeRequest trade in trades)
+        {
+            if (trade.id == id)
+            {
                 selectedTrade = trade;
                 break;
             }
         }
-        if(selectedTrade==null){Debug.Log("No matching trade request");return;}
+        if (selectedTrade == null) { Debug.Log("No matching trade request"); return; }
+        bool myTrade = selectedTrade.seller == DBmanager.username;
         InventoryItem item = Inventory.GetInventoryItem(selectedTrade.item);
         itemImg.sprite = item.image;
 
         #region setResource
-        if(selectedTrade.coins > 0){
+        if (selectedTrade.coins > 0)
+        {
             coinsItem.SetActive(true);
             coinsItem.GetComponentInChildren<TMP_Text>().text = selectedTrade.coins.ToString();
-        }else{
+        }
+        else
+        {
             coinsItem.SetActive(false);
         }
-        
-        if(selectedTrade.gems > 0){
+
+        if (selectedTrade.gems > 0)
+        {
             gemsItem.SetActive(true);
             gemsItem.GetComponentInChildren<TMP_Text>().text = selectedTrade.gems.ToString();
-        }else{
+        }
+        else
+        {
             gemsItem.SetActive(false);
         }
-        
-        if(selectedTrade.metals > 0){
+
+        if (selectedTrade.metals > 0)
+        {
             metalsItem.SetActive(true);
             metalsItem.GetComponentInChildren<TMP_Text>().text = selectedTrade.metals.ToString();
-        }else{
+        }
+        else
+        {
             metalsItem.SetActive(false);
         }
-        
-        if(selectedTrade.oxygen > 0){
+
+        if (selectedTrade.oxygen > 0)
+        {
             oxygenItem.SetActive(true);
             oxygenItem.GetComponentInChildren<TMP_Text>().text = selectedTrade.oxygen.ToString();
-        }else{
+        }
+        else
+        {
             oxygenItem.SetActive(false);
         }
         #endregion
 
         sellerNameTxt.text = selectedTrade.seller;
 
-        acceptBtn.interactable = (DBmanager.Coins >= selectedTrade.coins) && (DBmanager.Gems >= selectedTrade.gems) && (DBmanager.Metal >= selectedTrade.metals) && (DBmanager.Oxygen >= selectedTrade.oxygen);
+        acceptBtn.interactable = !myTrade && isTradeAffordable(selectedTrade);
+    }
+
+    public bool isTradeAffordable(TradeRequest trade) => (DBmanager.Coins >= trade.coins) && (DBmanager.Gems >= trade.gems) && (DBmanager.Metal >= trade.metals) && (DBmanager.Oxygen >= trade.oxygen);
+
+    public void OnAcceptClicked(){
+        if(selectedTrade==null){Debug.Log("No offer is selected to accept"); return;}
+        if(selectedTrade.seller == DBmanager.username){Debug.LogError("Cannot accept my own offer, This is illegal"); return;}
+        if(!isTradeAffordable(selectedTrade)){Debug.Log("Insufficient resources to complete the trade (LC)");return;}
+
+        //Good to go
+        StartCoroutine(acceptOffer(selectedTrade));
+    }
+
+    IEnumerator acceptOffer(TradeRequest trade){
+        acceptBtn.interactable=false;
+        WWWForm form = new WWWForm();
+        form.AddField("name", DBmanager.username);
+        form.AddField("id", trade.id);
+
+        WWW www = new WWW(DBmanager.phpRoot+"accept_trade.php", form);
+        yield return www;
+
+        if(www.text=="0"){
+            Debug.Log("Trade success");
+            //change local stuff
+            DBmanager.SetCoins(DBmanager.Coins - trade.coins,true);
+            DBmanager.SetGems(DBmanager.Gems -  trade.gems,true);
+            DBmanager.SetOxygen(DBmanager.Oxygen - trade.oxygen,true);
+            DBmanager.SetMetal(DBmanager.Metal - trade.metals, true);
+            DBmanager.AddInventoryItem(Inventory.GetInventoryItem(trade.item));
+            Refresh();
+        }else{
+            Debug.Log($"I wanted to trade, but server said :{www.text}");
+        }
+        acceptBtn.interactable=true;
     }
 
 
-    public void Show(){
+    public void Show()
+    {
         gameObject.SetActive(true);
         Refresh();
     }
 
-    public void Close(){
+    public void Close()
+    {
         gameObject.SetActive(false);
     }
 }
 
 
 [System.Serializable]
-public class TradeRequest{
+public class TradeRequest
+{
     public int id;
     public string seller;
     public string item;