Simplifying the inventory menu (and fixing a nasty swap bug)