Fix typos and layout