goHome and ShopNow fix