Fixed Shelf Rendering :D