Update and rename layout_old.tpl to layout.tpl