Updates to Inventory view; to do: show inventory contents
Merge remote-tracking branch 'origin/master'