Made paging toolbar work and fixed grouping