diff --git a/Adventures in Lestoria/AdventuresInLestoria.cpp b/Adventures in Lestoria/AdventuresInLestoria.cpp
index 7dc6c8a6..fa9e8c0b 100644
--- a/Adventures in Lestoria/AdventuresInLestoria.cpp	
+++ b/Adventures in Lestoria/AdventuresInLestoria.cpp	
@@ -2869,7 +2869,7 @@ void AiL::InitializeDefaultKeybinds(){
 	KEY_START.AddKeybind({KEY,SPACE});
 	KEY_START.AddKeybind({CONTROLLER,static_cast<int>(GPButtons::START)});
 	KEY_CONTROLLER_START.AddKeybind({CONTROLLER,static_cast<int>(GPButtons::START)});
-	KEY_SELECT.AddKeybind({KEY,ESCAPE});
+	KEY_SELECT.AddKeybind({KEY,CTRL});
 	KEY_SELECT.AddKeybind({CONTROLLER,static_cast<int>(GPButtons::SELECT)});
 
 	KEY_FACEUP.AddKeybind({KEY,R});
diff --git a/Adventures in Lestoria/ConsumableCraftItemWindow.cpp b/Adventures in Lestoria/ConsumableCraftItemWindow.cpp
index 4016ee23..67d60890 100644
--- a/Adventures in Lestoria/ConsumableCraftItemWindow.cpp	
+++ b/Adventures in Lestoria/ConsumableCraftItemWindow.cpp	
@@ -194,8 +194,8 @@ void Menu::InitializeConsumableCraftItemWindow(){
 			.left="Decrease Craft amount Button",
 			.right="Decrease Craft amount Button",}},
 		{"Decrease Craft amount Button",{
-			.up="Back Button",
-			.down="Back Button",
+			.up="Craft Button",
+			.down="Craft Button",
 			.left="Increase Craft amount Button",
 			.right="Increase Craft amount Button",}},
 	});
diff --git a/Adventures in Lestoria/InventoryWindow.cpp b/Adventures in Lestoria/InventoryWindow.cpp
index c97ad414..f3566a19 100644
--- a/Adventures in Lestoria/InventoryWindow.cpp	
+++ b/Adventures in Lestoria/InventoryWindow.cpp	
@@ -138,7 +138,7 @@ void Menu::InitializeInventoryWindow(){
 	#pragma region Inventory Description
 		float inventoryDescriptionWidth=inventoryWindow->pos.x+inventoryWindow->size.x-26-224;
 		inventoryWindow->ADD("Item Description Outline",MenuLabel)(geom2d::rect<float>{{224,28},{inventoryDescriptionWidth,inventoryWindow->size.y-44}},"",1,LEFT_ALIGN|OUTLINE|BACKGROUND)END;
-		inventoryWindow->ADD("Item Icon",MenuItemItemButton)(geom2d::rect<float>{{226+inventoryDescriptionWidth/2-24,30},{48,48}},Item::BLANK,DO_NOTHING,"","",IconButtonAttr::NOT_SELECTABLE)END
+		inventoryWindow->ADD("Item Icon",MenuItemItemButton)(geom2d::rect<float>{{226+inventoryDescriptionWidth/2-24,30},{48,48}},Item::BLANK,DO_NOTHING,"Item Name Label","Item Description Label",IconButtonAttr::NOT_SELECTABLE)END
 			->SetIconScale({2.f,2.f});
 		inventoryWindow->ADD("Item Name Label",MenuLabel)(geom2d::rect<float>{{226,84},{inventoryDescriptionWidth-6,12}},"",0.75f,LEFT_ALIGN|SHADOW)END;
 		inventoryWindow->ADD("Item Description Label",MenuLabel)(geom2d::rect<float>{{226,94},{inventoryDescriptionWidth-6,inventoryWindow->size.y-44-66}},"",0.5f,LEFT_ALIGN|SHADOW)END;
diff --git a/Adventures in Lestoria/Item.cpp b/Adventures in Lestoria/Item.cpp
index 913db2c1..aa52bc59 100644
--- a/Adventures in Lestoria/Item.cpp	
+++ b/Adventures in Lestoria/Item.cpp	
@@ -686,9 +686,9 @@ const std::string Item::Description(CompactText compact)const{
 		}
 	}
 	if(compact==CRAFTING_INFO){
-		description+="\n\nCrafting Requirements:\n---------\n";
-		if(IsCraftable()){
-			size_t enhanceIndex=std::min(EnhancementLevel()+1,"Item.Item Max Enhancement Level"_I);
+		if(IsCraftable()&&EnhancementLevel()+1<="Item.Item Max Enhancement Level"_I&&GetEnhancementInfo()[EnhancementLevel()+1].chapterAvailable<=game->GetCurrentChapter()){
+			description+="\n\nCrafting Requirements:\n---------\n";
+			size_t enhanceIndex=EnhancementLevel()+1;
 			if(IsEquippable()&&Inventory::GetItemCount(ActualName())==0)enhanceIndex=0;
 
 			const EnhancementLevelInfo&info=GetEnhancementInfo()[int(enhanceIndex)];
diff --git a/Adventures in Lestoria/TODO.txt b/Adventures in Lestoria/TODO.txt
index ea9af8d1..862949a7 100644
--- a/Adventures in Lestoria/TODO.txt	
+++ b/Adventures in Lestoria/TODO.txt	
@@ -10,4 +10,7 @@ should gemstones dropp from boss stages aswell? (Maybe lower droprate?)
 
 Funny text colors with text color override on blacksmith menu
 
-Toggle for displaying error messages
\ No newline at end of file
+Toggle for displaying error messages
+Pressing down from the - button on sherman should move to the craft button as well.
+Inventory menu still not blinking
+Pressing R2/L2 scrolls through monster loot/stage loot window REALLY fast
\ No newline at end of file
diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h
index b1ceb873..5bcf02ff 100644
--- a/Adventures in Lestoria/Version.h	
+++ b/Adventures in Lestoria/Version.h	
@@ -39,7 +39,7 @@ All rights reserved.
 #define VERSION_MAJOR 0
 #define VERSION_MINOR 5
 #define VERSION_PATCH 1
-#define VERSION_BUILD 8068
+#define VERSION_BUILD 8082
 
 #define stringify(a) stringify_(a)
 #define stringify_(a) #a
diff --git a/Adventures in Lestoria/olcPGEX_Gamepad.h b/Adventures in Lestoria/olcPGEX_Gamepad.h
index 2626ae86..2604109a 100644
--- a/Adventures in Lestoria/olcPGEX_Gamepad.h	
+++ b/Adventures in Lestoria/olcPGEX_Gamepad.h	
@@ -851,6 +851,7 @@ void olc::GamePad::poll() {
         };
 
         for (size_t i = 0; i < GP_BUTTON_COUNT; i++) {
+            if(i==6||i==7)continue;
             bool pressed = state.Gamepad.wButtons & buttonCodes[i];
             handleButton(i, pressed);
         }
diff --git a/x64/Release/Adventures in Lestoria.exe b/x64/Release/Adventures in Lestoria.exe
index a423d5e7..93e35234 100644
Binary files a/x64/Release/Adventures in Lestoria.exe and b/x64/Release/Adventures in Lestoria.exe differ