Inventory fixes

You can read the commit names for a description.
Why not fix the armor slot area instead?