diff --git a/addons/vana_loadoutmanagement/Functions/TreeView/Button/fn_TvDelete.sqf b/addons/vana_loadoutmanagement/Functions/TreeView/Button/fn_TvDelete.sqf
index 2c62e0b..55dba8c 100644
--- a/addons/vana_loadoutmanagement/Functions/TreeView/Button/fn_TvDelete.sqf
+++ b/addons/vana_loadoutmanagement/Functions/TreeView/Button/fn_TvDelete.sqf
@@ -28,7 +28,7 @@ switch _TvData do
 		{
 			if (tolower (_x select 2) isEqualto "tvloadout") then
 			{
-				[_CtrlTreeView, [_TargetTvParent, _x] select 0] call VANA_fnc_TvCreateLoadout;
+				[_CtrlTreeView, [_TargetTvParent, _x]] call VANA_fnc_TvCreateLoadout;
 			};
 		} foreach _TargetTvChildren;
 	};
diff --git a/addons/vana_loadoutmanagement/Functions/TreeView/Core/fn_TvLoadData.sqf b/addons/vana_loadoutmanagement/Functions/TreeView/Core/fn_TvLoadData.sqf
index d8ddfbf..89f31ad 100644
--- a/addons/vana_loadoutmanagement/Functions/TreeView/Core/fn_TvLoadData.sqf
+++ b/addons/vana_loadoutmanagement/Functions/TreeView/Core/fn_TvLoadData.sqf
@@ -53,10 +53,7 @@ if (_VANAData isequalto []) exitwith
 
 //Create loadouts that werent created
 {
-	if !(_x in _LoadoutNames) then
-	{
-		[_CtrlTreeView, [], _x] call VANA_fnc_TvCreateLoadout;
-	};
-} foreach (_LoadoutData select {_x isequaltype ""});
+	[_CtrlTreeView, [[], _x]] call VANA_fnc_TvCreateLoadout;
+} foreach (_LoadoutData select {_x isequaltype "" && !(_x in _LoadoutNames)});
 
 EndSegment(True)
diff --git a/addons/vana_loadoutmanagement/Functions/fn_Arsenal.sqf b/addons/vana_loadoutmanagement/Functions/fn_Arsenal.sqf
index b9609a9..e784d5d 100644
--- a/addons/vana_loadoutmanagement/Functions/fn_Arsenal.sqf
+++ b/addons/vana_loadoutmanagement/Functions/fn_Arsenal.sqf
@@ -512,6 +512,8 @@ switch _mode do {
 
 	///////////////////////////////////////////////////////////////////////////////////////////
 	case "KeyDown": {
+		BIS_fnc_arsenal_type = uinamespace getvariable ["BIS_fnc_arsenal_type", 0]; //VANA
+
 		_display = _this select 0;
 		_key = _this select 1;
 		_shift = _this select 2;
diff --git a/addons/vana_loadoutmanagement/Stringtable.xml b/addons/vana_loadoutmanagement/Stringtable.xml
index 97dd568..5fc1418 100644
--- a/addons/vana_loadoutmanagement/Stringtable.xml
+++ b/addons/vana_loadoutmanagement/Stringtable.xml
@@ -2,16 +2,16 @@
 <Project Name="VANA">
     <Package Name="Mod.ccp">
         <Key ID="STR_VANA_Tooltip">
-            <Original>Vana - Loadout Management 0.87</Original>
-            <English>Vana - Loadout Management 0.87</English>
+            <Original>Vana - Loadout Management 0.88</Original>
+            <English>Vana - Loadout Management 0.88</English>
         </Key>
         <Key ID="STR_VANA_TooltipOwned">
-            <Original>Vana - Loadout Management 0.87</Original>
-            <English>Vana - Loadout Management 0.87</English>
+            <Original>Vana - Loadout Management 0.88</Original>
+            <English>Vana - Loadout Management 0.88</English>
         </Key>
         <Key ID="STR_VANA_OverviewText">
-            <Original>Vana - Loadout Management 0.87</Original>
-            <English>Vana - Loadout Management 0.87</English>
+            <Original>Vana - Loadout Management 0.88</Original>
+            <English>Vana - Loadout Management 0.88</English>
         </Key>
         <Key ID="STR_VANA_Overview">
             <Original>Vana Purpose is to add extra loadout sorting options to the Virtual Arsenal.</Original>
diff --git a/addons/vana_loadoutmanagement/UI/HPP/RscUIPopup.hpp b/addons/vana_loadoutmanagement/UI/HPP/RscUIPopup.hpp
index bd6e8a5..a0ab232 100644
--- a/addons/vana_loadoutmanagement/UI/HPP/RscUIPopup.hpp
+++ b/addons/vana_loadoutmanagement/UI/HPP/RscUIPopup.hpp
@@ -56,7 +56,7 @@ class VANA_UIPopupControlGroup: RscControlsGroupNoScrollbars
     };
     class VANA_ButtonCancel: RscButtonMenuCancel
     {
-      onButtonClick="with uinamespace do {If !((ctrlparent (_this select 0)) getvariable ['Vana_Initialised', False]) then {(ctrlparent (_this select 0) displayctrl 979000) ctrlshow False;}}";
+      onButtonClick="Private _Display = ctrlparent (_this select 0); If !(_Display getvariable ['Vana_Initialised', false]) then {_Display displayctrl 979000 ctrlshow false;}";
       idc=979005;
       colorBackground[]={0,0,0,1.21};
       x="0 * 					(			((safezoneW / safezoneH) min 1.2) / 40)";
@@ -73,7 +73,7 @@ class VANA_UIPopupControlGroup: RscControlsGroupNoScrollbars
     };
     class VANA_ButtonOK: RscButtonMenuOk
     {
-      onButtonClick="with uinamespace do {If !((ctrlparent (_this select 0)) getvariable ['Vana_Initialised', False]) then {(ctrlparent (_this select 0) displayctrl 979000) ctrlshow False;}}";
+      onButtonClick="Private _Display = ctrlparent (_this select 0); If !(_Display getvariable ['Vana_Initialised', false]) then {_Display displayctrl 979000 ctrlshow false;}";
       text=$STR_VANA_ButtonOK_Text;
       idc=979007;
       colorBackground[]={0,0,0,1.21};
diff --git a/addons/vana_loadoutmanagement/config.cpp b/addons/vana_loadoutmanagement/config.cpp
index 088cb47..2b2956d 100644
--- a/addons/vana_loadoutmanagement/config.cpp
+++ b/addons/vana_loadoutmanagement/config.cpp
@@ -4,7 +4,7 @@ class CfgPatches
   {
     name = "Vana - Loadout Management";
     author = "Eathox";
-    version = "0.87";
+    version = "0.88";
     requiredVersion = 1.3;
     units[] = {};
     requiredAddons[] =