add page & solve some bugs