Update layout and bootstrap