Adding sorting and filter options (in progress)