Added sorting and filter controls