Fix typo and improve layout