diff -r 3082bbc15a0a esoui/ingame/lfg/gamepad/zo_activityfindertemplate_gamepad.xml
--- a/esoui/ingame/lfg/gamepad/zo_activityfindertemplate_gamepad.xml    Wed Apr 13 16:28:54 2016 +0200
+++ b/esoui/ingame/lfg/gamepad/zo_activityfindertemplate_gamepad.xml    Wed Apr 13 16:35:26 2016 +0200
@@ -2,7 +2,7 @@
     <Controls>
         <Control name="ZO_ActivityFinderTemplateRewardTemplate_Gamepad" virtual="true">
             <Controls>
-                <Label name="$(parent)Text" maxLineCount="2" font="ZoFontGamepadCondensed42">
+                <Label name="$(parent)Text" font="ZoFontGamepadCondensed42">
                     <Dimensions x="300" />
                 </Label>
             </Controls>
diff -r 3082bbc15a0a esoui/ingame/lfg/keyboard/zo_activityfindertemplate_keyboard.xml
--- a/esoui/ingame/lfg/keyboard/zo_activityfindertemplate_keyboard.xml  Wed Apr 13 16:28:54 2016 +0200
+++ b/esoui/ingame/lfg/keyboard/zo_activityfindertemplate_keyboard.xml  Wed Apr 13 16:35:26 2016 +0200
@@ -50,7 +50,7 @@
 
         <Control name="ZO_ActivityFinderTemplateRewardTemplate_Keyboard" virtual="true">
             <Controls>
-                <Label name="$(parent)Text" maxLineCount="2" font="ZoFontWinH2">
+                <Label name="$(parent)Text" font="ZoFontWinH2">
                     <Dimensions x="220" />
                 </Label>
             </Controls>
diff -r 3082bbc15a0a esoui/ingame/lfg/zo_activityfindertemplate_shared.xml
--- a/esoui/ingame/lfg/zo_activityfindertemplate_shared.xml Wed Apr 13 16:28:54 2016 +0200
+++ b/esoui/ingame/lfg/zo_activityfindertemplate_shared.xml Wed Apr 13 16:35:26 2016 +0200
@@ -34,7 +34,6 @@
                                 <Control name="$(parent)ItemReward" inherits="ZO_ActivityFinderTemplateRewardTemplate_Shared">
                                     <Controls>
                                         <Texture name="$(parent)Icon" override="true" textureFile="EsoUI/Art/LFG/LFG_bonus_letter.dds" />
-                                        <Label name="$(parent)Text" override="true" />
                                     </Controls>
                                 </Control>
 
diff -r 3082bbc15a0a esoui/ingame/storewindow/gamepad/storewindow_gamepad.lua
--- a/esoui/ingame/storewindow/gamepad/storewindow_gamepad.lua  Wed Apr 13 16:28:54 2016 +0200
+++ b/esoui/ingame/storewindow/gamepad/storewindow_gamepad.lua  Wed Apr 13 16:35:26 2016 +0200
@@ -53,15 +53,18 @@
     self.control:RegisterForEvent(EVENT_OPEN_STORE, OnOpenStore)
     self.control:RegisterForEvent(EVENT_CLOSE_STORE, OnCloseStore)
 
+    local function UpdateActiveComponentKeybindButtonGroup()
+        local activeComponent = self:GetActiveComponent()
+        if activeComponent then
+            KEYBIND_STRIP:UpdateKeybindButtonGroup(activeComponent.keybindStripDescriptor)
+        end
+    end
+
     local OnCurrencyChanged = function()
         if not self.control:IsControlHidden() then
             self:RefreshHeaderData()
-
-            local activeComponent = self:GetActiveComponent()
-            if activeComponent then
-                KEYBIND_STRIP:UpdateKeybindButtonGroup(activeComponent.keybindStripDescriptor)
-            end
         end
+        UpdateActiveComponentKeybindButtonGroup()
     end
 
     local OnFailedRepair = function(eventId, reason)
@@ -86,7 +89,8 @@
             PlaySound(SOUNDS.ITEM_MONEY_CHANGED)
         else
             PlayItemSound(itemSoundCategory, ITEM_SOUND_ACTION_ACQUIRE)
-        end    
+        end
+        UpdateActiveComponentKeybindButtonGroup()
     end
 
     local OnInventoryUpdated = function()
@@ -120,11 +124,7 @@
         else
             self:RepairMessageBox(bagId, slotIndex)
         end
-
-        local activeComponent = self:GetActiveComponent()
-        if activeComponent then
-            KEYBIND_STRIP:UpdateKeybindButtonGroup(activeComponent.keybindStripDescriptor)
-        end
+        UpdateActiveComponentKeybindButtonGroup()
     end
 
     SHARED_INVENTORY:RegisterCallback("ItemRepaired", OnItemRepaired)
diff -r 3082bbc15a0a esoui/ingamelocalization/localizegeneratedstrings.lua
--- a/esoui/ingamelocalization/localizegeneratedstrings.lua Wed Apr 13 16:28:54 2016 +0200
+++ b/esoui/ingamelocalization/localizegeneratedstrings.lua Wed Apr 13 16:35:26 2016 +0200
@@ -349,7 +349,7 @@
     "[eng] <<1>>/<<2>>", -- SI_MARKET_PRODUCT_TOOLTIP_UNLOCK_LEVEL
     "[eng] This increases your inventory capacity by |cffffff<<1>>|r slots, though it can’t exceed the maximum size available from Bag Merchants. ", -- SI_MARKET_PRODUCT_TOOLTIP_BACKPACK_UPGRADE_DESCRIPTION
     "[eng] This increases your bank capacity by |cffffff<<1>>|r slots, though it can’t exceed the maximum size available from Bankers.", -- SI_MARKET_PRODUCT_TOOLTIP_BANK_UPGRADE_DESCRIPTION
-    "[eng] This item allows you to create items in any style.", -- SI_ITEM_DESCRIPTION_UNIVERSAL_STYLE
+    "[eng] This item allows you to craft items in any known style.", -- SI_ITEM_DESCRIPTION_UNIVERSAL_STYLE
     "[eng] \"<<1>>\"", -- SI_TOOLTIP_COLLECTIBLE_NICKNAME
     "[eng] <<1>>", -- SI_COLLECTIBLE_NAME_FORMATTER
     "[eng] <<1>>", -- SI_MARKET_PRODUCT_NAME_FORMATTER
@@ -11690,6 +11690,7 @@
 SafeAddVersion(SI_ITEM_FORMAT_STR_CLOTH_MATERIAL_VETERAN_RANK, 1)
 SafeAddVersion(SI_ITEM_FORMAT_STR_LEATHER_MATERIAL_VETERAN_RANK, 1)
 SafeAddVersion(SI_ITEM_FORMAT_STR_METAL_MATERIAL_VETERAN_RANK, 1)
+SafeAddVersion(SI_ITEM_DESCRIPTION_UNIVERSAL_STYLE, 1)
 SafeAddVersion(SI_LONG_LOAD_TIME, 1)
 SafeAddVersion(SI_TIME_DURATION_NOT_LONG_AGO, 2)
 SafeAddVersion(SI_TIME_FORMAT_MONTHS, 1)
diff -r 3082bbc15a0a esoui/internalingamelocalization/localizeinternalingamegeneratedstrings.lua
--- a/esoui/internalingamelocalization/localizeinternalingamegeneratedstrings.lua   Wed Apr 13 16:28:54 2016 +0200
+++ b/esoui/internalingamelocalization/localizeinternalingamegeneratedstrings.lua   Wed Apr 13 16:35:26 2016 +0200
@@ -349,7 +349,7 @@
     "[eng] <<1>>/<<2>>", -- SI_MARKET_PRODUCT_TOOLTIP_UNLOCK_LEVEL
     "[eng] This increases your inventory capacity by |cffffff<<1>>|r slots, though it can’t exceed the maximum size available from Bag Merchants. ", -- SI_MARKET_PRODUCT_TOOLTIP_BACKPACK_UPGRADE_DESCRIPTION
     "[eng] This increases your bank capacity by |cffffff<<1>>|r slots, though it can’t exceed the maximum size available from Bankers.", -- SI_MARKET_PRODUCT_TOOLTIP_BANK_UPGRADE_DESCRIPTION
-    "[eng] This item allows you to create items in any style.", -- SI_ITEM_DESCRIPTION_UNIVERSAL_STYLE
+    "[eng] This item allows you to craft items in any known style.", -- SI_ITEM_DESCRIPTION_UNIVERSAL_STYLE
     "[eng] \"<<1>>\"", -- SI_TOOLTIP_COLLECTIBLE_NICKNAME
     "[eng] <<1>>", -- SI_COLLECTIBLE_NAME_FORMATTER
     "[eng] <<1>>", -- SI_MARKET_PRODUCT_NAME_FORMATTER
@@ -4830,6 +4830,7 @@
 SafeAddVersion(SI_ITEM_FORMAT_STR_CLOTH_MATERIAL_VETERAN_RANK, 1)
 SafeAddVersion(SI_ITEM_FORMAT_STR_LEATHER_MATERIAL_VETERAN_RANK, 1)
 SafeAddVersion(SI_ITEM_FORMAT_STR_METAL_MATERIAL_VETERAN_RANK, 1)
+SafeAddVersion(SI_ITEM_DESCRIPTION_UNIVERSAL_STYLE, 1)
 SafeAddVersion(SI_LONG_LOAD_TIME, 1)
 SafeAddVersion(SI_TIME_DURATION_NOT_LONG_AGO, 2)
 SafeAddVersion(SI_TIME_FORMAT_MONTHS, 1)
diff -r 3082bbc15a0a esoui/pregamelocalization/localizepregamegeneratedstrings.lua
--- a/esoui/pregamelocalization/localizepregamegeneratedstrings.lua Wed Apr 13 16:28:54 2016 +0200
+++ b/esoui/pregamelocalization/localizepregamegeneratedstrings.lua Wed Apr 13 16:35:26 2016 +0200
@@ -349,7 +349,7 @@
     "[eng] <<1>>/<<2>>", -- SI_MARKET_PRODUCT_TOOLTIP_UNLOCK_LEVEL
     "[eng] This increases your inventory capacity by |cffffff<<1>>|r slots, though it can’t exceed the maximum size available from Bag Merchants. ", -- SI_MARKET_PRODUCT_TOOLTIP_BACKPACK_UPGRADE_DESCRIPTION
     "[eng] This increases your bank capacity by |cffffff<<1>>|r slots, though it can’t exceed the maximum size available from Bankers.", -- SI_MARKET_PRODUCT_TOOLTIP_BANK_UPGRADE_DESCRIPTION
-    "[eng] This item allows you to create items in any style.", -- SI_ITEM_DESCRIPTION_UNIVERSAL_STYLE
+    "[eng] This item allows you to craft items in any known style.", -- SI_ITEM_DESCRIPTION_UNIVERSAL_STYLE
     "[eng] \"<<1>>\"", -- SI_TOOLTIP_COLLECTIBLE_NICKNAME
     "[eng] <<1>>", -- SI_COLLECTIBLE_NAME_FORMATTER
     "[eng] <<1>>", -- SI_MARKET_PRODUCT_NAME_FORMATTER
@@ -5314,6 +5314,7 @@
 SafeAddVersion(SI_ITEM_FORMAT_STR_CLOTH_MATERIAL_VETERAN_RANK, 1)
 SafeAddVersion(SI_ITEM_FORMAT_STR_LEATHER_MATERIAL_VETERAN_RANK, 1)
 SafeAddVersion(SI_ITEM_FORMAT_STR_METAL_MATERIAL_VETERAN_RANK, 1)
+SafeAddVersion(SI_ITEM_DESCRIPTION_UNIVERSAL_STYLE, 1)
 SafeAddVersion(SI_LONG_LOAD_TIME, 1)
 SafeAddVersion(SI_TIME_DURATION_NOT_LONG_AGO, 2)
 SafeAddVersion(SI_TIME_FORMAT_MONTHS, 1)

diff -r 8977876e0dd0 esoui/ingame/crafting/keyboard/smithingcreation_keyboard.lua
--- a/esoui/ingame/crafting/keyboard/smithingcreation_keyboard.lua  Tue Mar 22 07:59:26 2016 +0100
+++ b/esoui/ingame/crafting/keyboard/smithingcreation_keyboard.lua  Tue Mar 22 08:01:32 2016 +0100
@@ -39,7 +39,8 @@
     if IsChatSystemAvailableForCurrentPlatform() then
         local function OnTooltipMouseUp(control, button, upInside)
             if upInside and button == MOUSE_BUTTON_INDEX_RIGHT then
-                local link = ZO_LinkHandler_CreateChatLink(GetSmithingPatternResultLink, self:GetAllCraftingParameters())
+                local link = ZO_LinkHandler_CreateChatLink(GetSmithingPatternResultLink, self:GetSelectedPatternIndex(), self:GetSelectedMaterialIndex(), 
+                    self:GetSelectedMaterialQuantity(), self:GetSelectedStyleIndex(), self:GetSelectedTraitIndex())
                 if link ~= "" then
                     ClearMenu()
 
diff -r 8977876e0dd0 esoui/ingame/inventory/inventoryslot.lua
--- a/esoui/ingame/inventory/inventoryslot.lua  Tue Mar 22 07:59:26 2016 +0100
+++ b/esoui/ingame/inventory/inventoryslot.lua  Tue Mar 22 08:01:32 2016 +0100
@@ -666,19 +666,16 @@
 end
 
 -- If called on an item inventory slot, returns the index of the attachment slot that's holding it, or nil if it's not attached.
--- If called on an attachment inventory slot, returns the index of that attachment slot.
 local function GetQueuedItemAttachmentSlotIndex(inventorySlot)
     local bag, attachmentIndex = ZO_Inventory_GetBagAndIndex(inventorySlot)
     if (bag) then
         for i = 1, MAIL_MAX_ATTACHED_ITEMS do
             local bagId, slotIndex = GetQueuedItemAttachmentInfo(i)
             if bagId == bag and attachmentIndex == slotIndex then
-                attachmentIndex = i
-                break
+                return i
             end
         end
     end
-    return attachmentIndex
 end
 
 local function IsItemAlreadyAttachedToMail(inventorySlot)
@@ -2387,7 +2384,7 @@
     [SLOT_TYPE_MAIL_QUEUED_ATTACHMENT] =
     {
         function(inventorySlot)
-            local attachmentIndex = GetQueuedItemAttachmentSlotIndex(inventorySlot)
+            local attachmentIndex = inventorySlot.slotIndex
             if attachmentIndex then
                 PlaceInAttachmentSlot(attachmentIndex)
             end
diff -r 8977876e0dd0 esoui/ingame/mail/mailsend_shared.lua
--- a/esoui/ingame/mail/mailsend_shared.lua Tue Mar 22 07:59:26 2016 +0100
+++ b/esoui/ingame/mail/mailsend_shared.lua Tue Mar 22 08:01:32 2016 +0100
@@ -32,11 +32,13 @@
         for i = 1, MAIL_MAX_ATTACHED_ITEMS do
             local bagId, slotIndex, icon, stack = GetQueuedItemAttachmentInfo(i)
             if(stack > 0) then
-            g_pendingAttachments[i] = { bagId = bagId,
-                                           slotIndex = slotIndex,
-                                           itemInstanceId = GetItemInstanceId(bagId, slotIndex),
-                                           stackSize = stack, 
-                                           icon = icon }
+                g_pendingAttachments[i] = {
+                    bagId = bagId,
+                    slotIndex = slotIndex,
+                    itemInstanceId = GetItemInstanceId(bagId, slotIndex),
+                    stackSize = stack, 
+                    icon = icon
+                }
                 RemoveQueuedItemAttachment(i)
             end
         end
@@ -45,15 +47,12 @@
 end
 
 function ZO_MailSendShared_RestorePendingMail(manager)
-    local nextSlot = 1
-
     if(g_pendingAttachments) then
-        for _, pendingAttachment in ipairs(g_pendingAttachments) do
+        for attachmentSlot, pendingAttachment in pairs(g_pendingAttachments) do
             local sameItemInSlot = GetItemInstanceId(pendingAttachment.bagId, pendingAttachment.slotIndex) == pendingAttachment.itemInstanceId
             local sameStackSize = GetSlotStackSize(pendingAttachment.bagId, pendingAttachment.slotIndex) == pendingAttachment.stackSize
             if(sameItemInSlot and sameStackSize) then
-                QueueItemAttachment(pendingAttachment.bagId, pendingAttachment.slotIndex, nextSlot)
-                nextSlot = nextSlot + 1
+                QueueItemAttachment(pendingAttachment.bagId, pendingAttachment.slotIndex, attachmentSlot)
             else
                 manager.pendingMailChanged = true
             end