Fixed shift-click for armor items, cleanup