fix layout and typos