Move some HTML from PHP code to templates