More fixes on FB templates