Updated templates for newer layout.