lots of shopscreen tweaks