fix some page improvement