Riley-Pittman-Euvin Merged

Fixes UI bugs in Inventory Manager