Update layout and design