Fix paging and empty boxes