New Inventory design

Merging the new design into master