Fix typos and improve layout