Added sorting
Change pagination