Added pagination (kaminari), fixed minor issues