Added SortBy and SortOrder, updated main page