page refine, fix bugs