Adjusted layout and template data