wp - templates fixes