Improve UI with better pagination and link page display