fix typo and layout problem