Fix typo, improved layout