Extended templates

Wrapped all new template files in layout.html