Update layout and base template