Some tweaks to the original merge
 - Fixed some oddities with storage locations
 - Improved the logic of the sorting and type-selecting bars
 - Fixed typos