Update layout and typos