Moved weight/volume display to inventory and made one minor bugfix