Make sure inventory gets saved after re-arranging items.
Quite a bit of work to try and fix the bouncing of names when switching spells.