Typo and layout fine-tune