Improved shelf layout