Some tweaks to visual stuff
Style and template adjustments to shopfront top of page to get content hierarchy looking right. Removed change location link as new menu system supercedes this.
Merge branch 'master' into laura_and_will
Tweaking test