fix some pages bugs