diff --git a/client/drops.lua b/client/drops.lua
index 10c8a378..69a23de0 100644
--- a/client/drops.lua
+++ b/client/drops.lua
@@ -32,6 +32,13 @@ end
 
 -- Events
 
+RegisterNetEvent('qb-inventory:client:removeDropTarget', function(dropId)
+    while not NetworkDoesNetworkIdExist(dropId) do Wait(10) end
+    local bag = NetworkGetEntityFromNetworkId(dropId)
+    while not DoesEntityExist(bag) do Wait(10) end
+    exports['qb-target']:RemoveTargetEntity(bag)
+end)
+
 RegisterNetEvent('qb-inventory:client:setupDropTarget', function(dropId)
     while not NetworkDoesNetworkIdExist(dropId) do Wait(10) end
     local bag = NetworkGetEntityFromNetworkId(dropId)
@@ -51,6 +58,12 @@ RegisterNetEvent('qb-inventory:client:setupDropTarget', function(dropId)
                 icon = 'fas fa-hand-pointer',
                 label = 'Pick up bag',
                 action = function()
+                    if IsPedArmed(PlayerPedId(), 4) then
+                        return QBCore.Functions.Notify("You can not be holding a Gun and a Bag!", "error", 5500) 
+                    end
+                    if holdingDrop then
+                        return QBCore.Functions.Notify("Your already holding a bag, Go Drop it!", "error", 5500)
+                    end
                     AttachEntityToEntity(
                         bag,
                         PlayerPedId(),
diff --git a/client/main.lua b/client/main.lua
index 0b715378..161ecd7b 100644
--- a/client/main.lua
+++ b/client/main.lua
@@ -219,7 +219,7 @@ RegisterNUICallback('GiveItem', function(data, cb)
         local playerId = GetPlayerServerId(player)
         QBCore.Functions.TriggerCallback('qb-inventory:server:giveItem', function(success)
             cb(success)
-        end, playerId, data.item.name, data.amount)
+        end, playerId, data.item.name, data.amount, data.slot, data.info)
     else
         QBCore.Functions.Notify(Lang:t('notify.nonb'), 'error')
         cb(false)
@@ -300,6 +300,11 @@ for i = 1, 5 do
     RegisterCommand('slot_' .. i, function()
         local itemData = PlayerData.items[i]
         if not itemData then return end
+        if itemData.type == "weapon" then
+            if holdingDrop then
+                return QBCore.Functions.Notify("Your already holding a bag, Go Drop it!", "error", 5500)
+            end
+        end
         TriggerServerEvent('qb-inventory:server:useItem', itemData)
     end, false)
     RegisterKeyMapping('slot_' .. i, Lang:t('inf_mapping.use_item') .. i, 'keyboard', i)
diff --git a/config/vehicles.lua b/config/vehicles.lua
index 2b0ef53b..4669f8e3 100644
--- a/config/vehicles.lua
+++ b/config/vehicles.lua
@@ -21,13 +21,13 @@ VehicleStorage = {
         gloveboxSlots = 5,
         gloveboxWeight = 10000,
         trunkSlots = 50,
-        maxWeight = 75000
+        trunkWeight = 75000
     },
     [3] = { -- Coupes
         gloveboxSlots = 5,
         gloveboxWeight = 10000,
         trunkSlots = 35,
-        maxWeight = 42000
+        trunkWeight = 42000
     },
     [4] = { -- Muscle
         gloveboxSlots = 5,
@@ -95,6 +95,42 @@ VehicleStorage = {
         trunkSlots = 50,
         trunkWeight = 120000
     },
+    [17] = { -- service
+        gloveboxSlots = 0,
+        gloveboxWeight = 0,
+        trunkSlots = 0,
+        trunkWeight = 0
+    },
+    [18] = { -- Emergency
+        gloveboxSlots = 4,
+        gloveboxWeight = 10000,
+        trunkSlots = 12,
+        trunkWeight = 150000
+    },
+    [19] = { -- Military
+        gloveboxSlots = 0,
+        gloveboxWeight = 0,
+        trunkSlots = 0,
+        trunkWeight = 0
+    },
+    [20] = { -- Commercial
+        gloveboxSlots = 0,
+        gloveboxWeight = 0,
+        trunkSlots = 0,
+        trunkWeight = 0
+    },
+    [21] = { -- trains
+        gloveboxSlots = 0,
+        gloveboxWeight = 0,
+        trunkSlots = 0,
+        trunkWeight = 0
+    },
+    [22] = { -- Commercial
+        gloveboxSlots = 0,
+        gloveboxWeight = 0,
+        trunkSlots = 0,
+        trunkWeight = 0
+    },
 }
 
 BackEngineVehicles = {
diff --git a/html/app.js b/html/app.js
index e17a42ac..ff00bea8 100644
--- a/html/app.js
+++ b/html/app.js
@@ -70,7 +70,6 @@ const InventoryContainer = Vue.createApp({
                 otherInventory: {},
                 otherInventoryName: "",
                 otherInventoryLabel: "Drop",
-                otherInventoryTotalWeight: 0,
                 otherInventoryMaxWeight: 1000000,
                 otherInventorySlots: 100,
                 isShopInventory: false,
@@ -210,7 +209,13 @@ const InventoryContainer = Vue.createApp({
         getHotbarItemInSlot(slot) {
             return this.hotbarItems[slot - 1] || null;
         },
+        containerMouseDownAction(event) {
+            if (event.button === 0 && this.showContextMenu) {
+                this.showContextMenu = false;
+            }
+        },
         handleMouseDown(event, slot, inventory) {
+            if (event.button === 1) return; // skip middle mouse
             event.preventDefault();
             const itemInSlot = this.getItemInSlot(slot, inventory);
             if (event.button === 0) {
@@ -234,42 +239,58 @@ const InventoryContainer = Vue.createApp({
         moveItemBetweenInventories(item, sourceInventoryType) {
             const sourceInventory = sourceInventoryType === "player" ? this.playerInventory : this.otherInventory;
             const targetInventory = sourceInventoryType === "player" ? this.otherInventory : this.playerInventory;
-            const targetItemKey = Object.keys(targetInventory).find((key) => targetInventory[key] && targetInventory[key].name === item.name);
-            const targetItem = targetInventory[targetItemKey];
             const amountToTransfer = this.transferAmount !== null ? this.transferAmount : 1;
             let targetSlot = null;
 
             const sourceItem = sourceInventory[item.slot];
             if (!sourceItem || sourceItem.amount < amountToTransfer) {
-                console.error("Error: Insufficient amount of item in source inventory");
+                this.inventoryError(item.slot);
                 return;
             }
 
-            if (!targetItem) {
+            const totalWeightAfterTransfer = this.otherInventoryWeight + sourceItem.weight * amountToTransfer;
+            if (totalWeightAfterTransfer > this.otherInventoryMaxWeight) {
+                this.inventoryError(item.slot);
+                return;
+            }
+
+            if (item.unique) {
+                targetSlot = this.findNextAvailableSlot(targetInventory);
+                if (targetSlot === null) {
+                    this.inventoryError(item.slot);
+                    return;
+                }
+
                 const newItem = {
                     ...item,
                     inventory: sourceInventoryType === "player" ? "other" : "player",
                     amount: amountToTransfer,
                 };
+                targetInventory[targetSlot] = newItem;
+                newItem.slot = targetSlot;
+            } else {
+                const targetItemKey = Object.keys(targetInventory).find((key) => targetInventory[key] && targetInventory[key].name === item.name);
+                const targetItem = targetInventory[targetItemKey];
+
+                if (!targetItem) {
+                    const newItem = {
+                        ...item,
+                        inventory: sourceInventoryType === "player" ? "other" : "player",
+                        amount: amountToTransfer,
+                    };
 
-                let added = false;
-                for (let slot = 1; slot <= this.totalSlots; slot++) {
-                    if (!targetInventory[slot]) {
-                        targetInventory[slot] = newItem;
-                        newItem.slot = slot;
-                        targetSlot = slot;
-                        added = true;
-                        break;
+                    targetSlot = this.findNextAvailableSlot(targetInventory);
+                    if (targetSlot === null) {
+                        this.inventoryError(item.slot);
+                        return;
                     }
-                }
 
-                if (!added) {
-                    console.error("Error: No free slots available in target inventory");
-                    return;
+                    targetInventory[targetSlot] = newItem;
+                    newItem.slot = targetSlot;
+                } else {
+                    targetItem.amount += amountToTransfer;
+                    targetSlot = targetItem.slot;
                 }
-            } else {
-                targetItem.amount += amountToTransfer;
-                targetSlot = targetItem.slot;
             }
 
             sourceItem.amount -= amountToTransfer;
@@ -298,6 +319,7 @@ const InventoryContainer = Vue.createApp({
             this.dragStartX = event.clientX;
             this.dragStartY = event.clientY;
             this.dragStartInventoryType = inventoryType;
+            this.showContextMenu = false;
         },
         createGhostElement(slotElement) {
             const ghostElement = slotElement.cloneNode(true);
@@ -403,6 +425,11 @@ const InventoryContainer = Vue.createApp({
         },
         handleItemDrop(targetInventoryType, targetSlot) {
             try {
+                const isShop = this.otherInventoryName.indexOf("shop-");
+                if (this.dragStartInventoryType === "other" && targetInventoryType === "other" && isShop !== -1) {
+                    return;
+                }
+
                 const targetSlotNumber = parseInt(targetSlot, 10);
                 if (isNaN(targetSlotNumber)) {
                     throw new Error("Invalid target slot number");
@@ -420,6 +447,21 @@ const InventoryContainer = Vue.createApp({
                 if (sourceItem.amount < amountToTransfer) {
                     throw new Error("Insufficient amount of item in source inventory");
                 }
+                
+                if (targetInventoryType == "other")
+                    {
+                        const totalWeightAfterTransfer = this.otherInventoryWeight + sourceItem.weight * amountToTransfer;
+                        if (totalWeightAfterTransfer > this.otherInventoryMaxWeight) {
+                            throw new Error("Insufficient weight capacity in target inventory");
+                        }
+                    }
+                else if (targetInventoryType == "player")
+                    {
+                        const totalWeightAfterTransfer = this.playerWeight + sourceItem.weight * amountToTransfer;
+                        if (totalWeightAfterTransfer > this.maxWeight) {
+                            throw new Error("Insufficient weight capacity in player inventory");
+                        }
+                    }
 
                 const targetItem = targetInventory[targetSlotNumber];
 
@@ -659,6 +701,8 @@ const InventoryContainer = Vue.createApp({
                         await axios.post("https://qb-inventory/GiveItem", {
                             item: selectedItem,
                             amount: amountToGive,
+                            slot: selectedItem.slot,
+                            info: selectedItem.info,
                         });
                         this.playerInventory[selectedItem.slot].amount -= amountToGive;
                         if (this.playerInventory[selectedItem.slot].amount === 0) {
diff --git a/html/index.html b/html/index.html
index 8c4d1c19..884f58ad 100644
--- a/html/index.html
+++ b/html/index.html
@@ -16,7 +16,7 @@
     </head>
     <body>
         <div id="app">
-            <div class="inventory-container" v-if="isInventoryOpen" @mousemove="drag" @mouseup="endDrag">
+            <div class="inventory-container" v-if="isInventoryOpen" @mousemove="drag" @mouseup="endDrag" @mousedown="containerMouseDownAction">
                 <div class="player-inventory-header" :class="{ 'centered-inventory-header': shouldCenterInventory }">
                     <div class="labels-container">
                         <div class="inventory-label">
@@ -27,7 +27,7 @@
                         </div>
                     </div>
                     <div class="weight-bar">
-                        <div class="weight-bar-fill" :style="{ width: (playerWeight / maxWeight) * 100 + '%' }" :class="weightBarClass"></div>
+                        <div class="weight-bar-fill" :style="{ width: Math.min((playerWeight / maxWeight) * 100, 100) + '%' }" :class="weightBarClass"></div>
                     </div>
                 </div>
                 <div class="player-inventory" :class="{ 'centered-player-inventory': shouldCenterInventory }">
@@ -79,7 +79,7 @@
                         </div>
                     </div>
                     <div class="weight-bar">
-                        <div class="weight-bar-fill" :style="{ width: (otherInventoryWeight / otherInventoryMaxWeight) * 100 + '%' }" :class="otherWeightBarClass"></div>
+                        <div class="weight-bar-fill" :style="{ width: Math.min((otherInventoryWeight / otherInventoryMaxWeight) * 100, 100) + '%' }" :class="otherWeightBarClass"></div>
                     </div>
                 </div>
                 <div class="other-inventory" v-if="!isOtherInventoryEmpty">
@@ -191,7 +191,7 @@
                 </div>
             </div>
             <ul v-if="showContextMenu" class="context-menu" :style="{ top: contextMenuPosition.top, left: contextMenuPosition.left }">
-                <li @click="useItem(contextMenuItem)">Use</li>
+                <li v-if="contextMenuItem.useable" @click="useItem(contextMenuItem)">Use</li>
                 <li @mouseover="showSubmenu = true" @mouseleave="showSubmenu = false">
                     Give
                     <ul v-if="showSubmenu" class="submenu">
diff --git a/html/main.css b/html/main.css
index 6c10a79a..a3ccc2c7 100644
--- a/html/main.css
+++ b/html/main.css
@@ -1,5 +1,9 @@
 @import url("https://fonts.googleapis.com/css2?family=Open+Sans&display=swap");
 
+body {
+    margin: 0;
+}
+
 div {
     font-family: "Open Sans", sans-serif;
 }
@@ -9,8 +13,8 @@ div {
 }
 
 #app {
-    height: 99vh;
-    width: 99vw;
+    height: 100vh;
+    width: 100vw;
     background: transparent;
 }
 
@@ -195,7 +199,7 @@ div {
     white-space: nowrap;
     bottom: 0;
     height: 1vh;
-    width: 99%;
+    width: 100%;
     background-color: #cccccc;
     display: flex;
     justify-content: center;
diff --git a/server/functions.lua b/server/functions.lua
index 9cea1e8f..7c5b9743 100644
--- a/server/functions.lua
+++ b/server/functions.lua
@@ -344,6 +344,21 @@ end
 
 exports('CanAddItem', CanAddItem)
 
+--- Gets the total free weight of the player's inventory.
+--- @param source number The player's server ID.
+--- @return number - Returns the free weight of the players inventory. Error will return 0
+function GetFreeWeight(source)
+    if not source then warn("Source was not passed into GetFreeWeight") return 0 end
+    local Player = QBCore.Functions.GetPlayer(source)
+    if not Player then return 0 end
+
+    local totalWeight = GetTotalWeight(Player.PlayerData.items)
+    local freeWeight = Config.MaxWeight - totalWeight
+    return freeWeight
+end
+
+exports('GetFreeWeight', GetFreeWeight)
+
 function ClearInventory(source, filterItems)
     local player = QBCore.Functions.GetPlayer(source)
     local savedItemData = {}
diff --git a/server/main.lua b/server/main.lua
index 04e61627..46295554 100644
--- a/server/main.lua
+++ b/server/main.lua
@@ -129,6 +129,8 @@ AddEventHandler('onResourceStart', function(resourceName)
         QBCore.Functions.AddPlayerMethod(k, 'SetInventory', function(items)
             SetInventory(k, items)
         end)
+
+        Player(k).state.inv_busy = false
     end
 end)
 
@@ -172,6 +174,13 @@ RegisterNetEvent('qb-inventory:server:closeInventory', function(inventory)
     end
     if Drops[inventory] then
         Drops[inventory].isOpen = false
+        if #Drops[inventory].items == 0 and not Drops[inventory].isOpen then -- if no listeed items in the drop on close
+            TriggerClientEvent('qb-inventory:client:removeDropTarget', -1, Drops[inventory].entityId)
+            Wait(500)
+            local entity = NetworkGetEntityFromNetworkId(Drops[inventory].entityId)
+            if DoesEntityExist(entity) then DeleteEntity(entity) end
+            Drops[inventory] = nil
+        end
         return
     end
     if not Inventories[inventory] then return end
@@ -180,15 +189,16 @@ RegisterNetEvent('qb-inventory:server:closeInventory', function(inventory)
 end)
 
 RegisterNetEvent('qb-inventory:server:useItem', function(item)
-    local itemData = GetItemBySlot(source, item.slot)
+    local src = source
+    local itemData = GetItemBySlot(src, item.slot)
     if not itemData then return end
     local itemInfo = QBCore.Shared.Items[itemData.name]
     if itemData.type == 'weapon' then
-        TriggerClientEvent('qb-weapons:client:UseWeapon', source, itemData, itemData.info.quality and itemData.info.quality > 0)
-        TriggerClientEvent('qb-inventory:client:ItemBox', source, itemInfo, 'use')
+        TriggerClientEvent('qb-weapons:client:UseWeapon', src, itemData, itemData.info.quality and itemData.info.quality > 0)
+        TriggerClientEvent('qb-inventory:client:ItemBox', src, itemInfo, 'use')
     else
-        UseItem(itemData.name, source, itemData)
-        TriggerClientEvent('qb-inventory:client:ItemBox', source, itemInfo, 'use')
+        UseItem(itemData.name, src, itemData)
+        TriggerClientEvent('qb-inventory:client:ItemBox', src, itemInfo, 'use')
     end
 end)
 
@@ -275,10 +285,28 @@ QBCore.Functions.CreateCallback('qb-inventory:server:attemptPurchase', function(
     local shop = string.gsub(data.shop, 'shop%-', '')
     local price = itemInfo.price * amount
     local Player = QBCore.Functions.GetPlayer(source)
+
     if not Player then
         cb(false)
         return
     end
+
+    local shopInfo = RegisteredShops[shop]
+    if not shopInfo then
+        cb(false)
+        return
+    end
+
+    local playerPed = GetPlayerPed(source)
+    local playerCoords = GetEntityCoords(playerPed)
+    if shopInfo.coords then
+        local shopCoords = vector3(shopInfo.coords.x, shopInfo.coords.y, shopInfo.coords.z)
+        if #(playerCoords - shopCoords) > 10 then
+            cb(false)
+            return
+        end
+    end
+
     if not CanAddItem(source, itemInfo.name, amount) then
         TriggerClientEvent('QBCore:Notify', source, 'Cannot hold item', 'error')
         cb(false)
@@ -296,7 +324,7 @@ QBCore.Functions.CreateCallback('qb-inventory:server:attemptPurchase', function(
     end
 end)
 
-QBCore.Functions.CreateCallback('qb-inventory:server:giveItem', function(source, cb, target, item, amount)
+QBCore.Functions.CreateCallback('qb-inventory:server:giveItem', function(source, cb, target, item, amount, slot, info)
     local player = QBCore.Functions.GetPlayer(source)
     if not player or player.PlayerData.metadata['isdead'] or player.PlayerData.metadata['inlaststand'] or player.PlayerData.metadata['ishandcuffed'] then
         cb(false)
@@ -342,14 +370,14 @@ QBCore.Functions.CreateCallback('qb-inventory:server:giveItem', function(source,
         return
     end
 
-    local giveItem = AddItem(target, item, giveAmount)
-    if not giveItem then
+    local removeItem = RemoveItem(source, item, giveAmount, slot, 'Item given to ID #'..target)
+    if not removeItem then
         cb(false)
         return
     end
 
-    local removeItem = RemoveItem(source, item, giveAmount)
-    if not removeItem then
+    local giveItem = AddItem(target, item, giveAmount, false, info, 'Item given from ID #'..source)
+    if not giveItem then
         cb(false)
         return
     end
@@ -376,7 +404,7 @@ local function getItem(inventoryId, src, slot)
         if targetPlayer then
             item = targetPlayer.PlayerData.items[slot]
         end
-    elseif inventoryId:find('drop-') then
+    elseif inventoryId:find('drop-') == 1 then
         item = Drops[inventoryId]['items'][slot]
     else
         item = Inventories[inventoryId]['items'][slot]
@@ -395,6 +423,7 @@ local function getIdentifier(inventoryId, src)
 end
 
 RegisterNetEvent('qb-inventory:server:SetInventoryData', function(fromInventory, toInventory, fromSlot, toSlot, fromAmount, toAmount)
+    if toInventory:find('shop-') then return end
     if not fromInventory or not toInventory or not fromSlot or not toSlot or not fromAmount or not toAmount then return end
     local src = source
     local Player = QBCore.Functions.GetPlayer(src)