Update for layout and template files