fix typos & layout