Fixed lines
Added paginators