fix design and pagenation