fix typo and data mapping between model and page