Fix typos, change layout.