Move HTML tags into PHP echo statements