Update layout and css