Shop phone numbers will display properly now in header + general cleanup