Correction for shelf bug and a css tweak for a jumping border issue