Update layout and templates