waterfall fix other pages
Merge pull request #118 from RenchuSong/master

waterfall fix other pages