improved pagenation design