1. Solved the bug of display on wathlist
2. Improved pagination display in watchlist