Some work on fixing inventory

UI's a mess at the moment