Revert "Revert "Updated Inventory and gui""

This reverts commit bea2436f64d973a4862852aacdd1f00f78e164b0.