Further improve inventory layout
Add check to see if this is enabled