Update layout and design a bit