Updated ShopFront and HeaderMenu